cli-jaw 2.2.15 → 2.2.17

package/dist/src/cli/cli-status-worker.js

@@ -0,0 +1,296 @@
+import { fork, spawn } from 'node:child_process';
+import { fileURLToPath, pathToFileURL } from 'node:url';
+import { extname } from 'node:path';
+import { detectAllCli } from '../core/cli-detection.js';
+import { readClaudeCreds, readCodexTokens } from '../routes/quota.js';
+import { hasCopilotAuthSync } from '../../lib/quota-copilot.js';
+import { killProcessTree, killProcessTreeIfAlive } from '../agent/spawn/process-kill.js';
+import { probeCodexAppCapabilityAsync } from './capability-probe.js';
+import { CLI_KEYS } from './registry.js';
+const WORKER_OUTER_TIMEOUT_MS = 60_000;
+const WORKER_KILL_GRACE_MS = 250;
+const CHILD_MARKER = '--cli-status-worker-child';
+const OUTPUT_LIMIT_BYTES = 64 * 1024;
+function defaultWorkerPath() {
+    const extension = extname(fileURLToPath(import.meta.url));
+    return fileURLToPath(new URL(`./cli-status-worker${extension}`, import.meta.url));
+}
+function workerExecArgv() {
+    const args = [];
+    for (let index = 0; index < process.execArgv.length; index += 1) {
+        const arg = process.execArgv[index];
+        if (arg === '--eval' || arg === '-e' || arg === '--print' || arg === '-p') {
+            index += 1;
+            continue;
+        }
+        if (arg === '--input-type' || arg?.startsWith('--input-type=')) {
+            if (arg === '--input-type')
+                index += 1;
+            continue;
+        }
+        if (arg)
+            args.push(arg);
+    }
+    return args;
+}
+function terminateWorker(child) {
+    if (!child.pid)
+        return;
+    if (process.platform !== 'win32') {
+        try {
+            process.kill(-child.pid, 'SIGTERM');
+        }
+        catch { /* group may not exist */ }
+    }
+    killProcessTree(child.pid, 'SIGTERM');
+    const escalation = setTimeout(() => {
+        if (process.platform !== 'win32' && child.pid) {
+            try {
+                process.kill(-child.pid, 'SIGKILL');
+            }
+            catch { /* already exited */ }
+        }
+        killProcessTreeIfAlive(child, child.pid);
+    }, WORKER_KILL_GRACE_MS);
+    escalation.unref();
+}
+function isSnapshot(value) {
+    if (!value || typeof value !== 'object' || Array.isArray(value))
+        return false;
+    const snapshot = value;
+    return CLI_KEYS.every((cli) => {
+        const row = snapshot[cli];
+        if (!row || typeof row !== 'object' || Array.isArray(row))
+            return false;
+        const record = row;
+        return (typeof record['available'] === 'boolean' || record['available'] === null)
+            && (typeof record['binaryInstalled'] === 'boolean' || record['binaryInstalled'] === null)
+            && (typeof record['capabilityReady'] === 'boolean' || record['capabilityReady'] === null)
+            && (typeof record['authenticated'] === 'boolean' || record['authenticated'] === null)
+            && (typeof record['path'] === 'string' || record['path'] === null)
+            && typeof record['source'] === 'string'
+            && ['checking', 'fresh', 'stale'].includes(String(record['probeState']));
+    });
+}
+export function runCliStatusWorker(options = {}) {
+    const workerPath = options.workerPath ?? defaultWorkerPath();
+    const child = fork(workerPath, options.workerPath ? [] : [CHILD_MARKER], {
+        detached: process.platform !== 'win32',
+        env: options.env ?? process.env,
+        execArgv: workerExecArgv(),
+        stdio: ['ignore', 'ignore', 'ignore', 'ipc'],
+    });
+    return new Promise((resolve, reject) => {
+        let settled = false;
+        const finish = (error, snapshot) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timeout);
+            child.removeAllListeners();
+            if (error)
+                reject(error);
+            else
+                resolve(snapshot);
+        };
+        const timeout = setTimeout(() => {
+            terminateWorker(child);
+            finish(new Error(`CLI status worker exceeded ${options.timeoutMs ?? WORKER_OUTER_TIMEOUT_MS}ms`));
+        }, options.timeoutMs ?? WORKER_OUTER_TIMEOUT_MS);
+        timeout.unref();
+        child.once('error', (error) => finish(error));
+        child.once('exit', (code, signal) => {
+            if (!settled)
+                finish(new Error(`CLI status worker exited before result (${code ?? signal ?? 'unknown'})`));
+        });
+        child.once('message', (message) => {
+            const payload = message;
+            if (payload?.ok === true && isSnapshot(payload.snapshot)) {
+                finish(null, payload.snapshot);
+                return;
+            }
+            finish(new Error(typeof payload?.error === 'string' ? payload.error : 'Invalid CLI status worker response'));
+        });
+    });
+}
+export function runCommand(binary, args, timeoutMs) {
+    return new Promise((resolve) => {
+        const child = spawn(binary, args, {
+            detached: process.platform !== 'win32',
+            shell: process.platform === 'win32' && !binary.toLowerCase().endsWith('.exe'),
+            stdio: ['ignore', 'pipe', 'pipe'],
+        });
+        let output = '';
+        let bytes = 0;
+        let timedOut = false;
+        let outputLimited = false;
+        let settled = false;
+        const finish = (code) => {
+            if (settled)
+                return;
+            settled = true;
+            clearTimeout(timer);
+            const result = { code, output, timedOut, outputLimited };
+            if (cleanupDone)
+                void cleanupDone.then(() => resolve(result));
+            else
+                resolve(result);
+        };
+        // Both abort paths face the same process: one that may ignore SIGTERM
+        // and may have left a descendant holding the pipe. Terminating only on
+        // the timeout path would let a chatty command survive by exceeding the
+        // output cap instead of the clock, so they share one escalation.
+        //
+        // The tree walk alone is not enough. If the direct child obeys SIGTERM
+        // and only a grandchild ignores it, the escalation would find the child
+        // already gone and return, leaving an orphan that no PID-parent scan
+        // can reach any more. On POSIX the child is detached and therefore
+        // leads its own process group, so signalling the negated PID covers
+        // every descendant regardless of what the direct child did.
+        //
+        // The escalation must not be unref'd. This runs inside a short-lived
+        // worker that exits as soon as the last probe settles, and an unref'd
+        // timer simply never fires there: the direct child's pipe closes, the
+        // event loop empties, and the process leaves before the grace period is
+        // up. Holding a real ref and resolving only after cleanup keeps the
+        // worker alive exactly long enough to finish killing what it started.
+        let aborted = false;
+        let cleanupDone = null;
+        const signalGroup = (signal) => {
+            if (process.platform === 'win32' || !child.pid)
+                return;
+            try {
+                process.kill(-child.pid, signal);
+            }
+            catch { /* group already gone */ }
+        };
+        const abortChild = () => {
+            if (aborted || !child.pid)
+                return;
+            aborted = true;
+            killProcessTree(child.pid, 'SIGTERM');
+            signalGroup('SIGTERM');
+            cleanupDone = new Promise((done) => {
+                setTimeout(() => {
+                    killProcessTreeIfAlive(child, child.pid);
+                    signalGroup('SIGKILL');
+                    done();
+                }, WORKER_KILL_GRACE_MS);
+            });
+        };
+        const onData = (chunk) => {
+            if (settled || outputLimited)
+                return;
+            bytes += chunk.byteLength;
+            if (bytes > OUTPUT_LIMIT_BYTES) {
+                outputLimited = true;
+                abortChild();
+                finish(null);
+                return;
+            }
+            output += chunk.toString('utf8');
+        };
+        child.stdout?.on('data', onData);
+        child.stderr?.on('data', onData);
+        child.once('error', () => finish(null));
+        child.once('exit', (code) => finish(code));
+        const timer = setTimeout(() => {
+            timedOut = true;
+            abortChild();
+            finish(null);
+        }, timeoutMs);
+        timer.unref();
+    });
+}
+async function probeCodexApp(binary) {
+    const result = await probeCodexAppCapabilityAsync(binary);
+    return result.ok ? { ready: true } : { ready: false, reason: `app-server ${result.reason}` };
+}
+async function authForCli(cli, path, detected) {
+    switch (cli) {
+        case 'agy': return { authenticated: true, source: 'installed; auth checked by agy at run time' };
+        case 'ai-e': return { authenticated: true, source: 'provider-delegated' };
+        case 'pi': return { authenticated: true, source: 'profile auth validated at registration' };
+        case 'claude': {
+            const creds = readClaudeCreds();
+            return { authenticated: Boolean(creds?.token) || creds?.source === 'cloud-provider-env', source: creds?.source ?? 'none' };
+        }
+        case 'codex':
+        case 'codex-app': {
+            const authenticated = Boolean(readCodexTokens()?.access_token);
+            return { authenticated, source: authenticated ? 'auth.json' : 'none' };
+        }
+        case 'cursor': {
+            if (process.env['CURSOR_API_KEY'])
+                return { authenticated: true, source: 'CURSOR_API_KEY' };
+            const result = await runCommand(path || 'cursor-agent', ['status'], 5_000);
+            const authenticated = result.code === 0 && /logged in|authenticated/i.test(result.output);
+            return { authenticated, source: authenticated ? 'cursor-agent status' : 'none' };
+        }
+        case 'kiro-code': {
+            const result = await runCommand(path || 'kiro-cli', ['whoami'], 5_000);
+            const authenticated = result.code === 0 && /logged in|email:/i.test(result.output);
+            return { authenticated, source: authenticated ? 'kiro-cli whoami' : 'none' };
+        }
+        case 'grok': {
+            const result = await runCommand(path || 'grok', ['models'], 5_000);
+            const authenticated = result.code === 0 && /grok-build|Available models/.test(result.output);
+            return { authenticated, source: authenticated ? 'grok models' : 'none' };
+        }
+        case 'copilot': {
+            const authenticated = hasCopilotAuthSync();
+            return { authenticated, source: authenticated ? 'local-auth-chain' : 'none' };
+        }
+        case 'claude-e': {
+            if (!detected['claude']?.available)
+                return { authenticated: false, source: 'underlying claude missing' };
+            const creds = readClaudeCreds();
+            return { authenticated: Boolean(creds?.token) || creds?.source === 'cloud-provider-env', source: creds?.source ?? 'none' };
+        }
+        case 'opencode': return { authenticated: true, source: 'installed' };
+        default: return { authenticated: false, source: 'none' };
+    }
+}
+export async function collectCliStatus() {
+    const detected = detectAllCli();
+    const rows = await Promise.all(Object.entries(detected).map(async ([cli, info]) => {
+        const binaryInstalled = Boolean(info.available);
+        const path = typeof info.path === 'string' ? info.path : null;
+        let capability = { ready: binaryInstalled };
+        if (cli === 'codex-app' && binaryInstalled && path)
+            capability = await probeCodexApp(path);
+        const auth = binaryInstalled
+            ? await authForCli(cli, path, detected)
+            : { authenticated: false, source: 'none' };
+        const row = {
+            available: binaryInstalled && capability.ready,
+            binaryInstalled,
+            capabilityReady: capability.ready,
+            authenticated: auth.authenticated,
+            path,
+            source: auth.source,
+            probeState: 'fresh',
+            ...(capability.reason ? { reason: capability.reason } : {}),
+        };
+        return [cli, row];
+    }));
+    return Object.fromEntries(rows);
+}
+async function runChild() {
+    try {
+        process.send?.({ ok: true, snapshot: await collectCliStatus() });
+    }
+    catch (error) {
+        process.send?.({ ok: false, error: error instanceof Error ? error.message : String(error) });
+    }
+    finally {
+        process.disconnect?.();
+    }
+}
+if (process.argv.includes(CHILD_MARKER))
+    void runChild();
+/** Fixture helper for tests that need a standalone worker URL. */
+export function cliStatusWorkerUrl() {
+    return pathToFileURL(defaultWorkerPath());
+}
+//# sourceMappingURL=cli-status-worker.js.map

