cli-jaw 1.5.0 → 1.6.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.ko.md +26 -19
- package/README.md +50 -22
- package/README.zh-CN.md +26 -19
- package/dist/bin/cli-jaw.js +5 -1
- package/dist/bin/cli-jaw.js.map +1 -1
- package/dist/bin/commands/dispatch.js +57 -0
- package/dist/bin/commands/dispatch.js.map +1 -0
- package/dist/lib/mcp-sync.js +1 -1
- package/dist/lib/mcp-sync.js.map +1 -1
- package/dist/lib/upload.js +14 -1
- package/dist/lib/upload.js.map +1 -1
- package/dist/server.js +57 -42
- package/dist/server.js.map +1 -1
- package/dist/src/agent/events.js +72 -13
- package/dist/src/agent/events.js.map +1 -1
- package/dist/src/agent/spawn.js +71 -29
- package/dist/src/agent/spawn.js.map +1 -1
- package/dist/src/cli/acp-client.js +4 -2
- package/dist/src/cli/acp-client.js.map +1 -1
- package/dist/src/cli/commands.js +6 -6
- package/dist/src/cli/commands.js.map +1 -1
- package/dist/src/cli/handlers.js +11 -9
- package/dist/src/cli/handlers.js.map +1 -1
- package/dist/src/cli/registry.js +7 -1
- package/dist/src/cli/registry.js.map +1 -1
- package/dist/src/core/config.js +15 -8
- package/dist/src/core/config.js.map +1 -1
- package/dist/src/core/db.js +18 -3
- package/dist/src/core/db.js.map +1 -1
- package/dist/src/core/employees.js +34 -0
- package/dist/src/core/employees.js.map +1 -0
- package/dist/src/discord/bot.js +72 -9
- package/dist/src/discord/bot.js.map +1 -1
- package/dist/src/discord/commands.js +12 -8
- package/dist/src/discord/commands.js.map +1 -1
- package/dist/src/orchestrator/distribute.js +57 -35
- package/dist/src/orchestrator/distribute.js.map +1 -1
- package/dist/src/orchestrator/gateway.js +3 -1
- package/dist/src/orchestrator/gateway.js.map +1 -1
- package/dist/src/orchestrator/pipeline.js +120 -27
- package/dist/src/orchestrator/pipeline.js.map +1 -1
- package/dist/src/orchestrator/research.js +5 -5
- package/dist/src/orchestrator/research.js.map +1 -1
- package/dist/src/orchestrator/scope.js +55 -0
- package/dist/src/orchestrator/scope.js.map +1 -0
- package/dist/src/orchestrator/state-machine.js +23 -21
- package/dist/src/orchestrator/state-machine.js.map +1 -1
- package/dist/src/orchestrator/worker-registry.js +9 -2
- package/dist/src/orchestrator/worker-registry.js.map +1 -1
- package/dist/src/prompt/builder.js +76 -37
- package/dist/src/prompt/builder.js.map +1 -1
- package/dist/src/prompt/templates/a1-system.md +40 -0
- package/dist/src/prompt/templates/employee.md +12 -4
- package/dist/src/prompt/templates/orchestration.md +17 -1
- package/dist/src/telegram/bot.js +7 -1
- package/dist/src/telegram/bot.js.map +1 -1
- package/package.json +4 -2
- package/public/assets/fonts/GeistVF.woff2 +0 -0
- package/public/assets/fonts/JetBrainsMono-Variable.woff2 +0 -0
- package/public/assets/providers/claude-color.svg +1 -0
- package/public/assets/providers/claude.svg +1 -0
- package/public/assets/providers/copilot-color.svg +1 -0
- package/public/assets/providers/copilot.svg +1 -0
- package/public/assets/providers/discord.svg +1 -0
- package/public/assets/providers/gemini-color.svg +1 -0
- package/public/assets/providers/gemini.svg +1 -0
- package/public/assets/providers/openai.svg +1 -0
- package/public/assets/providers/opencode.svg +1 -0
- package/public/assets/providers/telegram.svg +1 -0
- package/public/css/chat.css +79 -51
- package/public/css/diagram.css +348 -0
- package/public/css/layout.css +38 -11
- package/public/css/markdown.css +64 -18
- package/public/css/modals.css +3 -3
- package/public/css/orc-state.css +9 -9
- package/public/css/sidebar.css +37 -3
- package/public/css/tool-ui.css +46 -11
- package/public/css/variables.css +63 -63
- package/public/dist/assets/api-Bbmmo0o1.js +1 -0
- package/public/dist/assets/architecture-YZFGNWBL-BxiHqtOH.js +1 -0
- package/public/dist/assets/architectureDiagram-Q4EWVU46-CJTGDw5p.js +1 -0
- package/public/dist/assets/blockDiagram-DXYQGD6D-Btl5Y-Er.js +1 -0
- package/public/dist/assets/c4Diagram-AHTNJAMY-sDfjW4ZF.js +1 -0
- package/public/dist/assets/classDiagram-6PBFFD2Q-ByCgggL2.js +1 -0
- package/public/dist/assets/classDiagram-v2-HSJHXN6E-t1amaXkU.js +1 -0
- package/public/dist/assets/constants-C8_0OtK2.js +1 -0
- package/public/dist/assets/cose-bilkent-S5V4N54A-eOSFGdaE.js +1 -0
- package/public/dist/assets/dagre-KV5264BT-OCB5j8Q6.js +1 -0
- package/public/dist/assets/diagram-5BDNPKRD-C-4fgK5P.js +1 -0
- package/public/dist/assets/diagram-G4DWMVQ6-C6vmHKDV.js +1 -0
- package/public/dist/assets/diagram-MMDJMWI5-BMCo_wmt.js +1 -0
- package/public/dist/assets/diagram-TYMM5635-DaCLdttJ.js +1 -0
- package/public/dist/assets/employees-D5n7mX5v.js +39 -0
- package/public/dist/assets/erDiagram-SMLLAGMA-BiTRdm5s.js +1 -0
- package/public/dist/assets/flowDiagram-DWJPFMVM-sv6jVi0d.js +1 -0
- package/public/dist/assets/ganttDiagram-T4ZO3ILL-jCP3OW23.js +1 -0
- package/public/dist/assets/gitGraph-7Q5UKJZL-BIeKLxpm.js +1 -0
- package/public/dist/assets/gitGraphDiagram-UUTBAWPF-CokylnbW.js +1 -0
- package/public/dist/assets/index-CLd0BsAu.js +49 -0
- package/public/dist/assets/index-D6ci1wCN.css +1 -0
- package/public/dist/assets/info-OMHHGYJF-CIEl5dWF.js +1 -0
- package/public/dist/assets/infoDiagram-42DDH7IO-BBnK1Bh2.js +1 -0
- package/public/dist/assets/ishikawaDiagram-UXIWVN3A-qXIz0VhS.js +1 -0
- package/public/dist/assets/journeyDiagram-VCZTEJTY-BdrOLof3.js +1 -0
- package/public/dist/assets/kanban-definition-6JOO6SKY-CcX7CE04.js +1 -0
- package/public/dist/assets/mermaid.core-BoxIvw7E.js +1 -0
- package/public/dist/assets/mindmap-definition-QFDTVHPH-CdXARskX.js +1 -0
- package/public/dist/assets/packet-4T2RLAQJ-Bz4ZwYZ3.js +1 -0
- package/public/dist/assets/pie-ZZUOXDRM-AtGL3wZ2.js +1 -0
- package/public/dist/assets/pieDiagram-DEJITSTG-B5SOq9Yr.js +1 -0
- package/public/dist/assets/quadrantDiagram-34T5L4WZ-D0uNWgpI.js +1 -0
- package/public/dist/assets/radar-PYXPWWZC-AbJSfeqB.js +1 -0
- package/public/dist/assets/render-C8N0rp4L.js +25 -0
- package/public/dist/assets/requirementDiagram-MS252O5E-62td6IQ-.js +1 -0
- package/public/dist/assets/sankeyDiagram-XADWPNL6-Crg_02iC.js +1 -0
- package/public/dist/assets/sequenceDiagram-FGHM5R23-fbCocZHj.js +1 -0
- package/public/dist/assets/settings-BJR-IGM5.js +41 -0
- package/public/dist/assets/settings-Dm6OnPmY.js +1 -0
- package/public/dist/assets/skills-D6jv9AIs.js +1 -0
- package/public/dist/assets/skills-uywskdFh.js +12 -0
- package/public/dist/assets/slash-commands-CCDonT40.js +1 -0
- package/public/dist/assets/{slash-commands-DMsE88bu.js → slash-commands-DWvL-VDU.js} +1 -1
- package/public/dist/assets/stateDiagram-FHFEXIEX-Gy3DhXxQ.js +1 -0
- package/public/dist/assets/stateDiagram-v2-QKLJ7IA2-DJc-FW9O.js +1 -0
- package/public/dist/assets/timeline-definition-GMOUNBTQ-B3cA9DgY.js +1 -0
- package/public/dist/assets/treeView-SZITEDCU-Cn58DIbB.js +1 -0
- package/public/dist/assets/treemap-W4RFUUIX-DPcYjDzH.js +1 -0
- package/public/dist/assets/ui-C1daR00l.js +1 -0
- package/public/dist/assets/ui-D-oFkXed.js +131 -0
- package/public/dist/assets/vendor-icons-1Ec7ZWcT.js +1 -0
- package/public/dist/assets/{vendor-mermaid-COidH9HB.js → vendor-mermaid-lvHqQdfg.js} +4 -4
- package/public/dist/assets/vennDiagram-DHZGUBPP-DkBfxilo.js +1 -0
- package/public/dist/assets/wardley-RL74JXVD-6Dg0PJ4H.js +1 -0
- package/public/dist/assets/wardleyDiagram-NUSXRM2D-Dsntl_vy.js +1 -0
- package/public/dist/assets/ws-Dnn8HG8B.js +2 -0
- package/public/dist/assets/xychartDiagram-5P7HB3ND-B_McB5GE.js +1 -0
- package/public/dist/index.html +63 -55
- package/public/index.html +62 -53
- package/public/js/constants.ts +8 -2
- package/public/js/diagram/iframe-renderer.ts +559 -0
- package/public/js/diagram/types.ts +129 -0
- package/public/js/diagram/widget-validator.ts +82 -0
- package/public/js/features/chat.ts +24 -12
- package/public/js/features/employees.ts +3 -2
- package/public/js/features/heartbeat.ts +4 -3
- package/public/js/features/memory.ts +4 -3
- package/public/js/features/process-block.ts +12 -11
- package/public/js/features/settings-cli-status.ts +10 -7
- package/public/js/features/settings-core.ts +13 -3
- package/public/js/features/settings-discord.ts +9 -0
- package/public/js/features/settings-mcp.ts +8 -7
- package/public/js/features/settings-stt.ts +4 -4
- package/public/js/features/settings-templates.ts +10 -8
- package/public/js/features/settings-types.ts +1 -1
- package/public/js/features/settings.ts +1 -1
- package/public/js/features/sidebar.ts +37 -7
- package/public/js/features/skills.ts +4 -3
- package/public/js/features/theme.ts +4 -0
- package/public/js/features/tool-ui.ts +6 -5
- package/public/js/features/voice-recorder.ts +2 -1
- package/public/js/icons.ts +257 -0
- package/public/js/main.ts +9 -3
- package/public/js/provider-icons.ts +88 -0
- package/public/js/render.ts +493 -30
- package/public/js/streaming-render.ts +3 -3
- package/public/js/ui.ts +38 -18
- package/public/js/ws.ts +17 -10
- package/public/locales/en.json +89 -88
- package/public/locales/ko.json +89 -88
- package/scripts/release-1.6.0.sh +69 -0
- package/scripts/release-preview.sh +1 -1
- package/dist/lib/token-keepalive.js +0 -34
- package/dist/lib/token-keepalive.js.map +0 -1
- package/public/dist/assets/api-BlPw3bUI.js +0 -1
- package/public/dist/assets/architecture-YZFGNWBL-BkS7SZQi.js +0 -1
- package/public/dist/assets/architectureDiagram-Q4EWVU46-Dl3iBKeR.js +0 -1
- package/public/dist/assets/blockDiagram-DXYQGD6D-DPr4D17p.js +0 -1
- package/public/dist/assets/c4Diagram-AHTNJAMY-CfoxJtDk.js +0 -1
- package/public/dist/assets/classDiagram-6PBFFD2Q-BOAdHnnB.js +0 -1
- package/public/dist/assets/classDiagram-v2-HSJHXN6E-B2QCJXWC.js +0 -1
- package/public/dist/assets/constants-DshMUJbo.js +0 -1
- package/public/dist/assets/cose-bilkent-S5V4N54A-CA14jk7w.js +0 -1
- package/public/dist/assets/dagre-KV5264BT-BVwNaSwC.js +0 -1
- package/public/dist/assets/diagram-5BDNPKRD-CHqIAvdc.js +0 -1
- package/public/dist/assets/diagram-G4DWMVQ6-DxvsCvTP.js +0 -1
- package/public/dist/assets/diagram-MMDJMWI5-DqOPO7dl.js +0 -1
- package/public/dist/assets/diagram-TYMM5635-C9xMWPQn.js +0 -1
- package/public/dist/assets/employees-CFRlsbHm.js +0 -39
- package/public/dist/assets/erDiagram-SMLLAGMA-BTmpfRkm.js +0 -1
- package/public/dist/assets/flowDiagram-DWJPFMVM-DZBSQAKA.js +0 -1
- package/public/dist/assets/ganttDiagram-T4ZO3ILL-TAEMCRbT.js +0 -1
- package/public/dist/assets/gitGraph-7Q5UKJZL-bbxndRNA.js +0 -1
- package/public/dist/assets/gitGraphDiagram-UUTBAWPF-CBxtx0MB.js +0 -1
- package/public/dist/assets/index-1Gg-6jeC.css +0 -1
- package/public/dist/assets/index-CQHqXjrK.js +0 -49
- package/public/dist/assets/info-OMHHGYJF-DRXq_Ywr.js +0 -1
- package/public/dist/assets/infoDiagram-42DDH7IO-C7FFwX4m.js +0 -1
- package/public/dist/assets/ishikawaDiagram-UXIWVN3A-DEZJE79j.js +0 -1
- package/public/dist/assets/journeyDiagram-VCZTEJTY-ZHLiY6GV.js +0 -1
- package/public/dist/assets/kanban-definition-6JOO6SKY-NP7pY7ML.js +0 -1
- package/public/dist/assets/mermaid.core-CHuluSlD.js +0 -1
- package/public/dist/assets/mindmap-definition-QFDTVHPH-Bd1OgfN_.js +0 -1
- package/public/dist/assets/packet-4T2RLAQJ-CGu8ST97.js +0 -1
- package/public/dist/assets/pie-ZZUOXDRM-CDG65mhS.js +0 -1
- package/public/dist/assets/pieDiagram-DEJITSTG-BbMBHLDM.js +0 -1
- package/public/dist/assets/quadrantDiagram-34T5L4WZ-CDCDgI1e.js +0 -1
- package/public/dist/assets/radar-PYXPWWZC-1gS-6ylu.js +0 -1
- package/public/dist/assets/render-YHvL5VM_.js +0 -6
- package/public/dist/assets/requirementDiagram-MS252O5E-DkmvOtYz.js +0 -1
- package/public/dist/assets/sankeyDiagram-XADWPNL6-GNcXIYsL.js +0 -1
- package/public/dist/assets/sequenceDiagram-FGHM5R23-BFrw2n6x.js +0 -1
- package/public/dist/assets/settings-BQF_u5px.js +0 -37
- package/public/dist/assets/settings-C5Q9IPjJ.js +0 -1
- package/public/dist/assets/skills-9Pd2rOw-.js +0 -1
- package/public/dist/assets/skills-BI7sQAdk.js +0 -12
- package/public/dist/assets/slash-commands-FMpJzlDB.js +0 -1
- package/public/dist/assets/stateDiagram-FHFEXIEX-BLgKnllT.js +0 -1
- package/public/dist/assets/stateDiagram-v2-QKLJ7IA2-CbzuWsSa.js +0 -1
- package/public/dist/assets/timeline-definition-GMOUNBTQ-CcZTJ3gL.js +0 -1
- package/public/dist/assets/treeView-SZITEDCU-BDqBsaH1.js +0 -1
- package/public/dist/assets/treemap-W4RFUUIX-BaWHA3Di.js +0 -1
- package/public/dist/assets/ui-BukgLHuh.js +0 -29
- package/public/dist/assets/ui-Bvz1JfTE.js +0 -1
- package/public/dist/assets/vennDiagram-DHZGUBPP-BWV_j1bh.js +0 -1
- package/public/dist/assets/wardley-RL74JXVD-C7gKA3d7.js +0 -1
- package/public/dist/assets/wardleyDiagram-NUSXRM2D-BUoq_wug.js +0 -1
- package/public/dist/assets/ws-S_AZgx7L.js +0 -2
- package/public/dist/assets/xychartDiagram-5P7HB3ND-PvT5Ec82.js +0 -1
- /package/public/dist/assets/{api-B8XKQ4OT.js → api-Ci-lgwRp.js} +0 -0
- /package/public/dist/assets/{locale-BjoAcbis.js → locale-DIXc-_34.js} +0 -0
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
import { broadcast } from '../core/bus.js';
|
|
5
5
|
import { settings } from '../core/config.js';
|
|
6
6
|
import { getEmployees, clearAllEmployeeSessions, upsertEmployeeSession, } from '../core/db.js';
|
|
7
|
-
import { clearBossSessionOnly } from '../core/main-session.js';
|
|
8
7
|
import { clearPromptCache } from '../prompt/builder.js';
|
|
9
|
-
import { spawnAgent } from '../agent/spawn.js';
|
|
10
|
-
import { readLatestWorklog, appendToWorklog, updateWorklogStatus, } from '../memory/worklog.js';
|
|
8
|
+
import { spawnAgent, killAgentById, killActiveAgent } from '../agent/spawn.js';
|
|
9
|
+
import { createWorklog, readLatestWorklog, appendToWorklog, updateWorklogStatus, } from '../memory/worklog.js';
|
|
11
10
|
import { findEmployee, runSingleAgent } from './distribute.js';
|
|
12
11
|
import { claimWorker, finishWorker, failWorker, listPendingWorkerResults, claimWorkerReplay, markWorkerReplayed, releaseWorkerReplay, getActiveWorkers, cancelWorker, clearAllWorkers, } from './worker-registry.js';
|
|
13
|
-
import { messageQueue } from '../agent/spawn.js';
|
|
12
|
+
import { messageQueue, processQueue } from '../agent/spawn.js';
|
|
14
13
|
import { getState, getPrefix, resetState, setState, getStatePrompt, getCtx, } from './state-machine.js';
|
|
14
|
+
import { resolveOrcScope, findActiveScope } from './scope.js';
|
|
15
15
|
import { dispatchResearchTask, injectResearchIntoPlanningPrompt, shouldRunResearch, } from './research.js';
|
|
16
16
|
import { buildTaskSnapshot, getMemoryStatus } from '../memory/runtime.js';
|
|
17
17
|
// ─── Parser re-exports ─────────────────────────────
|
|
@@ -26,6 +26,42 @@ function pickPlanningTask(userText, _prompt, ctx) {
|
|
|
26
26
|
return userPrompt;
|
|
27
27
|
return '';
|
|
28
28
|
}
|
|
29
|
+
function pickWorklogSeed(...candidates) {
|
|
30
|
+
for (const candidate of candidates) {
|
|
31
|
+
const value = String(candidate || '').trim();
|
|
32
|
+
if (value)
|
|
33
|
+
return value;
|
|
34
|
+
}
|
|
35
|
+
return 'orchestration';
|
|
36
|
+
}
|
|
37
|
+
async function executePreparedWorkerTask(prepared, args) {
|
|
38
|
+
const { task, emp, workerPhase } = prepared;
|
|
39
|
+
upsertEmployeeSession.run(emp.id, null, emp.cli);
|
|
40
|
+
claimWorker(emp, task.task);
|
|
41
|
+
try {
|
|
42
|
+
const result = await args.runSingle({
|
|
43
|
+
...task,
|
|
44
|
+
phaseProfile: [workerPhase],
|
|
45
|
+
currentPhaseIdx: 0,
|
|
46
|
+
currentPhase: workerPhase,
|
|
47
|
+
completed: false,
|
|
48
|
+
history: [],
|
|
49
|
+
}, emp, { path: args.worklogPath }, 1, { origin: args.origin }, args.priorResults || [], args.parallelPeers || []);
|
|
50
|
+
if (result.status === 'done') {
|
|
51
|
+
finishWorker(emp.id, result.text || '');
|
|
52
|
+
}
|
|
53
|
+
else {
|
|
54
|
+
failWorker(emp.id, result.text || `[worker error] ${emp.id}`);
|
|
55
|
+
}
|
|
56
|
+
return { emp, result, dispatched: true, ran: true };
|
|
57
|
+
}
|
|
58
|
+
catch (err) {
|
|
59
|
+
failWorker(emp.id, err.message || String(err));
|
|
60
|
+
console.error(`[jaw:pabcd] worker ${emp.id} failed:`, err.message);
|
|
61
|
+
return { emp, result: null, dispatched: true, ran: false };
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
const ACTIVE_PABCD_DISPATCH_STATES = new Set(['P', 'A', 'B', 'C']);
|
|
29
65
|
// ─── orchestrate (PABCD sole entry point) ───────────
|
|
30
66
|
export async function orchestrate(prompt, meta = {}) {
|
|
31
67
|
const origin = meta.origin || 'web';
|
|
@@ -42,6 +78,7 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
42
78
|
try {
|
|
43
79
|
await orchestrate(pr.text, { ...meta, _workerResult: true, _skipInsert: true, _skipReplayDrain: true });
|
|
44
80
|
markWorkerReplayed(pr.agentId);
|
|
81
|
+
processQueue();
|
|
45
82
|
}
|
|
46
83
|
catch {
|
|
47
84
|
releaseWorkerReplay(pr.agentId);
|
|
@@ -55,7 +92,18 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
55
92
|
const runDispatchResearch = typeof meta._dispatchResearchTask === 'function'
|
|
56
93
|
? meta._dispatchResearchTask
|
|
57
94
|
: dispatchResearchTask;
|
|
58
|
-
|
|
95
|
+
// Resolve scope: compute candidate from params, check for active scope (handles workingDir changes)
|
|
96
|
+
const candidateScope = resolveOrcScope({
|
|
97
|
+
persistedScopeId: null,
|
|
98
|
+
origin,
|
|
99
|
+
target,
|
|
100
|
+
chatId,
|
|
101
|
+
workingDir: settings.workingDir || null,
|
|
102
|
+
});
|
|
103
|
+
let ctx = getCtx(candidateScope);
|
|
104
|
+
// If candidate scope has no active ctx, check if an existing active scope matches this origin
|
|
105
|
+
const scope = ctx?.scopeId || (ctx ? candidateScope : (findActiveScope(origin, chatId) || candidateScope));
|
|
106
|
+
let state = getState(scope);
|
|
59
107
|
let skipPrefix = !!meta._skipPrefix;
|
|
60
108
|
// Skip session clear during active PABCD (preserve resume)
|
|
61
109
|
if (!meta._skipClear && state === 'IDLE') {
|
|
@@ -64,7 +112,7 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
64
112
|
// PABCD entry is explicit only — via `/orchestrate`, `/pabcd`, or LLM tool call.
|
|
65
113
|
// Auto-entry and auto-advance removed per user request.
|
|
66
114
|
clearPromptCache();
|
|
67
|
-
|
|
115
|
+
ctx = getCtx(scope);
|
|
68
116
|
const planningTask = pickPlanningTask(userText, prompt, ctx);
|
|
69
117
|
const isInitialPlanningTurn = state === 'P'
|
|
70
118
|
&& !meta._workerResult
|
|
@@ -78,6 +126,7 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
78
126
|
...(ctx || {
|
|
79
127
|
originalPrompt: '',
|
|
80
128
|
workingDir: settings.workingDir || null,
|
|
129
|
+
scopeId: scope,
|
|
81
130
|
plan: null,
|
|
82
131
|
workerResults: [],
|
|
83
132
|
origin,
|
|
@@ -85,6 +134,7 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
85
134
|
}),
|
|
86
135
|
originalPrompt: planningTask,
|
|
87
136
|
workingDir: settings.workingDir || null,
|
|
137
|
+
scopeId: scope,
|
|
88
138
|
origin,
|
|
89
139
|
chatId,
|
|
90
140
|
};
|
|
@@ -96,7 +146,10 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
96
146
|
nextCtx.researchNeeded = true;
|
|
97
147
|
nextCtx.researchReport = report.rawText || null;
|
|
98
148
|
}
|
|
99
|
-
setState(
|
|
149
|
+
// Create a fresh worklog before setState() so state/title reads the new latest worklog.
|
|
150
|
+
const worklogSeed = pickWorklogSeed(nextCtx.originalPrompt, planningTask, userText);
|
|
151
|
+
createWorklog(worklogSeed);
|
|
152
|
+
setState('P', nextCtx, scope, pickWorklogSeed(nextCtx.originalPrompt));
|
|
100
153
|
ctx = nextCtx;
|
|
101
154
|
}
|
|
102
155
|
// prefix injection
|
|
@@ -125,30 +178,37 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
125
178
|
const result = await promise;
|
|
126
179
|
// Re-read state from DB — it may have changed during agent execution
|
|
127
180
|
// (phase transitions via CLI commands, user reset, etc.)
|
|
128
|
-
state = getState();
|
|
181
|
+
state = getState(scope);
|
|
129
182
|
if (state === 'P' && !meta._workerResult) {
|
|
130
|
-
const savedCtx = getCtx();
|
|
183
|
+
const savedCtx = getCtx(scope);
|
|
131
184
|
if (savedCtx) {
|
|
132
185
|
const newPlan = stripSubtaskJSON(result.text) || result.text || savedCtx.plan;
|
|
133
186
|
if (newPlan) {
|
|
187
|
+
// Re-derive title from this scope's original prompt to avoid cross-scope worklog bleed
|
|
188
|
+
const title = pickWorklogSeed(savedCtx.originalPrompt);
|
|
134
189
|
setState('P', {
|
|
135
190
|
...savedCtx,
|
|
136
191
|
plan: newPlan,
|
|
137
|
-
});
|
|
192
|
+
}, scope, title);
|
|
138
193
|
}
|
|
139
194
|
}
|
|
140
195
|
}
|
|
141
196
|
// Worker JSON detected → spawn workers → feed results back
|
|
142
197
|
const workerTasks = parseSubtasks(result.text);
|
|
143
|
-
// Research subtasks
|
|
144
|
-
// Non-Research subtasks only dispatch during active PABCD (P/A/B/C).
|
|
198
|
+
// Research subtasks can run from any state. Non-research blocked only in D.
|
|
145
199
|
const isResearchOnly = workerTasks?.length && workerTasks.every((wt) => /^research$/i.test(wt.agent || ''));
|
|
146
|
-
|
|
200
|
+
const canDispatchWorkers = isResearchOnly || state !== 'D';
|
|
201
|
+
if (workerTasks?.length && canDispatchWorkers) {
|
|
147
202
|
console.log(`[jaw:pabcd] worker JSON detected (${workerTasks.length} tasks, research=${!!isResearchOnly})`);
|
|
148
203
|
// Map PABCD state → worker phase context
|
|
149
204
|
const PABCD_PHASE_MAP = { A: 2, B: 3, C: 4 };
|
|
150
205
|
const defaultPhase = PABCD_PHASE_MAP[state] || 3;
|
|
206
|
+
const worklogSeed = pickWorklogSeed(ctx?.originalPrompt, planningTask, userText);
|
|
207
|
+
const activeWorklog = isInitialPlanningTurn
|
|
208
|
+
? readLatestWorklog()
|
|
209
|
+
: (readLatestWorklog() || { path: createWorklog(worklogSeed).path });
|
|
151
210
|
let anyWorkerRan = false;
|
|
211
|
+
let anyWorkerDispatched = false;
|
|
152
212
|
for (const wt of workerTasks) {
|
|
153
213
|
const emp = findEmployee(getEmployees.all(), wt);
|
|
154
214
|
if (!emp) {
|
|
@@ -162,6 +222,7 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
162
222
|
claimWorker(emp, wt.task);
|
|
163
223
|
let wResult;
|
|
164
224
|
try {
|
|
225
|
+
anyWorkerDispatched = true;
|
|
165
226
|
wResult = await runSingleAgent({
|
|
166
227
|
...wt,
|
|
167
228
|
phaseProfile: [workerPhase],
|
|
@@ -169,17 +230,23 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
169
230
|
currentPhase: workerPhase,
|
|
170
231
|
completed: false,
|
|
171
232
|
history: [],
|
|
172
|
-
}, emp, { path: '' }, 1, { origin }, []);
|
|
173
|
-
|
|
233
|
+
}, emp, { path: activeWorklog?.path || '' }, 1, { origin }, []);
|
|
234
|
+
if (wResult.status === 'done') {
|
|
235
|
+
finishWorker(emp.id, wResult.text || '');
|
|
236
|
+
}
|
|
237
|
+
else {
|
|
238
|
+
failWorker(emp.id, wResult.text || `[worker error] ${emp.id}`);
|
|
239
|
+
}
|
|
174
240
|
}
|
|
175
241
|
catch (err) {
|
|
176
242
|
failWorker(emp.id, err.message || String(err));
|
|
177
|
-
|
|
243
|
+
console.error(`[jaw:pabcd] worker ${emp.id} failed:`, err.message);
|
|
244
|
+
continue; // Don't abort remaining workers
|
|
178
245
|
}
|
|
179
246
|
anyWorkerRan = true;
|
|
180
247
|
// Inject the worker result exactly once through the replay contract.
|
|
181
248
|
// This keeps durable handoff semantics while avoiding duplicate boss processing.
|
|
182
|
-
if (claimWorkerReplay(emp.id)) {
|
|
249
|
+
if (wResult.status === 'done' && claimWorkerReplay(emp.id)) {
|
|
183
250
|
try {
|
|
184
251
|
await orchestrate(wResult.text, {
|
|
185
252
|
...meta,
|
|
@@ -188,24 +255,32 @@ export async function orchestrate(prompt, meta = {}) {
|
|
|
188
255
|
_skipReplayDrain: true,
|
|
189
256
|
});
|
|
190
257
|
markWorkerReplayed(emp.id);
|
|
258
|
+
processQueue();
|
|
191
259
|
}
|
|
192
260
|
catch (err) {
|
|
193
261
|
releaseWorkerReplay(emp.id);
|
|
194
|
-
|
|
262
|
+
console.error(`[jaw:pabcd] worker ${emp.id} replay failed:`, err.message);
|
|
263
|
+
continue; // Don't abort remaining worker replays
|
|
195
264
|
}
|
|
196
265
|
}
|
|
197
266
|
}
|
|
198
267
|
// If no workers could be found, broadcast the original response
|
|
199
|
-
if (!anyWorkerRan) {
|
|
268
|
+
if (!anyWorkerRan && !anyWorkerDispatched) {
|
|
200
269
|
const stripped = stripSubtaskJSON(result.text);
|
|
201
270
|
broadcast('orchestrate_done', {
|
|
202
271
|
text: `[Worker dispatch failed — no matching employees]\n${stripped || result.text || ''}`,
|
|
203
|
-
origin,
|
|
204
|
-
chatId,
|
|
205
|
-
target,
|
|
206
|
-
requestId,
|
|
272
|
+
origin, chatId, target, requestId,
|
|
207
273
|
});
|
|
208
274
|
}
|
|
275
|
+
else if (!anyWorkerRan && anyWorkerDispatched) {
|
|
276
|
+
const stripped = stripSubtaskJSON(result.text);
|
|
277
|
+
broadcast('orchestrate_done', {
|
|
278
|
+
text: `[All dispatched workers failed]\n${stripped || result.text || ''}`,
|
|
279
|
+
origin, chatId, target, requestId,
|
|
280
|
+
});
|
|
281
|
+
}
|
|
282
|
+
// Ensure queue drains after all worker replays are processed
|
|
283
|
+
processQueue();
|
|
209
284
|
return;
|
|
210
285
|
}
|
|
211
286
|
// Normal response → broadcast
|
|
@@ -224,7 +299,16 @@ export async function orchestrateContinue(meta = {}) {
|
|
|
224
299
|
const chatId = meta.chatId;
|
|
225
300
|
const target = meta.target;
|
|
226
301
|
const requestId = meta.requestId;
|
|
227
|
-
const
|
|
302
|
+
const candidateScope = resolveOrcScope({
|
|
303
|
+
persistedScopeId: null,
|
|
304
|
+
origin,
|
|
305
|
+
target,
|
|
306
|
+
chatId,
|
|
307
|
+
workingDir: settings.workingDir || null,
|
|
308
|
+
});
|
|
309
|
+
const ctxCandidate = getCtx(candidateScope);
|
|
310
|
+
const scope = ctxCandidate?.scopeId || (ctxCandidate ? candidateScope : (findActiveScope(origin, chatId) || candidateScope));
|
|
311
|
+
const state = getState(scope);
|
|
228
312
|
// Active PABCD → resume from current state
|
|
229
313
|
if (state !== 'IDLE') {
|
|
230
314
|
console.log(`[jaw:pabcd] continue in state=${state}`);
|
|
@@ -256,15 +340,24 @@ export async function orchestrateReset(meta = {}) {
|
|
|
256
340
|
const target = meta.target;
|
|
257
341
|
const requestId = meta.requestId;
|
|
258
342
|
// --- cancel running workers and clear replay state on reset ---
|
|
343
|
+
killActiveAgent('reset');
|
|
259
344
|
for (const w of getActiveWorkers()) {
|
|
345
|
+
killAgentById(w.agentId);
|
|
260
346
|
cancelWorker(w.agentId);
|
|
261
347
|
}
|
|
262
348
|
clearAllWorkers();
|
|
263
349
|
messageQueue.length = 0;
|
|
264
350
|
clearAllEmployeeSessions.run();
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
351
|
+
const candidateScope = resolveOrcScope({
|
|
352
|
+
persistedScopeId: null,
|
|
353
|
+
origin,
|
|
354
|
+
target,
|
|
355
|
+
chatId,
|
|
356
|
+
workingDir: settings.workingDir || null,
|
|
357
|
+
});
|
|
358
|
+
const ctxReset = getCtx(candidateScope);
|
|
359
|
+
const scope = ctxReset?.scopeId || (ctxReset ? candidateScope : (findActiveScope(origin, chatId) || candidateScope));
|
|
360
|
+
resetState(scope);
|
|
268
361
|
const latest = readLatestWorklog();
|
|
269
362
|
if (!latest) {
|
|
270
363
|
broadcast('orchestrate_done', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/orchestrator/pipeline.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"pipeline.js","sourceRoot":"","sources":["../../../src/orchestrator/pipeline.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
// ─── Research
|
|
2
|
-
// Phase-independent research dispatch for the Research
|
|
1
|
+
// ─── Research Employee Dispatch Helper ──────────────
|
|
2
|
+
// Phase-independent research dispatch for the Research employee.
|
|
3
3
|
// Callable from IDLE, P, A, B, C — always read-only, report-only.
|
|
4
4
|
import { broadcast } from '../core/bus.js';
|
|
5
5
|
import { getEmployees, upsertEmployeeSession } from '../core/db.js';
|
|
@@ -40,7 +40,7 @@ export async function dispatchResearchTask(task, meta = {}) {
|
|
|
40
40
|
? meta._spawnAgent
|
|
41
41
|
: spawnAgent;
|
|
42
42
|
if (!configuredEmp) {
|
|
43
|
-
console.warn('[jaw:research] Research employee not found, using fallback Research
|
|
43
|
+
console.warn('[jaw:research] Research employee not found, using fallback Research employee');
|
|
44
44
|
}
|
|
45
45
|
const sysPrompt = getEmployeePromptV2(emp, 'research', 1);
|
|
46
46
|
// Force fresh session to avoid context contamination
|
|
@@ -92,8 +92,8 @@ Respond with this exact structure:
|
|
|
92
92
|
if (parsed.rawText)
|
|
93
93
|
return parsed;
|
|
94
94
|
const failureReason = r.code === 127
|
|
95
|
-
? 'Research
|
|
96
|
-
: `Research
|
|
95
|
+
? 'Research employee CLI not available'
|
|
96
|
+
: `Research employee failed with code ${r.code ?? 'unknown'}`;
|
|
97
97
|
return {
|
|
98
98
|
rawText: '',
|
|
99
99
|
summary: '',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"research.js","sourceRoot":"","sources":["../../../src/orchestrator/research.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD
|
|
1
|
+
{"version":3,"file":"research.js","sourceRoot":"","sources":["../../../src/orchestrator/research.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { settings } from '../core/config.js';
|
|
2
|
+
import { listActiveOrcStates } from '../core/db.js';
|
|
3
|
+
function normalizeRemoteKey(target, chatId) {
|
|
4
|
+
if (chatId !== undefined && chatId !== null)
|
|
5
|
+
return String(chatId);
|
|
6
|
+
if (!target)
|
|
7
|
+
return 'default';
|
|
8
|
+
if (typeof target === 'string')
|
|
9
|
+
return target;
|
|
10
|
+
return String(target.channelId
|
|
11
|
+
|| target.threadId
|
|
12
|
+
|| target.id
|
|
13
|
+
|| 'default');
|
|
14
|
+
}
|
|
15
|
+
export function resolveOrcScope(input = {}) {
|
|
16
|
+
if (input.persistedScopeId)
|
|
17
|
+
return String(input.persistedScopeId);
|
|
18
|
+
const origin = String(input.origin || 'web').trim() || 'web';
|
|
19
|
+
const workingDir = String(input.workingDir ?? settings.workingDir ?? '~').trim() || '~';
|
|
20
|
+
if (origin === 'telegram' || origin === 'discord') {
|
|
21
|
+
return `${origin}:${normalizeRemoteKey(input.target, input.chatId)}:${workingDir}`;
|
|
22
|
+
}
|
|
23
|
+
return `local:${workingDir}`;
|
|
24
|
+
}
|
|
25
|
+
/**
|
|
26
|
+
* Find an existing active (non-IDLE) scope row matching the given origin/chatId.
|
|
27
|
+
* Used when workingDir may have changed mid-phase — the old scope row has the
|
|
28
|
+
* persisted scopeId that should be reused.
|
|
29
|
+
*
|
|
30
|
+
* When multiple active rows match, returns the most recently updated one.
|
|
31
|
+
* This is a best-effort heuristic: if a user runs concurrent PABCD flows
|
|
32
|
+
* from different directories, the most-recently-active flow wins.
|
|
33
|
+
*/
|
|
34
|
+
export function findActiveScope(origin, chatId) {
|
|
35
|
+
const activeRows = listActiveOrcStates.all();
|
|
36
|
+
if (!activeRows.length)
|
|
37
|
+
return null;
|
|
38
|
+
let matches;
|
|
39
|
+
if (origin === 'telegram' || origin === 'discord') {
|
|
40
|
+
const chatKey = normalizeRemoteKey(undefined, chatId);
|
|
41
|
+
const prefix = `${origin}:${chatKey}:`;
|
|
42
|
+
matches = activeRows.filter(r => r.id.startsWith(prefix));
|
|
43
|
+
}
|
|
44
|
+
else {
|
|
45
|
+
matches = activeRows.filter(r => r.id.startsWith('local:'));
|
|
46
|
+
}
|
|
47
|
+
if (matches.length === 0)
|
|
48
|
+
return null;
|
|
49
|
+
if (matches.length === 1)
|
|
50
|
+
return matches[0].id;
|
|
51
|
+
// Multiple active scopes for this origin — pick most recently updated
|
|
52
|
+
matches.sort((a, b) => (b.updated_at > a.updated_at ? 1 : -1));
|
|
53
|
+
return matches[0].id;
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=scope.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"scope.js","sourceRoot":"","sources":["../../../src/orchestrator/scope.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAC7C,OAAO,EAAE,mBAAmB,EAAE,MAAM,eAAe,CAAC;AAWpD,SAAS,kBAAkB,CAAC,MAAqB,EAAE,MAAwB;IACvE,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC;IACnE,IAAI,CAAC,MAAM;QAAE,OAAO,SAAS,CAAC;IAC9B,IAAI,OAAO,MAAM,KAAK,QAAQ;QAAE,OAAO,MAAM,CAAC;IAC9C,OAAO,MAAM,CACR,MAA8B,CAAC,SAAS;WACrC,MAA8B,CAAC,QAAQ;WACvC,MAA8B,CAAC,EAAE;WAClC,SAAS,CACf,CAAC;AACN,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,QAAuB,EAAE;IACrD,IAAI,KAAK,CAAC,gBAAgB;QAAE,OAAO,MAAM,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAElE,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,IAAI,EAAE,IAAI,KAAK,CAAC;IAC7D,MAAM,UAAU,GAAG,MAAM,CAAC,KAAK,CAAC,UAAU,IAAI,QAAQ,CAAC,UAAU,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,IAAI,GAAG,CAAC;IAExF,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAChD,OAAO,GAAG,MAAM,IAAI,kBAAkB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,UAAU,EAAE,CAAC;IACvF,CAAC;IAED,OAAO,SAAS,UAAU,EAAE,CAAC;AACjC,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,eAAe,CAAC,MAAc,EAAE,MAAwB;IACpE,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,EAA+C,CAAC;IAC1F,IAAI,CAAC,UAAU,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEpC,IAAI,OAAkD,CAAC;IAEvD,IAAI,MAAM,KAAK,UAAU,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,kBAAkB,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QACtD,MAAM,MAAM,GAAG,GAAG,MAAM,IAAI,OAAO,GAAG,CAAC;QACvC,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC;IAC9D,CAAC;SAAM,CAAC;QACJ,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC;IAChE,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACtC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,OAAO,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;IAEhD,sEAAsE;IACtE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC/D,OAAO,OAAO,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;AAC1B,CAAC"}
|
|
@@ -6,12 +6,12 @@ import { getOrcState, setOrcState, resetOrcState } from '../core/db.js';
|
|
|
6
6
|
import { broadcast } from '../core/bus.js';
|
|
7
7
|
import { readLatestWorklog } from '../memory/worklog.js';
|
|
8
8
|
// ─── State Read/Write (DB-backed) ───────────────────
|
|
9
|
-
export function getState() {
|
|
10
|
-
const row = getOrcState();
|
|
9
|
+
export function getState(scope = 'default') {
|
|
10
|
+
const row = getOrcState.get(scope);
|
|
11
11
|
return row?.state || 'IDLE';
|
|
12
12
|
}
|
|
13
|
-
export function getCtx() {
|
|
14
|
-
const row = getOrcState();
|
|
13
|
+
export function getCtx(scope = 'default') {
|
|
14
|
+
const row = getOrcState.get(scope);
|
|
15
15
|
if (!row?.ctx)
|
|
16
16
|
return null;
|
|
17
17
|
try {
|
|
@@ -24,30 +24,32 @@ export function getCtx() {
|
|
|
24
24
|
return null;
|
|
25
25
|
}
|
|
26
26
|
}
|
|
27
|
-
export function setState(s, ctx) {
|
|
27
|
+
export function setState(s, ctx, scope = 'default', titleOverride) {
|
|
28
28
|
const ctxJson = ctx !== undefined
|
|
29
29
|
? (ctx ? JSON.stringify(ctx) : null)
|
|
30
|
-
: getOrcState()?.ctx || null;
|
|
31
|
-
setOrcState.run(s, ctxJson
|
|
30
|
+
: (getOrcState.get(scope)?.ctx || null);
|
|
31
|
+
setOrcState.run(scope, s, ctxJson);
|
|
32
32
|
// Parse worklog title (max 2 words + …)
|
|
33
|
-
let title = 'PABCD';
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
33
|
+
let title = titleOverride || 'PABCD';
|
|
34
|
+
if (!titleOverride) {
|
|
35
|
+
try {
|
|
36
|
+
const wl = readLatestWorklog();
|
|
37
|
+
if (wl?.content) {
|
|
38
|
+
const firstLine = wl.content.split('\n')[0] || '';
|
|
39
|
+
const raw = firstLine.replace(/^#\s*Work Log:\s*"?/, '').replace(/"?\s*$/, '').trim();
|
|
40
|
+
if (raw) {
|
|
41
|
+
const words = raw.split(/\s+/);
|
|
42
|
+
title = words.slice(0, 2).join(' ') + (words.length > 2 ? '…' : '');
|
|
43
|
+
}
|
|
42
44
|
}
|
|
43
45
|
}
|
|
46
|
+
catch { /* fallback to PABCD */ }
|
|
44
47
|
}
|
|
45
|
-
|
|
46
|
-
broadcast('orc_state', { state: s, title });
|
|
48
|
+
broadcast('orc_state', { state: s, title, scope });
|
|
47
49
|
}
|
|
48
|
-
export function resetState() {
|
|
49
|
-
resetOrcState();
|
|
50
|
-
broadcast('orc_state', { state: 'IDLE', title: '' });
|
|
50
|
+
export function resetState(scope = 'default') {
|
|
51
|
+
resetOrcState.run(scope);
|
|
52
|
+
broadcast('orc_state', { state: 'IDLE', title: '', scope });
|
|
51
53
|
}
|
|
52
54
|
// ─── Prefix Map ─────────────────────────────────────
|
|
53
55
|
// B state: only worker results get Bb2 prefix, user messages get no prefix.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"state-machine.js","sourceRoot":"","sources":["../../../src/orchestrator/state-machine.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,mFAAmF;AACnF,6CAA6C;AAC7C,kEAAkE;AAElE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"state-machine.js","sourceRoot":"","sources":["../../../src/orchestrator/state-machine.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,mFAAmF;AACnF,6CAA6C;AAC7C,kEAAkE;AAElE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAoBzD,uDAAuD;AAEvD,MAAM,UAAU,QAAQ,CAAC,KAAK,GAAG,SAAS;IACxC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAmC,CAAC;IACrE,OAAQ,GAAG,EAAE,KAAsB,IAAI,MAAM,CAAC;AAChD,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,KAAK,GAAG,SAAS;IACtC,MAAM,GAAG,GAAG,WAAW,CAAC,GAAG,CAAC,KAAK,CAAwC,CAAC;IAC1E,IAAI,CAAC,GAAG,EAAE,GAAG;QAAE,OAAO,IAAI,CAAC;IAC3B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACnC,IAAI,MAAM,IAAI,MAAM,CAAC,UAAU,KAAK,SAAS;YAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC;QACxE,OAAO,MAAM,CAAC;IAChB,CAAC;IAAC,MAAM,CAAC;QAAC,OAAO,IAAI,CAAC;IAAC,CAAC;AAC1B,CAAC;AAED,MAAM,UAAU,QAAQ,CACtB,CAAe,EACf,GAAuB,EACvB,KAAK,GAAG,SAAS,EACjB,aAA6B;IAE7B,MAAM,OAAO,GAAG,GAAG,KAAK,SAAS;QAC/B,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpC,CAAC,CAAC,CAAE,WAAW,CAAC,GAAG,CAAC,KAAK,CAAyC,EAAE,GAAG,IAAI,IAAI,CAAC,CAAC;IACnF,WAAW,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC;IAEnC,wCAAwC;IACxC,IAAI,KAAK,GAAG,aAAa,IAAI,OAAO,CAAC;IACrC,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,EAAE,GAAG,iBAAiB,EAAE,CAAC;YAC/B,IAAI,EAAE,EAAE,OAAO,EAAE,CAAC;gBAChB,MAAM,SAAS,GAAG,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;gBAClD,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,CAAC,qBAAqB,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;gBACtF,IAAI,GAAG,EAAE,CAAC;oBACR,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;oBAC/B,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBACtE,CAAC;YACH,CAAC;QACH,CAAC;QAAC,MAAM,CAAC,CAAC,uBAAuB,CAAC,CAAC;IACrC,CAAC;IAED,SAAS,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,UAAU,CAAC,KAAK,GAAG,SAAS;IAC1C,aAAa,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACzB,SAAS,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;AAC9D,CAAC;AAED,uDAAuD;AACvD,4EAA4E;AAE5E,MAAM,QAAQ,GAA2B;IACvC,GAAG,EAAE;;;;;;;WAOI;IAET,GAAG,EAAE;;;;;;;;kBAQW;IAEhB,GAAG,EAAE;;;;;;;;kBAQW;CACjB,CAAC;AAEF,MAAM,UAAU,SAAS,CAAC,KAAmB,EAAE,SAA4B,MAAM;IAC/E,IAAI,KAAK,KAAK,GAAG;QAAE,OAAO,QAAQ,CAAC,GAAI,CAAC;IACxC,IAAI,KAAK,KAAK,GAAG;QAAE,OAAO,QAAQ,CAAC,GAAI,CAAC;IACxC,IAAI,KAAK,KAAK,GAAG,IAAI,MAAM,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC,GAAI,CAAC;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,uDAAuD;AAEvD,MAAM,aAAa,GAA2B;IAC5C,CAAC,EAAE;;;;;;;;;;;;;;;;;qFAiBgF;IAEnF,CAAC,EAAE;;;;;;;;;;;;;;;;;;;;qDAoBgD;IAEnD,CAAC,EAAE;;;;;;;;;;;;;;;;;;;;;;qDAsBgD;IAEnD,CAAC,EAAE;;;;;;;;;0EASqE;IAExE,CAAC,EAAE;;;;;uBAKkB;CACtB,CAAC;AAEF,MAAM,UAAU,cAAc,CAAC,MAAc;IAC3C,OAAO,aAAa,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;AACrC,CAAC;AAED,uDAAuD;AAEvD,MAAM,iBAAiB,GAA6B;IAClD,IAAI,EAAE,CAAC,GAAG,CAAC;IACX,CAAC,EAAE,CAAC,GAAG,CAAC;IACR,CAAC,EAAE,CAAC,GAAG,CAAC;IACR,CAAC,EAAE,CAAC,GAAG,CAAC;IACR,CAAC,EAAE,CAAC,GAAG,CAAC;IACR,CAAC,EAAE,CAAC,MAAM,CAAC;CACZ,CAAC;AAEF,MAAM,UAAU,aAAa,CAAC,IAAkB,EAAE,EAAgB;IAChE,OAAO,iBAAiB,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC;AACxD,CAAC"}
|
|
@@ -14,6 +14,7 @@ export function claimWorker(emp, task) {
|
|
|
14
14
|
completedAt: null,
|
|
15
15
|
pendingReplay: false,
|
|
16
16
|
replayClaimed: false,
|
|
17
|
+
replayAttempts: 0,
|
|
17
18
|
result: null,
|
|
18
19
|
};
|
|
19
20
|
workers.set(emp.id, slot);
|
|
@@ -42,7 +43,7 @@ export function failWorker(agentId, result) {
|
|
|
42
43
|
slot.state = 'failed';
|
|
43
44
|
slot.completedAt = Date.now();
|
|
44
45
|
slot.result = result;
|
|
45
|
-
slot.pendingReplay =
|
|
46
|
+
slot.pendingReplay = false; // Failed workers don't need replay — no result to feed back to Boss
|
|
46
47
|
}
|
|
47
48
|
export function cancelWorker(agentId) {
|
|
48
49
|
const slot = workers.get(agentId);
|
|
@@ -73,7 +74,7 @@ export function hasPendingWorkerReplays() {
|
|
|
73
74
|
export function listPendingWorkerResults() {
|
|
74
75
|
const results = [];
|
|
75
76
|
for (const slot of workers.values()) {
|
|
76
|
-
if (slot.pendingReplay && !slot.replayClaimed && slot.result) {
|
|
77
|
+
if (slot.state === 'done' && slot.pendingReplay && !slot.replayClaimed && slot.result) {
|
|
77
78
|
results.push({ agentId: slot.agentId, text: slot.result });
|
|
78
79
|
}
|
|
79
80
|
}
|
|
@@ -100,6 +101,12 @@ export function releaseWorkerReplay(agentId) {
|
|
|
100
101
|
if (!slot)
|
|
101
102
|
return;
|
|
102
103
|
slot.replayClaimed = false;
|
|
104
|
+
slot.replayAttempts++;
|
|
105
|
+
if (slot.replayAttempts >= 3) {
|
|
106
|
+
console.error(`[worker-registry] ${agentId} replay failed 3 times — marking as failed`);
|
|
107
|
+
slot.state = 'failed';
|
|
108
|
+
slot.pendingReplay = false;
|
|
109
|
+
}
|
|
103
110
|
}
|
|
104
111
|
export function clearAllWorkers() {
|
|
105
112
|
workers.clear();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-registry.js","sourceRoot":"","sources":["../../../src/orchestrator/worker-registry.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,mEAAmE;AAEnE,MAAM,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"worker-registry.js","sourceRoot":"","sources":["../../../src/orchestrator/worker-registry.ts"],"names":[],"mappings":"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"}
|