@monoes/monomindcli 2.16.5 → 2.16.7
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/commands/agents/agent-capabilities.md +2 -5
- package/.claude/commands/coordination/task-orchestrate.md +0 -1
- package/.claude/commands/hooks/post-edit.md +1 -1
- package/.claude/commands/hooks/post-task.md +2 -3
- package/.claude/commands/hooks/pre-edit.md +0 -2
- package/.claude/commands/hooks/session-end.md +4 -4
- package/.claude/commands/monoswarm/consensus.md +1 -1
- package/.claude/commands/monoswarm/memory.md +1 -1
- package/.claude/commands/monoswarm/monoswarm.md +1 -1
- package/.claude/commands/monoswarm/spawn.md +1 -1
- package/.claude/commands/optimization/auto-topology.md +6 -9
- package/.claude/commands/optimization/performance-optimize.md +23 -39
- package/.claude/helpers/pick-rank.cjs +118 -9
- package/dist/src/catalog/projection.d.ts.map +1 -1
- package/dist/src/catalog/projection.js +2 -1
- package/dist/src/catalog/projection.js.map +1 -1
- package/dist/src/commands/agent-exec.d.ts.map +1 -1
- package/dist/src/commands/agent-exec.js +10 -1
- package/dist/src/commands/agent-exec.js.map +1 -1
- package/dist/src/commands/cleanup-plan.d.ts +3 -2
- package/dist/src/commands/cleanup-plan.d.ts.map +1 -1
- package/dist/src/commands/cleanup-plan.js +25 -5
- package/dist/src/commands/cleanup-plan.js.map +1 -1
- package/dist/src/commands/doctor.js +1 -1
- package/dist/src/commands/doctor.js.map +1 -1
- package/dist/src/commands/hooks-core-commands.d.ts.map +1 -1
- package/dist/src/commands/hooks-core-commands.js +10 -42
- package/dist/src/commands/hooks-core-commands.js.map +1 -1
- package/dist/src/commands/hooks-extended-commands.d.ts.map +1 -1
- package/dist/src/commands/hooks-extended-commands.js +3 -4
- package/dist/src/commands/hooks-extended-commands.js.map +1 -1
- package/dist/src/commands/hooks-routing-commands.d.ts.map +1 -1
- package/dist/src/commands/hooks-routing-commands.js +13 -24
- package/dist/src/commands/hooks-routing-commands.js.map +1 -1
- package/dist/src/commands/hooks-workers.d.ts.map +1 -1
- package/dist/src/commands/hooks-workers.js +0 -5
- package/dist/src/commands/hooks-workers.js.map +1 -1
- package/dist/src/commands/hooks.d.ts.map +1 -1
- package/dist/src/commands/hooks.js +9 -16
- package/dist/src/commands/hooks.js.map +1 -1
- package/dist/src/commands/monograph.d.ts.map +1 -1
- package/dist/src/commands/monograph.js +24 -2
- package/dist/src/commands/monograph.js.map +1 -1
- package/dist/src/commands/org.d.ts.map +1 -1
- package/dist/src/commands/org.js +29 -1
- package/dist/src/commands/org.js.map +1 -1
- package/dist/src/commands/platforms.js +2 -1
- package/dist/src/commands/platforms.js.map +1 -1
- package/dist/src/init/asset-maps.d.ts +46 -0
- package/dist/src/init/asset-maps.d.ts.map +1 -0
- package/dist/src/init/asset-maps.js +177 -0
- package/dist/src/init/asset-maps.js.map +1 -0
- package/dist/src/init/copy-assets.d.ts.map +1 -1
- package/dist/src/init/copy-assets.js +4 -1
- package/dist/src/init/copy-assets.js.map +1 -1
- package/dist/src/init/executor.d.ts.map +1 -1
- package/dist/src/init/executor.js +6 -3
- package/dist/src/init/executor.js.map +1 -1
- package/dist/src/init/file-guard.d.ts +6 -0
- package/dist/src/init/file-guard.d.ts.map +1 -1
- package/dist/src/init/file-guard.js +27 -11
- package/dist/src/init/file-guard.js.map +1 -1
- package/dist/src/init/fs-helpers.d.ts +63 -0
- package/dist/src/init/fs-helpers.d.ts.map +1 -0
- package/dist/src/init/fs-helpers.js +198 -0
- package/dist/src/init/fs-helpers.js.map +1 -0
- package/dist/src/init/init-manifest.d.ts +106 -0
- package/dist/src/init/init-manifest.d.ts.map +1 -0
- package/dist/src/init/init-manifest.js +222 -0
- package/dist/src/init/init-manifest.js.map +1 -0
- package/dist/src/init/shared.d.ts +3 -201
- package/dist/src/init/shared.d.ts.map +1 -1
- package/dist/src/init/shared.js +7 -573
- package/dist/src/init/shared.js.map +1 -1
- package/dist/src/init/upgrade.d.ts.map +1 -1
- package/dist/src/init/upgrade.js +4 -2
- package/dist/src/init/upgrade.js.map +1 -1
- package/dist/src/init/write-antigravity.d.ts.map +1 -1
- package/dist/src/init/write-antigravity.js +2 -1
- package/dist/src/init/write-antigravity.js.map +1 -1
- package/dist/src/init/write-capabilities.js +2 -1
- package/dist/src/init/write-capabilities.js.map +1 -1
- package/dist/src/init/write-claude.d.ts +3 -5
- package/dist/src/init/write-claude.d.ts.map +1 -1
- package/dist/src/init/write-claude.js +6 -210
- package/dist/src/init/write-claude.js.map +1 -1
- package/dist/src/init/write-codex.js +1 -1
- package/dist/src/init/write-codex.js.map +1 -1
- package/dist/src/init/write-kimicode.d.ts.map +1 -1
- package/dist/src/init/write-kimicode.js +6 -2
- package/dist/src/init/write-kimicode.js.map +1 -1
- package/dist/src/init/write-opencode.d.ts.map +1 -1
- package/dist/src/init/write-opencode.js +5 -4
- package/dist/src/init/write-opencode.js.map +1 -1
- package/dist/src/init/write-runtime-config.d.ts.map +1 -1
- package/dist/src/init/write-runtime-config.js +2 -1
- package/dist/src/init/write-runtime-config.js.map +1 -1
- package/dist/src/init/write-settings.d.ts +9 -0
- package/dist/src/init/write-settings.d.ts.map +1 -0
- package/dist/src/init/write-settings.js +217 -0
- package/dist/src/init/write-settings.js.map +1 -0
- package/dist/src/mcp-tools/hooks-intelligence.d.ts.map +1 -1
- package/dist/src/mcp-tools/hooks-intelligence.js +2 -1
- package/dist/src/mcp-tools/hooks-intelligence.js.map +1 -1
- package/dist/src/mcp-tools/hooks-routing.d.ts.map +1 -1
- package/dist/src/mcp-tools/hooks-routing.js +11 -11
- package/dist/src/mcp-tools/hooks-routing.js.map +1 -1
- package/dist/src/mcp-tools/platforms-tools.js +1 -1
- package/dist/src/mcp-tools/platforms-tools.js.map +1 -1
- package/dist/src/monovector/command-outcomes.d.ts +2 -1
- package/dist/src/monovector/command-outcomes.d.ts.map +1 -1
- package/dist/src/monovector/command-outcomes.js +2 -2
- package/dist/src/monovector/command-outcomes.js.map +1 -1
- package/dist/src/orgrt/approvals.d.ts +25 -0
- package/dist/src/orgrt/approvals.d.ts.map +1 -1
- package/dist/src/orgrt/approvals.js +51 -2
- package/dist/src/orgrt/approvals.js.map +1 -1
- package/dist/src/orgrt/budget-closure.d.ts +27 -0
- package/dist/src/orgrt/budget-closure.d.ts.map +1 -0
- package/dist/src/orgrt/budget-closure.js +179 -0
- package/dist/src/orgrt/budget-closure.js.map +1 -0
- package/dist/src/orgrt/daemon.d.ts +14 -2
- package/dist/src/orgrt/daemon.d.ts.map +1 -1
- package/dist/src/orgrt/daemon.js +37 -2
- package/dist/src/orgrt/daemon.js.map +1 -1
- package/dist/src/orgrt/decisions.d.ts +8 -0
- package/dist/src/orgrt/decisions.d.ts.map +1 -1
- package/dist/src/orgrt/decisions.js +7 -1
- package/dist/src/orgrt/decisions.js.map +1 -1
- package/dist/src/orgrt/policy.d.ts +6 -0
- package/dist/src/orgrt/policy.d.ts.map +1 -1
- package/dist/src/orgrt/policy.js +5 -0
- package/dist/src/orgrt/policy.js.map +1 -1
- package/dist/src/orgrt/runner-registry.d.ts +11 -2
- package/dist/src/orgrt/runner-registry.d.ts.map +1 -1
- package/dist/src/orgrt/runner-registry.js +11 -34
- package/dist/src/orgrt/runner-registry.js.map +1 -1
- package/dist/src/orgrt/task-dag.d.ts +13 -0
- package/dist/src/orgrt/task-dag.d.ts.map +1 -1
- package/dist/src/orgrt/task-dag.js +29 -0
- package/dist/src/orgrt/task-dag.js.map +1 -1
- package/dist/src/orgrt/version-probe.d.ts +43 -0
- package/dist/src/orgrt/version-probe.d.ts.map +1 -0
- package/dist/src/orgrt/version-probe.js +136 -0
- package/dist/src/orgrt/version-probe.js.map +1 -0
- package/dist/src/platform-adapters/locations.d.ts +12 -0
- package/dist/src/platform-adapters/locations.d.ts.map +1 -0
- package/dist/src/platform-adapters/locations.js +57 -0
- package/dist/src/platform-adapters/locations.js.map +1 -0
- package/dist/src/platform-adapters/merge.d.ts +13 -0
- package/dist/src/platform-adapters/merge.d.ts.map +1 -1
- package/dist/src/platform-adapters/merge.js +33 -1
- package/dist/src/platform-adapters/merge.js.map +1 -1
- package/dist/src/platform-adapters/migration.d.ts.map +1 -1
- package/dist/src/platform-adapters/migration.js +10 -5
- package/dist/src/platform-adapters/migration.js.map +1 -1
- package/dist/src/platform-adapters/mutation.js +1 -1
- package/dist/src/platform-adapters/mutation.js.map +1 -1
- package/dist/src/platform-adapters/operations.d.ts +3 -16
- package/dist/src/platform-adapters/operations.d.ts.map +1 -1
- package/dist/src/platform-adapters/operations.js +43 -167
- package/dist/src/platform-adapters/operations.js.map +1 -1
- package/dist/src/platform-adapters/owned-files.d.ts +23 -0
- package/dist/src/platform-adapters/owned-files.d.ts.map +1 -0
- package/dist/src/platform-adapters/owned-files.js +64 -0
- package/dist/src/platform-adapters/owned-files.js.map +1 -0
- package/dist/src/platform-adapters/platform-doctor.d.ts +9 -0
- package/dist/src/platform-adapters/platform-doctor.d.ts.map +1 -0
- package/dist/src/platform-adapters/platform-doctor.js +117 -0
- package/dist/src/platform-adapters/platform-doctor.js.map +1 -0
- package/dist/src/platform-adapters/renderers/skills.d.ts.map +1 -1
- package/dist/src/platform-adapters/renderers/skills.js +5 -2
- package/dist/src/platform-adapters/renderers/skills.js.map +1 -1
- package/dist/src/platform-adapters/shared-surface.d.ts +7 -4
- package/dist/src/platform-adapters/shared-surface.d.ts.map +1 -1
- package/dist/src/platform-adapters/shared-surface.js +9 -5
- package/dist/src/platform-adapters/shared-surface.js.map +1 -1
- package/dist/src/platform-adapters/types.d.ts +24 -1
- package/dist/src/platform-adapters/types.d.ts.map +1 -1
- package/dist/src/protocol-capabilities.d.ts +4 -1
- package/dist/src/protocol-capabilities.d.ts.map +1 -1
- package/dist/src/protocol-capabilities.js +4 -0
- package/dist/src/protocol-capabilities.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +4 -4
|
@@ -0,0 +1,179 @@
|
|
|
1
|
+
// packages/@monomind/cli/src/orgrt/budget-closure.ts
|
|
2
|
+
//
|
|
3
|
+
// #343: a role whose budget_usd / budget_tokens runs out has its session
|
|
4
|
+
// closed (session.ts, mailbox.close('usd-budget' | 'token-budget')). Tasks
|
|
5
|
+
// assigned to it used to stay 'ready' forever behind a bus warning that the
|
|
6
|
+
// assignee was "crashed or unreachable", so the coordinator took it for a
|
|
7
|
+
// dispatch stall. Here: such tasks are held as 'blocked' with the reason, the
|
|
8
|
+
// coordinator is told, a role nearing its budget_usd is flagged, and a hot
|
|
9
|
+
// reload that raises the budget reopens the role with its spend kept.
|
|
10
|
+
import { captureCheckpoint } from './checkpoint.js';
|
|
11
|
+
import { dispatchReadyTasks, queueDispatch } from './decisions.js';
|
|
12
|
+
import { taskTag } from './loadouts.js';
|
|
13
|
+
import { isRecoverableCloseReason } from './mailbox.js';
|
|
14
|
+
/** Share of budget_usd at which the coordinator is warned, once per role per run. */
|
|
15
|
+
export const BUDGET_WARN_FRACTION = 0.8;
|
|
16
|
+
/** Which of the role's own caps it has spent, or undefined when neither. */
|
|
17
|
+
function exhaustedDetail(policy) {
|
|
18
|
+
if (policy.overBudgetUsd)
|
|
19
|
+
return `budget_usd exhausted ($${policy.usageUsd.toFixed(2)} / $${policy.policy.maxUsd})`;
|
|
20
|
+
if (policy.overBudget)
|
|
21
|
+
return `budget_tokens exhausted (${policy.budgetedUsage} / ${policy.policy.maxTokens})`;
|
|
22
|
+
return undefined;
|
|
23
|
+
}
|
|
24
|
+
/** Why `roleId`'s session is closed for budget, or undefined when it is not.
|
|
25
|
+
* A role closed by the org-wide run_config.budget_tokens ceiling carries the
|
|
26
|
+
* same close reason without being over its own caps. */
|
|
27
|
+
export function budgetClosureDetail(running, roleId) {
|
|
28
|
+
const rt = running.agents.get(roleId);
|
|
29
|
+
if (!rt?.mailbox.isClosed || !isRecoverableCloseReason(rt.mailbox.closeReason))
|
|
30
|
+
return undefined;
|
|
31
|
+
return (exhaustedDetail(rt.policy) ??
|
|
32
|
+
(running.budgetClosed?.has(roleId) ? 'budget exhausted' : 'org-wide budget_tokens exhausted'));
|
|
33
|
+
}
|
|
34
|
+
const holdReason = (roleId, detail) => `assignee "${roleId}" closed: ${detail}`;
|
|
35
|
+
const remedy = (roleId) => `Raise budget_usd / budget_tokens for "${roleId}" in the org definition and hot-reload it (\`monomind org reload\`) — the role reopens with its spend so far kept — or reassign the work to another role.`;
|
|
36
|
+
/** Tell the coordinator (or `preferred`, e.g. the task's creator) — never the
|
|
37
|
+
* closed role itself. Uses the same coalesced dispatch as task notices. */
|
|
38
|
+
function notify(running, closedRole, line, preferred) {
|
|
39
|
+
const to = preferred && preferred !== closedRole ? preferred : running.bossRoleId;
|
|
40
|
+
if (!to || to === closedRole)
|
|
41
|
+
return;
|
|
42
|
+
queueDispatch(running, to, line);
|
|
43
|
+
}
|
|
44
|
+
/** Bus hook (daemon.ts's org subscriber): note a per-role budget closure and
|
|
45
|
+
* warn on the approach to budget_usd. */
|
|
46
|
+
export function onBudgetBusEvent(running, e) {
|
|
47
|
+
if (!e.from)
|
|
48
|
+
return;
|
|
49
|
+
if (e.type === 'status' && e.reason === 'budget-exhausted')
|
|
50
|
+
noteBudgetClosure(running, e.from);
|
|
51
|
+
else if (e.type === 'usage')
|
|
52
|
+
warnNearBudget(running, e.from);
|
|
53
|
+
}
|
|
54
|
+
/** The role's session is about to close for budget (session.ts emits the
|
|
55
|
+
* status event right before mailbox.close). Hold its open tasks — one it was
|
|
56
|
+
* working would otherwise sit 'running' with no one on it — and tell the
|
|
57
|
+
* coordinator. Both caps can trip in one turn: noted once. */
|
|
58
|
+
function noteBudgetClosure(running, roleId) {
|
|
59
|
+
const rt = running.agents.get(roleId);
|
|
60
|
+
if (!rt || !running.taskDag)
|
|
61
|
+
return;
|
|
62
|
+
if (running.budgetClosed?.has(roleId) && rt.mailbox.isClosed)
|
|
63
|
+
return;
|
|
64
|
+
(running.budgetClosed ??= new Set()).add(roleId);
|
|
65
|
+
const detail = exhaustedDetail(rt.policy) ?? 'budget exhausted';
|
|
66
|
+
const held = [];
|
|
67
|
+
for (const t of running.taskDag.all()) {
|
|
68
|
+
if (t.assignee !== roleId || (t.status !== 'ready' && t.status !== 'running'))
|
|
69
|
+
continue;
|
|
70
|
+
held.push(running.taskDag.holdForAssignee(t.id, holdReason(roleId, detail)));
|
|
71
|
+
}
|
|
72
|
+
const tasks = held.length
|
|
73
|
+
? ` Its open task(s) are now blocked: ${held.map((t) => `${t.id} ("${t.title}")`).join(', ')}.`
|
|
74
|
+
: '';
|
|
75
|
+
notify(running, roleId, `[budget] "${roleId}" was closed: ${detail}. Tasks assigned to it stay blocked until its budget is raised.${tasks} ${remedy(roleId)}`);
|
|
76
|
+
}
|
|
77
|
+
function warnNearBudget(running, roleId) {
|
|
78
|
+
const policy = running.agents.get(roleId)?.policy;
|
|
79
|
+
const cap = policy?.policy.maxUsd;
|
|
80
|
+
if (!policy || cap == null || running.budgetWarned?.has(roleId))
|
|
81
|
+
return;
|
|
82
|
+
const spent = policy.usageUsd;
|
|
83
|
+
// At or over the cap the closure notice says it instead.
|
|
84
|
+
if (spent < cap * BUDGET_WARN_FRACTION || spent >= cap)
|
|
85
|
+
return;
|
|
86
|
+
(running.budgetWarned ??= new Set()).add(roleId);
|
|
87
|
+
const pct = Math.round((spent / cap) * 100);
|
|
88
|
+
running.bus.emit({
|
|
89
|
+
type: 'audit',
|
|
90
|
+
from: roleId,
|
|
91
|
+
reason: 'budget-warning',
|
|
92
|
+
msg: `"${roleId}" has spent $${spent.toFixed(2)} of its $${cap} budget_usd (${pct}%)`,
|
|
93
|
+
data: { roleId, spentUsd: spent, budgetUsd: cap },
|
|
94
|
+
});
|
|
95
|
+
notify(running, '', `[budget] "${roleId}" has spent $${spent.toFixed(2)} of its $${cap} budget_usd (${pct}%). At the cap its session closes and tasks assigned to it are blocked. ${remedy(roleId)}`);
|
|
96
|
+
}
|
|
97
|
+
/** dispatchReadyTasks, for a task whose assignee's mailbox is closed: when it
|
|
98
|
+
* was closed for budget, hold the task with the reason, warn, tell the task's
|
|
99
|
+
* creator (or the coordinator) and return true. The task leaves 'ready', so
|
|
100
|
+
* this happens once per task. */
|
|
101
|
+
export function holdForBudgetClosedAssignee(running, task) {
|
|
102
|
+
const detail = budgetClosureDetail(running, task.assignee);
|
|
103
|
+
if (!detail || !running.taskDag)
|
|
104
|
+
return false;
|
|
105
|
+
const reason = holdReason(task.assignee, detail);
|
|
106
|
+
running.taskDag.holdForAssignee(task.id, reason);
|
|
107
|
+
running.bus.emit({
|
|
108
|
+
type: 'audit',
|
|
109
|
+
from: 'dag',
|
|
110
|
+
reason: 'dispatch-recipient-unavailable',
|
|
111
|
+
msg: `task ${task.id} not dispatched — assignee "${task.assignee}" budget exhausted (${detail}); task blocked`,
|
|
112
|
+
data: { taskId: task.id, assignee: task.assignee, blockedReason: reason },
|
|
113
|
+
});
|
|
114
|
+
notify(running, task.assignee, `${taskTag(task)} BLOCKED — "${task.title}" was not dispatched: ${reason}. ${remedy(task.assignee)}`, task.createdBy);
|
|
115
|
+
return true;
|
|
116
|
+
}
|
|
117
|
+
/** Put every budget-held task whose assignee is no longer budget-closed back
|
|
118
|
+
* to 'ready' — after a reload reopened it, a respawn replaced it, or a resume
|
|
119
|
+
* left its recoverable close open. Called at the top of dispatchReadyTasks. */
|
|
120
|
+
export function releaseBudgetHolds(running) {
|
|
121
|
+
if (!running.taskDag)
|
|
122
|
+
return;
|
|
123
|
+
for (const t of running.taskDag.all()) {
|
|
124
|
+
if (t.status !== 'blocked' || !t.heldForAssignee)
|
|
125
|
+
continue;
|
|
126
|
+
if (budgetClosureDetail(running, t.assignee) === undefined)
|
|
127
|
+
running.taskDag.releaseAssigneeHold(t.id);
|
|
128
|
+
}
|
|
129
|
+
}
|
|
130
|
+
/** After a hot reload applied new caps: reopen each role closed for its own
|
|
131
|
+
* budget that is no longer over it, keeping its spend (the new cap applies
|
|
132
|
+
* to the total), and re-dispatch its tasks. A role still over its cap stays
|
|
133
|
+
* closed; its held tasks get the new numbers in their reason. */
|
|
134
|
+
export function reopenBudgetClosedRoles(daemon, org, running) {
|
|
135
|
+
const reopened = [];
|
|
136
|
+
for (const roleId of [...(running.budgetClosed ?? [])]) {
|
|
137
|
+
const rt = running.agents.get(roleId);
|
|
138
|
+
const role = running.def.roles.find((r) => r.id === roleId);
|
|
139
|
+
if (!rt || !role || !running.spawnRole)
|
|
140
|
+
continue;
|
|
141
|
+
if (!rt.mailbox.isClosed || !isRecoverableCloseReason(rt.mailbox.closeReason)) {
|
|
142
|
+
running.budgetClosed?.delete(roleId);
|
|
143
|
+
continue;
|
|
144
|
+
}
|
|
145
|
+
const detail = exhaustedDetail(rt.policy);
|
|
146
|
+
if (detail) {
|
|
147
|
+
for (const t of running.taskDag?.all() ?? []) {
|
|
148
|
+
if (t.assignee === roleId && t.status === 'blocked' && t.heldForAssignee)
|
|
149
|
+
running.taskDag?.holdForAssignee(t.id, holdReason(roleId, detail));
|
|
150
|
+
}
|
|
151
|
+
continue;
|
|
152
|
+
}
|
|
153
|
+
// Resume the role the way a checkpoint resume does (a budget close is
|
|
154
|
+
// recoverable, so the new mailbox opens), one generation on.
|
|
155
|
+
const rc = captureCheckpoint(running).roleState[roleId];
|
|
156
|
+
running.agents.delete(roleId);
|
|
157
|
+
running.spawnRole(role, { ...rc, generation: rc.generation + 1, status: 'running' });
|
|
158
|
+
const next = running.agents.get(roleId);
|
|
159
|
+
if (!next) {
|
|
160
|
+
running.agents.set(roleId, rt);
|
|
161
|
+
continue;
|
|
162
|
+
}
|
|
163
|
+
next.policy.setTokenUsage(rt.policy.tokenUsage);
|
|
164
|
+
next.policy.setUsageUsd(rt.policy.usageUsd);
|
|
165
|
+
running.budgetClosed?.delete(roleId);
|
|
166
|
+
reopened.push(roleId);
|
|
167
|
+
running.bus.emit({
|
|
168
|
+
type: 'audit',
|
|
169
|
+
from: roleId,
|
|
170
|
+
reason: 'role-budget-reopened',
|
|
171
|
+
msg: `"${roleId}" reopened after its budget was raised ($${rt.policy.usageUsd.toFixed(2)} spent so far${role.budget_usd != null ? ` / $${role.budget_usd}` : ''})`,
|
|
172
|
+
data: { roleId, spentUsd: rt.policy.usageUsd, budgetUsd: role.budget_usd ?? null },
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
if (reopened.length)
|
|
176
|
+
dispatchReadyTasks(daemon, org, running);
|
|
177
|
+
return reopened;
|
|
178
|
+
}
|
|
179
|
+
//# sourceMappingURL=budget-closure.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"budget-closure.js","sourceRoot":"","sources":["../../../src/orgrt/budget-closure.ts"],"names":[],"mappings":"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"}
|
|
@@ -141,8 +141,9 @@ export interface RunningOrg {
|
|
|
141
141
|
busEvents: () => BusEvent[];
|
|
142
142
|
/** Roles not yet spawned — spawned lazily on first message. */
|
|
143
143
|
pendingRoles?: Map<string, OrgRole>;
|
|
144
|
-
/** Spawn a pending role on demand
|
|
145
|
-
|
|
144
|
+
/** Spawn a pending role on demand — or, with a checkpoint, resume one
|
|
145
|
+
* (budget-closure.ts reopens a budget-closed role this way). */
|
|
146
|
+
spawnRole?: (role: OrgRole, roleCheckpoint?: RoleCheckpoint) => void;
|
|
146
147
|
/** Git worktree path if workspace: 'worktree' — cleaned up on stop. */
|
|
147
148
|
worktreePath?: string;
|
|
148
149
|
/** Task DAG for structured work ordering. */
|
|
@@ -193,6 +194,12 @@ export interface RunningOrg {
|
|
|
193
194
|
* bound on decisions.ts's nudgeOpenTasksAtTurnEnd. Cleared for a task when
|
|
194
195
|
* it is dispatched again, so each dispatch is worth one nudge at most. */
|
|
195
196
|
nudgedOpenTasks?: Set<string>;
|
|
197
|
+
/** #343: roles whose session closed on their own budget_usd/budget_tokens
|
|
198
|
+
* this run, reopened by a reload that raises it (budget-closure.ts). */
|
|
199
|
+
budgetClosed?: Set<string>;
|
|
200
|
+
/** #343: roles the coordinator was warned about nearing budget_usd — once
|
|
201
|
+
* per role per run. */
|
|
202
|
+
budgetWarned?: Set<string>;
|
|
196
203
|
/** #304: why this run is stopping, set by stopOrg before the org is removed from
|
|
197
204
|
* `this.orgs`. Read by the role loop so a planned stop is logged with one stable
|
|
198
205
|
* wording instead of whichever abort string the SDK produced. */
|
|
@@ -299,6 +306,10 @@ export declare class OrgDaemon {
|
|
|
299
306
|
resolvedBy?: string;
|
|
300
307
|
resolvedAt?: number;
|
|
301
308
|
}[]>;
|
|
309
|
+
/** @internal #345: per org, the actions `org run --auto-approve` pre-approved
|
|
310
|
+
* for the current run (approvals.ts's checkApproval). Kept across a boss
|
|
311
|
+
* auto-restart, replaced by every other start. */
|
|
312
|
+
runAutoApprove: Map<string, string[]>;
|
|
302
313
|
/** @internal */ approvalLocks: Map<string, Promise<unknown>>;
|
|
303
314
|
/** @internal */ gatesLocks: Map<string, Promise<unknown>>;
|
|
304
315
|
/** @internal */ questionsLocks: Map<string, Promise<unknown>>;
|
|
@@ -354,6 +365,7 @@ export declare class OrgDaemon {
|
|
|
354
365
|
private workspaceSetting;
|
|
355
366
|
startOrg(name: string, taskOverride?: string, options?: {
|
|
356
367
|
resume?: boolean;
|
|
368
|
+
autoApprove?: string[];
|
|
357
369
|
}): Promise<RunningOrg>;
|
|
358
370
|
/** The actual startOrg implementation. Split out of startOrg() so the
|
|
359
371
|
* reservation guard above runs synchronously, before any `await` in here —
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../../../src/orgrt/daemon.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"daemon.d.ts","sourceRoot":"","sources":["../../../src/orgrt/daemon.ts"],"names":[],"mappings":"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"}
|
package/dist/src/orgrt/daemon.js
CHANGED
|
@@ -12,6 +12,7 @@ import { AntigravityAgentRunner } from './antigravity-runner.js';
|
|
|
12
12
|
import * as approvalOps from './approvals.js';
|
|
13
13
|
import { wakeDueBlockRechecks } from './block-recheck.js';
|
|
14
14
|
import { BrokerLease, normalizeCredential } from './broker.js';
|
|
15
|
+
import { onBudgetBusEvent, reopenBudgetClosedRoles } from './budget-closure.js';
|
|
15
16
|
import { OrgBus } from './bus.js';
|
|
16
17
|
import { captureCheckpoint, generateChecksum, isCheckpointExpired, migrateCheckpoint, restoredRoleStatus, restoreMailboxQueue, validateCheckpoint, } from './checkpoint.js';
|
|
17
18
|
import * as checkpointOps from './checkpoint-ops.js';
|
|
@@ -274,6 +275,10 @@ export class OrgDaemon {
|
|
|
274
275
|
* either registered and spawn duplicate runs. */
|
|
275
276
|
/** @internal */ startingOrgs = new Set();
|
|
276
277
|
/** @internal */ approvals = new Map();
|
|
278
|
+
/** @internal #345: per org, the actions `org run --auto-approve` pre-approved
|
|
279
|
+
* for the current run (approvals.ts's checkApproval). Kept across a boss
|
|
280
|
+
* auto-restart, replaced by every other start. */
|
|
281
|
+
runAutoApprove = new Map();
|
|
277
282
|
/** @internal */ approvalLocks = new Map();
|
|
278
283
|
/** @internal */ gatesLocks = new Map();
|
|
279
284
|
/** @internal */ questionsLocks = new Map();
|
|
@@ -350,7 +355,17 @@ export class OrgDaemon {
|
|
|
350
355
|
// kind and policy. Fields are replaced on the live role object (sessions
|
|
351
356
|
// read tool_providers at their next start, checkApproval reads policy
|
|
352
357
|
// live) and a running role's PolicyEngine gets the new policy now.
|
|
353
|
-
|
|
358
|
+
// #343: budget_usd / budget_tokens too — the live PolicyEngine gets the
|
|
359
|
+
// new caps with its spend kept, and a role closed for budget reopens
|
|
360
|
+
// below once it is no longer over them.
|
|
361
|
+
const RELOADABLE_ROLE_FIELDS = [
|
|
362
|
+
'tool_providers',
|
|
363
|
+
'endpoint',
|
|
364
|
+
'kind',
|
|
365
|
+
'policy',
|
|
366
|
+
'budget_usd',
|
|
367
|
+
'budget_tokens',
|
|
368
|
+
];
|
|
354
369
|
for (const next of newDef.roles) {
|
|
355
370
|
const live = running.def.roles.find((r) => r.id === next.id);
|
|
356
371
|
if (!live)
|
|
@@ -375,9 +390,15 @@ export class OrgDaemon {
|
|
|
375
390
|
}
|
|
376
391
|
if (field === 'policy')
|
|
377
392
|
running.agents.get(next.id)?.policy.updatePolicy(next.policy ?? {});
|
|
393
|
+
if (field === 'budget_usd' || field === 'budget_tokens')
|
|
394
|
+
running.agents.get(next.id)?.policy.setBudgetCaps({
|
|
395
|
+
maxTokens: live.policy?.maxTokens ?? computeReplacementBudget(running.def, next.id),
|
|
396
|
+
maxUsd: live.policy?.maxUsd ?? live.budget_usd,
|
|
397
|
+
});
|
|
378
398
|
changed.push(`role:${next.id}:${field}`);
|
|
379
399
|
}
|
|
380
400
|
}
|
|
401
|
+
const reopened = reopenBudgetClosedRoles(this, name, running);
|
|
381
402
|
const existingRoleIds = new Set(running.def.roles.map((r) => r.id));
|
|
382
403
|
const newRoleIds = new Set(newDef.roles.map((r) => r.id));
|
|
383
404
|
for (const role of newDef.roles) {
|
|
@@ -399,7 +420,7 @@ export class OrgDaemon {
|
|
|
399
420
|
running.bus.emit({
|
|
400
421
|
type: 'audit',
|
|
401
422
|
reason: 'hot-reload',
|
|
402
|
-
msg: `org def reloaded: ${changed.length} fields changed, ${newRoles.length} new roles, ${removedRoles.length} removed roles`,
|
|
423
|
+
msg: `org def reloaded: ${changed.length} fields changed, ${newRoles.length} new roles, ${removedRoles.length} removed roles${reopened.length ? `, reopened ${reopened.join(', ')}` : ''}`,
|
|
403
424
|
data: { changed, newRoles, removedRoles },
|
|
404
425
|
});
|
|
405
426
|
return { changed, newRoles, removedRoles };
|
|
@@ -482,6 +503,15 @@ export class OrgDaemon {
|
|
|
482
503
|
if (this.startingOrgs.has(name))
|
|
483
504
|
throw new Error(`org ${name} already starting`);
|
|
484
505
|
this.startingOrgs.add(name);
|
|
506
|
+
// #345: the run's --auto-approve list — kept by a boss auto-restart like
|
|
507
|
+
// the crash counter, replaced by any other start. Set only after the
|
|
508
|
+
// guards above, so a rejected start can't rewrite a live run's list.
|
|
509
|
+
if (!this.restarting.has(name)) {
|
|
510
|
+
if (options?.autoApprove?.length)
|
|
511
|
+
this.runAutoApprove.set(name, options.autoApprove);
|
|
512
|
+
else
|
|
513
|
+
this.runAutoApprove.delete(name);
|
|
514
|
+
}
|
|
485
515
|
try {
|
|
486
516
|
return await this.startOrgInner(name, taskOverride, options);
|
|
487
517
|
}
|
|
@@ -535,6 +565,9 @@ export class OrgDaemon {
|
|
|
535
565
|
const bp = resolveOrgDefBlueprints(parsedDef, this.root);
|
|
536
566
|
// {{home}} / {{org_root}} in policy paths, before any root or sandbox sees them.
|
|
537
567
|
const def = expandOrgPolicyPathVars(bp.def, promptVarsFor(this.root));
|
|
568
|
+
const autoApproveError = approvalOps.unknownAutoApproveError(options?.autoApprove ?? [], def.roles);
|
|
569
|
+
if (autoApproveError)
|
|
570
|
+
throw new Error(autoApproveError);
|
|
538
571
|
let run;
|
|
539
572
|
let checkpoint;
|
|
540
573
|
if (options?.resume) {
|
|
@@ -799,6 +832,8 @@ export class OrgDaemon {
|
|
|
799
832
|
}
|
|
800
833
|
}
|
|
801
834
|
}
|
|
835
|
+
// #343: hold a budget-closed role's tasks, warn near budget_usd.
|
|
836
|
+
onBudgetBusEvent(running, e);
|
|
802
837
|
// Track last message ID for threading responses
|
|
803
838
|
if ((e.type === 'message' || e.type === 'xorg') && e.from) {
|
|
804
839
|
const runtime = running.agents.get(e.from);
|