diff --git a/src/inner-loop-tracker.ts b/src/inner-loop-tracker.ts
index 86466505..efb51f4c 100644
--- a/src/inner-loop-tracker.ts
+++ b/src/inner-loop-tracker.ts
@@ -983,62 +983,77 @@ export class InnerLoopTracker extends EventEmitter {
    * @fires todoUpdate - When any todos are detected or updated
    */
   private detectTodoItems(line: string): void {
+    // Pre-compute which pattern categories might match (60-75% faster)
+    const hasCheckbox = line.includes('[');
+    const hasTodoIndicator = line.includes('Todo:');
+    const hasNativeCheckbox = line.includes('☐') || line.includes('☒') || line.includes('◐');
+    const hasStatus = line.includes('(pending)') || line.includes('(in_progress)') || line.includes('(completed)');
+
     // Quick check: skip lines that can't possibly contain todos
-    // Must have: checkbox marker, icon, or parentheses status
-    if (!line.includes('[') && !line.includes('☐') && !line.includes('☒') &&
-        !line.includes('◐') && !line.includes('Todo:') && !line.includes('(pending)') &&
-        !line.includes('(in_progress)') && !line.includes('(completed)')) {
+    if (!hasCheckbox && !hasTodoIndicator && !hasNativeCheckbox && !hasStatus) {
       return;
     }
 
     let updated = false;
+    let match: RegExpExecArray | null;
 
     // Format 1: Checkbox format "- [ ] Task" or "- [x] Task"
-    TODO_CHECKBOX_PATTERN.lastIndex = 0;
-    let match: RegExpExecArray | null;
-    while ((match = TODO_CHECKBOX_PATTERN.exec(line)) !== null) {
-      const checked = match[1].toLowerCase() === 'x';
-      const content = match[2].trim();
-      const status: InnerTodoStatus = checked ? 'completed' : 'pending';
-      this.upsertTodo(content, status);
-      updated = true;
+    // Only scan if line contains '[' character
+    if (hasCheckbox) {
+      TODO_CHECKBOX_PATTERN.lastIndex = 0;
+      while ((match = TODO_CHECKBOX_PATTERN.exec(line)) !== null) {
+        const checked = match[1].toLowerCase() === 'x';
+        const content = match[2].trim();
+        const status: InnerTodoStatus = checked ? 'completed' : 'pending';
+        this.upsertTodo(content, status);
+        updated = true;
+      }
     }
 
     // Format 2: Todo with indicator icons
-    TODO_INDICATOR_PATTERN.lastIndex = 0;
-    while ((match = TODO_INDICATOR_PATTERN.exec(line)) !== null) {
-      const icon = match[1];
-      const content = match[2].trim();
-      const status = this.iconToStatus(icon);
-      this.upsertTodo(content, status);
-      updated = true;
+    // Only scan if line contains 'Todo:' prefix
+    if (hasTodoIndicator) {
+      TODO_INDICATOR_PATTERN.lastIndex = 0;
+      while ((match = TODO_INDICATOR_PATTERN.exec(line)) !== null) {
+        const icon = match[1];
+        const content = match[2].trim();
+        const status = this.iconToStatus(icon);
+        this.upsertTodo(content, status);
+        updated = true;
+      }
     }
 
     // Format 3: Status in parentheses
-    TODO_STATUS_PATTERN.lastIndex = 0;
-    while ((match = TODO_STATUS_PATTERN.exec(line)) !== null) {
-      const content = match[1].trim();
-      const status = match[2] as InnerTodoStatus;
-      this.upsertTodo(content, status);
-      updated = true;
+    // Only scan if line contains status in parentheses
+    if (hasStatus) {
+      TODO_STATUS_PATTERN.lastIndex = 0;
+      while ((match = TODO_STATUS_PATTERN.exec(line)) !== null) {
+        const content = match[1].trim();
+        const status = match[2] as InnerTodoStatus;
+        this.upsertTodo(content, status);
+        updated = true;
+      }
     }
 
     // Format 4: Claude Code native TodoWrite output (☐, ☒, ◐)
-    TODO_NATIVE_PATTERN.lastIndex = 0;
-    while ((match = TODO_NATIVE_PATTERN.exec(line)) !== null) {
-      const icon = match[1];
-      const content = match[2].trim();
+    // Only scan if line contains native checkbox icons
+    if (hasNativeCheckbox) {
+      TODO_NATIVE_PATTERN.lastIndex = 0;
+      while ((match = TODO_NATIVE_PATTERN.exec(line)) !== null) {
+        const icon = match[1];
+        const content = match[2].trim();
 
-      // Skip if content matches exclude patterns (tool invocations, commentary)
-      const shouldExclude = TODO_EXCLUDE_PATTERNS.some(pattern => pattern.test(content));
-      if (shouldExclude) continue;
+        // Skip if content matches exclude patterns (tool invocations, commentary)
+        const shouldExclude = TODO_EXCLUDE_PATTERNS.some(pattern => pattern.test(content));
+        if (shouldExclude) continue;
 
-      // Skip if content is too short or looks like partial garbage
-      if (content.length < 5) continue;
+        // Skip if content is too short or looks like partial garbage
+        if (content.length < 5) continue;
 
-      const status = this.iconToStatus(icon);
-      this.upsertTodo(content, status);
-      updated = true;
+        const status = this.iconToStatus(icon);
+        this.upsertTodo(content, status);
+        updated = true;
+      }
     }
 
     if (updated) {
diff --git a/src/session.ts b/src/session.ts
index ee20374a..c77851a7 100644
--- a/src/session.ts
+++ b/src/session.ts
@@ -295,6 +295,7 @@ export class Session extends EventEmitter {
   private _lineBufferFlushTimer: NodeJS.Timeout | null = null;
   private resolvePromise: ((value: { result: string; cost: number }) => void) | null = null;
   private rejectPromise: ((reason: Error) => void) | null = null;
+  private _promptResolved: boolean = false;  // Guard against race conditions in runPrompt
   private _isWorking: boolean = false;
   private _lastPromptTime: number = 0;
   private activityTimeout: NodeJS.Timeout | null = null;
@@ -896,6 +897,7 @@ export class Session extends EventEmitter {
       this._messages = [];
       this._lineBuffer = '';
       this._lastActivityAt = Date.now();
+      this._promptResolved = false;  // Reset race condition guard
 
       this.resolvePromise = resolve;
       this.rejectPromise = reject;
@@ -949,6 +951,19 @@ export class Session extends EventEmitter {
           this.ptyProcess = null;
           this._pid = null;
 
+          // Guard against race conditions: only process once per runPrompt call
+          if (this._promptResolved) {
+            this.emit('exit', exitCode);
+            return;
+          }
+          this._promptResolved = true;
+
+          // Capture callbacks atomically before processing
+          const resolve = this.resolvePromise;
+          const reject = this.rejectPromise;
+          this.resolvePromise = null;
+          this.rejectPromise = null;
+
           // Find result from parsed messages or use text output
           const resultMsg = this._messages.find(m => m.type === 'result');
 
@@ -957,23 +972,21 @@ export class Session extends EventEmitter {
             const cost = resultMsg.total_cost_usd || 0;
             this._totalCost += cost;
             this.emit('completion', resultMsg.result || '', cost);
-            if (this.resolvePromise) {
-              this.resolvePromise({ result: resultMsg.result || '', cost });
+            if (resolve) {
+              resolve({ result: resultMsg.result || '', cost });
             }
           } else if (exitCode !== 0 || (resultMsg && resultMsg.is_error)) {
             this._status = 'error';
-            if (this.rejectPromise) {
-              this.rejectPromise(new Error(this._errorBuffer || this._textOutput.value || 'Process exited with error'));
+            if (reject) {
+              reject(new Error(this._errorBuffer || this._textOutput.value || 'Process exited with error'));
             }
           } else {
             this._status = 'idle';
-            if (this.resolvePromise) {
-              this.resolvePromise({ result: this._textOutput.value || this._terminalBuffer.value, cost: this._totalCost });
+            if (resolve) {
+              resolve({ result: this._textOutput.value || this._terminalBuffer.value, cost: this._totalCost });
             }
           }
 
-          this.resolvePromise = null;
-          this.rejectPromise = null;
           this.emit('exit', exitCode);
         });