package/dist/src/cli/cli-status-worker.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli-status-worker.js","sourceRoot":"","sources":["../../../src/cli/cli-status-worker.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAChE,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AACzF,OAAO,EAAE,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AAErE,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,MAAM,uBAAuB,GAAG,MAAM,CAAC;AACvC,MAAM,oBAAoB,GAAG,GAAG,CAAC;AACjC,MAAM,YAAY,GAAG,2BAA2B,CAAC;AACjD,MAAM,kBAAkB,GAAG,EAAE,GAAG,IAAI,CAAC;AAWrC,SAAS,iBAAiB;IACtB,MAAM,SAAS,GAAG,OAAO,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IAC1D,OAAO,aAAa,CAAC,IAAI,GAAG,CAAC,sBAAsB,SAAS,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AACtF,CAAC;AAED,SAAS,cAAc;IACnB,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,QAAQ,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC9D,MAAM,GAAG,GAAG,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI,IAAI,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACxE,KAAK,IAAI,CAAC,CAAC;YACX,SAAS;QACb,CAAC;QACD,IAAI,GAAG,KAAK,cAAc,IAAI,GAAG,EAAE,UAAU,CAAC,eAAe,CAAC,EAAE,CAAC;YAC7D,IAAI,GAAG,KAAK,cAAc;gBAAE,KAAK,IAAI,CAAC,CAAC;YACvC,SAAS;QACb,CAAC;QACD,IAAI,GAAG;YAAE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC5B,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC;AAED,SAAS,eAAe,CAAC,KAA8B;IACnD,IAAI,CAAC,KAAK,CAAC,GAAG;QAAE,OAAO;IACvB,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,yBAAyB,CAAC,CAAC;IACpF,CAAC;IACD,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACtC,MAAM,UAAU,GAAG,UAAU,CAAC,GAAG,EAAE;QAC/B,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;YAC5C,IAAI,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,oBAAoB,CAAC,CAAC;QAC/E,CAAC;QACD,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC,EAAE,oBAAoB,CAAC,CAAC;IACzB,UAAU,CAAC,KAAK,EAAE,CAAC;AACvB,CAAC;AAED,SAAS,UAAU,CAAC,KAAc;IAC9B,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC9E,MAAM,QAAQ,GAAG,KAAgC,CAAC;IAClD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,EAAE;QAC1B,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC1B,IAAI,CAAC,GAAG,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;YAAE,OAAO,KAAK,CAAC;QACxE,MAAM,MAAM,GAAG,GAA8B,CAAC;QAC9C,OAAO,CAAC,OAAO,MAAM,CAAC,WAAW,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,WAAW,CAAC,KAAK,IAAI,CAAC;eAC1E,CAAC,OAAO,MAAM,CAAC,iBAAiB,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;eACtF,CAAC,OAAO,MAAM,CAAC,iBAAiB,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAC;eACtF,CAAC,OAAO,MAAM,CAAC,eAAe,CAAC,KAAK,SAAS,IAAI,MAAM,CAAC,eAAe,CAAC,KAAK,IAAI,CAAC;eAClF,CAAC,OAAO,MAAM,CAAC,MAAM,CAAC,KAAK,QAAQ,IAAI,MAAM,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;eAC/D,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,QAAQ;eACpC,CAAC,UAAU,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;IACjF,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,UAAkC,EAAE;IACnE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,iBAAiB,EAAE,CAAC;IAC7D,MAAM,KAAK,GAAG,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,EAAE;QACrE,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;QACtC,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG;QAC/B,QAAQ,EAAE,cAAc,EAAE;QAC1B,KAAK,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,CAAC;KAC/C,CAAC,CAAC;IAEH,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACnC,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,MAAM,MAAM,GAAG,CAAC,KAAmB,EAAE,QAA4B,EAAQ,EAAE;YACvE,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,OAAO,CAAC,CAAC;YACtB,KAAK,CAAC,kBAAkB,EAAE,CAAC;YAC3B,IAAI,KAAK;gBAAE,MAAM,CAAC,KAAK,CAAC,CAAC;;gBACpB,OAAO,CAAC,QAAS,CAAC,CAAC;QAC5B,CAAC,CAAC;QACF,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;YAC5B,eAAe,CAAC,KAAK,CAAC,CAAC;YACvB,MAAM,CAAC,IAAI,KAAK,CAAC,8BAA8B,OAAO,CAAC,SAAS,IAAI,uBAAuB,IAAI,CAAC,CAAC,CAAC;QACtG,CAAC,EAAE,OAAO,CAAC,SAAS,IAAI,uBAAuB,CAAC,CAAC;QACjD,OAAO,CAAC,KAAK,EAAE,CAAC;QAEhB,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC9C,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE;YAChC,IAAI,CAAC,OAAO;gBAAE,MAAM,CAAC,IAAI,KAAK,CAAC,2CAA2C,IAAI,IAAI,MAAM,IAAI,SAAS,GAAG,CAAC,CAAC,CAAC;QAC/G,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,IAAI,CAAC,SAAS,EAAE,CAAC,OAAgB,EAAE,EAAE;YACvC,MAAM,OAAO,GAAG,OAAgE,CAAC;YACjF,IAAI,OAAO,EAAE,EAAE,KAAK,IAAI,IAAI,UAAU,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;gBACvD,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;gBAC/B,OAAO;YACX,CAAC;YACD,MAAM,CAAC,IAAI,KAAK,CAAC,OAAO,OAAO,EAAE,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC;QACjH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,MAAc,EAAE,IAAc,EAAE,SAAiB;IACxE,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC3B,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,IAAI,EAAE;YAC9B,QAAQ,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO;YACtC,KAAK,EAAE,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC7E,KAAK,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC;SACpC,CAAC,CAAC;QACH,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,IAAI,KAAK,GAAG,CAAC,CAAC;QACd,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,IAAI,aAAa,GAAG,KAAK,CAAC;QAC1B,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,MAAM,MAAM,GAAG,CAAC,IAAmB,EAAQ,EAAE;YACzC,IAAI,OAAO;gBAAE,OAAO;YACpB,OAAO,GAAG,IAAI,CAAC;YACf,YAAY,CAAC,KAAK,CAAC,CAAC;YACpB,MAAM,MAAM,GAAG,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;YACzD,IAAI,WAAW;gBAAE,KAAK,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;;gBACzD,OAAO,CAAC,MAAM,CAAC,CAAC;QACzB,CAAC,CAAC;QACF,sEAAsE;QACtE,uEAAuE;QACvE,uEAAuE;QACvE,iEAAiE;QACjE,EAAE;QACF,uEAAuE;QACvE,wEAAwE;QACxE,qEAAqE;QACrE,mEAAmE;QACnE,oEAAoE;QACpE,4DAA4D;QAC5D,EAAE;QACF,qEAAqE;QACrE,sEAAsE;QACtE,sEAAsE;QACtE,wEAAwE;QACxE,oEAAoE;QACpE,sEAAsE;QACtE,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,WAAW,GAAyB,IAAI,CAAC;QAC7C,MAAM,WAAW,GAAG,CAAC,MAAsB,EAAQ,EAAE;YACjD,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG;gBAAE,OAAO;YACvD,IAAI,CAAC;gBAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAAC,CAAC;YAAC,MAAM,CAAC,CAAC,wBAAwB,CAAC,CAAC;QAChF,CAAC,CAAC;QACF,MAAM,UAAU,GAAG,GAAS,EAAE;YAC1B,IAAI,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG;gBAAE,OAAO;YAClC,OAAO,GAAG,IAAI,CAAC;YACf,eAAe,CAAC,KAAK,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YACtC,WAAW,CAAC,SAAS,CAAC,CAAC;YACvB,WAAW,GAAG,IAAI,OAAO,CAAO,CAAC,IAAI,EAAE,EAAE;gBACrC,UAAU,CAAC,GAAG,EAAE;oBACZ,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;oBACzC,WAAW,CAAC,SAAS,CAAC,CAAC;oBACvB,IAAI,EAAE,CAAC;gBACX,CAAC,EAAE,oBAAoB,CAAC,CAAC;YAC7B,CAAC,CAAC,CAAC;QACP,CAAC,CAAC;QACF,MAAM,MAAM,GAAG,CAAC,KAAa,EAAQ,EAAE;YACnC,IAAI,OAAO,IAAI,aAAa;gBAAE,OAAO;YACrC,KAAK,IAAI,KAAK,CAAC,UAAU,CAAC;YAC1B,IAAI,KAAK,GAAG,kBAAkB,EAAE,CAAC;gBAC7B,aAAa,GAAG,IAAI,CAAC;gBACrB,UAAU,EAAE,CAAC;gBACb,MAAM,CAAC,IAAI,CAAC,CAAC;gBACb,OAAO;YACX,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC,CAAC;QACF,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,KAAK,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QACxC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;QAC3C,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE;YAC1B,QAAQ,GAAG,IAAI,CAAC;YAChB,UAAU,EAAE,CAAC;YACb,MAAM,CAAC,IAAI,CAAC,CAAC;QACjB,CAAC,EAAE,SAAS,CAAC,CAAC;QACd,KAAK,CAAC,KAAK,EAAE,CAAC;IAClB,CAAC,CAAC,CAAC;AACP,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,MAAc;IACvC,MAAM,MAAM,GAAG,MAAM,4BAA4B,CAAC,MAAM,CAAC,CAAC;IAC1D,OAAO,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;AACjG,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,GAAW,EAAE,IAAmB,EAAE,QAAiD;IACzG,QAAQ,GAAG,EAAE,CAAC;QACV,KAAK,KAAK,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,4CAA4C,EAAE,CAAC;QACjG,KAAK,MAAM,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,oBAAoB,EAAE,CAAC;QAC1E,KAAK,IAAI,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,wCAAwC,EAAE,CAAC;QAC5F,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;YAChC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,KAAK,EAAE,MAAM,KAAK,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,CAAC;QAC/H,CAAC;QACD,KAAK,OAAO,CAAC;QACb,KAAK,WAAW,CAAC,CAAC,CAAC;YACf,MAAM,aAAa,GAAG,OAAO,CAAC,eAAe,EAAE,EAAE,YAAY,CAAC,CAAC;YAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC3E,CAAC;QACD,KAAK,QAAQ,CAAC,CAAC,CAAC;YACZ,IAAI,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;gBAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,gBAAgB,EAAE,CAAC;YAC5F,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,IAAI,cAAc,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;YAC3E,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,0BAA0B,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC1F,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACrF,CAAC;QACD,KAAK,WAAW,CAAC,CAAC,CAAC;YACf,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,IAAI,UAAU,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;YACvE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YACnF,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QACjF,CAAC;QACD,KAAK,MAAM,CAAC,CAAC,CAAC;YACV,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,IAAI,IAAI,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,KAAK,CAAC,CAAC;YACnE,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,6BAA6B,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;YAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAC7E,CAAC;QACD,KAAK,SAAS,CAAC,CAAC,CAAC;YACb,MAAM,aAAa,GAAG,kBAAkB,EAAE,CAAC;YAC3C,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC;QAClF,CAAC;QACD,KAAK,UAAU,CAAC,CAAC,CAAC;YACd,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS;gBAAE,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,2BAA2B,EAAE,CAAC;YACzG,MAAM,KAAK,GAAG,eAAe,EAAE,CAAC;YAChC,OAAO,EAAE,aAAa,EAAE,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,KAAK,EAAE,MAAM,KAAK,oBAAoB,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,IAAI,MAAM,EAAE,CAAC;QAC/H,CAAC;QACD,KAAK,UAAU,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;QACrE,OAAO,CAAC,CAAC,OAAO,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;IAC7D,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IAClC,MAAM,QAAQ,GAAG,YAAY,EAAmE,CAAC;IACjG,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE;QAC9E,MAAM,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QAChD,MAAM,IAAI,GAAG,OAAO,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QAC9D,IAAI,UAAU,GAAqB,EAAE,KAAK,EAAE,eAAe,EAAE,CAAC;QAC9D,IAAI,GAAG,KAAK,WAAW,IAAI,eAAe,IAAI,IAAI;YAAE,UAAU,GAAG,MAAM,aAAa,CAAC,IAAI,CAAC,CAAC;QAC3F,MAAM,IAAI,GAAG,eAAe;YACxB,CAAC,CAAC,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,EAAE,QAAQ,CAAC;YACvC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC;QAC/C,MAAM,GAAG,GAAiB;YACtB,SAAS,EAAE,eAAe,IAAI,UAAU,CAAC,KAAK;YAC9C,eAAe;YACf,eAAe,EAAE,UAAU,CAAC,KAAK;YACjC,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,IAAI;YACJ,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,UAAU,EAAE,OAAO;YACnB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9D,CAAC;QACF,OAAO,CAAC,GAAG,EAAE,GAAG,CAAU,CAAC;IAC/B,CAAC,CAAC,CAAC,CAAC;IACJ,OAAO,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAED,KAAK,UAAU,QAAQ;IACnB,IAAI,CAAC;QACD,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,gBAAgB,EAAE,EAAE,CAAC,CAAC;IACrE,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,OAAO,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;IACjG,CAAC;YAAS,CAAC;QACP,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;IAC3B,CAAC;AACL,CAAC;AAED,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IAAE,KAAK,QAAQ,EAAE,CAAC;AAEzD,kEAAkE;AAClE,MAAM,UAAU,kBAAkB;IAC9B,OAAO,aAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC;AAC9C,CAAC"}

