autodev-cli 1.4.190 → 1.4.192

package/out/providers/opencode/acp.js

@@ -0,0 +1,427 @@
+"use strict";
+// ---------------------------------------------------------------------------
+// opencode ACP — native `opencode acp` driven through the shared AcpSession.
+//
+// opencode ships FIRST-PARTY ACP (`opencode acp`, verified live on opencode
+// 1.14.22): the same line-delimited JSON-RPC 2.0 protocol grok speaks, so we
+// reuse the exact AcpSession client. One long-lived `opencode acp` process per
+// workspace root, fed each turn, kept alive; resume only at (re)start via
+// session/load (never minting a new session per turn — the opencode-session-
+// explosion guard).
+//
+// This layer is the opencode BINDING of AcpSession:
+//   - the launch spec: `opencode [-m MODEL] acp` (global -m BEFORE the acp
+//     subcommand; the acp subcommand itself rejects -m). The MODEL comes from the
+//     agent's settings (settings.opencodeModel) — a real, usable model. NB the
+//     free `opencode/*` zen models return empty over raw ACP ("only usable from
+//     within OpenCode"), so an empty clean turn is surfaced as a clear log.
+//   - host hooks that emit the SAME canonical hook events (provider
+//     'opencode-sdk') + live narration + secret redaction the SDK path emits, so
+//     pixel-office sees an identical event stream whether opencode runs via ACP
+//     or the createOpencode server.
+//   - gate `AUTODEV_OPENCODE_ACP` (default ON when `opencode acp` is available)
+//     with the createOpencode-server path as automatic fallback (wired in sdk.ts).
+// ---------------------------------------------------------------------------
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.OPENCODE_ACP_SPEC = void 0;
+exports.opencodeAcpSupported = opencodeAcpSupported;
+exports.__setOpencodeAcpEnabledForTest = __setOpencodeAcpEnabledForTest;
+exports.opencodeAcpEnabled = opencodeAcpEnabled;
+exports.isOpencodeAcpBusy = isOpencodeAcpBusy;
+exports.getOpencodeAcpActivity = getOpencodeAcpActivity;
+exports.getOpencodeAcpLatestSessionId = getOpencodeAcpLatestSessionId;
+exports.hasOpencodeAcpSession = hasOpencodeAcpSession;
+exports.sendOpencodeAcpPrompt = sendOpencodeAcpPrompt;
+exports.steerOpencodeAcp = steerOpencodeAcp;
+exports.steerOpencodeAcpTracked = steerOpencodeAcpTracked;
+exports.ensureOpencodeAcpSteer = ensureOpencodeAcpSteer;
+exports.compactOpencodeAcp = compactOpencodeAcp;
+exports.forceIdleOpencodeAcp = forceIdleOpencodeAcp;
+exports.closeOpencodeAcp = closeOpencodeAcp;
+exports.closeAllOpencodeAcp = closeAllOpencodeAcp;
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const child_process = __importStar(require("child_process"));
+const AcpSession_1 = require("../acp/AcpSession");
+const ProviderNormalizer_1 = require("../base/ProviderNormalizer");
+const redactSecrets_1 = require("../../core/redactSecrets");
+const OPENCODE_BIN = 'opencode';
+/** opencode's ACP launch spec. NB the model is NOT a CLI arg — `opencode acp`
+ *  rejects `-m` (and the global `-m … acp` form exits 1). The model is injected
+ *  via a merged OPENCODE_CONFIG file instead (see _writeAcpConfig). */
+exports.OPENCODE_ACP_SPEC = {
+    buildArgs(_model, extraArgs) {
+        return [...extraArgs, 'acp'];
+    },
+    decodeUpdate: AcpSession_1.decodeAcpUpdateStandard,
+    narrationTitle: 'opencode',
+    narrateReasoning: false, // keep opencode's agent_thought_chunk out of the feed
+};
+/**
+ * Write a MERGED opencode config to `<root>/.autodev/opencode-acp.json` and return
+ * its path — the workspace `opencode.json` (which carries autodev's office/operate
+ * MCP) with the agent's model layered in (and permission:allow ensured). Pointed
+ * at via OPENCODE_CONFIG so `opencode acp` runs the right model WITHOUT the CLI
+ * -m flag and WITHOUT mutating the workspace file. Returns undefined on failure
+ * (the session then just runs with opencode's own resolved config/model).
+ */
+function _writeAcpConfig(root, model) {
+    try {
+        let cfg = {};
+        const wsFile = path.join(root, 'opencode.json');
+        if (fs.existsSync(wsFile)) {
+            try {
+                cfg = JSON.parse(fs.readFileSync(wsFile, 'utf8'));
+            }
+            catch {
+                cfg = {};
+            }
+        }
+        if (!cfg['$schema']) {
+            cfg['$schema'] = 'https://opencode.ai/config.json';
+        }
+        if (model) {
+            cfg['model'] = model;
+        }
+        if (!cfg['permission']) {
+            cfg['permission'] = { '*': 'allow' };
+        } // empty client caps → opencode does its own I/O
+        const dir = path.join(root, '.autodev');
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        const out = path.join(dir, 'opencode-acp.json');
+        fs.writeFileSync(out, JSON.stringify(cfg, null, 2), 'utf8');
+        return out;
+    }
+    catch {
+        return undefined;
+    }
+}
+// --- persistent state (one AcpSession per root) ---------------------------
+const _acpSessions = new Map();
+/** Roots with an opencode ACP turn dispatched (busy synchronously from dispatch
+ *  through full drain — covers the window before AcpSession.runTurn sets busy). */
+const _acpBusyRoots = new Set();
+const _latestSessionIds = new Map();
+// --- availability gate ----------------------------------------------------
+let _opencodeAcpSupported = null;
+/** Cached probe: is `opencode acp` a real subcommand? (opencode prints its help
+ *  to STDERR, so we merge 2>&1 and look for the ACP banner.) */
+function opencodeAcpSupported() {
+    if (_opencodeAcpSupported !== null) {
+        return _opencodeAcpSupported;
+    }
+    try {
+        const out = child_process.execSync(`${OPENCODE_BIN} acp --help 2>&1`, { encoding: 'utf8', stdio: ['ignore', 'pipe', 'pipe'], timeout: 10000 });
+        _opencodeAcpSupported = /Agent Client Protocol|\bACP\b/i.test(out);
+    }
+    catch {
+        _opencodeAcpSupported = false;
+    }
+    return _opencodeAcpSupported;
+}
+let _opencodeAcpTestOverride = null;
+/** Test-only: force the ACP enablement decision. */
+function __setOpencodeAcpEnabledForTest(v) { _opencodeAcpTestOverride = v; }
+/**
+ * Whether opencode should run over native ACP instead of the createOpencode
+ * server. Gated by AUTODEV_OPENCODE_ACP (false/0/off/no forces the server path)
+ * AND `opencode acp` being available. Default ON when available.
+ */
+function opencodeAcpEnabled(env = process.env) {
+    if (_opencodeAcpTestOverride !== null) {
+        return _opencodeAcpTestOverride;
+    }
+    const raw = String(env['AUTODEV_OPENCODE_ACP'] ?? '').toLowerCase();
+    if (raw === 'false' || raw === '0' || raw === 'off' || raw === 'no') {
+        return false;
+    }
+    return opencodeAcpSupported();
+}
+// --- canonical hook emission (parity with grok ACP + the opencode-sdk sink) --
+function _emitOpencodeHook(root, hookEventName, extra = {}) {
+    try {
+        const dir = path.join(root, '.autodev');
+        if (!fs.existsSync(dir)) {
+            fs.mkdirSync(dir, { recursive: true });
+        }
+        const ev = { hook_event_name: hookEventName, event_type: (0, ProviderNormalizer_1.eventTypeFor)(hookEventName), provider: 'opencode-sdk', cwd: root, timestamp: new Date().toISOString(), ...extra };
+        fs.appendFileSync(path.join(dir, 'hooks-events.jsonl'), JSON.stringify(ev) + '\n', 'utf8');
+    }
+    catch { /* non-critical */ }
+}
+/** Get (or lazily create) the persistent opencode ACP session for a root. */
+function _getOrCreate(root, model, log, resumeSessionId) {
+    let sess = _acpSessions.get(root);
+    if (sess) {
+        return sess;
+    }
+    const seedId = resumeSessionId || _latestSessionIds.get(root) || undefined;
+    const hooks = {
+        emitHook: (name, e) => {
+            if (name === 'Notification' && typeof e['message'] === 'string') {
+                const msg = (0, redactSecrets_1.redactSecrets)(String(e['message'])).slice(0, 1200);
+                if (!msg.trim()) {
+                    return;
+                }
+                _emitOpencodeHook(root, 'Notification', { ...e, message: msg });
+            }
+            else {
+                _emitOpencodeHook(root, name, (0, redactSecrets_1.redactDeep)(e));
+            }
+        },
+        log,
+    };
+    const cfgPath = _writeAcpConfig(root, model);
+    const extraEnv = cfgPath ? { OPENCODE_CONFIG: cfgPath } : {};
+    sess = new AcpSession_1.AcpSession({ root, model, bin: OPENCODE_BIN, hooks, spec: exports.OPENCODE_ACP_SPEC, initialSessionId: seedId, extraEnv });
+    _acpSessions.set(root, sess);
+    return sess;
+}
+/** True while an opencode ACP turn (incl. steered continuations) is running. */
+function isOpencodeAcpBusy(root) {
+    if (_acpBusyRoots.has(root)) {
+        return true;
+    }
+    const s = _acpSessions.get(root);
+    return !!s && s.isBusy();
+}
+/** Current tool activity label for the root (undefined = idle). */
+function getOpencodeAcpActivity(root) {
+    return _acpSessions.get(root)?.activity;
+}
+/** Latest opencode ACP session id (for resume-on-restart / session save). */
+function getOpencodeAcpLatestSessionId(root) {
+    return _acpSessions.get(root)?.sessionId ?? _latestSessionIds.get(root);
+}
+/** Is an opencode ACP session currently held for this root? */
+function hasOpencodeAcpSession(root) {
+    return _acpSessions.has(root);
+}
+/**
+ * Run ONE turn through the persistent opencode ACP session. Mirrors the SDK
+ * path's stdout/exit contract. On ACP startup failure, calls `onAcpUnavailable`
+ * (the createOpencode-server fallback) and does NOT write the exit file itself.
+ */
+function sendOpencodeAcpPrompt(root, promptFilePath, resumeSessionId, stdoutFile, exitFile, log, model, showOutput, onAcpUnavailable) {
+    try {
+        fs.writeFileSync(stdoutFile, '', 'utf8');
+    }
+    catch { /* ignore */ }
+    try {
+        fs.writeFileSync(exitFile, '', 'utf8');
+    }
+    catch { /* ignore */ }
+    let promptText = '';
+    try {
+        promptText = fs.readFileSync(promptFilePath, 'utf8');
+    }
+    catch (err) {
+        try {
+            fs.appendFileSync(stdoutFile, `\n[OpenCode ACP: cannot read prompt file: ${err?.message ?? err}]\n`, 'utf8');
+        }
+        catch { /* ignore */ }
+        try {
+            fs.writeFileSync(exitFile, '1\n', 'utf8');
+        }
+        catch { /* ignore */ }
+        return;
+    }
+    const sess = _getOrCreate(root, model, log, resumeSessionId);
+    _acpBusyRoots.add(root); // synchronous busy (before runTurn flips its own flag)
+    if (showOutput) {
+        try {
+            showOutput();
+        }
+        catch { /* ignore */ }
+    }
+    const sink = (text) => { try {
+        fs.appendFileSync(stdoutFile, text, 'utf8');
+    }
+    catch { /* ignore */ } };
+    void (async () => {
+        try {
+            await sess.ensureReady();
+        }
+        catch (err) {
+            log(`OpenCode ACP: startup failed (${err?.message ?? err}); stderr="${sess.stderrSnapshot.slice(0, 200)}" — falling back to createOpencode server`);
+            try {
+                sess.close();
+            }
+            catch { /* ignore */ }
+            _acpSessions.delete(root);
+            _acpBusyRoots.delete(root); // hand the busy flag over to the server path
+            onAcpUnavailable();
+            return;
+        }
+        if (sess.sessionId) {
+            _latestSessionIds.set(root, sess.sessionId);
+        }
+        let res;
+        try {
+            res = await sess.runTurn(promptText, sink);
+        }
+        catch (err) {
+            res = { clean: false, stopReason: 'exception', error: err?.message ?? String(err) };
+        }
+        if (res.emptyOutput) {
+            log(`OpenCode ACP: turn produced NO output (stopReason=${res.stopReason}). The model "${model ?? '(default)'}" may be an unusable free zen model or misconfigured — set a real model (e.g. ollama-cloud/gpt-oss:20b or a configured provider) in the agent settings.`);
+            try {
+                fs.appendFileSync(stdoutFile, `\n[OpenCode ACP: empty turn — check the configured model "${model ?? '(default)'}"]\n`, 'utf8');
+            }
+            catch { /* ignore */ }
+        }
+        if (!res.clean && res.error) {
+            try {
+                fs.appendFileSync(stdoutFile, `\n[OpenCode ACP: turn ended ${res.stopReason} — ${res.error}]\n`, 'utf8');
+            }
+            catch { /* ignore */ }
+        }
+        try {
+            fs.writeFileSync(exitFile, `${res.clean ? 0 : 1}\n`, 'utf8');
+        }
+        catch { /* ignore */ }
+        _acpBusyRoots.delete(root);
+    })();
+}
+/** Steer the live opencode ACP process mid-turn (a queued session/prompt). */
+function steerOpencodeAcp(root, text, log) {
+    const sess = _acpSessions.get(root);
+    if (!sess || !sess.isAlive()) {
+        return false;
+    }
+    const ok = sess.steer(text);
+    if (ok) {
+        log(`OpenCode ACP: steered live process (${text.length} chars) — queued to the running session`);
+    }
+    return ok;
+}
+/**
+ * Durable-steer delivery to an EXISTING live opencode ACP session. Resolves when
+ * the steered turn COMPLETES; null when no live session exists (caller keeps the
+ * steer queued and retries via {@link ensureOpencodeAcpSteer}).
+ */
+function steerOpencodeAcpTracked(root, text, log) {
+    const sess = _acpSessions.get(root);
+    if (!sess || !sess.isAlive()) {
+        return null;
+    }
+    const p = sess.steerTracked(text);
+    if (p) {
+        log(`OpenCode ACP: durable steer delivered to live session (${text.length} chars) — awaiting completion`);
+    }
+    return p;
+}
+/**
+ * Restart-drain delivery: ENSURE a live opencode ACP session (spawn + session/load
+ * if none is held), then deliver the steer and await completion. Returns the turn
+ * result, or null when the session could not be brought up.
+ */
+async function ensureOpencodeAcpSteer(root, model, text, log) {
+    if (!opencodeAcpEnabled()) {
+        return null;
+    }
+    const sess = _getOrCreate(root, model, log, undefined);
+    try {
+        await sess.ensureReady();
+    }
+    catch (err) {
+        log(`OpenCode ACP: durable-steer ensureReady failed (${err?.message ?? err})`);
+        return null;
+    }
+    if (sess.sessionId) {
+        _latestSessionIds.set(root, sess.sessionId);
+    }
+    const p = sess.steerTracked(text);
+    if (!p) {
+        return null;
+    }
+    log(`OpenCode ACP: durable steer (re)delivered on restart-drain (${text.length} chars) — awaiting completion`);
+    return p;
+}
+/** Best-effort /compact on the live opencode ACP session (quiet, no Stop hook). */
+async function compactOpencodeAcp(root, log) {
+    const sess = _acpSessions.get(root);
+    if (!sess) {
+        return;
+    }
+    log('OpenCode ACP: requesting /compact');
+    await sess.sendQuiet('/compact');
+}
+/** Force-clear busy + evict the ACP session for a root. */
+function forceIdleOpencodeAcp(root) {
+    _acpBusyRoots.delete(root);
+    const sess = _acpSessions.get(root);
+    if (sess) {
+        if (sess.pid) {
+            try {
+                child_process.spawn('kill', ['-9', String(sess.pid)]);
+            }
+            catch { /* ignore */ }
+        }
+        try {
+            sess.close();
+        }
+        catch { /* ignore */ }
+        _acpSessions.delete(root);
+    }
+}
+/** Close + evict the opencode ACP session for a root (preserves session id). */
+function closeOpencodeAcp(root, log) {
+    const sess = _acpSessions.get(root);
+    if (sess) {
+        log('OpenCode ACP: closing persistent session');
+        try {
+            sess.close();
+        }
+        catch { /* ignore */ }
+        _acpSessions.delete(root);
+    }
+    _acpBusyRoots.delete(root);
+}
+/** Close all opencode ACP sessions — extension deactivate. */
+function closeAllOpencodeAcp() {
+    for (const [, sess] of _acpSessions) {
+        try {
+            sess.close();
+        }
+        catch { /* ignore */ }
+    }
+    _acpSessions.clear();
+    _acpBusyRoots.clear();
+}
+//# sourceMappingURL=acp.js.map

