cli-jaw 1.5.0 → 1.6.0

package/dist/src/discord/commands.js

@@ -8,11 +8,9 @@ import { normalizeLocale } from '../core/i18n.js';
 import { resetFallbackState } from '../agent/spawn.js';
 import { applyRuntimeSettingsPatch } from '../core/runtime-settings.js';
 import { bumpSessionOwnershipGeneration } from '../agent/session-persistence.js';
-import { clearMainSessionState } from '../core/main-session.js';
-// Operational commands exposed as slash commands
-const DISCORD_SLASH_COMMANDS = [
-    'help', 'status', 'model', 'cli', 'fallback', 'forward', 'flush', 'version', 'clear', 'compact', 'steer',
-];
+import { clearMainSessionState, resetSessionPreservingHistory } from '../core/main-session.js';
+import { getVisibleCommands } from '../command-contract/policy.js';
+import { seedDefaultEmployees } from '../core/employees.js';
 export async function registerDiscordSlashCommands(client) {
     if (!settings.discord?.guildId) {
         console.warn('[discord] guildId not set — skipping slash command registration');
@@ -22,9 +20,10 @@ export async function registerDiscordSlashCommands(client) {
         console.warn('[discord] application id not available — skipping slash commands');
         return;
     }
-    const commands = DISCORD_SLASH_COMMANDS.map(name => new SlashCommandBuilder()
-        .setName(name)
-        .setDescription(`/${name}`)
+    const discordCommands = getVisibleCommands('discord');
+    const commands = discordCommands.map(c => new SlashCommandBuilder()
+        .setName(c.name)
+        .setDescription(c.desc || `/${c.name}`)
         .addStringOption(opt => opt.setName('args').setDescription('Arguments').setRequired(false))
         .toJSON());
     try {
@@ -49,6 +48,11 @@ function makeDiscordCommandCtx() {
             bumpSessionOwnershipGeneration();
             clearMainSessionState();
         },
+        resetSession: () => {
+            bumpSessionOwnershipGeneration();
+            resetSessionPreservingHistory();
+        },
+        resetEmployees: () => seedDefaultEmployees({ reset: true, notify: true }),
     });
 }
 export async function handleDiscordSlashCommand(interaction) {

package/dist/src/discord/commands.js.map

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

package/dist/src/orchestrator/distribute.js

@@ -266,6 +266,12 @@ export async function runSingleAgent(ap, emp, worklog, round, meta, priorResults
         .slice(ap.currentPhaseIdx)
         .map((p) => `${p}(${PHASES[p]})`)
         .join('→');
+    const worklogPath = String(worklog?.path || '').trim();
+    const worklogBlock = worklogPath
+        ? `## Worklog
+Read this file first: ${worklogPath}
+After completing your task, record results in the Execution Log section.`
+        : '';
     const taskPrompt = `## Task Instruction [${phaseLabel}]
 ${ap.task}
 
@@ -281,19 +287,15 @@ ${instruction}
 - Code change + tests → Phases 3~4 at once
 
 Example: planning + development together → complete analysis + code in one pass.
-In that case, add this JSON at the end of your response:
+In that case, state which phases you completed at the end of your response:
 
-\`\`\`json
-{ "phases_completed": [${ap.phaseProfile.slice(ap.currentPhaseIdx).join(', ')}] }
-\`\`\`
+Phases completed: ${ap.phaseProfile.slice(ap.currentPhaseIdx).join(', ')}
 
-If you completed only one phase, you do not need to add this JSON.
+Use this exact plain-text format (NOT JSON). If you completed only one phase, you do not need to add this line.
 
 ${executionContext}
 
-## Worklog
-Read this file first: ${worklog.path}
-After completing your task, record results in the Execution Log section.`;
+${worklogBlock}`.trim();
     broadcast('agent_status', {
         agentId: emp.id, agentName: emp.name,
         status: 'running', phase: ap.currentPhase, phaseLabel,
@@ -341,31 +343,46 @@ After completing your task, record results in the Execution Log section.`;
         status: r.code === 0 ? 'done' : 'error',
         text: r.text || '',
     };
-    // Parse phases_completed from agent output
-    const pcMatch = (r.text || '').match(/\{[\s\S]*"phases_completed"\s*:\s*\[[\d,\s]+\][\s\S]*\}/);
-    if (pcMatch) {
+    // Parse phases_completed from agent output (supports both plain-text and legacy JSON)
+    const responseText = r.text || '';
+    // Plain-text format: "Phases completed: A, P, B" or "Phases completed: 1, 2, 3"
+    const plainMatch = responseText.match(/Phases completed:\s*(.+)/i);
+    // Legacy JSON format: { "phases_completed": [1, 2, 3] }
+    const jsonMatch = responseText.match(/\{[\s\S]*"phases_completed"\s*:\s*\[[\d,\s]+\][\s\S]*\}/);
+    let completedPhases = null;
+    if (plainMatch) {
+        const parts = plainMatch[1].split(',').map((s) => parseInt(s.trim(), 10)).filter((n) => !isNaN(n));
+        if (parts.length > 1)
+            completedPhases = parts;
+    }
+    else if (jsonMatch) {
         try {
-            const pc = JSON.parse(pcMatch[0]);
+            const pc = JSON.parse(jsonMatch[0]);
             if (Array.isArray(pc.phases_completed) && pc.phases_completed.length > 1) {
-                const maxCompleted = Math.max(...pc.phases_completed);
-                const newIdx = ap.phaseProfile.findIndex((p) => p > maxCompleted);
-                if (newIdx === -1) {
-                    ap.completed = true;
-                    console.log(`[claw:phase-skip] ${ap.agent} completed ALL phases in one pass`);
-                }
-                else if (newIdx > ap.currentPhaseIdx + 1) {
-                    ap.currentPhaseIdx = newIdx;
-                    ap.currentPhase = ap.phaseProfile[newIdx];
-                    console.log(`[claw:phase-skip] ${ap.agent} jumped to phase ${ap.currentPhase} (completed: ${pc.phases_completed})`);
-                }
+                completedPhases = pc.phases_completed;
             }
         }
         catch (e) {
             console.debug('[orchestrator:phases] JSON parse failed');
         }
     }
+    if (completedPhases) {
+        const maxCompleted = Math.max(...completedPhases);
+        const newIdx = ap.phaseProfile.findIndex((p) => p > maxCompleted);
+        if (newIdx === -1) {
+            ap.completed = true;
+            console.log(`[claw:phase-skip] ${ap.agent} completed ALL phases in one pass`);
+        }
+        else if (newIdx > ap.currentPhaseIdx + 1) {
+            ap.currentPhaseIdx = newIdx;
+            ap.currentPhase = ap.phaseProfile[newIdx];
+            console.log(`[claw:phase-skip] ${ap.agent} jumped to phase ${ap.currentPhase} (completed: ${completedPhases})`);
+        }
+    }
     broadcast('agent_status', { agentId: emp.id, agentName: emp.name, status: result.status, phase: ap.currentPhase });
-    appendToWorklog(worklog.path, 'Execution Log', `### Round ${round} — ${result.agent} (${result.role}, ${result.phaseLabel})\n- Status: ${result.status}\n- Result: ${result.text.slice(0, 500)}`);
+    if (worklogPath) {
+        appendToWorklog(worklogPath, 'Execution Log', `### Round ${round} — ${result.agent} (${result.role}, ${result.phaseLabel})\n- Status: ${result.status}\n- Result: ${result.text.slice(0, 500)}`);
+    }
     return result;
 }
 //# sourceMappingURL=distribute.js.map

package/dist/src/orchestrator/distribute.js.map

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

package/dist/src/orchestrator/gateway.js

@@ -9,6 +9,7 @@ import { settings } from '../core/config.js';
 import { broadcast } from '../core/bus.js';
 import { orchestrate, orchestrateContinue, orchestrateReset, isContinueIntent, isResetIntent, } from './pipeline.js';
 import { getState } from './state-machine.js';
+import { resolveOrcScope } from './scope.js';
 function runDetached(task, label, meta) {
     task.catch((err) => {
         const msg = err?.message || String(err);
@@ -30,7 +31,8 @@ export function submitMessage(text, meta) {
     const display = meta.displayText || trimmed;
     const requestId = randomUUID();
     // ── continue intent (only when IDLE) ──
-    if (getState() === 'IDLE' && isContinueIntent(trimmed)) {
+    const scope = resolveOrcScope({ origin: meta.origin, chatId: meta.chatId, workingDir: settings.workingDir || null });
+    if (getState(scope) === 'IDLE' && isContinueIntent(trimmed)) {
         if (isAgentBusy())
             return { action: 'rejected', reason: 'busy' };
         insertMessage.run('user', display, meta.origin, '', settings.workingDir || null);

package/dist/src/orchestrator/gateway.js.map

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

package/dist/src/orchestrator/pipeline.js

@@ -4,14 +4,14 @@
 import { broadcast } from '../core/bus.js';
 import { settings } from '../core/config.js';
 import { getEmployees, clearAllEmployeeSessions, upsertEmployeeSession, } from '../core/db.js';
-import { clearBossSessionOnly } from '../core/main-session.js';
 import { clearPromptCache } from '../prompt/builder.js';
-import { spawnAgent } from '../agent/spawn.js';
-import { readLatestWorklog, appendToWorklog, updateWorklogStatus, } from '../memory/worklog.js';
+import { spawnAgent, killAgentById, killActiveAgent } from '../agent/spawn.js';
+import { createWorklog, readLatestWorklog, appendToWorklog, updateWorklogStatus, } from '../memory/worklog.js';
 import { findEmployee, runSingleAgent } from './distribute.js';
 import { claimWorker, finishWorker, failWorker, listPendingWorkerResults, claimWorkerReplay, markWorkerReplayed, releaseWorkerReplay, getActiveWorkers, cancelWorker, clearAllWorkers, } from './worker-registry.js';
-import { messageQueue } from '../agent/spawn.js';
+import { messageQueue, processQueue } from '../agent/spawn.js';
 import { getState, getPrefix, resetState, setState, getStatePrompt, getCtx, } from './state-machine.js';
+import { resolveOrcScope, findActiveScope } from './scope.js';
 import { dispatchResearchTask, injectResearchIntoPlanningPrompt, shouldRunResearch, } from './research.js';
 import { buildTaskSnapshot, getMemoryStatus } from '../memory/runtime.js';
 // ─── Parser re-exports ─────────────────────────────
@@ -26,6 +26,15 @@ function pickPlanningTask(userText, _prompt, ctx) {
         return userPrompt;
     return '';
 }
+function pickWorklogSeed(...candidates) {
+    for (const candidate of candidates) {
+        const value = String(candidate || '').trim();
+        if (value)
+            return value;
+    }
+    return 'orchestration';
+}
+const ACTIVE_PABCD_DISPATCH_STATES = new Set(['P', 'A', 'B', 'C']);
 // ─── orchestrate (PABCD sole entry point) ───────────
 export async function orchestrate(prompt, meta = {}) {
     const origin = meta.origin || 'web';
@@ -42,6 +51,7 @@ export async function orchestrate(prompt, meta = {}) {
             try {
                 await orchestrate(pr.text, { ...meta, _workerResult: true, _skipInsert: true, _skipReplayDrain: true });
                 markWorkerReplayed(pr.agentId);
+                processQueue();
             }
             catch {
                 releaseWorkerReplay(pr.agentId);
@@ -55,7 +65,18 @@ export async function orchestrate(prompt, meta = {}) {
     const runDispatchResearch = typeof meta._dispatchResearchTask === 'function'
         ? meta._dispatchResearchTask
         : dispatchResearchTask;
-    let state = getState();
+    // Resolve scope: compute candidate from params, check for active scope (handles workingDir changes)
+    const candidateScope = resolveOrcScope({
+        persistedScopeId: null,
+        origin,
+        target,
+        chatId,
+        workingDir: settings.workingDir || null,
+    });
+    let ctx = getCtx(candidateScope);
+    // If candidate scope has no active ctx, check if an existing active scope matches this origin
+    const scope = ctx?.scopeId || (ctx ? candidateScope : (findActiveScope(origin, chatId) || candidateScope));
+    let state = getState(scope);
     let skipPrefix = !!meta._skipPrefix;
     // Skip session clear during active PABCD (preserve resume)
     if (!meta._skipClear && state === 'IDLE') {
@@ -64,7 +85,7 @@ export async function orchestrate(prompt, meta = {}) {
     // PABCD entry is explicit only — via `/orchestrate`, `/pabcd`, or LLM tool call.
     // Auto-entry and auto-advance removed per user request.
     clearPromptCache();
-    let ctx = getCtx();
+    ctx = getCtx(scope);
     const planningTask = pickPlanningTask(userText, prompt, ctx);
     const isInitialPlanningTurn = state === 'P'
         && !meta._workerResult
@@ -78,6 +99,7 @@ export async function orchestrate(prompt, meta = {}) {
             ...(ctx || {
                 originalPrompt: '',
                 workingDir: settings.workingDir || null,
+                scopeId: scope,
                 plan: null,
                 workerResults: [],
                 origin,
@@ -85,6 +107,7 @@ export async function orchestrate(prompt, meta = {}) {
             }),
             originalPrompt: planningTask,
             workingDir: settings.workingDir || null,
+            scopeId: scope,
             origin,
             chatId,
         };
@@ -96,7 +119,10 @@ export async function orchestrate(prompt, meta = {}) {
             nextCtx.researchNeeded = true;
             nextCtx.researchReport = report.rawText || null;
         }
-        setState('P', nextCtx);
+        // Create a fresh worklog before setState() so state/title reads the new latest worklog.
+        const worklogSeed = pickWorklogSeed(nextCtx.originalPrompt, planningTask, userText);
+        createWorklog(worklogSeed);
+        setState('P', nextCtx, scope, pickWorklogSeed(nextCtx.originalPrompt));
         ctx = nextCtx;
     }
     // prefix injection
@@ -125,30 +151,37 @@ export async function orchestrate(prompt, meta = {}) {
     const result = await promise;
     // Re-read state from DB — it may have changed during agent execution
     // (phase transitions via CLI commands, user reset, etc.)
-    state = getState();
+    state = getState(scope);
     if (state === 'P' && !meta._workerResult) {
-        const savedCtx = getCtx();
+        const savedCtx = getCtx(scope);
         if (savedCtx) {
             const newPlan = stripSubtaskJSON(result.text) || result.text || savedCtx.plan;
             if (newPlan) {
+                // Re-derive title from this scope's original prompt to avoid cross-scope worklog bleed
+                const title = pickWorklogSeed(savedCtx.originalPrompt);
                 setState('P', {
                     ...savedCtx,
                     plan: newPlan,
-                });
+                }, scope, title);
             }
         }
     }
     // Worker JSON detected → spawn workers → feed results back
     const workerTasks = parseSubtasks(result.text);
-    // Research subtasks use phase 1 and can run from any state (including IDLE).
-    // Non-Research subtasks only dispatch during active PABCD (P/A/B/C).
+    // Research subtasks can run from any state. Non-research blocked only in D.
     const isResearchOnly = workerTasks?.length && workerTasks.every((wt) => /^research$/i.test(wt.agent || ''));
-    if (workerTasks?.length && (state !== 'IDLE' || isResearchOnly)) {
+    const canDispatchWorkers = isResearchOnly || state !== 'D';
+    if (workerTasks?.length && canDispatchWorkers) {
         console.log(`[jaw:pabcd] worker JSON detected (${workerTasks.length} tasks, research=${!!isResearchOnly})`);
         // Map PABCD state → worker phase context
         const PABCD_PHASE_MAP = { A: 2, B: 3, C: 4 };
         const defaultPhase = PABCD_PHASE_MAP[state] || 3;
+        const worklogSeed = pickWorklogSeed(ctx?.originalPrompt, planningTask, userText);
+        const activeWorklog = isInitialPlanningTurn
+            ? readLatestWorklog()
+            : (readLatestWorklog() || { path: createWorklog(worklogSeed).path });
         let anyWorkerRan = false;
+        let anyWorkerDispatched = false;
         for (const wt of workerTasks) {
             const emp = findEmployee(getEmployees.all(), wt);
             if (!emp) {
@@ -162,6 +195,7 @@ export async function orchestrate(prompt, meta = {}) {
             claimWorker(emp, wt.task);
             let wResult;
             try {
+                anyWorkerDispatched = true;
                 wResult = await runSingleAgent({
                     ...wt,
                     phaseProfile: [workerPhase],
@@ -169,17 +203,23 @@ export async function orchestrate(prompt, meta = {}) {
                     currentPhase: workerPhase,
                     completed: false,
                     history: [],
-                }, emp, { path: '' }, 1, { origin }, []);
-                finishWorker(emp.id, wResult.text || '');
+                }, emp, { path: activeWorklog?.path || '' }, 1, { origin }, []);
+                if (wResult.status === 'done') {
+                    finishWorker(emp.id, wResult.text || '');
+                }
+                else {
+                    failWorker(emp.id, wResult.text || `[worker error] ${emp.id}`);
+                }
             }
             catch (err) {
                 failWorker(emp.id, err.message || String(err));
-                throw err;
+                console.error(`[jaw:pabcd] worker ${emp.id} failed:`, err.message);
+                continue; // Don't abort remaining workers
             }
             anyWorkerRan = true;
             // Inject the worker result exactly once through the replay contract.
             // This keeps durable handoff semantics while avoiding duplicate boss processing.
-            if (claimWorkerReplay(emp.id)) {
+            if (wResult.status === 'done' && claimWorkerReplay(emp.id)) {
                 try {
                     await orchestrate(wResult.text, {
                         ...meta,
@@ -188,24 +228,32 @@ export async function orchestrate(prompt, meta = {}) {
                         _skipReplayDrain: true,
                     });
                     markWorkerReplayed(emp.id);
+                    processQueue();
                 }
                 catch (err) {
                     releaseWorkerReplay(emp.id);
-                    throw err;
+                    console.error(`[jaw:pabcd] worker ${emp.id} replay failed:`, err.message);
+                    continue; // Don't abort remaining worker replays
                 }
             }
         }
         // If no workers could be found, broadcast the original response
-        if (!anyWorkerRan) {
+        if (!anyWorkerRan && !anyWorkerDispatched) {
             const stripped = stripSubtaskJSON(result.text);
             broadcast('orchestrate_done', {
                 text: `[Worker dispatch failed — no matching employees]\n${stripped || result.text || ''}`,
-                origin,
-                chatId,
-                target,
-                requestId,
+                origin, chatId, target, requestId,
+            });
+        }
+        else if (!anyWorkerRan && anyWorkerDispatched) {
+            const stripped = stripSubtaskJSON(result.text);
+            broadcast('orchestrate_done', {
+                text: `[All dispatched workers failed]\n${stripped || result.text || ''}`,
+                origin, chatId, target, requestId,
             });
         }
+        // Ensure queue drains after all worker replays are processed
+        processQueue();
         return;
     }
     // Normal response → broadcast
@@ -224,7 +272,16 @@ export async function orchestrateContinue(meta = {}) {
     const chatId = meta.chatId;
     const target = meta.target;
     const requestId = meta.requestId;
-    const state = getState();
+    const candidateScope = resolveOrcScope({
+        persistedScopeId: null,
+        origin,
+        target,
+        chatId,
+        workingDir: settings.workingDir || null,
+    });
+    const ctxCandidate = getCtx(candidateScope);
+    const scope = ctxCandidate?.scopeId || (ctxCandidate ? candidateScope : (findActiveScope(origin, chatId) || candidateScope));
+    const state = getState(scope);
     // Active PABCD → resume from current state
     if (state !== 'IDLE') {
         console.log(`[jaw:pabcd] continue in state=${state}`);
@@ -256,15 +313,24 @@ export async function orchestrateReset(meta = {}) {
     const target = meta.target;
     const requestId = meta.requestId;
     // --- cancel running workers and clear replay state on reset ---
+    killActiveAgent('reset');
     for (const w of getActiveWorkers()) {
+        killAgentById(w.agentId);
         cancelWorker(w.agentId);
     }
     clearAllWorkers();
     messageQueue.length = 0;
     clearAllEmployeeSessions.run();
-    // Reset boss session ID (prevents stale --resume) but keep message history
-    clearBossSessionOnly();
-    resetState();
+    const candidateScope = resolveOrcScope({
+        persistedScopeId: null,
+        origin,
+        target,
+        chatId,
+        workingDir: settings.workingDir || null,
+    });
+    const ctxReset = getCtx(candidateScope);
+    const scope = ctxReset?.scopeId || (ctxReset ? candidateScope : (findActiveScope(origin, chatId) || candidateScope));
+    resetState(scope);
     const latest = readLatestWorklog();
     if (!latest) {
         broadcast('orchestrate_done', {

package/dist/src/orchestrator/pipeline.js.map

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

package/dist/src/orchestrator/research.js

@@ -1,5 +1,5 @@
-// ─── Research Worker Dispatch Helper ────────────────
-// Phase-independent research dispatch for the Research worker.
+// ─── Research Employee Dispatch Helper ──────────────
+// Phase-independent research dispatch for the Research employee.
 // Callable from IDLE, P, A, B, C — always read-only, report-only.
 import { broadcast } from '../core/bus.js';
 import { getEmployees, upsertEmployeeSession } from '../core/db.js';
@@ -40,7 +40,7 @@ export async function dispatchResearchTask(task, meta = {}) {
         ? meta._spawnAgent
         : spawnAgent;
     if (!configuredEmp) {
-        console.warn('[jaw:research] Research employee not found, using fallback Research worker');
+        console.warn('[jaw:research] Research employee not found, using fallback Research employee');
     }
     const sysPrompt = getEmployeePromptV2(emp, 'research', 1);
     // Force fresh session to avoid context contamination
@@ -92,8 +92,8 @@ Respond with this exact structure:
     if (parsed.rawText)
         return parsed;
     const failureReason = r.code === 127
-        ? 'Research worker CLI not available'
-        : `Research worker failed with code ${r.code ?? 'unknown'}`;
+        ? 'Research employee CLI not available'
+        : `Research employee failed with code ${r.code ?? 'unknown'}`;
     return {
         rawText: '',
         summary: '',

package/dist/src/orchestrator/research.js.map

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