package/dist/src/cli/cli-status.js

@@ -0,0 +1,81 @@
+import { CLI_KEYS } from './registry.js';
+import { runCliStatusWorker } from './cli-status-worker.js';
+export function formatCliStatusLine(cli, row) {
+    if (row.probeState === 'checking')
+        return `${cli}: checking`;
+    const ready = row.available === true && row.capabilityReady !== false;
+    return `${cli}: ${ready ? '✅' : '❌'}${row.path ? ` ${row.path}` : ''}`;
+}
+const FRESH_TTL_MS = 30_000;
+const STALE_TTL_MS = 5 * 60_000;
+function coldSnapshot() {
+    return Object.fromEntries(CLI_KEYS.map((cli) => [cli, {
+            available: null,
+            binaryInstalled: null,
+            capabilityReady: null,
+            authenticated: null,
+            path: null,
+            source: 'pending-probe',
+            probeState: 'checking',
+        }]));
+}
+function snapshotWithState(snapshot, probeState) {
+    return Object.fromEntries(Object.entries(snapshot).map(([cli, row]) => [cli, {
+            ...row,
+            probeState,
+        }]));
+}
+export class CliStatusCache {
+    now;
+    refresh;
+    freshTtlMs;
+    staleTtlMs;
+    lastSuccessfulSnapshot = null;
+    lastSuccessfulProbeAt = null;
+    refreshInFlight = null;
+    constructor(options = {}) {
+        this.now = options.now ?? Date.now;
+        this.refresh = options.refresh ?? runCliStatusWorker;
+        this.freshTtlMs = options.freshTtlMs ?? FRESH_TTL_MS;
+        this.staleTtlMs = options.staleTtlMs ?? STALE_TTL_MS;
+    }
+    getSnapshot() {
+        const now = this.now();
+        const age = this.lastSuccessfulProbeAt == null
+            ? Number.POSITIVE_INFINITY
+            : now - this.lastSuccessfulProbeAt;
+        if (this.lastSuccessfulSnapshot && age <= this.freshTtlMs) {
+            return snapshotWithState(this.lastSuccessfulSnapshot, 'fresh');
+        }
+        this.startRefresh();
+        if (this.lastSuccessfulSnapshot && age <= this.staleTtlMs) {
+            return snapshotWithState(this.lastSuccessfulSnapshot, 'stale');
+        }
+        return coldSnapshot();
+    }
+    startRefresh() {
+        if (this.refreshInFlight)
+            return;
+        this.refreshInFlight = Promise.resolve()
+            .then(() => this.refresh())
+            .then((snapshot) => {
+            this.lastSuccessfulSnapshot = snapshotWithState(snapshot, 'fresh');
+            this.lastSuccessfulProbeAt = this.now();
+        })
+            .catch(() => {
+            // Preserve the last successful snapshot/timestamp. A later request retries.
+        })
+            .finally(() => {
+            this.refreshInFlight = null;
+        });
+    }
+}
+const defaultCliStatusCache = new CliStatusCache();
+export function getCachedCliStatus() {
+    return defaultCliStatusCache.getSnapshot();
+}
+/** @internal exported for deterministic cache tests. */
+export function createCliStatusCacheForTest(options) {
+    return new CliStatusCache(options);
+}
+//# sourceMappingURL=cli-status.js.map

