autodev-cli 1.4.187 → 1.4.189

package/out/taskLoop.js

@@ -72,6 +72,27 @@ const projectSkills_1 = require("./core/projectSkills");
 const configManager_1 = require("./configManager");
 const agentBackup_1 = require("./agentBackup");
 const version_1 = require("./version");
+// ---------------------------------------------------------------------------
+// Persistent-CLI predicates (Phase 2). A CLI provider that runs through its
+// persistent sibling's in-process client this turn must be treated by the loop
+// exactly like that sibling (busy flag, mid-turn steer, session capture, close,
+// compact/clear) instead of the exit-file/command path. These mirror the gate
+// the dispatcher uses, so both agree per turn. When the gate is off (or the
+// transport is unavailable) they return false and the legacy command handling
+// applies — nothing regresses.
+// ---------------------------------------------------------------------------
+/** claude-cli is reusing the claude-tui StructuredClient this turn. */
+function claudeCliIsPersistent(p) { return p === 'claude-cli' && (0, claudeTuiProvider_1.claudeCliPersistentEnabled)(); }
+/** copilot-cli is reusing the copilot-sdk LocalSession this turn. */
+function copilotCliIsPersistent(p) { return p === 'copilot-cli' && (0, copilotSdkProvider_1.copilotCliPersistentEnabled)(); }
+/** opencode-cli is reusing the opencode-sdk server+session this turn. */
+function opencodeCliIsPersistent(p) { return p === 'opencode-cli' && (0, opencodeSdkProvider_1.opencodeCliPersistentEnabled)(); }
+/** Provider runs on the persistent claude-tui client (native or claude-cli routed). */
+function usesClaudeTuiClient(p) { return p === 'claude-tui' || claudeCliIsPersistent(p); }
+/** Provider runs on the persistent copilot-sdk session (native or copilot-cli routed). */
+function usesCopilotSdkSession(p) { return p === 'copilot-sdk' || copilotCliIsPersistent(p); }
+/** Provider runs on the persistent opencode-sdk server (native or opencode-cli routed). */
+function usesOpencodeSdkServer(p) { return p === 'opencode-sdk' || opencodeCliIsPersistent(p); }
 /**
  * After `_waitForTaskCompletion` resolves, decide whether the SUCCESS/completion
  * path (`task_done` → COMPLETED, `task_progress` → WORKING, completedCount++)
@@ -373,7 +394,7 @@ class TaskLoopRunner {
         this._compacting = true;
         log(`🗜 Manual compact triggered (provider: ${provider})`);
         try {
-            if (provider === 'claude-cli') {
+            if (provider === 'claude-cli' && !claudeCliIsPersistent(provider)) {
                 let sid = (0, sessionState_1.getSessionId)(root, 'claude-cli');
                 if (!sid) {
                     sid = (0, dispatcher_1.findLatestClaudeSession)(root);
@@ -386,8 +407,10 @@ class TaskLoopRunner {
                     log('⚠️ Compact: no Claude session ID found');
                 }
             }
-            else if (provider === 'claude-tui') {
-                let sid = (0, sessionState_1.getSessionId)(root, 'claude-tui');
+            else if (usesClaudeTuiClient(provider)) {
+                // claude-tui OR a persistent claude-cli — compact the LIVE StructuredClient
+                // (spawning a separate `claude … /compact` would fight the held session).
+                let sid = (0, sessionState_1.getSessionId)(root, provider);
                 if (!sid) {
                     sid = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(root);
                 }
@@ -399,7 +422,7 @@ class TaskLoopRunner {
                     log('⚠️ Compact: no Claude TUI session ID found');
                 }
             }
-            else if (provider === 'opencode-cli') {
+            else if (provider === 'opencode-cli' && !opencodeCliIsPersistent(provider)) {
                 let sid = (0, sessionState_1.getSessionId)(root, 'opencode-cli');
                 if (!sid) {
                     sid = await (0, opencodeCliProvider_1.getLatestOpenCodeSessionId)(root, log);
@@ -412,7 +435,7 @@ class TaskLoopRunner {
                     log('⚠️ Compact: no OpenCode session ID found');
                 }
             }
-            else if (provider === 'opencode-sdk') {
+            else if (usesOpencodeSdkServer(provider)) {
                 await (0, opencodeSdkProvider_1.runOpencodeSdkCompact)(root, log);
                 log('🗜 Compact complete (opencode-sdk)');
             }
@@ -433,7 +456,7 @@ class TaskLoopRunner {
         const log = (m) => this._cb?.log(m);
         log(`🗑 Manual /clear triggered (provider: ${provider})`);
         try {
-            if (provider === 'claude-cli') {
+            if (provider === 'claude-cli' && !claudeCliIsPersistent(provider)) {
                 let sid = (0, sessionState_1.getSessionId)(root, 'claude-cli');
                 if (!sid) {
                     sid = (0, dispatcher_1.findLatestClaudeSession)(root);
@@ -447,14 +470,15 @@ class TaskLoopRunner {
                     log('⚠️ /clear: no Claude session ID found');
                 }
             }
-            else if (provider === 'claude-tui') {
-                let sid = (0, sessionState_1.getSessionId)(root, 'claude-tui');
+            else if (usesClaudeTuiClient(provider)) {
+                // claude-tui OR a persistent claude-cli — /clear the LIVE StructuredClient.
+                let sid = (0, sessionState_1.getSessionId)(root, provider);
                 if (!sid) {
                     sid = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(root);
                 }
                 if (sid) {
                     await (0, claudeTuiProvider_1.runClaudeTuiClear)(root, sid, log);
-                    (0, sessionState_1.clearSessionId)(root, 'claude-tui');
+                    (0, sessionState_1.clearSessionId)(root, provider);
                     log('🗑 /clear (TUI) complete — session reset');
                 }
                 else {
@@ -1118,14 +1142,16 @@ class TaskLoopRunner {
             const root = this._workspaceRoot;
             const provider = this._cb?.getActiveProvider() ?? '';
             if (root) {
-                if (provider === 'claude-tui') {
-                    let sessionId = (0, sessionState_1.getSessionId)(root, 'claude-tui');
+                if (usesClaudeTuiClient(provider)) {
+                    // claude-tui OR a persistent claude-cli — clear the LIVE StructuredClient.
+                    const claudeProvider = provider;
+                    let sessionId = (0, sessionState_1.getSessionId)(root, claudeProvider);
                     if (!sessionId) {
                         sessionId = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(root);
                     }
                     if (sessionId) {
                         (0, claudeTuiProvider_1.runClaudeTuiClear)(root, sessionId, msg => this._cb?.log(msg))
-                            .then(() => { (0, sessionState_1.clearSessionId)(root, 'claude-tui'); this._cb?.log('🗑 /clear (TUI) complete'); })
+                            .then(() => { (0, sessionState_1.clearSessionId)(root, claudeProvider); this._cb?.log('🗑 /clear (TUI) complete'); })
                             .catch(e => this._cb?.log(`⚠️ /clear (TUI) failed: ${e instanceof Error ? e.message : String(e)}`));
                     }
                     else {
@@ -1133,7 +1159,7 @@ class TaskLoopRunner {
                     }
                 }
                 else {
-                    // Default to claude-cli
+                    // Default to claude-cli (legacy per-turn command path)
                     let sessionId = (0, sessionState_1.getSessionId)(root, 'claude-cli');
                     if (!sessionId) {
                         sessionId = (0, dispatcher_1.findLatestClaudeSession)(root);
@@ -1187,7 +1213,7 @@ class TaskLoopRunner {
         // `_currentTask` routes an idle steer to the buffer path below, which wakes the
         // idle sleep and drains it into a real turn immediately.
         const turnInFlight = !!this._currentTask;
-        if (root && turnInFlight && provider === 'claude-tui' && (0, claudeTuiProvider_1.isClaudeTuiBusy)(root)) {
+        if (root && turnInFlight && usesClaudeTuiClient(provider) && (0, claudeTuiProvider_1.isClaudeTuiBusy)(root)) {
             if (await (0, claudeTuiProvider_1.steerClaudeTui)(root, clean, msg => this._cb?.log(msg))) {
                 this._cb?.log(`⚡ Steered mid-turn: "${clean.slice(0, 80)}"`);
                 onDelivered?.(); // durably injected into the live turn
@@ -1198,7 +1224,7 @@ class TaskLoopRunner {
         // injects into the running turn — true mid-turn steering, same as claude-tui.
         // (copilot-CLI is a one-shot subprocess with no live turn to inject into, so
         // it always falls through to the next-turn TODO queue below.)
-        if (root && turnInFlight && provider === 'copilot-sdk' && (0, copilotSdkProvider_1.isCopilotSdkBusy)(root)) {
+        if (root && turnInFlight && usesCopilotSdkSession(provider) && (0, copilotSdkProvider_1.isCopilotSdkBusy)(root)) {
             if (await (0, copilotSdkProvider_1.steerCopilotSdk)(root, clean, msg => this._cb?.log(msg))) {
                 this._cb?.log(`⚡ Steered mid-turn (copilot-sdk): "${clean.slice(0, 80)}"`);
                 onDelivered?.();
@@ -1207,7 +1233,7 @@ class TaskLoopRunner {
         }
         // opencode-sdk keeps a persistent in-process server + session; a prompt sent to
         // the live session mid-turn is picked up by the running turn (interrupt + continue).
-        if (root && turnInFlight && provider === 'opencode-sdk' && (0, opencodeSdkProvider_1.isOpencodeSdkBusy)(root)) {
+        if (root && turnInFlight && usesOpencodeSdkServer(provider) && (0, opencodeSdkProvider_1.isOpencodeSdkBusy)(root)) {
             if (await (0, opencodeSdkProvider_1.steerOpencodeSdk)(root, clean, msg => this._cb?.log(msg))) {
                 this._cb?.log(`⚡ Steered mid-turn (opencode-sdk): "${clean.slice(0, 80)}"`);
                 onDelivered?.();
@@ -1225,6 +1251,16 @@ class TaskLoopRunner {
                 return;
             }
         }
+        // Persistent-process grok (ACP `grok agent stdio`, grok-cli AND grok-tui):
+        // a mid-run steer is a QUEUED session/prompt delivered to the LIVE process —
+        // it never exits, so the steer reaches the same long-lived agent.
+        if (root && turnInFlight && (provider === 'grok-cli' || provider === 'grok-tui') && (0, grokTuiProvider_1.isGrokAcpBusy)(root)) {
+            if ((0, grokTuiProvider_1.steerGrokAcp)(root, clean, msg => this._cb?.log(msg))) {
+                this._cb?.log(`⚡ Steered mid-turn (grok ACP): "${clean.slice(0, 80)}"`);
+                onDelivered?.();
+                return;
+            }
+        }
         // Fallback: the provider can't be steered mid-turn (grok-*/copilot-cli are
         // one-shot subprocesses). Do NOT append to TODO here — a provider that edits
         // TODO.md itself as it runs (grok manages its own checklist) would clobber a