package/out/providers/opencode/acp.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"acp.js","sourceRoot":"","sources":["../../../src/providers/opencode/acp.ts"],"names":[],"mappings":"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"}

package/out/providers/opencode/sdk.d.ts

@@ -1,4 +1,5 @@
-/** True while an opencode-sdk turn is running for the given workspace root. */
+export { opencodeAcpEnabled, hasOpencodeAcpSession, steerOpencodeAcpTracked, ensureOpencodeAcpSteer } from './acp';
+/** True while an opencode turn is running (ACP session OR createOpencode server). */
 export declare function isOpencodeSdkBusy(root: string): boolean;
 /** Current tool activity label for the given root (undefined = idle). */
 export declare function getOpencodeSdkActivity(root: string): string | undefined;
@@ -17,13 +18,14 @@ export declare function opencodeSdkTransportAvailable(): boolean;
 /** Test-only: force the persistence decision regardless of env/transport. */
 export declare function __setOpencodeCliPersistentForTest(v: boolean | null): void;
 export declare function opencodeCliPersistentEnabled(env?: NodeJS.ProcessEnv): boolean;
-export declare function sendOpencodeSdkPrompt(root: string, 
-/** Absolute path to the combined agent-profile + message file. */
-promptFilePath: string, resumeSessionId: string | undefined, stdoutFile: string, exitFile: string, log: (msg: string) => void, 
-/** Optional model string "providerID/modelID" */
-model?: string, 
-/** Optional callback invoked once to reveal the output panel to the user. */
-showOutput?: () => void): void;
+/**
+ * Router: prefer native `opencode acp` (persistent AcpSession) when enabled;
+ * otherwise use the createOpencode in-process server. On ACP startup failure the
+ * ACP layer transparently falls back to the server path (onAcpUnavailable), so
+ * nothing regresses. Both paths are "SDK-like" to the task loop (persistent,
+ * turn-end via isOpencodeSdkBusy) so no loop change is needed.
+ */
+export declare function sendOpencodeSdkPrompt(root: string, promptFilePath: string, resumeSessionId: string | undefined, stdoutFile: string, exitFile: string, log: (msg: string) => void, model?: string, showOutput?: () => void): void;
 export declare function runOpencodeSdkCompact(root: string, log: (msg: string) => void): Promise<void>;
 export declare function closeOpencodeSdkClient(root: string, log: (msg: string) => void): void;
 /**

package/out/providers/opencode/sdk.js

@@ -44,6 +44,7 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.ensureOpencodeAcpSteer = exports.steerOpencodeAcpTracked = exports.hasOpencodeAcpSession = exports.opencodeAcpEnabled = void 0;
 exports.isOpencodeSdkBusy = isOpencodeSdkBusy;
 exports.getOpencodeSdkActivity = getOpencodeSdkActivity;
 exports.getOpencodeSdkLatestSessionId = getOpencodeSdkLatestSessionId;
@@ -62,6 +63,14 @@ const net = __importStar(require("net"));
 const url_1 = require("url");
 const hookEventNormalizer_1 = require("../../hookEventNormalizer");
 const liveNarration_1 = require("../../core/liveNarration");
+const acp_1 = require("./acp");
+// Re-export the durable-steer primitives so the task loop can reach them through
+// the same opencodeSdkProvider barrel it already uses.
+var acp_2 = require("./acp");
+Object.defineProperty(exports, "opencodeAcpEnabled", { enumerable: true, get: function () { return acp_2.opencodeAcpEnabled; } });
+Object.defineProperty(exports, "hasOpencodeAcpSession", { enumerable: true, get: function () { return acp_2.hasOpencodeAcpSession; } });
+Object.defineProperty(exports, "steerOpencodeAcpTracked", { enumerable: true, get: function () { return acp_2.steerOpencodeAcpTracked; } });
+Object.defineProperty(exports, "ensureOpencodeAcpSteer", { enumerable: true, get: function () { return acp_2.ensureOpencodeAcpSteer; } });
 const _state = new Map();
 const _latestSessionIds = new Map();
 /** Latest log function per root — updated every dispatch so the background logger always writes to the active channel. */