package/dist/src/cli/cli-status.js.map

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

package/dist/src/cli/command-context.js

@@ -2,27 +2,36 @@
 // Replaces makeWebCommandCtx (server.ts) and makeTelegramCommandCtx (bot.ts).
 // Interface-specific behavior is handled via the `interface` parameter.
 import fs from 'fs';
-import { settings, detectAllCli, APP_VERSION, deriveCdpPort } from '../core/config.js';
+import { settings, APP_VERSION, deriveCdpPort } from '../core/config.js';
 import { getSession } from '../core/db.js';
 import { t } from '../core/i18n.js';
 import { getMergedSkills, A2_PATH, regenerateB } from '../prompt/builder.js';
 import { isAgentBusy, messageQueue } from '../agent/spawn.js';
+import { currentSessionScope } from '../core/session-context.js';
 import * as browser from '../browser/index.js';
 import * as memory from '../memory/memory.js';
 import { bootstrapMemory, ensureMemoryStructure, getMemoryStatus, reindexMemory } from '../memory/runtime.js';
 import { searchMemoryWithPolicy } from '../memory/injection.js';
 import { loadUnifiedMcp, saveUnifiedMcp, syncToAll, runSkillReset, } from '../../lib/mcp-sync.js';
+import { getCachedCliStatus } from './cli-status.js';
 // Remote interface에서 허용하는 settings patch 키
 const REMOTE_ALLOWED_SETTINGS_KEYS = new Set([
     'fallbackOrder', // /fallback
-    'cli', // /cli
-    'perCli', // /model
     'showReasoning', // /thought
     'memory', // /flush
     'telegram', // /forward (telegram)
     'discord', // /forward (discord)
     'slack', // /forward (slack)
 ]);