@@ -1562,13 +1598,16 @@ class TaskLoopRunner {
                 // turn takes >30 s to finish.  Instead, use the in-flight turn flag which
                 // stays true for the entire duration of the async, including after
                 // _waitForTaskCompletion resolves but before the turn emits 'result'.
-                if (provider === 'claude-tui') {
+                // claude-tui OR a persistent claude-cli — both track the turn via the
+                // shared in-memory busy flag on the StructuredClient (honest signal even
+                // for turns >30s, unlike the exit-file sentinel).
+                if (usesClaudeTuiClient(provider)) {
                     return (0, claudeTuiProvider_1.isClaudeTuiBusy)(this._workspaceRoot);
                 }
-                if (provider === 'copilot-sdk') {
+                if (usesCopilotSdkSession(provider)) {
                     return (0, copilotSdkProvider_1.isCopilotSdkBusy)(this._workspaceRoot);
                 }
-                if (provider === 'opencode-sdk') {
+                if (usesOpencodeSdkServer(provider)) {
                     return (0, opencodeSdkProvider_1.isOpencodeSdkBusy)(this._workspaceRoot);
                 }
                 // grok-tui: like claude-tui, it runs a PERSISTENT session (tmux PTY, or a
@@ -1958,7 +1997,7 @@ class TaskLoopRunner {
                 // The exit-code file is written only after the shell command completes,
                 // so a non-empty file guarantees the stdout file is fully flushed.
                 const activeProvider = this._cb?.getActiveProvider();
-                if (this._workspaceRoot && activeProvider === 'claude-tui') {
+                if (this._workspaceRoot && usesClaudeTuiClient(activeProvider)) {
                     // claude-tui: _waitForTaskCompletion resolves as soon as the task is
                     // marked [x] in TODO.md, but the persistent async turn may still be
                     // running (Claude executing further tool calls, marking other tasks [~],
@@ -1989,7 +2028,7 @@ class TaskLoopRunner {
                         (0, claudeTuiProvider_1.forceIdleClaudeTui)(this._workspaceRoot);
                     }
                 }
-                else if (this._workspaceRoot && activeProvider === 'copilot-sdk') {
+                else if (this._workspaceRoot && usesCopilotSdkSession(activeProvider)) {
                     const tuiDeadline = Date.now() + 10 * 60_000;
                     while ((0, copilotSdkProvider_1.isCopilotSdkBusy)(this._workspaceRoot) && Date.now() < tuiDeadline) {
                         if (this._state !== 'running') {
@@ -2001,7 +2040,7 @@ class TaskLoopRunner {
                         this._cb?.log('⚠️ Copilot TUI turn did not complete within 10 minutes — moving on');
                     }
                 }
-                else if (this._workspaceRoot && activeProvider === 'opencode-sdk') {
+                else if (this._workspaceRoot && usesOpencodeSdkServer(activeProvider)) {
                     // opencode-sdk: same pattern as claude-tui — wait for the in-flight
                     // fire-and-forget async to fully complete (session.idle received).
                     // Use activity-based deadline: reset the 30-minute window on each tool
@@ -2095,7 +2134,7 @@ class TaskLoopRunner {
                 }
                 // Capture and persist CLI session ID so the next task can resume it
                 if (this._workspaceRoot && activeProvider && providers_1.PROVIDERS[activeProvider]?.isCli) {
-                    if (activeProvider === 'opencode-cli') {
+                    if (activeProvider === 'opencode-cli' && !opencodeCliIsPersistent(activeProvider)) {
                         // Prefer the session ID from hooks events (fast, no subprocess);
                         // fall back to `opencode session list` if hooks haven't fired yet.
                         // Pass taskStartTime so we ignore stale/foreign hooks events from
@@ -2113,10 +2152,13 @@ class TaskLoopRunner {
                                 .catch(() => { });
                         }
                     }
-                    else if (activeProvider === 'claude-tui') {
+                    else if (usesClaudeTuiClient(activeProvider)) {
+                        // claude-tui OR a persistent claude-cli — the StructuredClient owns the
+                        // real ~/.claude session uuid; persist it under the ACTIVE provider key
+                        // so a (re)start resumes the same session (works for command fallback too).
                         const sid = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(this._workspaceRoot);
                         if (sid) {
-                            (0, sessionState_1.saveSessionId)(this._workspaceRoot, 'claude-tui', sid);
+                            (0, sessionState_1.saveSessionId)(this._workspaceRoot, activeProvider, sid);
                         }
                     }
                     else if (activeProvider === 'copilot-sdk') {
@@ -2125,10 +2167,13 @@ class TaskLoopRunner {
                             (0, sessionState_1.saveSessionId)(this._workspaceRoot, 'copilot-sdk', sid);
                         }
                     }
-                    else if (activeProvider === 'opencode-sdk') {
+                    else if (usesOpencodeSdkServer(activeProvider)) {
+                        // opencode-sdk OR a persistent opencode-cli — persist the real SDK
+                        // session id under the ACTIVE provider key so the next turn RESUMES it
+                        // (never mints a fresh session — see memory opencode-session-explosion).
                         const sid = (0, opencodeSdkProvider_1.getOpencodeSdkLatestSessionId)(this._workspaceRoot);
                         if (sid) {
-                            (0, sessionState_1.saveSessionId)(this._workspaceRoot, 'opencode-sdk', sid);
+                            (0, sessionState_1.saveSessionId)(this._workspaceRoot, activeProvider, sid);
                         }
                     }
                     else {
@@ -2302,7 +2347,7 @@ class TaskLoopRunner {
                     this._cb?.log(`🗜 Auto-compact triggered after ${compactInterval} tasks (provider: ${acProvider})`);
                     this._notifyDiscord(`🗜 Auto-compact triggered after ${compactInterval} tasks`);
                     try {
-                        if (acProvider === 'claude-cli') {
+                        if (acProvider === 'claude-cli' && !claudeCliIsPersistent(acProvider)) {
                             let sid = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'claude-cli');
                             if (!sid) {
                                 sid = (0, dispatcher_1.findLatestClaudeSession)(this._workspaceRoot);
@@ -2315,8 +2360,9 @@ class TaskLoopRunner {
                                 this._cb?.log('⚠️ Auto-compact: no Claude session ID found — skipping');
                             }
                         }
-                        else if (acProvider === 'claude-tui') {
-                            let sid = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'claude-tui');
+                        else if (usesClaudeTuiClient(acProvider)) {
+                            // claude-tui OR a persistent claude-cli — compact the LIVE client.
+                            let sid = (0, sessionState_1.getSessionId)(this._workspaceRoot, acProvider);
                             if (!sid) {
                                 sid = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(this._workspaceRoot);
                             }
@@ -2328,10 +2374,10 @@ class TaskLoopRunner {
                                 this._cb?.log('⚠️ Auto-compact: no Claude TUI session ID found — skipping');
                             }
                         }
-                        else if (acProvider === 'copilot-sdk') {
+                        else if (usesCopilotSdkSession(acProvider)) {
                             this._cb?.log('ℹ️ Auto-compact not supported for copilot-sdk — skipping');
                         }
-                        else if (acProvider === 'opencode-cli') {
+                        else if (acProvider === 'opencode-cli' && !opencodeCliIsPersistent(acProvider)) {
                             let sid = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'opencode-cli');
                             if (!sid) {
                                 sid = await (0, opencodeCliProvider_1.getLatestOpenCodeSessionId)(this._workspaceRoot, msg => this._cb?.log(msg));
@@ -2344,7 +2390,7 @@ class TaskLoopRunner {
                                 this._cb?.log('⚠️ Auto-compact: no OpenCode session ID found — skipping');
                             }
                         }
-                        else if (acProvider === 'opencode-sdk') {
+                        else if (usesOpencodeSdkServer(acProvider)) {
                             await (0, opencodeSdkProvider_1.runOpencodeSdkCompact)(this._workspaceRoot, msg => this._cb?.log(msg));
                             this._cb?.log('🗜 Auto-compact complete (opencode-sdk)');
                         }
@@ -2480,13 +2526,15 @@ class TaskLoopRunner {
                     if (evictRoot) {
                         try {
                             const evictLog = (m) => this._cb?.log(m);
-                            if (currentProvider === 'claude-tui') {
+                            // Also evict the persistent CLI variants (Phase 2) — they hold the
+                            // same live sibling process, which is likewise clutching the dead token.
+                            if (usesClaudeTuiClient(currentProvider)) {
                                 (0, claudeTuiProvider_1.closeClaudeTuiClient)(evictRoot, evictLog);
                             }
-                            else if (currentProvider === 'opencode-sdk') {
+                            else if (usesOpencodeSdkServer(currentProvider)) {
                                 (0, opencodeSdkProvider_1.closeOpencodeSdkClient)(evictRoot, evictLog);
                             }
-                            else if (currentProvider === 'copilot-sdk') {
+                            else if (usesCopilotSdkSession(currentProvider)) {
                                 (0, copilotSdkProvider_1.closeCopilotSdkSession)(evictRoot, evictLog);
                             }
                             else if (currentProvider === 'grok-tui') {
@@ -2614,7 +2662,7 @@ class TaskLoopRunner {
                     const provider = this._cb?.getActiveProvider() ?? '';
                     this._cb?.log(`🗑 Autocompact thrashing (${provider}) — running /clear to reset session…\n${rawMsg}`);
                     this._notifyDiscord(`🗑 **Autocompact thrashing** (${provider}) — running \`/clear\` to reset session…\n\`\`\`\n${rawMsg}\n\`\`\``);
-                    if (provider === 'claude-cli') {
+                    if (provider === 'claude-cli' && !claudeCliIsPersistent(provider)) {
                         let sessionId = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'claude-cli');
                         if (!sessionId) {
                             sessionId = (0, dispatcher_1.findLatestClaudeSession)(this._workspaceRoot);
@@ -2634,15 +2682,16 @@ class TaskLoopRunner {
                             this._cb?.log('⚠️ No Claude session ID found for /clear — retrying anyway');
                         }
                     }
-                    else if (provider === 'claude-tui') {
-                        let sessionId = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'claude-tui');
+                    else if (usesClaudeTuiClient(provider)) {
+                        const claudeProvider = provider;
+                        let sessionId = (0, sessionState_1.getSessionId)(this._workspaceRoot, claudeProvider);
                         if (!sessionId) {
                             sessionId = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(this._workspaceRoot);
                         }
                         if (sessionId) {
                             try {
                                 await (0, claudeTuiProvider_1.runClaudeTuiClear)(this._workspaceRoot, sessionId, msg => this._cb?.log(msg));
-                                (0, sessionState_1.clearSessionId)(this._workspaceRoot, 'claude-tui');
+                                (0, sessionState_1.clearSessionId)(this._workspaceRoot, claudeProvider);
                                 this._cb?.log('🗑 /clear (TUI) complete — session reset, retrying task');
                                 this._notifyDiscord('🗑 `/clear` (TUI) complete — session reset, retrying task');
                             }
@@ -2665,7 +2714,7 @@ class TaskLoopRunner {
                     const provider = this._cb?.getActiveProvider() ?? '';
                     this._cb?.log(`🗜 Context length exceeded (${provider}) — running /compact: ${rawMsg}`);
                     this._notifyDiscord(`🗜 **Context length exceeded** (${provider}) — running \`/compact\`…\n\`\`\`\n${rawMsg}\n\`\`\``);
-                    if (provider === 'claude-cli') {
+                    if (provider === 'claude-cli' && !claudeCliIsPersistent(provider)) {
                         // Resolve a Claude session ID — prefer the saved one, else scan
                         // the .claude/projects jsonl folder for the most recent.
                         let sessionId = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'claude-cli');
@@ -2687,8 +2736,9 @@ class TaskLoopRunner {
                             this._cb?.log('⚠️ No Claude session ID found for compact — retrying task without compact');
                         }
                     }
-                    else if (provider === 'claude-tui') {
-                        let sessionId = (0, sessionState_1.getSessionId)(this._workspaceRoot, 'claude-tui');
+                    else if (usesClaudeTuiClient(provider)) {
+                        const claudeProvider = provider;
+                        let sessionId = (0, sessionState_1.getSessionId)(this._workspaceRoot, claudeProvider);
                         if (!sessionId) {
                             sessionId = (0, claudeTuiProvider_1.getClaudeTuiLatestSessionId)(this._workspaceRoot);
                         }
@@ -2862,6 +2912,11 @@ class TaskLoopRunner {
         const iscopilotSdkProvider = this._cb?.getActiveProvider() === 'copilot-sdk';
         const isOpenCodeCli = this._cb?.getActiveProvider() === 'opencode-cli';
         const isOpencodeSdk = this._cb?.getActiveProvider() === 'opencode-sdk';
+        // opencode-cli running PERSISTENT (Phase 2) shares the opencode-sdk code path:
+        // its in-process server writes '0' to the exit file on session.idle, so it must
+        // be handled like opencode-sdk (resolve on !busy) — NOT via the CLI exit-file
+        // watcher, which would re-prompt in a loop. Command-mode opencode-cli is unaffected.
+        const isOpencodeSdkLike = isOpencodeSdk || (isOpenCodeCli && (0, opencodeSdkProvider_1.opencodeCliPersistentEnabled)());
         // grok-cli / grok-tui / copilot-cli all tee stdout too — without these flags
         // the rate-limit / context-length / thrash detectors never ran for them, so
         // a throttled or context-blown turn was silently walked to give_up and the
@@ -2878,7 +2933,12 @@ class TaskLoopRunner {
         // already tails. Feed that stdout (ANSI-stripped) through a narrator so each
         // chunk becomes a `Notification` hook event, giving line/chunk-granularity
         // live output. (Claude/grok/SDK providers already stream and are untouched.)
-        const cliNarrator = (this._workspaceRoot && (isCopilotCli || isOpenCodeCli))
+        // When copilot-cli / opencode-cli run PERSISTENT (Phase 2) their SDK sibling
+        // already streams assistant text as live Notification events, so the teed-stdout
+        // narrator here would DOUBLE every chunk — disable it in that mode.
+        const cliNarrateCopilot = isCopilotCli && !(0, copilotSdkProvider_1.copilotCliPersistentEnabled)();
+        const cliNarrateOpencode = isOpenCodeCli && !(0, opencodeSdkProvider_1.opencodeCliPersistentEnabled)();
+        const cliNarrator = (this._workspaceRoot && (cliNarrateCopilot || cliNarrateOpencode))
             ? new liveNarration_1.LiveNarrationStreamer(this._cb.getActiveProvider() ?? 'cli', this._workspaceRoot, ev => (0, liveNarration_1.appendHookEventLine)(this._workspaceRoot, ev))
             : null;
         // Independent cursor so narration doesn't disturb the claude-cli Discord
@@ -3385,7 +3445,7 @@ class TaskLoopRunner {
             // exit file when session.idle fires, the poller sees it, calls onCliExit(),
             // which re-sends the prompt, which loops).  Instead, the poller resolves this
             // promise directly when isOpencodeSdkBusy() becomes false (see below).
-            if (!isOpencodeSdk && this._workspaceRoot) {
+            if (!isOpencodeSdkLike && this._workspaceRoot) {
                 attachExitWatcher((0, sessionState_1.exitFilePath)(this._workspaceRoot, activeProvider));
             }
             // Inactivity-based check-in: track Claude JSONL byte size every 3 s.
@@ -3414,14 +3474,14 @@ class TaskLoopRunner {
                     attachStdoutWatcher(resolvedStdoutFile);
                 }
                 const latestExit = (0, sessionState_1.exitFilePath)(this._workspaceRoot, activeProvider);
-                if (!isOpencodeSdk && latestExit !== watchedExitFile) {
+                if (!isOpencodeSdkLike && latestExit !== watchedExitFile) {
                     attachExitWatcher(latestExit);
                 }
                 // opencode-sdk: resolve _waitForTaskCompletion as soon as the SDK
                 // session goes idle (isOpencodeSdkBusy false).  This avoids the
                 // CLI-style onCliExit() reminder re-prompt loop that the exit-file
                 // mechanism would otherwise trigger.
-                if (isOpencodeSdk && this._workspaceRoot && !(0, opencodeSdkProvider_1.isOpencodeSdkBusy)(this._workspaceRoot)) {
+                if (isOpencodeSdkLike && this._workspaceRoot && !(0, opencodeSdkProvider_1.isOpencodeSdkBusy)(this._workspaceRoot)) {
                     check(); // one last todo-file check before resolving
                     if (!cancelled) {
                         cleanup();
@@ -3433,7 +3493,7 @@ class TaskLoopRunner {
                 // events (gitignored dirs, inotify limits, fast exits before re-attach).
                 // Read the exit file directly every tick and trigger onCliExit() if it
                 // became non-empty without the watcher firing.
-                if (!isOpencodeSdk && latestExit && latestExit !== handledExitFile) {
+                if (!isOpencodeSdkLike && latestExit && latestExit !== handledExitFile) {
                     try {
                         if (fs.readFileSync(latestExit, 'utf8').trim() !== '') {
                             handledExitFile = latestExit;