cli-jaw 2.0.5 → 2.0.6

package/dist/src/agent/memory-flush-controller.js

@@ -6,6 +6,8 @@ import { settings, JAW_HOME } from '../core/config.js';
 import { getRecentMessages } from '../core/db.js';
 import { getMemoryFlushFilePath } from '../memory/runtime.js';
 import { maybeAutoReflect } from '../memory/reflect.js';
+import { resolveDashboardHome } from '../manager/dashboard-home.js';
+import { DASHBOARD_DEFAULT_PORT } from '../manager/constants.js';
 export let memoryFlushCounter = 0;
 export let flushCycleCount = 0;
 let _flushLock = false;
@@ -117,6 +119,7 @@ export async function triggerMemoryFlush() {
                     _lastFlushedMessageId = maxId;
                     _flushLock = false;
                     maybeAutoReflect().catch(e => console.error('[memory] post-flush auto-reflect failed:', e));
+                    triggerEmbeddingSync().catch(e => console.warn('[memory] post-flush embedding sync error:', e));
                     console.log(`[memory] flush complete (code=${code}), watermark=${maxId}`);
                 },
             },
@@ -129,6 +132,29 @@ export async function triggerMemoryFlush() {
         console.error('[memory] flush spawn failed:', e);
     }
 }
+async function triggerEmbeddingSync() {
+    try {
+        const home = resolveDashboardHome();
+        const cfgPath = join(home, 'embedding.json');
+        if (!fs.existsSync(cfgPath))
+            return;
+        const cfg = JSON.parse(fs.readFileSync(cfgPath, 'utf8'));
+        if (!cfg.enabled)
+            return;
+        const port = Number(process.env['DASHBOARD_PORT']) || Number(DASHBOARD_DEFAULT_PORT);
+        const resp = await fetch(`http://127.0.0.1:${port}/api/dashboard/memory/reindex`, {
+            method: 'POST',
+            signal: AbortSignal.timeout(30_000),
+            headers: { host: `127.0.0.1:${port}`, 'Content-Type': 'application/json' },
+        });
+        if (resp.ok) {
+            console.log('[memory] post-flush embedding sync triggered');
+        }
+    }
+    catch (err) {
+        console.warn('[memory] post-flush embedding sync failed (non-critical):', err.message);
+    }
+}
 export function getFlushStatus() {
     return {
         locked: _flushLock,

package/dist/src/agent/memory-flush-controller.js.map

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

package/dist/src/agent/resume-classifier.js

@@ -11,6 +11,11 @@ const CLI_STALE_MATCHERS = {
     claude: [
         /no conversation found with session id/i,
     ],
+    'claude-e': [
+        /prompt injection did not reach Claude transcript/i,
+        /prompt injection transcript verification failed/i,
+        /prompt injection cannot be verified/i,
+    ],
     codex: [
         /\bconversation\b.*\bnot found\b/i,
         /\bresume\b.*\bnot found\b/i,
@@ -21,6 +26,10 @@ const CLI_STALE_MATCHERS = {
         /\bsession\b.*\bnot found\b/i,
         /\bresume\b.*\bnot found\b/i,
     ],
+    grok: [
+        /\bsession\b.*\bnot found\b/i,
+        /\bresume\b.*\bnot found\b/i,
+    ],
     opencode: [
         /\bsession\b.*\bnot found\b/i,
     ],

package/dist/src/agent/resume-classifier.js.map

@@ -1 +1 @@
-{"version":3,"file":"resume-classifier.js","sourceRoot":"","sources":["../../../src/agent/resume-classifier.ts"],"names":[],"mappings":"AAEA,MAAM,sBAAsB,GAAG;IAC3B,wCAAwC;IACxC,kCAAkC;IAClC,6BAA6B;IAC7B,0BAA0B;IAC1B,0BAA0B;IAC1B,2BAA2B;IAC3B,sBAAsB;CACzB,CAAC;AAEF,MAAM,kBAAkB,GAAe;IACnC,MAAM,EAAE;QACJ,wCAAwC;KAC3C;IACD,KAAK,EAAE;QACH,kCAAkC;QAClC,4BAA4B;QAC5B,uBAAuB,EAAe,kEAAkE;QACxG,4BAA4B;KAC/B;IACD,MAAM,EAAE;QACJ,6BAA6B;QAC7B,4BAA4B;KAC/B;IACD,QAAQ,EAAE;QACN,6BAA6B;KAChC;IACD,OAAO,EAAE;QACL,6BAA6B;QAC7B,8BAA8B;KACjC;CACJ,CAAC;AAEF,MAAM,UAAU,6BAA6B,CACzC,GAAW,EACX,IAA+B,EAC/B,MAAM,GAAG,EAAE,EACX,UAAU,GAAG,EAAE;IAEf,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7B,MAAM,QAAQ,GAAG,GAAG,MAAM,KAAK,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC;IACnD,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,MAAM,QAAQ,GAAG;QACb,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAClC,GAAG,sBAAsB;KAC5B,CAAC;IACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC9D,CAAC"}
+{"version":3,"file":"resume-classifier.js","sourceRoot":"","sources":["../../../src/agent/resume-classifier.ts"],"names":[],"mappings":"AAEA,MAAM,sBAAsB,GAAG;IAC3B,wCAAwC;IACxC,kCAAkC;IAClC,6BAA6B;IAC7B,0BAA0B;IAC1B,0BAA0B;IAC1B,2BAA2B;IAC3B,sBAAsB;CACzB,CAAC;AAEF,MAAM,kBAAkB,GAAe;IACnC,MAAM,EAAE;QACJ,wCAAwC;KAC3C;IACD,UAAU,EAAE;QACR,mDAAmD;QACnD,kDAAkD;QAClD,sCAAsC;KACzC;IACD,KAAK,EAAE;QACH,kCAAkC;QAClC,4BAA4B;QAC5B,uBAAuB,EAAe,kEAAkE;QACxG,4BAA4B;KAC/B;IACD,MAAM,EAAE;QACJ,6BAA6B;QAC7B,4BAA4B;KAC/B;IACD,IAAI,EAAE;QACF,6BAA6B;QAC7B,4BAA4B;KAC/B;IACD,QAAQ,EAAE;QACN,6BAA6B;KAChC;IACD,OAAO,EAAE;QACL,6BAA6B;QAC7B,8BAA8B;KACjC;CACJ,CAAC;AAEF,MAAM,UAAU,6BAA6B,CACzC,GAAW,EACX,IAA+B,EAC/B,MAAM,GAAG,EAAE,EACX,UAAU,GAAG,EAAE;IAEf,IAAI,IAAI,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IAC7B,MAAM,QAAQ,GAAG,GAAG,MAAM,KAAK,UAAU,EAAE,CAAC,IAAI,EAAE,CAAC;IACnD,IAAI,CAAC,QAAQ;QAAE,OAAO,KAAK,CAAC;IAE5B,MAAM,QAAQ,GAAG;QACb,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;QAClC,GAAG,sBAAsB;KAC5B,CAAC;IACF,OAAO,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;AAC9D,CAAC"}

package/dist/src/agent/session-persistence.js

@@ -20,11 +20,16 @@ export function shouldPersistMainSession(input) {
         return false;
     if (input.forceNew || input.employeeSessionId || !input.sessionId || input.isFallback)
         return false;
+    if (input.cli === 'ai-e' && input.provider !== 'claude')
+        return false;
     // User-initiated kill (SIGTERM/SIGKILL) yields exit codes like 143/137/1 depending on
     // the CLI's signal handler. Allow persistence when wasKilled=true so resume works for
     // CLIs (claude, copilot) that don't translate SIGTERM to exit 0.
+    // claude-e and ai-e's Claude PTY provider use exit code 2 for graceful SIGINT interrupt.
+    const isGracefulInterrupt = input.code === 2
+        && (input.cli === 'claude-e' || (input.cli === 'ai-e' && input.provider === 'claude'));
     if (input.code !== undefined && input.code !== null && input.code !== 0
-        && !input.wasKilled)
+        && !input.wasKilled && !isGracefulInterrupt)
         return false;
     return isCurrentSessionOwner(input.ownerGeneration);
 }
@@ -35,7 +40,7 @@ export function persistMainSession(input) {
     // Mirror into per-bucket table so codex-spark keeps a session independent from
     // plain codex (gpt-5.4 etc.) — avoids 'thread/resume failed: no rollout found'
     // on cross-model toggles.
-    const bucket = resolveSessionBucket(input.cli, input.model);
+    const bucket = resolveSessionBucket(input.cli, input.model, input.provider);
     if (bucket && input.sessionId) {
         upsertSessionBucket.run(bucket, input.sessionId, input.model, input.resumeKey || null);
     }

package/dist/src/agent/session-persistence.js.map

@@ -1 +1 @@
-{"version":3,"file":"session-persistence.js","sourceRoot":"","sources":["../../../src/agent/session-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAmBjD,IAAI,0BAA0B,GAAG,CAAC,CAAC;AAEnC,MAAM,UAAU,6BAA6B;IACzC,OAAO,0BAA0B,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,8BAA8B;IAC1C,0BAA0B,IAAI,CAAC,CAAC;IAChC,OAAO,0BAA0B,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,sCAAsC;IAClD,0BAA0B,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,eAAuB;IACzD,OAAO,eAAe,KAAK,0BAA0B,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAA8B;IACnE,IAAI,KAAK,CAAC,kBAAkB;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IACpG,sFAAsF;IACtF,sFAAsF;IACtF,iEAAiE;IACjE,IACI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC;WAChE,CAAC,KAAK,CAAC,SAAS;QACrB,OAAO,KAAK,CAAC;IACf,OAAO,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAA8B;IAC7D,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnD,aAAa,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,WAAW,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,MAAM,EACtD,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,EACjD,KAAK,CAAC,MAAM,CACf,CAAC;IACF,+EAA+E;IAC/E,+EAA+E;IAC/E,0BAA0B;IAC1B,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC5D,IAAI,MAAM,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QAC5B,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}
+{"version":3,"file":"session-persistence.js","sourceRoot":"","sources":["../../../src/agent/session-persistence.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AACnE,OAAO,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAC;AAoBjD,IAAI,0BAA0B,GAAG,CAAC,CAAC;AAEnC,MAAM,UAAU,6BAA6B;IACzC,OAAO,0BAA0B,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,8BAA8B;IAC1C,0BAA0B,IAAI,CAAC,CAAC;IAChC,OAAO,0BAA0B,CAAC;AACtC,CAAC;AAED,MAAM,UAAU,sCAAsC;IAClD,0BAA0B,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAM,UAAU,qBAAqB,CAAC,eAAuB;IACzD,OAAO,eAAe,KAAK,0BAA0B,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,KAA8B;IACnE,IAAI,KAAK,CAAC,kBAAkB;QAAE,OAAO,KAAK,CAAC;IAC3C,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,UAAU;QAAE,OAAO,KAAK,CAAC;IACpG,IAAI,KAAK,CAAC,GAAG,KAAK,MAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAC;IACtE,sFAAsF;IACtF,sFAAsF;IACtF,iEAAiE;IACjE,yFAAyF;IACzF,MAAM,mBAAmB,GAAG,KAAK,CAAC,IAAI,KAAK,CAAC;WACrC,CAAC,KAAK,CAAC,GAAG,KAAK,UAAU,IAAI,CAAC,KAAK,CAAC,GAAG,KAAK,MAAM,IAAI,KAAK,CAAC,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC;IAC3F,IACI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC;WAChE,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,mBAAmB;QAC7C,OAAO,KAAK,CAAC;IACf,OAAO,qBAAqB,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;AACxD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,KAA8B;IAC7D,IAAI,CAAC,wBAAwB,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAC;IACnD,aAAa,CAAC,GAAG,CACb,KAAK,CAAC,GAAG,EACT,KAAK,CAAC,SAAS,EACf,KAAK,CAAC,KAAK,EACX,KAAK,CAAC,WAAW,IAAI,QAAQ,CAAC,aAAa,CAAC,IAAI,MAAM,EACtD,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAC,YAAY,CAAC,IAAI,GAAG,EACjD,KAAK,CAAC,MAAM,CACf,CAAC;IACF,+EAA+E;IAC/E,+EAA+E;IAC/E,0BAA0B;IAC1B,MAAM,MAAM,GAAG,oBAAoB,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IAC5E,IAAI,MAAM,IAAI,KAAK,CAAC,SAAS,EAAE,CAAC;QAC5B,mBAAmB,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,SAAS,EAAE,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,SAAS,IAAI,IAAI,CAAC,CAAC;IAC3F,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC"}

package/dist/src/agent/spawn/process-kill.js

@@ -0,0 +1,29 @@
+import { execFileSync } from 'child_process';
+/**
+ * Recursively kill a process tree using pgrep -P.
+ * Codex sub-agents spawn children with separate PGIDs,
+ * so process.kill(-pid) won't reach them.
+ */
+export function killProcessTree(pid, signal = 'SIGTERM') {
+    if (process.platform === 'win32') {
+        try {
+            execFileSync('taskkill', ['/PID', String(pid), '/T', '/F'], { stdio: 'ignore' });
+        }
+        catch { /* best effort */ }
+        return;
+    }
+    let childPids = [];
+    try {
+        const out = execFileSync('pgrep', ['-P', String(pid)], { encoding: 'utf8', timeout: 3000 });
+        childPids = out.trim().split('\n').filter(Boolean).map(Number).filter(n => n > 0);
+    }
+    catch { /* no children or pgrep failed */ }
+    for (const cpid of childPids) {
+        killProcessTree(cpid, signal);
+    }
+    try {
+        process.kill(pid, signal);
+    }
+    catch { /* already dead */ }
+}
+//# sourceMappingURL=process-kill.js.map

package/dist/src/agent/spawn/process-kill.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"process-kill.js","sourceRoot":"","sources":["../../../../src/agent/spawn/process-kill.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C;;;;GAIG;AACH,MAAM,UAAU,eAAe,CAAC,GAAW,EAAE,SAAyB,SAAS;IAC3E,IAAI,OAAO,CAAC,QAAQ,KAAK,OAAO,EAAE,CAAC;QAC/B,IAAI,CAAC;YAAC,YAAY,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,CAAC;QAAC,CAAC;QAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,CAAC;QACrH,OAAO;IACX,CAAC;IACD,IAAI,SAAS,GAAa,EAAE,CAAC;IAC7B,IAAI,CAAC;QACD,MAAM,GAAG,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;QAC5F,SAAS,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;IACtF,CAAC;IAAC,MAAM,CAAC,CAAC,iCAAiC,CAAC,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,SAAS,EAAE,CAAC;QAC3B,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAClC,CAAC;IACD,IAAI,CAAC;QAAC,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAAC,CAAC;IAAC,MAAM,CAAC,CAAC,kBAAkB,CAAC,CAAC;AACnE,CAAC"}

package/dist/src/agent/spawn/queue.js

@@ -0,0 +1,273 @@
+// Message queue controller — factory pattern to avoid spawn.ts circular imports.
+import crypto from 'node:crypto';
+import { groupQueueKey } from '../../messaging/session-key.js';
+import { stripUndefined } from '../../core/strip-undefined.js';
+export const FALLBACK_MAX_RETRIES = 3;
+export function createQueueController(deps) {
+    function normalizeQueueItem(row) {
+        try {
+            const parsed = JSON.parse(row.payload);
+            if (typeof parsed?.id !== 'string' || typeof parsed?.prompt !== 'string' || typeof parsed?.source !== 'string') {
+                return [];
+            }
+            return [stripUndefined({
+                    id: parsed.id,
+                    prompt: parsed.prompt,
+                    source: parsed.source,
+                    scope: 'default',
+                    target: parsed.target,
+                    chatId: parsed.chatId,
+                    requestId: parsed.requestId,
+                    ts: typeof parsed.ts === 'number' ? parsed.ts : Date.now(),
+                })];
+        }
+        catch {
+            return [];
+        }
+    }
+    function loadPersistedQueue() {
+        return deps.listQueuedMessages.all().flatMap(normalizeQueueItem);
+    }
+    const messageQueue = loadPersistedQueue();
+    if (messageQueue.length > 0) {
+        console.log(`[queue] recovered ${messageQueue.length} persisted message(s) from previous session`);
+    }
+    let queueProcessing = false;
+    // ─── 429 Retry Timer State ──────────────────────────
+    // INVARIANT: single-main — 동시에 1개의 main spawnAgent만 존재한다고 가정.
+    // 멀티 main task 도입 시 request-id 키 맵으로 전환 필요.
+    let retryPendingTimer = null;
+    let retryPendingResolve = null;
+    let retryPendingOrigin = null;
+    let retryPendingIsEmployee = false;
+    const fallbackState = new Map();
+    let queueHoldId = null;
+    let queueHoldTimer = null;
+    const QUEUE_HOLD_TIMEOUT_MS = 10_000;
+    function clearRetryTimer(resumeQueue = true) {
+        if (retryPendingTimer) {
+            clearTimeout(retryPendingTimer);
+            retryPendingTimer = null;
+            console.log('[jaw:retry] timer cancelled');
+            if (retryPendingResolve) {
+                deps.broadcast('agent_done', {
+                    text: '⏹️ 재시도 취소됨',
+                    error: true,
+                    origin: retryPendingOrigin || 'web',
+                    ...(retryPendingIsEmployee ? { isEmployee: true } : {}),
+                }, retryPendingIsEmployee ? 'internal' : 'public');
+                retryPendingResolve({ text: '', code: -1 });
+                retryPendingResolve = null;
+                retryPendingOrigin = null;
+                retryPendingIsEmployee = false;
+            }
+            if (resumeQueue)
+                processQueue();
+        }
+    }
+    function resetFallbackState() {
+        clearRetryTimer(true);
+        fallbackState.clear();
+        console.log('[jaw:fallback] state reset');
+    }
+    function getFallbackState() {
+        return Object.fromEntries(fallbackState);
+    }
+    function setQueueHold(id, timeoutMs = QUEUE_HOLD_TIMEOUT_MS) {
+        if (queueHoldId && queueHoldId !== id)
+            clearQueueHold();
+        queueHoldId = id;
+        if (queueHoldTimer)
+            clearTimeout(queueHoldTimer);
+        const holdId = id;
+        queueHoldTimer = setTimeout(() => {
+            if (queueHoldId !== holdId)
+                return;
+            console.warn(`[queue:hold] hold for ${holdId} expired after ${timeoutMs}ms`);
+            clearQueueHold();
+        }, timeoutMs);
+        console.log(`[queue:hold] set for ${id}`);
+    }
+    function clearQueueHold(id, opts) {
+        if (id && queueHoldId !== id)
+            return;
+        if (queueHoldTimer)
+            clearTimeout(queueHoldTimer);
+        queueHoldTimer = null;
+        const hadHold = queueHoldId !== null;
+        if (hadHold)
+            console.log(`[queue:hold] cleared (was ${queueHoldId})`);
+        queueHoldId = null;
+        if (hadHold && (opts?.resume ?? true))
+            queueMicrotask(() => processQueue());
+    }
+    function getQueueHoldId() {
+        return queueHoldId;
+    }
+    function getQueuedMessageSnapshotForScope(scope) {
+        return messageQueue
+            .filter(item => item.scope === scope)
+            .map(item => ({
+            id: item.id,
+            prompt: item.prompt,
+            source: item.source,
+            ts: item.ts,
+        }));
+    }
+    function removeQueuedMessage(id) {
+        const idx = messageQueue.findIndex(item => item.id === id);
+        if (idx === -1)
+            return { removed: null, pending: messageQueue.length };
+        const [removed] = messageQueue.splice(idx, 1);
+        try {
+            deps.deleteQueuedMessage.run(id);
+        }
+        catch (err) {
+            console.warn(`[queue] DB delete failed for ${id}:`, err.message);
+        }
+        console.log(`[queue] -1 (${messageQueue.length} pending) removed=${id}`);
+        deps.broadcast('queue_update', { pending: messageQueue.length });
+        return { removed: removed, pending: messageQueue.length };
+    }
+    function enqueueMessage(prompt, source, meta) {
+        const item = stripUndefined({
+            id: crypto.randomUUID(),
+            prompt,
+            source,
+            scope: meta?.scope || 'default',
+            target: meta?.target,
+            chatId: meta?.chatId,
+            requestId: meta?.requestId,
+            ts: Date.now(),
+        });
+        deps.insertQueuedMessage.run(item.id, JSON.stringify(item));
+        messageQueue.push(item);
+        console.log(`[queue] +1 (${messageQueue.length} pending)`);
+        deps.broadcast('queue_update', { pending: messageQueue.length });
+        processQueue();
+        return item.id;
+    }
+    // Queue policy: "fair" — batch head runs, tail goes after remaining
+    async function processQueue() {
+        if (queueProcessing)
+            return;
+        if (!deps.isSpawnBusy() && !deps.hasBlockingWorkers() && deps.hasPendingWorkerReplays()) {
+            queueMicrotask(() => {
+                deps.importPipeline()
+                    .then(({ drainPendingReplays }) => drainPendingReplays({ origin: 'system' }))
+                    .catch(err => console.error('[processQueue:drain]', err.message));
+            });
+        }
+        if (deps.isSpawnBusy()
+            || deps.hasBlockingWorkers()
+            || messageQueue.length === 0
+            || queueHoldId)
+            return;
+        // NOTE: hasPendingWorkerReplays() is intentionally NOT gated here —
+        // orchestrate() drains pending replays at entry (pipeline.ts drainPendingReplays),
+        // so the queued user message still arrives AFTER the worker result. Keeping this
+        // gate caused a deadlock (see devlog/_plan/260417_message_duplication/02_*).
+        queueProcessing = true;
+        const first = messageQueue[0];
+        const groupKey = groupQueueKey(first.source, first.target);
+        const batch = [];
+        const remaining = [];
+        for (const m of messageQueue) {
+            const key = groupQueueKey(m.source, m.target);
+            if (key === groupKey)
+                batch.push(m);
+            else
+                remaining.push(m);
+        }
+        messageQueue.length = 0;
+        if (batch.length > 1) {
+            messageQueue.push(...remaining, ...batch.slice(1));
+        }
+        else {
+            messageQueue.push(...remaining);
+        }
+        const item = batch[0];
+        const combined = item.prompt;
+        const source = item.source;
+        const target = item.target;
+        const chatId = item.chatId;
+        const requestId = item.requestId;
+        const origin = source || 'web';
+        console.log(`[queue] processing 1/${batch.length} message(s) for ${groupKey}, ${messageQueue.length} remaining`);
+        let inserted = false;
+        try {
+            deps.insertMessage.run('user', combined, source, '', deps.getWorkingDir());
+            deps.deleteQueuedMessage.run(item.id);
+            inserted = true;
+            deps.broadcast('new_message', { role: 'user', content: combined, source, fromQueue: true });
+            deps.broadcast('queue_update', { pending: messageQueue.length });
+            const { orchestrate, orchestrateContinue, orchestrateReset, isContinueIntent, isResetIntent } = await deps.importPipeline();
+            const task = isResetIntent(combined)
+                ? orchestrateReset({ origin, target, chatId, requestId, _skipInsert: true })
+                : isContinueIntent(combined)
+                    ? orchestrateContinue({ origin, target, chatId, requestId, _skipInsert: true })
+                    : orchestrate(combined, { origin, target, chatId, requestId, _skipInsert: true });
+            try {
+                await task;
+            }
+            catch (err) {
+                const msg = err.message;
+                console.error('[queue:orchestrate]', msg);
+                deps.broadcast('orchestrate_done', { text: `[error] ${msg}`, error: true, origin, chatId, target, requestId });
+            }
+        }
+        catch (setupErr) {
+            console.error('[queue:setup]', setupErr);
+            if (!inserted) {
+                messageQueue.unshift(item);
+            }
+            else {
+                deps.broadcast('orchestrate_done', { text: `[error] setup failed: ${setupErr.message}`, error: true, origin, chatId, target, requestId });
+            }
+        }
+        finally {
+            queueProcessing = false;
+            queueMicrotask(() => processQueue());
+        }
+    }
+    function purgeQueueOnStop(reason) {
+        if (messageQueue.length === 0)
+            return;
+        const dropped = messageQueue.length;
+        for (const item of messageQueue.splice(0)) {
+            try {
+                deps.deleteQueuedMessage.run(item.id);
+            }
+            catch { /* best-effort */ }
+        }
+        console.log(`[jaw:stop] cleared ${dropped} pending message(s) (reason=${reason})`);
+        deps.broadcast('queue_update', { pending: 0 });
+    }
+    return {
+        enqueueMessage,
+        removeQueuedMessage,
+        processQueue,
+        setQueueHold,
+        clearQueueHold,
+        getQueueHoldId,
+        clearRetryTimer,
+        resetFallbackState,
+        getFallbackState,
+        getQueuedMessageSnapshotForScope,
+        messageQueue,
+        fallbackState,
+        isRetryPending: () => !!retryPendingTimer,
+        isQueueBusy: () => queueProcessing,
+        purgeQueueOnStop,
+        retryState: {
+            get timer() { return retryPendingTimer; },
+            get resolve() { return retryPendingResolve; },
+            get origin() { return retryPendingOrigin; },
+            setTimer: (t) => { retryPendingTimer = t; },
+            setResolve: (r) => { retryPendingResolve = r; },
+            setOrigin: (o) => { retryPendingOrigin = o; },
+            setIsEmployee: (v) => { retryPendingIsEmployee = v; },
+        },
+    };
+}
+//# sourceMappingURL=queue.js.map

package/dist/src/agent/spawn/queue.js.map

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

package/dist/src/agent/spawn/resume.js

@@ -0,0 +1,56 @@
+// Resume/heartbeat/bucket decision helpers — pure functions, no spawn state mutation.
+import { normalizeModelForCli } from '../../core/config.js';
+// ─── ACP Heartbeat Helper ────────────────────────────
+// Pure function for conditional heartbeat gating.
+// "visible" = WebUI + Telegram common baseline. 💭 is WebUI-only
+// (bot.ts:337 hides it), so it's NOT counted as visible.
+const DEFAULT_HEARTBEAT_GATE_MS = 20_000;
+export function shouldEmitHeartbeat(lastVisibleTs, heartbeatSent, gateMs = DEFAULT_HEARTBEAT_GATE_MS, now = Date.now()) {
+    if (heartbeatSent)
+        return false;
+    return (now - lastVisibleTs) > gateMs;
+}
+export function shouldResumeBucketSession(cli, requestedModel, bucketModel, requestedResumeKey, bucketResumeKey, bucketUpdatedAt, nowMs = Date.now()) {
+    if (cli === 'gemini') {
+        if (!bucketModel)
+            return false;
+        if (isExpiredBucket(bucketUpdatedAt, GEMINI_RESUME_TTL_MS, nowMs))
+            return false;
+        const requested = normalizeGeminiResumeModel(requestedModel);
+        const bucket = normalizeGeminiResumeModel(bucketModel);
+        if (!requested || !bucket)
+            return false;
+        return requested === bucket;
+    }
+    if (cli === 'copilot' && bucketModel) {
+        return normalizeModelForCli(cli, requestedModel) === normalizeModelForCli(cli, bucketModel);
+    }
+    if (cli === 'opencode' && requestedResumeKey) {
+        return requestedResumeKey === (bucketResumeKey ?? null);
+    }
+    return true;
+}
+export const GEMINI_RESUME_TTL_MS = 72 * 60 * 60 * 1000;
+function normalizeGeminiResumeModel(model) {
+    const normalized = String(model || '').trim().toLowerCase();
+    if (!normalized || normalized === 'default' || normalized === 'auto')
+        return '';
+    return normalized;
+}
+function parseBucketUpdatedAt(value) {
+    if (typeof value === 'number' && Number.isFinite(value)) {
+        return value < 10_000_000_000 ? value * 1000 : value;
+    }
+    const text = String(value || '').trim();
+    if (!text)
+        return null;
+    const parsed = Date.parse(text.includes('T') ? text : `${text.replace(' ', 'T')}Z`);
+    return Number.isFinite(parsed) ? parsed : null;
+}
+function isExpiredBucket(value, ttlMs, nowMs) {
+    const updatedAtMs = parseBucketUpdatedAt(value);
+    if (updatedAtMs === null)
+        return true;
+    return nowMs - updatedAtMs > ttlMs;
+}
+//# sourceMappingURL=resume.js.map

package/dist/src/agent/spawn/resume.js.map

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