@monoes/monomindcli 2.16.0 → 2.16.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/.claude/helpers/handlers/edit-handler.cjs +14 -12
- package/.claude/helpers/handlers/route-handler.cjs +22 -3
- package/.claude/helpers/hook-handler.cjs +17 -2
- package/.claude/helpers/jev-picker.cjs +1 -1
- package/.claude/helpers/monograph-freshen.cjs +31 -113
- package/.claude/helpers/utils/monograph-resolve.cjs +497 -0
- package/.claude/helpers/utils/monograph.cjs +8 -51
- package/dist/src/capabilities/cap-code.d.ts.map +1 -1
- package/dist/src/capabilities/cap-code.js +10 -5
- package/dist/src/capabilities/cap-code.js.map +1 -1
- package/dist/src/capabilities/manager.d.ts +2 -1
- package/dist/src/capabilities/manager.d.ts.map +1 -1
- package/dist/src/capabilities/manager.js +4 -1
- package/dist/src/capabilities/manager.js.map +1 -1
- package/dist/src/commands/doctor-hook-monograph-checks.d.ts +8 -0
- package/dist/src/commands/doctor-hook-monograph-checks.d.ts.map +1 -0
- package/dist/src/commands/doctor-hook-monograph-checks.js +79 -0
- package/dist/src/commands/doctor-hook-monograph-checks.js.map +1 -0
- package/dist/src/commands/doctor-project-checks.js +1 -1
- package/dist/src/commands/doctor-project-checks.js.map +1 -1
- package/dist/src/commands/doctor.d.ts.map +1 -1
- package/dist/src/commands/doctor.js +4 -1
- package/dist/src/commands/doctor.js.map +1 -1
- package/dist/src/commands/init-wizard.d.ts.map +1 -1
- package/dist/src/commands/init-wizard.js +2 -0
- package/dist/src/commands/init-wizard.js.map +1 -1
- package/dist/src/commands/init.d.ts.map +1 -1
- package/dist/src/commands/init.js +25 -26
- package/dist/src/commands/init.js.map +1 -1
- package/dist/src/commands/monograph.d.ts.map +1 -1
- package/dist/src/commands/monograph.js +16 -1
- package/dist/src/commands/monograph.js.map +1 -1
- package/dist/src/commands/org-observe.d.ts.map +1 -1
- package/dist/src/commands/org-observe.js +5 -9
- package/dist/src/commands/org-observe.js.map +1 -1
- package/dist/src/commands/org-run-end.d.ts +26 -0
- package/dist/src/commands/org-run-end.d.ts.map +1 -0
- package/dist/src/commands/org-run-end.js +40 -0
- package/dist/src/commands/org-run-end.js.map +1 -0
- package/dist/src/commands/org.d.ts +2 -1
- package/dist/src/commands/org.d.ts.map +1 -1
- package/dist/src/commands/org.js +36 -15
- package/dist/src/commands/org.js.map +1 -1
- package/dist/src/commands/search-universal.d.ts.map +1 -1
- package/dist/src/commands/search-universal.js +1 -2
- package/dist/src/commands/search-universal.js.map +1 -1
- package/dist/src/init/executor.d.ts.map +1 -1
- package/dist/src/init/executor.js +7 -0
- package/dist/src/init/executor.js.map +1 -1
- package/dist/src/init/init-memory.d.ts +14 -0
- package/dist/src/init/init-memory.d.ts.map +1 -0
- package/dist/src/init/init-memory.js +44 -0
- package/dist/src/init/init-memory.js.map +1 -0
- package/dist/src/init/types.d.ts +13 -0
- package/dist/src/init/types.d.ts.map +1 -1
- package/dist/src/init/types.js.map +1 -1
- package/dist/src/init/upgrade.d.ts.map +1 -1
- package/dist/src/init/upgrade.js +9 -0
- package/dist/src/init/upgrade.js.map +1 -1
- package/dist/src/orgrt/agent-runner.d.ts +7 -0
- package/dist/src/orgrt/agent-runner.d.ts.map +1 -1
- package/dist/src/orgrt/agent-runner.js +5 -1
- package/dist/src/orgrt/agent-runner.js.map +1 -1
- package/dist/src/orgrt/antigravity-runner.d.ts.map +1 -1
- package/dist/src/orgrt/antigravity-runner.js +8 -14
- package/dist/src/orgrt/antigravity-runner.js.map +1 -1
- package/dist/src/orgrt/bash-timeout.d.ts +14 -0
- package/dist/src/orgrt/bash-timeout.d.ts.map +1 -0
- package/dist/src/orgrt/bash-timeout.js +18 -0
- package/dist/src/orgrt/bash-timeout.js.map +1 -0
- package/dist/src/orgrt/block-recheck.d.ts +30 -0
- package/dist/src/orgrt/block-recheck.d.ts.map +1 -0
- package/dist/src/orgrt/block-recheck.js +81 -0
- package/dist/src/orgrt/block-recheck.js.map +1 -0
- package/dist/src/orgrt/checkpoint-ops.d.ts.map +1 -1
- package/dist/src/orgrt/checkpoint-ops.js +2 -1
- package/dist/src/orgrt/checkpoint-ops.js.map +1 -1
- package/dist/src/orgrt/checkpoint.d.ts +10 -2
- package/dist/src/orgrt/checkpoint.d.ts.map +1 -1
- package/dist/src/orgrt/checkpoint.js +8 -2
- package/dist/src/orgrt/checkpoint.js.map +1 -1
- package/dist/src/orgrt/codex-runner.d.ts.map +1 -1
- package/dist/src/orgrt/codex-runner.js +8 -14
- package/dist/src/orgrt/codex-runner.js.map +1 -1
- package/dist/src/orgrt/completion-gate.d.ts +10 -0
- package/dist/src/orgrt/completion-gate.d.ts.map +1 -1
- package/dist/src/orgrt/completion-gate.js +40 -2
- package/dist/src/orgrt/completion-gate.js.map +1 -1
- package/dist/src/orgrt/copilot-runner.d.ts.map +1 -1
- package/dist/src/orgrt/copilot-runner.js +7 -10
- package/dist/src/orgrt/copilot-runner.js.map +1 -1
- package/dist/src/orgrt/crush-runner.d.ts.map +1 -1
- package/dist/src/orgrt/crush-runner.js +7 -10
- package/dist/src/orgrt/crush-runner.js.map +1 -1
- package/dist/src/orgrt/cumulative-meter.d.ts +26 -0
- package/dist/src/orgrt/cumulative-meter.d.ts.map +1 -0
- package/dist/src/orgrt/cumulative-meter.js +46 -0
- package/dist/src/orgrt/cumulative-meter.js.map +1 -0
- package/dist/src/orgrt/daemon.d.ts +6 -2
- package/dist/src/orgrt/daemon.d.ts.map +1 -1
- package/dist/src/orgrt/daemon.js +31 -31
- package/dist/src/orgrt/daemon.js.map +1 -1
- package/dist/src/orgrt/dashboard-health.d.ts +54 -0
- package/dist/src/orgrt/dashboard-health.d.ts.map +1 -0
- package/dist/src/orgrt/dashboard-health.js +143 -0
- package/dist/src/orgrt/dashboard-health.js.map +1 -0
- package/dist/src/orgrt/decisions.d.ts +7 -2
- package/dist/src/orgrt/decisions.d.ts.map +1 -1
- package/dist/src/orgrt/decisions.js +47 -11
- package/dist/src/orgrt/decisions.js.map +1 -1
- package/dist/src/orgrt/forwarder.d.ts +2 -1
- package/dist/src/orgrt/forwarder.d.ts.map +1 -1
- package/dist/src/orgrt/forwarder.js +87 -27
- package/dist/src/orgrt/forwarder.js.map +1 -1
- package/dist/src/orgrt/grok-runner.d.ts.map +1 -1
- package/dist/src/orgrt/grok-runner.js +7 -12
- package/dist/src/orgrt/grok-runner.js.map +1 -1
- package/dist/src/orgrt/hermes-runner.d.ts.map +1 -1
- package/dist/src/orgrt/hermes-runner.js +9 -15
- package/dist/src/orgrt/hermes-runner.js.map +1 -1
- package/dist/src/orgrt/kimicode-runner.d.ts +1 -1
- package/dist/src/orgrt/kimicode-runner.d.ts.map +1 -1
- package/dist/src/orgrt/kimicode-runner.js +9 -15
- package/dist/src/orgrt/kimicode-runner.js.map +1 -1
- package/dist/src/orgrt/mailbox.d.ts +14 -0
- package/dist/src/orgrt/mailbox.d.ts.map +1 -1
- package/dist/src/orgrt/mailbox.js +31 -1
- package/dist/src/orgrt/mailbox.js.map +1 -1
- package/dist/src/orgrt/opencode-runner.d.ts.map +1 -1
- package/dist/src/orgrt/opencode-runner.js +7 -13
- package/dist/src/orgrt/opencode-runner.js.map +1 -1
- package/dist/src/orgrt/org-harness-tools.d.ts +8 -0
- package/dist/src/orgrt/org-harness-tools.d.ts.map +1 -0
- package/dist/src/orgrt/org-harness-tools.js +21 -0
- package/dist/src/orgrt/org-harness-tools.js.map +1 -0
- package/dist/src/orgrt/pi-rpc-runner.d.ts.map +1 -1
- package/dist/src/orgrt/pi-rpc-runner.js +9 -13
- package/dist/src/orgrt/pi-rpc-runner.js.map +1 -1
- package/dist/src/orgrt/pi-runner.d.ts.map +1 -1
- package/dist/src/orgrt/pi-runner.js +7 -11
- package/dist/src/orgrt/pi-runner.js.map +1 -1
- package/dist/src/orgrt/policy-git.d.ts +5 -1
- package/dist/src/orgrt/policy-git.d.ts.map +1 -1
- package/dist/src/orgrt/policy-git.js +56 -29
- package/dist/src/orgrt/policy-git.js.map +1 -1
- package/dist/src/orgrt/policy.d.ts +7 -0
- package/dist/src/orgrt/policy.d.ts.map +1 -1
- package/dist/src/orgrt/policy.js +10 -1
- package/dist/src/orgrt/policy.js.map +1 -1
- package/dist/src/orgrt/prompt-vars.d.ts +8 -1
- package/dist/src/orgrt/prompt-vars.d.ts.map +1 -1
- package/dist/src/orgrt/prompt-vars.js +60 -11
- package/dist/src/orgrt/prompt-vars.js.map +1 -1
- package/dist/src/orgrt/qwen-rpc-runner.d.ts.map +1 -1
- package/dist/src/orgrt/qwen-rpc-runner.js +9 -14
- package/dist/src/orgrt/qwen-rpc-runner.js.map +1 -1
- package/dist/src/orgrt/qwen-runner.d.ts.map +1 -1
- package/dist/src/orgrt/qwen-runner.js +7 -12
- package/dist/src/orgrt/qwen-runner.js.map +1 -1
- package/dist/src/orgrt/report-budget.d.ts +4 -0
- package/dist/src/orgrt/report-budget.d.ts.map +1 -0
- package/dist/src/orgrt/report-budget.js +12 -0
- package/dist/src/orgrt/report-budget.js.map +1 -0
- package/dist/src/orgrt/reporting.d.ts +4 -0
- package/dist/src/orgrt/reporting.d.ts.map +1 -1
- package/dist/src/orgrt/reporting.js +8 -2
- package/dist/src/orgrt/reporting.js.map +1 -1
- package/dist/src/orgrt/role-sandbox.d.ts +4 -1
- package/dist/src/orgrt/role-sandbox.d.ts.map +1 -1
- package/dist/src/orgrt/role-sandbox.js +24 -10
- package/dist/src/orgrt/role-sandbox.js.map +1 -1
- package/dist/src/orgrt/role-trace.d.ts +27 -0
- package/dist/src/orgrt/role-trace.d.ts.map +1 -0
- package/dist/src/orgrt/role-trace.js +28 -0
- package/dist/src/orgrt/role-trace.js.map +1 -0
- package/dist/src/orgrt/sandbox-deny-write.d.ts +52 -0
- package/dist/src/orgrt/sandbox-deny-write.d.ts.map +1 -0
- package/dist/src/orgrt/sandbox-deny-write.js +89 -0
- package/dist/src/orgrt/sandbox-deny-write.js.map +1 -0
- package/dist/src/orgrt/sandbox-fault.d.ts +50 -0
- package/dist/src/orgrt/sandbox-fault.d.ts.map +1 -0
- package/dist/src/orgrt/sandbox-fault.js +139 -0
- package/dist/src/orgrt/sandbox-fault.js.map +1 -0
- package/dist/src/orgrt/session.d.ts +8 -6
- package/dist/src/orgrt/session.d.ts.map +1 -1
- package/dist/src/orgrt/session.js +121 -67
- package/dist/src/orgrt/session.js.map +1 -1
- package/dist/src/orgrt/task-dag.d.ts +17 -3
- package/dist/src/orgrt/task-dag.d.ts.map +1 -1
- package/dist/src/orgrt/task-dag.js +16 -5
- package/dist/src/orgrt/task-dag.js.map +1 -1
- package/dist/src/orgrt/tool-fence.d.ts +21 -3
- package/dist/src/orgrt/tool-fence.d.ts.map +1 -1
- package/dist/src/orgrt/tool-fence.js +45 -7
- package/dist/src/orgrt/tool-fence.js.map +1 -1
- package/dist/src/orgrt/tool-providers.d.ts +4 -0
- package/dist/src/orgrt/tool-providers.d.ts.map +1 -1
- package/dist/src/orgrt/tool-providers.js +10 -0
- package/dist/src/orgrt/tool-providers.js.map +1 -1
- package/dist/src/orgrt/types.d.ts +19 -0
- package/dist/src/orgrt/types.d.ts.map +1 -1
- package/dist/src/orgrt/types.js +29 -0
- package/dist/src/orgrt/types.js.map +1 -1
- package/dist/src/orgrt/vercel-runner.d.ts +23 -0
- package/dist/src/orgrt/vercel-runner.d.ts.map +1 -1
- package/dist/src/orgrt/vercel-runner.js +2 -26
- package/dist/src/orgrt/vercel-runner.js.map +1 -1
- package/dist/src/platform-adapters/merge.d.ts +11 -0
- package/dist/src/platform-adapters/merge.d.ts.map +1 -1
- package/dist/src/platform-adapters/merge.js +28 -0
- package/dist/src/platform-adapters/merge.js.map +1 -1
- package/dist/src/platform-adapters/mutation.d.ts +3 -0
- package/dist/src/platform-adapters/mutation.d.ts.map +1 -1
- package/dist/src/platform-adapters/mutation.js +43 -0
- package/dist/src/platform-adapters/mutation.js.map +1 -1
- package/dist/src/platform-adapters/operations.d.ts +1 -0
- package/dist/src/platform-adapters/operations.d.ts.map +1 -1
- package/dist/src/platform-adapters/operations.js +25 -9
- package/dist/src/platform-adapters/operations.js.map +1 -1
- package/dist/src/platform-adapters/renderers/skills.d.ts.map +1 -1
- package/dist/src/platform-adapters/renderers/skills.js +11 -2
- package/dist/src/platform-adapters/renderers/skills.js.map +1 -1
- package/dist/src/platform-adapters/shared-surface.d.ts +34 -0
- package/dist/src/platform-adapters/shared-surface.d.ts.map +1 -0
- package/dist/src/platform-adapters/shared-surface.js +89 -0
- package/dist/src/platform-adapters/shared-surface.js.map +1 -0
- package/dist/src/platform-adapters/types.d.ts +7 -0
- package/dist/src/platform-adapters/types.d.ts.map +1 -1
- package/dist/src/utils/resource-governor.d.ts.map +1 -1
- package/dist/src/utils/resource-governor.js +35 -2
- package/dist/src/utils/resource-governor.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"block-recheck.d.ts","sourceRoot":"","sources":["../../../src/orgrt/block-recheck.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAC7C,OAAO,EAAE,yBAAyB,EAAE,MAAM,YAAY,CAAC;AAEvD,OAAO,EAAE,yBAAyB,EAAE,CAAC;AACrC,eAAO,MAAM,6BAA6B,IAAI,CAAC;AAC/C,0EAA0E;AAC1E,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C;;wCAEwC;AACxC,wBAAgB,cAAc,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,EAAE,MAAM,GAAG,MAAM,CAMrF;AAaD;;kEAEkE;AAClE,wBAAgB,oBAAoB,CAClC,OAAO,EAAE,IAAI,CAAC,UAAU,EAAE,SAAS,GAAG,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC,EAC/D,GAAG,EAAE,MAAM,GACV,OAAO,EAAE,CAkCX"}
|
|
@@ -0,0 +1,81 @@
|
|
|
1
|
+
// packages/@monomind/cli/src/orgrt/block-recheck.ts
|
|
2
|
+
/**
|
|
3
|
+
* #329: a task blocked with org_task_block used to sleep until its deadline.
|
|
4
|
+
* Nothing external reaches a blocked task — a background command's
|
|
5
|
+
* completion, a Monitor event and npm propagation all live (at most) in the
|
|
6
|
+
* role's own process stream, which idle-cycling may already have ended — so a
|
|
7
|
+
* block set "until 11:00Z" on a four-minute install idled for half an hour.
|
|
8
|
+
*
|
|
9
|
+
* Every block is now re-checked: its assignee is woken on a bounded interval
|
|
10
|
+
* and asked whether what it was waiting for has happened, until the deadline
|
|
11
|
+
* (unblockExpired) or a close. The schedule lives on the task row
|
|
12
|
+
* (`recheckAt` / `recheckEveryMs`), so it survives process cycling and
|
|
13
|
+
* checkpoint resume; a tick that runs late — the daemon was down across the
|
|
14
|
+
* due time — fires once, then resumes the interval from now.
|
|
15
|
+
*/
|
|
16
|
+
import { taskTag } from './loadouts.js';
|
|
17
|
+
import { MAX_BLOCK_RECHECK_MINUTES } from './types.js';
|
|
18
|
+
export { MAX_BLOCK_RECHECK_MINUTES };
|
|
19
|
+
export const DEFAULT_BLOCK_RECHECK_MINUTES = 5;
|
|
20
|
+
/** Floor for a role's own recheckAfterMinutes: a wake is a model turn. */
|
|
21
|
+
export const MIN_BLOCK_RECHECK_MINUTES = 1;
|
|
22
|
+
/** The re-check interval for one block: the role's own request (clamped to
|
|
23
|
+
* [MIN, MAX]) if it made one, else run_config.block_recheck_minutes (bounded
|
|
24
|
+
* by the schema), else the default. */
|
|
25
|
+
export function blockRecheckMs(orgMinutes, requestedMinutes) {
|
|
26
|
+
const minutes = requestedMinutes !== undefined
|
|
27
|
+
? Math.min(MAX_BLOCK_RECHECK_MINUTES, Math.max(MIN_BLOCK_RECHECK_MINUTES, requestedMinutes))
|
|
28
|
+
: (orgMinutes ?? DEFAULT_BLOCK_RECHECK_MINUTES);
|
|
29
|
+
return minutes * 60_000;
|
|
30
|
+
}
|
|
31
|
+
function recheckLine(task) {
|
|
32
|
+
const until = task.blockedUntil ? new Date(task.blockedUntil).toISOString() : 'unknown';
|
|
33
|
+
return (`${taskTag(task)} still blocked (reason: ${task.blockedReason ?? 'none given'}; until ${until}) — ` +
|
|
34
|
+
`re-check now whether what you were waiting for has happened. If it has, finish the task and close it with org_task_done; ` +
|
|
35
|
+
`if it is still pending, call org_task_block again (a new untilIso, optionally recheckAfterMinutes); ` +
|
|
36
|
+
`if it cannot happen, report that via org_send. Nothing external (background commands, Monitor, npm) wakes a blocked task — ` +
|
|
37
|
+
`run waits in the foreground instead.`);
|
|
38
|
+
}
|
|
39
|
+
/** Wake the assignee of every blocked task whose re-check is due, and move
|
|
40
|
+
* its next re-check one interval on. Called on every idle-watchdog tick,
|
|
41
|
+
* next to the block-expiry resume. Returns the tasks it woke. */
|
|
42
|
+
export function wakeDueBlockRechecks(running, now) {
|
|
43
|
+
if (!running.taskDag)
|
|
44
|
+
return [];
|
|
45
|
+
const orgEvery = blockRecheckMs(running.def.run_config.block_recheck_minutes);
|
|
46
|
+
const due = [];
|
|
47
|
+
for (const task of running.taskDag.all()) {
|
|
48
|
+
if (task.status !== 'blocked' || (task.blockedUntil ?? 0) <= now)
|
|
49
|
+
continue;
|
|
50
|
+
const every = task.recheckEveryMs ?? orgEvery;
|
|
51
|
+
// A block from a checkpoint written before re-checks existed: schedule it.
|
|
52
|
+
if (task.recheckAt === undefined) {
|
|
53
|
+
task.recheckEveryMs = every;
|
|
54
|
+
task.recheckAt = now + every;
|
|
55
|
+
continue;
|
|
56
|
+
}
|
|
57
|
+
if (task.recheckAt > now)
|
|
58
|
+
continue;
|
|
59
|
+
task.recheckAt = now + every;
|
|
60
|
+
due.push(task);
|
|
61
|
+
const agent = running.agents.get(task.assignee);
|
|
62
|
+
const delivered = !!agent && !agent.mailbox.isClosed;
|
|
63
|
+
if (delivered)
|
|
64
|
+
agent.mailbox.push(recheckLine(task));
|
|
65
|
+
running.bus.emit({
|
|
66
|
+
type: 'status',
|
|
67
|
+
from: 'dag',
|
|
68
|
+
reason: 'task-block-recheck',
|
|
69
|
+
msg: `task ${task.id} still blocked — ${delivered ? 'asked' : 'could not reach'} ${task.assignee} to re-check it`,
|
|
70
|
+
data: {
|
|
71
|
+
taskId: task.id,
|
|
72
|
+
assignee: task.assignee,
|
|
73
|
+
delivered,
|
|
74
|
+
blockedUntil: task.blockedUntil,
|
|
75
|
+
nextRecheckAt: task.recheckAt,
|
|
76
|
+
},
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
return due;
|
|
80
|
+
}
|
|
81
|
+
//# sourceMappingURL=block-recheck.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"block-recheck.js","sourceRoot":"","sources":["../../../src/orgrt/block-recheck.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint-ops.d.ts","sourceRoot":"","sources":["../../../src/orgrt/checkpoint-ops.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"checkpoint-ops.d.ts","sourceRoot":"","sources":["../../../src/orgrt/checkpoint-ops.ts"],"names":[],"mappings":"AAaA,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAIzD;0FAC0F;AAC1F,wBAAsB,UAAU,CAC9B,MAAM,EAAE,SAAS,EACjB,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,GACV,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CA0E5B;AAED;;;;2FAI2F;AAC3F,wBAAsB,SAAS,CAAC,MAAM,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,IAAI,CAAC,CA6E3F;AAED;;;;;;;;;;yDAUyD;AACzD,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,GAAG,EAAE,MAAM,EACX,KAAK,EAAE,MAAM,GACZ;IAAE,EAAE,EAAE,IAAI,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAmChE"}
|
|
@@ -6,6 +6,7 @@ import { resolveOrgDefBlueprints } from '../catalog/blueprints.js';
|
|
|
6
6
|
import { writeJsonFileAtomic } from '../utils/json-file.js';
|
|
7
7
|
import { OrgBus } from './bus.js';
|
|
8
8
|
import { isCheckpointExpired, migrateCheckpoint, validateCheckpoint, } from './checkpoint.js';
|
|
9
|
+
import { expandOrgPolicyPathVars, promptVarsFor } from './prompt-vars.js';
|
|
9
10
|
import { ORG_DIR, OrgDefSchema } from './types.js';
|
|
10
11
|
/** Time-travel debugging: replay from a specific checkpoint by run ID.
|
|
11
12
|
* Creates a fresh daemon instance and replays events from the target run's bus.jsonl. */
|
|
@@ -43,7 +44,7 @@ export async function replayFrom(daemon, name, run) {
|
|
|
43
44
|
const bp = resolveOrgDefBlueprints(parsedDef, daemon.root);
|
|
44
45
|
if (bp.errors.length)
|
|
45
46
|
throw new Error(`org ${name}: ${bp.errors.join('; ')}`);
|
|
46
|
-
const def = bp.def;
|
|
47
|
+
const def = expandOrgPolicyPathVars(bp.def, promptVarsFor(daemon.root));
|
|
47
48
|
// Create replay bus
|
|
48
49
|
const bus = new OrgBus(name, replayRun, replayDir);
|
|
49
50
|
const MAX_COLLECTED = 1000;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint-ops.js","sourceRoot":"","sources":["../../../src/orgrt/checkpoint-ops.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"checkpoint-ops.js","sourceRoot":"","sources":["../../../src/orgrt/checkpoint-ops.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,10 +23,15 @@ export interface RoleCheckpoint {
|
|
|
23
23
|
costUsd: number;
|
|
24
24
|
/** Last message ID for threading */
|
|
25
25
|
lastMessageId?: string;
|
|
26
|
+
/** #327: turns the role has finished this run, so a resumed role's
|
|
27
|
+
* `_meta.trace.turn` continues instead of starting over at 1. */
|
|
28
|
+
turns?: number;
|
|
26
29
|
/** Session ID for SDK resume */
|
|
27
30
|
sessionId?: string;
|
|
28
|
-
/** Agent status
|
|
29
|
-
|
|
31
|
+
/** Agent status. 'stopped' marks a role whose session was still live when
|
|
32
|
+
* the org stopped (the stop checkpoint is captured before sessions drain);
|
|
33
|
+
* resume brings it back as 'running' — see restoredRoleStatus. */
|
|
34
|
+
status: 'running' | 'ended' | 'crashed' | 'stopped';
|
|
30
35
|
/** Error message if crashed */
|
|
31
36
|
error?: string;
|
|
32
37
|
/** Terminal scrollback — last N lines of agent output. */
|
|
@@ -77,6 +82,9 @@ export interface OrgCheckpoint {
|
|
|
77
82
|
/** Checksum for state validation */
|
|
78
83
|
checksum: string;
|
|
79
84
|
}
|
|
85
|
+
/** The live status a resumed role starts with: a role recorded as 'stopped'
|
|
86
|
+
* was running when the org stopped, so resume makes it running again. */
|
|
87
|
+
export declare function restoredRoleStatus(rc: Pick<RoleCheckpoint, 'status'> | undefined): 'running' | 'ended' | 'crashed';
|
|
80
88
|
/** Current checkpoint format version. Bump on breaking shape changes.
|
|
81
89
|
* v2 (this bump): added generation, respawnCount, effectiveRoleOverrides,
|
|
82
90
|
* queuedDuringSwap, retiredUsage per RoleCheckpoint for mid-run role
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../src/orgrt/checkpoint.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAE5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,eAAe,CAAC;AAE7C,+CAA+C;AAC/C,MAAM,WAAW,cAAc;IAC7B,8DAA8D;IAC9D,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,qCAAqC;IACrC,aAAa,EAAE,OAAO,CAAC;IACvB;;2CAEuC;IACvC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B;;2EAEuE;IACvE,UAAU,EAAE,MAAM,CAAC;IACnB;;mEAE+D;IAC/D,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,oBAAoB;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,oCAAoC;IACpC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gCAAgC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB
|
|
1
|
+
{"version":3,"file":"checkpoint.d.ts","sourceRoot":"","sources":["../../../src/orgrt/checkpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,11 @@
|
|
|
2
2
|
// Semantic checkpoint state management for org runtime - Pattern 3 implementation
|
|
3
3
|
import { createHash } from 'node:crypto';
|
|
4
4
|
import { isRecoverableCloseReason } from './mailbox.js';
|
|
5
|
+
/** The live status a resumed role starts with: a role recorded as 'stopped'
|
|
6
|
+
* was running when the org stopped, so resume makes it running again. */
|
|
7
|
+
export function restoredRoleStatus(rc) {
|
|
8
|
+
return !rc || rc.status === 'stopped' ? 'running' : rc.status;
|
|
9
|
+
}
|
|
5
10
|
/** Current checkpoint format version. Bump on breaking shape changes.
|
|
6
11
|
* v2 (this bump): added generation, respawnCount, effectiveRoleOverrides,
|
|
7
12
|
* queuedDuringSwap, retiredUsage per RoleCheckpoint for mid-run role
|
|
@@ -43,8 +48,9 @@ export function captureCheckpoint(org, status = 'running') {
|
|
|
43
48
|
tokenUsage: runtime.policy.tokenUsage,
|
|
44
49
|
costUsd: runtime.metrics.costUsd,
|
|
45
50
|
lastMessageId: runtime.lastMessageId,
|
|
51
|
+
...(org.turns?.get(roleId) ? { turns: org.turns.get(roleId) } : {}),
|
|
46
52
|
sessionId: runtime.sessionId, // P2-13: populated by session layer via onSessionId callback
|
|
47
|
-
status: runtime.status,
|
|
53
|
+
status: status === 'stopped' && runtime.status === 'running' ? 'stopped' : runtime.status,
|
|
48
54
|
error: runtime.error,
|
|
49
55
|
scrollback: runtime.scrollback?.snapshot(),
|
|
50
56
|
generation: slot?.generation ?? 0,
|
|
@@ -245,7 +251,7 @@ export function mergeCheckpoint(org, checkpoint, restoreMailboxes = true, restor
|
|
|
245
251
|
// Restore metadata
|
|
246
252
|
runtime.metrics.costUsd = roleState.costUsd;
|
|
247
253
|
runtime.lastMessageId = roleState.lastMessageId;
|
|
248
|
-
runtime.status = roleState
|
|
254
|
+
runtime.status = restoredRoleStatus(roleState);
|
|
249
255
|
if (roleState.error)
|
|
250
256
|
runtime.error = roleState.error;
|
|
251
257
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../../src/orgrt/checkpoint.ts"],"names":[],"mappings":"AAAA,iDAAiD;AACjD,kFAAkF;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,wBAAwB,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"checkpoint.js","sourceRoot":"","sources":["../../../src/orgrt/checkpoint.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/codex-runner.ts"],"names":[],"mappings":"AA6IA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"codex-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/codex-runner.ts"],"names":[],"mappings":"AA6IA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;AA4E3B;;;;;;;;;GASG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC;IACpC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAYD,qBAAa,gBAAiB,YAAW,WAAW;IACtC,OAAO,CAAC,QAAQ,CAAC;IAA7B,YAAoB,QAAQ,CAAC,EAAE,MAAM,YAAA,EAAI;IAElC,GAAG,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CAqG1D;IAED;;;;;;;OAOG;YACY,UAAU;CAoO1B"}
|
|
@@ -144,7 +144,7 @@ import { maskedCommand } from './authority-mask.js';
|
|
|
144
144
|
import { codexSandboxArgs, roleGitLevel } from './cli-sandbox.js';
|
|
145
145
|
import { classifyStderr } from './kimicode-runner.js';
|
|
146
146
|
import { omitAnthropicManagedKeys } from './provider.js';
|
|
147
|
-
import { buildToolProtocol,
|
|
147
|
+
import { buildToolProtocol, formatToolResults, parseToolCalls, runToolRound, TOOL_CALL_RE, } from './tool-fence.js';
|
|
148
148
|
const TURN_TIMEOUT_MS = 2 * 60 * 60 * 1000; // 2 hours, matching kimi/antigravity runners
|
|
149
149
|
export class CodexAgentRunner {
|
|
150
150
|
codexBin;
|
|
@@ -163,7 +163,8 @@ export class CodexAgentRunner {
|
|
|
163
163
|
// Tool-call loop (same shape as KimiCodeAgentRunner/AntigravityAgentRunner):
|
|
164
164
|
// keep driving the same codex session until a turn produces no
|
|
165
165
|
// tool_call fences (or the round cap hits).
|
|
166
|
-
|
|
166
|
+
// runToolRound ends this loop past the round cap (#326).
|
|
167
|
+
for (let round = 0;; round++) {
|
|
167
168
|
// Prepend system prompt + tool protocol on first turn only (when
|
|
168
169
|
// there's no thread to resume). Subsequent turns in the same
|
|
169
170
|
// session carry context via the thread_id.
|
|
@@ -217,19 +218,12 @@ export class CodexAgentRunner {
|
|
|
217
218
|
}
|
|
218
219
|
if (calls.length === 0)
|
|
219
220
|
break;
|
|
220
|
-
if (round === MAX_TOOL_ROUNDS) {
|
|
221
|
-
yield {
|
|
222
|
-
type: 'assistant',
|
|
223
|
-
session_id: threadId,
|
|
224
|
-
text: `[monomind] tool-call round cap (${MAX_TOOL_ROUNDS}) reached — dropping ${calls.length} pending tool call(s)`,
|
|
225
|
-
};
|
|
226
|
-
break;
|
|
227
|
-
}
|
|
228
221
|
// Execute org tools in-process, gated through canUseTool
|
|
229
|
-
const results =
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
222
|
+
const { results, note } = await runToolRound(args, calls, round);
|
|
223
|
+
if (note)
|
|
224
|
+
yield { type: 'assistant', session_id: threadId, text: note };
|
|
225
|
+
if (!results)
|
|
226
|
+
break;
|
|
233
227
|
nextPrompt = formatToolResults(calls, results);
|
|
234
228
|
}
|
|
235
229
|
// Synthesize one result message per mailbox prompt — session.ts uses
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codex-runner.js","sourceRoot":"","sources":["../../../src/orgrt/codex-runner.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"codex-runner.js","sourceRoot":"","sources":["../../../src/orgrt/codex-runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -160,6 +160,16 @@ export interface TaskEvidenceFacts {
|
|
|
160
160
|
* and each local branch tip. Evidence pinned to any of them is current.
|
|
161
161
|
* When absent, only `headSha` counts. */
|
|
162
162
|
heads?: LocalHead[];
|
|
163
|
+
/** Whether git knows `sha` as a commit. Tells a typo'd sha apart from
|
|
164
|
+
* one the tree moved past; when absent every sha is assumed known. */
|
|
165
|
+
isKnownCommit?: (sha: string) => boolean;
|
|
166
|
+
/** Whether the evidence's `worktree` exists on disk; an absent all-caps
|
|
167
|
+
* path (".../SRC") is then taken for an unfilled placeholder. */
|
|
168
|
+
worktreeExists?: boolean;
|
|
169
|
+
/** `worktree` as the role wrote it, before the caller resolved it against
|
|
170
|
+
* the workspace. A relative one ("src", "work/src") that resolves to no
|
|
171
|
+
* worktree names the one worktree whose path ends with it. */
|
|
172
|
+
worktreeLabel?: string;
|
|
163
173
|
/** Role id the runtime saw calling org_task_done. */
|
|
164
174
|
caller: string;
|
|
165
175
|
/** The task's recorded assignee. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-gate.d.ts","sourceRoot":"","sources":["../../../src/orgrt/completion-gate.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;mFAE+E;IAC/E,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IACrB,gEAAgE;IAChE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;kEAE8D;IAC9D,cAAc,EAAE,OAAO,CAAC;IACxB;;;;sBAIkB;IAClB,cAAc,EAAE,OAAO,CAAC;CACzB;AAiDD;4DAC4D;AAC5D,wBAAgB,eAAe,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CASjE;AAGD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH;2BAC2B;AAC3B,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;0BAKsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;4CAGwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,iDAAiD;AACjD,eAAO,MAAM,YAAY,MAAO,aAAa,KAAG,MAA2B,CAAC;AAE5E;;eAEe;AACf,eAAO,MAAM,kBAAkB,MAAO,aAAa,KAAG,OAAgC,CAAC;AAEvF;;2DAE2D;AAC3D,eAAO,MAAM,YAAY,MAAO,aAAa,KAAG,MAGiC,CAAC;AA4BlF,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI/D;AAMD,MAAM,WAAW,YAAY;IAC3B,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;8EAC0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED;+BAC+B;AAC/B,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,+EAA+E;IAC/E,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB;gEAC4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;8CAE0C;IAC1C,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAC;CAClB;
|
|
1
|
+
{"version":3,"file":"completion-gate.d.ts","sourceRoot":"","sources":["../../../src/orgrt/completion-gate.ts"],"names":[],"mappings":"AACA;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AAEH,MAAM,MAAM,iBAAiB,GAAG,UAAU,GAAG,SAAS,GAAG,QAAQ,CAAC;AAClE,MAAM,MAAM,iBAAiB,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,GAAG,MAAM,CAAC;AAEzE,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,iBAAiB,CAAC;IAC3B,OAAO,CAAC,EAAE,iBAAiB,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB;;mFAE+E;IAC/E,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC;IACrB,gEAAgE;IAChE,iBAAiB,EAAE,MAAM,CAAC;IAC1B,qEAAqE;IACrE,iBAAiB,EAAE,MAAM,CAAC;IAC1B;;kEAE8D;IAC9D,cAAc,EAAE,OAAO,CAAC;IACxB;;;;sBAIkB;IAClB,cAAc,EAAE,OAAO,CAAC;CACzB;AAiDD;4DAC4D;AAC5D,wBAAgB,eAAe,CAAC,CAAC,EAAE,eAAe,GAAG,MAAM,GAAG,IAAI,CASjE;AAGD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6CG;AAEH;2BAC2B;AAC3B,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB;;;;;0BAKsB;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;4CAGwC;IACxC,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,iDAAiD;AACjD,eAAO,MAAM,YAAY,MAAO,aAAa,KAAG,MAA2B,CAAC;AAE5E;;eAEe;AACf,eAAO,MAAM,kBAAkB,MAAO,aAAa,KAAG,OAAgC,CAAC;AAEvF;;2DAE2D;AAC3D,eAAO,MAAM,YAAY,MAAO,aAAa,KAAG,MAGiC,CAAC;AA4BlF,4EAA4E;AAC5E,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAI/D;AAMD,MAAM,WAAW,YAAY;IAC3B,kDAAkD;IAClD,OAAO,EAAE,MAAM,CAAC;IAChB;8EAC0E;IAC1E,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,aAAa,EAAE,CAAC;CACzB;AAED;+BAC+B;AAC/B,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,MAAM,CAAC;IACZ,mDAAmD;IACnD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,2EAA2E;IAC3E,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,iBAAiB;IAChC,+EAA+E;IAC/E,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,CAAC,EAAE,YAAY,CAAC;IACxB;gEAC4D;IAC5D,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;8CAE0C;IAC1C,KAAK,CAAC,EAAE,SAAS,EAAE,CAAC;IACpB;2EACuE;IACvE,aAAa,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC;sEACkE;IAClE,cAAc,CAAC,EAAE,OAAO,CAAC;IACzB;;mEAE+D;IAC/D,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf,oCAAoC;IACpC,QAAQ,EAAE,MAAM,CAAC;CAClB;AAsDD;;qCAEqC;AACrC,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,iBAAiB,GAAG,MAAM,GAAG,IAAI,CAqErE"}
|
|
@@ -139,6 +139,34 @@ const EVIDENCE_SHAPE = 'Attach evidence: { headSha: "<the current commit sha>",
|
|
|
139
139
|
* acceptance checks; its acceptance commands prove the report exists. */
|
|
140
140
|
const REPORT_TASK_HINT = "If this task's job is to REPORT (QA, an audit) and these failures are what you found, they are findings, not acceptance checks: put them in `result` and send them to the coordinator, and make the acceptance commands prove the report exists and is complete (e.g. `test -s <report file>`, a grep for each required section).";
|
|
141
141
|
const normalizePath = (p) => p.trim().replace(/\/+$/, '');
|
|
142
|
+
/** A worktree path that is a template the role never filled in: a literal
|
|
143
|
+
* `<…>`/`{{…}}`, or (when it does not exist) an all-caps last segment like
|
|
144
|
+
* the rules' `SRC`. */
|
|
145
|
+
function isPlaceholderPath(path, exists) {
|
|
146
|
+
if (/[<>]|\{\{|\}\}/.test(path))
|
|
147
|
+
return true;
|
|
148
|
+
return exists === false && /(?:^|\/)[A-Z][A-Z0-9_]*$/.test(normalizePath(path));
|
|
149
|
+
}
|
|
150
|
+
/** The worktree head evidence is pinned to: the one at the resolved path,
|
|
151
|
+
* else — for a relative label — the worktree(s) whose path ends with it.
|
|
152
|
+
* 2.16.1 release run: roles pinned `worktree: "src"` for the release
|
|
153
|
+
* worktree at ORG_ROOT/.monomind/orgs/release/work/src, and 11 of 11 first
|
|
154
|
+
* closes were refused because "src" resolved to ORG_ROOT/src. */
|
|
155
|
+
function pinnedWorktrees(resolved, label, heads) {
|
|
156
|
+
const worktrees = heads.filter((h) => h.worktree);
|
|
157
|
+
const exact = worktrees.find((h) => normalizePath(h.worktree) === normalizePath(resolved));
|
|
158
|
+
if (exact)
|
|
159
|
+
return [exact];
|
|
160
|
+
if (!label || label.trim().startsWith('/'))
|
|
161
|
+
return [];
|
|
162
|
+
const tail = normalizePath(label).replace(/^(?:\.\/)+/, '');
|
|
163
|
+
if (!tail || tail === '.' || tail.split('/').includes('..'))
|
|
164
|
+
return [];
|
|
165
|
+
return worktrees.filter((h) => normalizePath(h.worktree).endsWith(`/${tail}`));
|
|
166
|
+
}
|
|
167
|
+
function unknownCommit(claimed, heads) {
|
|
168
|
+
return `org_task_done refused: headSha ${claimed} is an unknown commit (typo?) — git has no commit by that name in this repository. Copy it from \`git -C <worktree> rev-parse HEAD\` rather than retyping it. Current heads: ${describeHeads(heads)}.`;
|
|
169
|
+
}
|
|
142
170
|
function describeHeads(heads) {
|
|
143
171
|
const shown = heads
|
|
144
172
|
.slice(0, 8)
|
|
@@ -193,18 +221,28 @@ export function checkTaskEvidence(f) {
|
|
|
193
221
|
}
|
|
194
222
|
const matches = (h) => h.sha.trim().toLowerCase().startsWith(claimed);
|
|
195
223
|
if (ev.worktree) {
|
|
196
|
-
const
|
|
197
|
-
|
|
224
|
+
const pinned = pinnedWorktrees(ev.worktree, f.worktreeLabel, heads);
|
|
225
|
+
if (pinned.length > 1) {
|
|
226
|
+
return `org_task_done refused: worktree "${f.worktreeLabel}" is ambiguous — it fits ${pinned.length} worktrees of this repository: ${pinned.map((h) => h.worktree).join(', ')}. Pin the full path of the one you ran the checks in.`;
|
|
227
|
+
}
|
|
228
|
+
const wt = pinned[0];
|
|
198
229
|
if (!wt) {
|
|
199
230
|
const known = heads.filter((h) => h.worktree).map((h) => h.worktree);
|
|
231
|
+
if (isPlaceholderPath(ev.worktree, f.worktreeExists)) {
|
|
232
|
+
return `org_task_done refused: worktree "${ev.worktree}" is a placeholder, not a path — pin the real worktree path you ran the checks in (see \`git worktree list\`). Worktrees: ${known.join(', ') || 'none'}.`;
|
|
233
|
+
}
|
|
200
234
|
return `org_task_done refused: "${ev.worktree}" is not a worktree of this repository, so its HEAD cannot be checked. If you ran the checks somewhere else — a scratch dir, an installed tarball — pin \`worktree\` and \`headSha\` to the git worktree the tested artifact was BUILT FROM (and keep the scratch path in the command or output). Worktrees: ${known.join(', ') || 'none'}.`;
|
|
201
235
|
}
|
|
202
236
|
if (!matches(wt)) {
|
|
237
|
+
if (f.isKnownCommit && !f.isKnownCommit(claimed))
|
|
238
|
+
return unknownCommit(claimed, heads);
|
|
203
239
|
return `org_task_done refused: the evidence is STALE. It is pinned to ${claimed}, but the current head of ${wt.worktree} is ${wt.sha} — the tree moved after those checks ran, so they say nothing about the code being closed. Re-run the acceptance commands against the current head and attach the new output.`;
|
|
204
240
|
}
|
|
205
241
|
return null;
|
|
206
242
|
}
|
|
207
243
|
if (!heads.some(matches)) {
|
|
244
|
+
if (f.isKnownCommit && !f.isKnownCommit(claimed))
|
|
245
|
+
return unknownCommit(claimed, heads);
|
|
208
246
|
return `org_task_done refused: the evidence is STALE. It is pinned to ${claimed}, which is not the current head of any worktree or local branch (current heads: ${describeHeads(heads)}) — the tree moved after those checks ran, so they say nothing about the code being closed. Re-run the acceptance commands against the current head and attach the new output, with \`worktree\` naming where you ran them.`;
|
|
209
247
|
}
|
|
210
248
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"completion-gate.js","sourceRoot":"","sources":["../../../src/orgrt/completion-gate.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"completion-gate.js","sourceRoot":"","sources":["../../../src/orgrt/completion-gate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"copilot-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/copilot-runner.ts"],"names":[],"mappings":"AA8FA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"copilot-runner.d.ts","sourceRoot":"","sources":["../../../src/orgrt/copilot-runner.ts"],"names":[],"mappings":"AA8FA,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,WAAW,EAEjB,MAAM,mBAAmB,CAAC;AAgC3B;+CAC+C;AAC/C,MAAM,WAAW,YAAY;IAC3B,8DAA8D;IAC9D,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,YAAY,GAAG,SAAS,CAuBvE;AAgBD;;;;;;;GAOG;AACH,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,WAAW,GAAG,MAAM,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAkDD;gCACgC;AAChC,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG;IAAE,KAAK,EAAE,MAAM,EAAE,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAQ3F;AAcD,qBAAa,kBAAmB,YAAW,WAAW;IACxC,OAAO,CAAC,UAAU,CAAC;IAA/B,YAAoB,UAAU,CAAC,EAAE,MAAM,YAAA,EAAI;IAEpC,GAAG,CAAC,IAAI,EAAE,YAAY,GAAG,aAAa,CAAC,YAAY,CAAC,CAsG1D;IAED;;;;;;;OAOG;YACY,UAAU;CA8J1B"}
|
|
@@ -96,7 +96,7 @@ import { killOnAbort, } from './agent-runner.js';
|
|
|
96
96
|
import { maskedCommand } from './authority-mask.js';
|
|
97
97
|
import { classifyStderr } from './kimicode-runner.js';
|
|
98
98
|
import { omitAnthropicManagedKeys } from './provider.js';
|
|
99
|
-
import { buildToolProtocol,
|
|
99
|
+
import { buildToolProtocol, formatToolResults, parseToolCalls, runToolRound, TOOL_CALL_RE, } from './tool-fence.js';
|
|
100
100
|
const TURN_TIMEOUT_MS = 2 * 60 * 60 * 1000;
|
|
101
101
|
/** Distinct from TURN_TIMEOUT_MS: catches a hung first-run interactive prompt
|
|
102
102
|
* fast instead of waiting out the full turn timeout. Any output at all
|
|
@@ -230,7 +230,8 @@ export class CopilotAgentRunner {
|
|
|
230
230
|
// 'result' message must be the sum over all of them.
|
|
231
231
|
let promptInputTokens = 0;
|
|
232
232
|
let promptOutputTokens = 0;
|
|
233
|
-
|
|
233
|
+
// runToolRound ends this loop past the round cap (#326).
|
|
234
|
+
for (let round = 0;; round++) {
|
|
234
235
|
// Filled in by streamTurn as the subprocess runs and when it exits.
|
|
235
236
|
const outcome = {
|
|
236
237
|
exitCode: 1,
|
|
@@ -286,11 +287,10 @@ export class CopilotAgentRunner {
|
|
|
286
287
|
};
|
|
287
288
|
break;
|
|
288
289
|
}
|
|
289
|
-
|
|
290
|
-
|
|
291
|
-
|
|
292
|
-
|
|
293
|
-
};
|
|
290
|
+
const { results, note } = await runToolRound(args, calls, round);
|
|
291
|
+
if (note)
|
|
292
|
+
yield { type: 'assistant', text: note };
|
|
293
|
+
if (!results) {
|
|
294
294
|
yield {
|
|
295
295
|
type: 'result',
|
|
296
296
|
subtype: 'success',
|
|
@@ -299,9 +299,6 @@ export class CopilotAgentRunner {
|
|
|
299
299
|
};
|
|
300
300
|
break;
|
|
301
301
|
}
|
|
302
|
-
const results = [];
|
|
303
|
-
for (const call of calls)
|
|
304
|
-
results.push(await executeToolCall(args.tools, call, args.canUseTool));
|
|
305
302
|
nextPrompt = `${args.systemPrompt}${buildToolProtocol(args.tools)}\n\n---\n\n${formatToolResults(calls, results)}`;
|
|
306
303
|
}
|
|
307
304
|
}
|