+// Runtime selection is shared by the whole instance and the instance web owns it
+// (devlog 074). A remote channel changing it would move every other session's model
+// too, so these keys are refused there with an answer that says where to go instead
+// of the generic "unsupported" line.
+const RUNTIME_SELECTION_SETTINGS_KEYS = new Set([
+    'cli', // /cli
+    'perCli', // /model, /effort
+    'activeOverrides', // /model, /effort
+]);
 export function makeCommandCtx(iface, locale, deps) {
     return {
         interface: iface,
@@ -39,6 +48,9 @@ export function makeCommandCtx(iface, locale, deps) {
                 if (allAllowed) {
                     return deps.applySettings(patch);
                 }
+                if (keys.some(k => RUNTIME_SELECTION_SETTINGS_KEYS.has(k))) {
+                    return { ok: false, text: t('cmd.runtimeSelectionInstanceWide', {}, locale) };
+                }
                 const msgKey = iface === 'discord' ? 'dc.settingsUnsupported'
                     : iface === 'slack' ? 'sl.settingsUnsupported'
                         : 'tg.settingsUnsupported';
@@ -48,7 +60,7 @@ export function makeCommandCtx(iface, locale, deps) {
         },
         getRuntime: () => ({
             uptimeSec: Math.floor(process.uptime()),
-            activeAgent: isAgentBusy(),
+            activeAgent: isAgentBusy(currentSessionScope()?.scope ?? 'default'),
             queuePending: messageQueue.length,
         }),
         getSkills: () => getMergedSkills(),
@@ -56,7 +68,7 @@ export function makeCommandCtx(iface, locale, deps) {
         resetSession: deps.resetSession
             ? async () => deps.resetSession()
             : async () => deps.clearSession(),
-        getCliStatus: () => detectAllCli(),
+        getCliStatus: () => getCachedCliStatus(),
         // MCP — unified across all interfaces (TG previously returned empty)
         getMcp: () => loadUnifiedMcp(),
         syncMcp: async () => ({ results: syncToAll(loadUnifiedMcp()) }),

package/dist/src/cli/command-context.js.map

@@ -1 +1 @@
-{"version":3,"file":"command-context.js","sourceRoot":"","sources":["../../../src/cli/command-context.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,8EAA8E;AAC9E,wEAAwE;AAExE,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,QAAQ,EAAE,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvF,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAC3C,OAAO,EAAE,CAAC,EAAE,MAAM,iBAAiB,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC9D,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAC;AAC/C,OAAO,KAAK,MAAM,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,qBAAqB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC9G,OAAO,EAAE,sBAAsB,EAAE,MAAM,wBAAwB,CAAC;AAChE,OAAO,EACH,cAAc,EAAE,cAAc,EAAE,SAAS,EACzC,aAAa,GAChB,MAAM,uBAAuB,CAAC;AAmB/B,2CAA2C;AAC3C,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC;IACzC,eAAe,EAAG,YAAY;IAC9B,KAAK,EAAa,OAAO;IACzB,QAAQ,EAAU,SAAS;IAC3B,eAAe,EAAG,WAAW;IAC7B,QAAQ,EAAU,SAAS;IAC3B,UAAU,EAAQ,sBAAsB;IACxC,SAAS,EAAS,qBAAqB;IACvC,OAAO,EAAW,mBAAmB;CACxC,CAAC,CAAC;AAIH,MAAM,UAAU,cAAc,CAC1B,KAA8B,EAC9B,MAAc,EACd,IAAwB;IAExB,OAAO;QACH,SAAS,EAAE,KAAK;QAChB,MAAM;QACN,OAAO,EAAE,WAAW;QACpB,UAAU;QACV,WAAW,EAAE,GAAG,EAAE,CAAC,QAAQ;QAC3B,cAAc,EAAE,KAAK,EAAE,KAA8B,EAAE,EAAE;YACrD,kEAAkE;YAClE,IAAI,KAAK,KAAK,UAAU,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,OAAO,EAAE,CAAC;gBACnE,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBAChC,MAAM,UAAU,GAAG,IAAI,CAAC,MAAM,GAAG,CAAC;uBAC3B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,IAAI,UAAU,EAAE,CAAC;oBACb,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;gBACrC,CAAC;gBACD,MAAM,MAAM,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,wBAAwB;oBACzD,CAAC,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC,wBAAwB;wBAC9C,CAAC,CAAC,wBAAwB,CAAC;gBAC/B,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,CAAC;YACtD,CAAC;YACD,OAAO,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;QACrC,CAAC;QACD,UAAU,EAAE,GAAG,EAAE,CAAC,CAAC;YACf,SAAS,EAAE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,CAAC;YACvC,WAAW,EAAE,WAAW,EAAE;YAC1B,YAAY,EAAE,YAAY,CAAC,MAAM;SACpC,CAAC;QACF,SAAS,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;QAClC,YAAY,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE;QAC7C,YAAY,EAAE,IAAI,CAAC,YAAY;YAC3B,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,YAAa,EAAE;YAClC,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,YAAY,EAAE;QACrC,YAAY,EAAE,GAAG,EAAE,CAAC,YAAY,EAAE;QAElC,qEAAqE;QACrE,MAAM,EAAE,GAAG,EAAE,CAAC,cAAc,EAAE;QAC9B,OAAO,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,SAAS,CAAC,cAAc,EAAE,CAAC,EAAE,CAAC;QAC/D,UAAU,EAAE,KAAK,IAAI,EAAE;YACnB,MAAM,MAAM,GAAG,cAAc,EAAE,CAAC;YAChC,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;YACpE,MAAM,OAAO,GAAG,MAAM,iBAAiB,CAAC,MAAM,CAAC,CAAC;YAChD,cAAc,CAAC,MAAM,CAAC,CAAC;YACvB,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC;YACjC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;QAC/B,CAAC;QAED,SAAS;QACT,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE;QAC/B,YAAY,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,sBAAsB,CAAC;YAChD,KAAK,EAAE,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;YACtB,IAAI,EAAE,gBAAgB;SACzB,CAAC;QACF,eAAe,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;QACxC,iBAAiB,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE;QAChD,eAAe,EAAE,CAAC,OAAiC,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC;QACtF,aAAa,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;QACpC,uBAAuB,EAAE,GAAG,EAAE,CAAC,eAAe,EAAE;QAChD,kBAAkB,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE;QACjD,uBAAuB,EAAE,CAAC,OAAiC,EAAE,EAAE,CAAC,eAAe,CAAC,OAAO,IAAI,EAAE,CAAC;QAC9F,qBAAqB,EAAE,GAAG,EAAE,CAAC,aAAa,EAAE;QAC5C,4BAA4B,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;QAE3F,UAAU;QACV,gBAAgB,EAAE,KAAK,IAAI,EAAE,CAAC,OAAO,CAAC,gBAAgB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,IAAI,aAAa,EAAE,CAAC;QACvG,cAAc,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,IAAI,aAAa,EAAE,CAAC,EAAE,CAAC;QAE/G,YAAY;QACZ,cAAc,EAAE,IAAI,CAAC,cAAc;YAC/B,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,cAAe,EAAE;YACpC,CAAC,CAAC,SAAS;QACf,qBAAqB,EAAE,IAAI,CAAC,qBAAqB;YAC7C,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,IAAI,CAAC,qBAAsB,EAAE;YAC3C,CAAC,CAAC,SAAS;QAEf,2CAA2C;QAC3C,WAAW,EAAE,KAAK,EAAE,OAAwB,MAAM,EAAE,EAAE;YAClD,MAAM,MAAM,GAAG,aAAa,CAAC;gBACzB,IAAI;gBACJ,eAAe,EAAE,QAAQ,CAAC,YAAY,CAAC;gBACvC,aAAa,EAAE,IAAI;aACtB,CAAC,CAAC;YACH,WAAW,EAAE,CAAC;YACd,OAAO,MAAM,CAAC;QAClB,CAAC;QAED,SAAS;QACT,SAAS,EAAE,GAAG,EAAE;YACZ,MAAM,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1E,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;QAC3B,CAAC;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"command-context.js","sourceRoot":"","sources":["../../../src/cli/command-context.ts"],"names":[],"mappings":"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"}

package/dist/src/cli/compact.js

@@ -37,17 +37,12 @@ export async function compactHandler(args, ctx) {
             text: 'Compact is available only when the main agent is idle.',
         };
     }
-    const { isAgentBusy } = await import('../agent/spawn.js');
-    if (isAgentBusy()) {
-        return {
-            ok: false,
-            code: 'compact_busy',
-            text: 'Compact is available only when the main agent is idle.',
-        };
-    }
     const activeCli = settings?.cli || session?.active_cli || session?.activeCli || 'claude';
     const workingDir = normalizeWorkingDir(settings?.workingDir || null);
-    const slots = harvestBootstrapSlots({ workingDir, instructions });
+    // Resolved before the harvest, not after: the marker below and the bootstrap built
+    // here have to describe the same conversation, and the harvest reads it (073 §2.5a).
+    const chatSessionId = getActiveChatSession();
+    const slots = harvestBootstrapSlots({ workingDir, instructions, chatSessionId });
     const hasAnyContent = Boolean(slots.recent_turns
         || slots.tool_context
         || slots.memory_hits
@@ -62,18 +57,60 @@ export async function compactHandler(args, ctx) {
     }
     const bootstrap = renderBootstrapPrompt(slots);
     const trace = `${BOOTSTRAP_TRACE_PREFIX}\n${bootstrap}`;
-    const { insertMessageWithTrace, clearSessionBucket } = await import('../core/db.js');
-    const { resolveSessionBucket } = await import('../agent/args.js');
-    const { bumpSessionOwnershipGeneration, } = await import('../agent/session-persistence.js');
+    const { insertMessageWithTrace, clearSessionBucket, clearSessionBucketsByPrefix } = await import('../core/db.js');
+    const { aiEProviderForBucket, resolveSessionBucket } = await import('../agent/args.js');
     const { clearBossSessionOnly, setPendingBootstrapPrompt, } = await import('../core/main-session.js');
     const model = getActiveModel(settings, session, activeCli);
-    const bucket = resolveSessionBucket(activeCli, model);
-    insertMessageWithTrace.run('assistant', COMPACT_MARKER_CONTENT, activeCli, model, trace, null, workingDir, getActiveChatSession());
-    setPendingBootstrapPrompt(bootstrap);
-    bumpSessionOwnershipGeneration();
-    clearBossSessionOnly();
-    if (bucket)
-        clearSessionBucket.run(bucket);
+    const { scopeForChatSession } = await import('../orchestrator/scope.js');
+    const { getChatSessionRemoteKey } = await import('../core/chat-sessions.js');
+    const scope = scopeForChatSession(chatSessionId, getChatSessionRemoteKey(chatSessionId) ?? undefined, settings?.multiSession?.enabled === true);
+    // Every runtime now keys its bucket by scope (073 §2.1), so this compacts the session
+    // it was typed into rather than refusing to touch anything. Its marker, its bootstrap
+    // and the state it drops all belong to the same session, which is what 072 could not
+    // arrange when a non-default scope had no bucket of its own.
+    //
+    const isCodexApp = activeCli === 'codex-app';
+    // ai-e keys its bucket by provider, and a null here would make the bucket infer one
+    // from the model name instead. When the configured provider and that inference
+    // disagree, the clear lands on a bucket the conversation never used.
+    const aiEProvider = aiEProviderForBucket(activeCli, model, settings);
+    const base = resolveSessionBucket(activeCli, model, aiEProvider);
+    // Always the scoped form, including the default scope. Letting default resolve to the
+    // bare name looks harmless until the prefix clear below runs: `claude` plus `claude:%`
+    // deletes every other session's bucket for this runtime. Default's own legacy bare row
+    // is cleared separately, by exact key.
+    const bucket = `${base}:${scope}`;
+    insertMessageWithTrace.run('assistant', COMPACT_MARKER_CONTENT, activeCli, model, trace, null, workingDir, chatSessionId);
+    const isDefaultScope = scope === 'default';
+    // The bootstrap is keyed by scope so the next turn of THIS session picks it up and
+    // no other session does. The default scope keeps the bare key it always had.
+    setPendingBootstrapPrompt(bootstrap, isDefaultScope ? undefined : scope);
+    // Only this session's generation moves. Bumping the global one would make every
+    // other session's in-flight turn fail its ownership check and discard the vendor
+    // conversation it had just created (073 §2e).
+    const { bumpScopeSessionGeneration } = await import('../agent/session-persistence.js');
+    bumpScopeSessionGeneration(scope);
+    if (isDefaultScope) {
+        // The singleton row belongs to the default session, so only its own compact
+        // clears it.
+        clearBossSessionOnly();
+    }
+    // The prefix form covers codex-app, whose key folds in lane mode and effort that this
+    // command cannot know. The scope is a whole segment of the pattern, so `claude:local:a`
+    // plus `claude:local:a:%` cannot reach `claude:local:abc`. For every other runtime the
+    // exact key is the only match, so the same call is correct without a branch.
+    clearSessionBucketsByPrefix.run(bucket, `${bucket}:`);
+    // The default scope also owns the bare legacy name, which is what a session created
+    // before 073 resumes from. Clearing it by exact key keeps the neighbours out of it.
+    if (isDefaultScope)
+        clearSessionBucket.run(base);
+    if (isCodexApp) {
+        // The rows are half of it: an idle lane keeps its thread in memory and, with no
+        // stored thread left to contradict it, the next turn would reuse the very
+        // conversation this compact discarded.
+        const { invalidateCodexAppLanesForScope } = await import('../agent/codex-host-pool.js');
+        invalidateCodexAppLanesForScope(scope);
+    }
     return {
         ok: true,
         code: 'compact_done',

package/dist/src/cli/compact.js.map

@@ -1 +1 @@
-{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../../src/cli/compact.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,yEAAyE;AACzE,+EAA+E;AAE/E,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAgBhE,SAAS,cAAc,CAAC,QAAgC,EAAE,OAA8B,EAAE,SAAiB;IACvG,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,OAAO,EAAE,SAAS,CAAC;IAC7D,MAAM,YAAY,GAAG,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,KAAK,SAAS,CAAC;QAC5E,CAAC,CAAC,OAAO,CAAC,KAAK;QACf,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO,QAAQ,EAAE,eAAe,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK;WAC7C,YAAY;WACZ,QAAQ,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK;WACpC,SAAS,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,QAAQ,CACnB,EAA6C,EAC7C,WAAqB,IAAI;IAEzB,IAAI,OAAO,EAAE,KAAK,UAAU;QAAE,OAAO,QAAQ,CAAC;IAC9C,IAAI,CAAC;QACD,OAAO,MAAM,EAAE,EAAE,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,QAAQ,CAAC;IACpB,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAc,EAAE,GAAsB;IACvE,MAAM,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC;QAChC,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC;QAC/B,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC;KAClC,CAAsF,CAAC;IAExF,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QACvB,OAAO;YACH,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,wDAAwD;SACjE,CAAC;IACN,CAAC;IAED,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,MAAM,CAAC,mBAAmB,CAAC,CAAC;IAC1D,IAAI,WAAW,EAAE,EAAE,CAAC;QAChB,OAAO;YACH,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,wDAAwD;SACjE,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,UAAU,IAAI,OAAO,EAAE,SAAS,IAAI,QAAQ,CAAC;IACzF,MAAM,UAAU,GAAG,mBAAmB,CAAC,QAAQ,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;IAErE,MAAM,KAAK,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC,CAAC;IAClE,MAAM,aAAa,GAAG,OAAO,CACzB,KAAK,CAAC,YAAY;WACf,KAAK,CAAC,YAAY;WAClB,KAAK,CAAC,WAAW;WACjB,KAAK,CAAC,SAAS;WACf,KAAK,CAAC,aAAa,CACzB,CAAC;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO;YACH,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,uDAAuD;SAChE,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,GAAG,sBAAsB,KAAK,SAAS,EAAE,CAAC;IAExD,MAAM,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IACrF,MAAM,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IAClE,MAAM,EACF,8BAA8B,GACjC,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACpD,MAAM,EACF,oBAAoB,EACpB,yBAAyB,GAC5B,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,MAAM,GAAG,oBAAoB,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IACtD,sBAAsB,CAAC,GAAG,CACtB,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,KAAK,EACL,KAAK,EACL,IAAI,EACJ,UAAU,EACV,oBAAoB,EAAE,CACzB,CAAC;IACF,yBAAyB,CAAC,SAAS,CAAC,CAAC;IACrC,8BAA8B,EAAE,CAAC;IACjC,oBAAoB,EAAE,CAAC;IACvB,IAAI,MAAM;QAAE,kBAAkB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAE3C,OAAO;QACH,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,kGAAkG;QACxG,IAAI,EAAE;YACF,IAAI,EAAE,WAAW;YACjB,gBAAgB,EAAE,IAAI;YACtB,KAAK,EAAE;gBACH,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM;gBAC3B,gBAAgB,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;gBAC3C,gBAAgB,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;gBAC3C,eAAe,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM;gBACzC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM;gBACrC,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM;gBAC7C,SAAS,EAAE,SAAS,CAAC,MAAM;aAC9B;SACJ;KACJ,CAAC;AACN,CAAC"}
+{"version":3,"file":"compact.js","sourceRoot":"","sources":["../../../src/cli/compact.ts"],"names":[],"mappings":"AAAA,wDAAwD;AACxD,yEAAyE;AACzE,+EAA+E;AAE/E,OAAO,EACH,sBAAsB,EACtB,sBAAsB,EACtB,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,GACtB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,oBAAoB,EAAE,MAAM,0BAA0B,CAAC;AAkBhE,SAAS,cAAc,CAAC,QAAgC,EAAE,OAA8B,EAAE,SAAiB;IACvG,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,OAAO,EAAE,SAAS,CAAC;IAC7D,MAAM,YAAY,GAAG,OAAO,EAAE,KAAK,IAAI,CAAC,CAAC,UAAU,IAAI,UAAU,KAAK,SAAS,CAAC;QAC5E,CAAC,CAAC,OAAO,CAAC,KAAK;QACf,CAAC,CAAC,SAAS,CAAC;IAChB,OAAO,QAAQ,EAAE,eAAe,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK;WAC7C,YAAY;WACZ,QAAQ,EAAE,MAAM,EAAE,CAAC,SAAS,CAAC,EAAE,KAAK;WACpC,SAAS,CAAC;AACrB,CAAC;AAED,KAAK,UAAU,QAAQ,CACnB,EAA6C,EAC7C,WAAqB,IAAI;IAEzB,IAAI,OAAO,EAAE,KAAK,UAAU;QAAE,OAAO,QAAQ,CAAC;IAC9C,IAAI,CAAC;QACD,OAAO,MAAM,EAAE,EAAE,CAAC;IACtB,CAAC;IAAC,MAAM,CAAC;QACL,OAAO,QAAQ,CAAC;IACpB,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,IAAc,EAAE,GAAsB;IACvE,MAAM,YAAY,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;IACnD,MAAM,CAAC,QAAQ,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACnD,QAAQ,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC;QAChC,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC;QAC/B,QAAQ,CAAC,GAAG,EAAE,UAAU,EAAE,IAAI,CAAC;KAClC,CAAsF,CAAC;IAExF,IAAI,OAAO,EAAE,WAAW,EAAE,CAAC;QACvB,OAAO;YACH,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,cAAc;YACpB,IAAI,EAAE,wDAAwD;SACjE,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,QAAQ,EAAE,GAAG,IAAI,OAAO,EAAE,UAAU,IAAI,OAAO,EAAE,SAAS,IAAI,QAAQ,CAAC;IACzF,MAAM,UAAU,GAAG,mBAAmB,CAAC,QAAQ,EAAE,UAAU,IAAI,IAAI,CAAC,CAAC;IAErE,mFAAmF;IACnF,qFAAqF;IACrF,MAAM,aAAa,GAAG,oBAAoB,EAAE,CAAC;IAC7C,MAAM,KAAK,GAAG,qBAAqB,CAAC,EAAE,UAAU,EAAE,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC;IACjF,MAAM,aAAa,GAAG,OAAO,CACzB,KAAK,CAAC,YAAY;WACf,KAAK,CAAC,YAAY;WAClB,KAAK,CAAC,WAAW;WACjB,KAAK,CAAC,SAAS;WACf,KAAK,CAAC,aAAa,CACzB,CAAC;IACF,IAAI,CAAC,aAAa,EAAE,CAAC;QACjB,OAAO;YACH,EAAE,EAAE,KAAK;YACT,IAAI,EAAE,qBAAqB;YAC3B,IAAI,EAAE,uDAAuD;SAChE,CAAC;IACN,CAAC;IAED,MAAM,SAAS,GAAG,qBAAqB,CAAC,KAAK,CAAC,CAAC;IAC/C,MAAM,KAAK,GAAG,GAAG,sBAAsB,KAAK,SAAS,EAAE,CAAC;IAExD,MAAM,EAAE,sBAAsB,EAAE,kBAAkB,EAAE,2BAA2B,EAAE,GAAG,MAAM,MAAM,CAAC,eAAe,CAAC,CAAC;IAClH,MAAM,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,CAAC,CAAC;IACxF,MAAM,EACF,oBAAoB,EACpB,yBAAyB,GAC5B,GAAG,MAAM,MAAM,CAAC,yBAAyB,CAAC,CAAC;IAE5C,MAAM,KAAK,GAAG,cAAc,CAAC,QAAQ,EAAE,OAAO,EAAE,SAAS,CAAC,CAAC;IAC3D,MAAM,EAAE,mBAAmB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IACzE,MAAM,EAAE,uBAAuB,EAAE,GAAG,MAAM,MAAM,CAAC,0BAA0B,CAAC,CAAC;IAC7E,MAAM,KAAK,GAAG,mBAAmB,CAC7B,aAAa,EACb,uBAAuB,CAAC,aAAa,CAAC,IAAI,SAAS,EACnD,QAAQ,EAAE,YAAY,EAAE,OAAO,KAAK,IAAI,CAC3C,CAAC;IACF,sFAAsF;IACtF,sFAAsF;IACtF,qFAAqF;IACrF,6DAA6D;IAC7D,EAAE;IACF,MAAM,UAAU,GAAG,SAAS,KAAK,WAAW,CAAC;IAC7C,oFAAoF;IACpF,+EAA+E;IAC/E,qEAAqE;IACrE,MAAM,WAAW,GAAG,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;IACrE,MAAM,IAAI,GAAG,oBAAoB,CAAC,SAAS,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;IACjE,sFAAsF;IACtF,uFAAuF;IACvF,uFAAuF;IACvF,uCAAuC;IACvC,MAAM,MAAM,GAAG,GAAG,IAAI,IAAI,KAAK,EAAE,CAAC;IAClC,sBAAsB,CAAC,GAAG,CACtB,WAAW,EACX,sBAAsB,EACtB,SAAS,EACT,KAAK,EACL,KAAK,EACL,IAAI,EACJ,UAAU,EACV,aAAa,CAChB,CAAC;IACF,MAAM,cAAc,GAAG,KAAK,KAAK,SAAS,CAAC;IAC3C,mFAAmF;IACnF,6EAA6E;IAC7E,yBAAyB,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAEzE,gFAAgF;IAChF,iFAAiF;IACjF,8CAA8C;IAC9C,MAAM,EAAE,0BAA0B,EAAE,GAAG,MAAM,MAAM,CAAC,iCAAiC,CAAC,CAAC;IACvF,0BAA0B,CAAC,KAAK,CAAC,CAAC;IAClC,IAAI,cAAc,EAAE,CAAC;QACjB,4EAA4E;QAC5E,aAAa;QACb,oBAAoB,EAAE,CAAC;IAC3B,CAAC;IAED,sFAAsF;IACtF,wFAAwF;IACxF,uFAAuF;IACvF,6EAA6E;IAC7E,2BAA2B,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,CAAC;IACtD,oFAAoF;IACpF,oFAAoF;IACpF,IAAI,cAAc;QAAE,kBAAkB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;IACjD,IAAI,UAAU,EAAE,CAAC;QACb,gFAAgF;QAChF,0EAA0E;QAC1E,uCAAuC;QACvC,MAAM,EAAE,+BAA+B,EAAE,GAAG,MAAM,MAAM,CAAC,6BAA6B,CAAC,CAAC;QACxF,+BAA+B,CAAC,KAAK,CAAC,CAAC;IAC3C,CAAC;IAED,OAAO;QACH,EAAE,EAAE,IAAI;QACR,IAAI,EAAE,cAAc;QACpB,IAAI,EAAE,kGAAkG;QACxG,IAAI,EAAE;YACF,IAAI,EAAE,WAAW;YACjB,gBAAgB,EAAE,IAAI;YACtB,KAAK,EAAE;gBACH,QAAQ,EAAE,KAAK,CAAC,IAAI,CAAC,MAAM;gBAC3B,gBAAgB,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;gBAC3C,gBAAgB,EAAE,KAAK,CAAC,YAAY,CAAC,MAAM;gBAC3C,eAAe,EAAE,KAAK,CAAC,WAAW,CAAC,MAAM;gBACzC,aAAa,EAAE,KAAK,CAAC,SAAS,CAAC,MAAM;gBACrC,iBAAiB,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM;gBAC7C,SAAS,EAAE,SAAS,CAAC,MAAM;aAC9B;SACJ;KACJ,CAAC;AACN,CAAC"}

package/dist/src/cli/handlers-runtime.js

@@ -228,14 +228,16 @@ export async function steerHandler(args, ctx) {
     if (!prompt) {
         return { ok: false, type: 'error', text: t('cmd.steer.noPrompt', {}, L) };
     }
+    const { currentSessionScope } = await import('../core/session-context.js');
+    const scopeKey = currentSessionScope()?.scope ?? 'default';
     const { isAgentBusy, killActiveAgent, waitForProcessEnd, getSteerWaitMsForActiveAgent } = await import('../agent/spawn.js');
-    if (!isAgentBusy()) {
+    if (!isAgentBusy(scopeKey)) {
         return { ok: false, type: 'error', text: t('cmd.steer.noAgent', {}, L) };
     }
     // Kill running agent (or cancel retry timer) and wait for clean exit
-    const steerWaitMs = getSteerWaitMsForActiveAgent();
-    killActiveAgent('steer');
-    await waitForProcessEnd(steerWaitMs);
+    const steerWaitMs = getSteerWaitMsForActiveAgent(scopeKey);
+    killActiveAgent(scopeKey, 'steer');
+    await waitForProcessEnd(scopeKey, steerWaitMs);
     // Remote interfaces: clear stale session before re-orchestrate
     const iface = ctx.interface || 'cli';
     if (iface === 'telegram' || iface === 'discord' || iface === 'slack') {