@@ -70,16 +79,16 @@ const _loggers = new Map();
 const _activity = new Map();
 /** Roots that currently have an opencode-sdk turn actively running. */
 const _busyRoots = new Set();
-/** True while an opencode-sdk turn is running for the given workspace root. */
+/** True while an opencode turn is running (ACP session OR createOpencode server). */
 function isOpencodeSdkBusy(root) {
-    return _busyRoots.has(root);
+    return _busyRoots.has(root) || (0, acp_1.isOpencodeAcpBusy)(root);
 }
 /** Current tool activity label for the given root (undefined = idle). */
 function getOpencodeSdkActivity(root) {
-    return _activity.get(root);
+    return (0, acp_1.getOpencodeAcpActivity)(root) ?? _activity.get(root);
 }
 function getOpencodeSdkLatestSessionId(root) {
-    return _latestSessionIds.get(root) ?? _state.get(root)?.sessionId;
+    return (0, acp_1.getOpencodeAcpLatestSessionId)(root) ?? _latestSessionIds.get(root) ?? _state.get(root)?.sessionId;
 }
 /**
  * Steer the live OpenCode SDK session MID-TURN. Unlike opencode-cli / grok /
@@ -91,6 +100,10 @@ function getOpencodeSdkLatestSessionId(root) {
  * the durable TODO queue (at-least-once delivery preserved).
  */
 async function steerOpencodeSdk(root, text, log) {
+    // Native-ACP path: a queued session/prompt to the live opencode acp process.
+    if ((0, acp_1.hasOpencodeAcpSession)(root)) {
+        return (0, acp_1.steerOpencodeAcp)(root, text, log);
+    }
     const st = _state.get(root);
     if (!st || !_busyRoots.has(root)) {
         return false;
@@ -449,7 +462,21 @@ function _evictClient(root) {
 // persistent SDK session, streams output to stdoutFile + log(), writes the
 // exit code to exitFile once session.idle fires.
 // ---------------------------------------------------------------------------
-function sendOpencodeSdkPrompt(root, 
+/**
+ * Router: prefer native `opencode acp` (persistent AcpSession) when enabled;
+ * otherwise use the createOpencode in-process server. On ACP startup failure the
+ * ACP layer transparently falls back to the server path (onAcpUnavailable), so
+ * nothing regresses. Both paths are "SDK-like" to the task loop (persistent,
+ * turn-end via isOpencodeSdkBusy) so no loop change is needed.
+ */
+function sendOpencodeSdkPrompt(root, promptFilePath, resumeSessionId, stdoutFile, exitFile, log, model, showOutput) {
+    if ((0, acp_1.opencodeAcpEnabled)()) {
+        (0, acp_1.sendOpencodeAcpPrompt)(root, promptFilePath, resumeSessionId, stdoutFile, exitFile, log, model, showOutput, () => _sendOpencodeSdkServerPrompt(root, promptFilePath, resumeSessionId, stdoutFile, exitFile, log, model, showOutput));
+        return;
+    }
+    _sendOpencodeSdkServerPrompt(root, promptFilePath, resumeSessionId, stdoutFile, exitFile, log, model, showOutput);
+}
+function _sendOpencodeSdkServerPrompt(root, 
 /** Absolute path to the combined agent-profile + message file. */
 promptFilePath, resumeSessionId, stdoutFile, exitFile, log, 
 /** Optional model string "providerID/modelID" */
@@ -598,6 +625,9 @@ showOutput) {
 // Compact (summarise) the active session to free context window space.
 // ---------------------------------------------------------------------------
 function runOpencodeSdkCompact(root, log) {
+    if ((0, acp_1.hasOpencodeAcpSession)(root)) {
+        return (0, acp_1.compactOpencodeAcp)(root, log);
+    }
     return new Promise((resolve) => {
         const s = _state.get(root);
         if (!s) {
@@ -616,6 +646,7 @@ function runOpencodeSdkCompact(root, log) {
 // Shutdown — cleanly close the server when the task loop stops.
 // ---------------------------------------------------------------------------
 function closeOpencodeSdkClient(root, log) {
+    (0, acp_1.closeOpencodeAcp)(root, log);
     const s = _state.get(root);
     if (s) {
         log('OpenCode SDK: closing persistent session + server');
@@ -639,10 +670,12 @@ function closeOpencodeSdkClient(root, log) {
 function forceIdleOpencodeSdk(root) {
     _busyRoots.delete(root);
     _activity.delete(root);
+    (0, acp_1.forceIdleOpencodeAcp)(root);
     _evictClient(root);
 }
 /** Close all open SDK servers — called on extension deactivate to avoid orphaned processes. */
 function closeAllOpencodeSdkClients() {
+    (0, acp_1.closeAllOpencodeAcp)();
     for (const [root, s] of _state) {
         try {
             s.server.close();