diff --git a/entry b/entry
index 61f24de..834939e 100755
--- a/entry
+++ b/entry
@@ -146370,7 +146370,7 @@ async function main() {
       try {
         if (payload.debug) {
           process.env.LOG_LEVEL = "debug";
-          log.info("\xBB debug mode enabled via #debug macro");
+          log.info("\xBB debug mode enabled via --debug flag");
         }
         if (payload.cwd && process.cwd() !== payload.cwd) {
           process.chdir(payload.cwd);
diff --git a/external.ts b/external.ts
index 98be620..e705df0 100644
--- a/external.ts
+++ b/external.ts
@@ -248,9 +248,9 @@ export interface WriteablePayload {
   agent?: AgentName | undefined;
   /** the user's actual request (body if @pullfrog tagged) */
   prompt: string;
-  /** event-level instructions for this trigger type (macro-expanded server-side) */
+  /** event-level instructions for this trigger type (flag-expanded server-side) */
   eventInstructions?: string | undefined;
-  /** repo-level instructions (macro-expanded server-side) */
+  /** repo-level instructions (flag-expanded server-side) */
   repoInstructions?: string | undefined;
   /** event data from webhook payload - discriminated union based on trigger field */
   event: PayloadEvent;
diff --git a/main.ts b/main.ts
index d8c97bc..70d0288 100644
--- a/main.ts
+++ b/main.ts
@@ -83,10 +83,10 @@ export async function main(): Promise<MainResult> {
   const runInfo = await resolveRun({ octokit });
 
   try {
-    // enable debug logging if #debug macro was used
+    // enable debug logging if --debug flag was used
     if (payload.debug) {
       process.env.LOG_LEVEL = "debug";
-      log.info("» debug mode enabled via #debug macro");
+      log.info("» debug mode enabled via --debug flag");
     }
 
     if (payload.cwd && process.cwd() !== payload.cwd) {
@@ -176,9 +176,9 @@ export async function main(): Promise<MainResult> {
       instructions,
     });
 
-    // timeout enforcement: default is 1 hour, but can be overridden via macros in the prompt:
-    // - #timeout2h (or any duration like "#timeout30m", "#timeout1h30m") to set a custom timeout
-    // - #notimeout to disable timeout entirely
+    // timeout enforcement: default is 1 hour, but can be overridden via flags in the prompt:
+    // - --timeout=2h (or any duration like "--timeout=30m", "--timeout=1h30m") to set a custom timeout
+    // - --notimeout to disable timeout entirely
     let result: Awaited<typeof agentPromise>;
     if (payload.timeout === TIMEOUT_DISABLED) {
       result = await Promise.race([agentPromise, activityTimeout.promise]);
diff --git a/utils/instructions.ts b/utils/instructions.ts
index 029b9e8..7146c3d 100644
--- a/utils/instructions.ts
+++ b/utils/instructions.ts
@@ -125,11 +125,11 @@ export function resolveInstructions(ctx: InstructionsContext): ResolvedInstructi
   // user prompt is the user's actual request (body if @pullfrog tagged)
   const user = ctx.payload.prompt;
 
-  // event-level instructions are trigger-specific (macro-expanded server-side)
+  // event-level instructions are trigger-specific (flag-expanded server-side)
   // note: server only sends these when there's no user prompt (user request has precedence)
   const eventInstructions = ctx.payload.eventInstructions ?? "";
 
-  // repo-level instructions are macro-expanded server-side
+  // repo-level instructions are flag-expanded server-side
   const repo = ctx.payload.repoInstructions ?? "";
 
   // determine if this is a PR or issue for labeling
diff --git a/utils/time.ts b/utils/time.ts
index 48efb2a..3c08a20 100644
--- a/utils/time.ts
+++ b/utils/time.ts
@@ -3,7 +3,7 @@
  * supports formats like "10m", "1h30m", "10m12s", "30s".
  */
 
-// special value indicating timeout is explicitly disabled via #notimeout macro
+// special value indicating timeout is explicitly disabled via --notimeout flag
 export const TIMEOUT_DISABLED = "none";
 
 // time string regex: supports formats like "10m", "1h30m", "10m12s", "30s"