@monoes/monomindcli 2.11.0 → 2.11.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/commands/coordination/agent-spawn.md +1 -1
- package/.claude/commands/mastermind/review.md +1 -1
- package/.claude/helpers/statusline.cjs +9 -4
- package/.claude/helpers/token-tracker.cjs +5 -2
- package/.claude/skills/mastermind-adapters/SKILL.md +6 -5
- package/.claude/skills/mastermind-agents/SKILL.md +7 -6
- package/.claude/skills/mastermind-createorg/SKILL.md +43 -16
- package/.claude/skills/mastermind-env/SKILL.md +1 -1
- package/.claude/skills/mastermind-invite-landing/SKILL.md +1 -1
- package/.claude/skills/mastermind-new-agent/SKILL.md +5 -5
- package/.claude/skills/mastermind-review/SKILL.md +1 -1
- package/.claude/skills/monomind/browse.md +1 -1
- package/bin/cli.js +60 -2
- package/dist/src/capabilities/cap-code.d.ts.map +1 -1
- package/dist/src/capabilities/cap-code.js +65 -3
- package/dist/src/capabilities/cap-code.js.map +1 -1
- package/dist/src/commands/analyze-diff.d.ts.map +1 -1
- package/dist/src/commands/analyze-diff.js +16 -6
- package/dist/src/commands/analyze-diff.js.map +1 -1
- package/dist/src/commands/autopilot.d.ts.map +1 -1
- package/dist/src/commands/autopilot.js +8 -1
- package/dist/src/commands/autopilot.js.map +1 -1
- package/dist/src/commands/config.d.ts.map +1 -1
- package/dist/src/commands/config.js +10 -4
- package/dist/src/commands/config.js.map +1 -1
- package/dist/src/commands/mcp.d.ts.map +1 -1
- package/dist/src/commands/mcp.js +7 -1
- package/dist/src/commands/mcp.js.map +1 -1
- package/dist/src/commands/monograph.d.ts.map +1 -1
- package/dist/src/commands/monograph.js +5 -3
- 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 +8 -3
- package/dist/src/commands/org-observe.js.map +1 -1
- package/dist/src/commands/org.d.ts +37 -0
- package/dist/src/commands/org.d.ts.map +1 -1
- package/dist/src/commands/org.js +99 -42
- package/dist/src/commands/org.js.map +1 -1
- package/dist/src/commands/platforms.d.ts.map +1 -1
- package/dist/src/commands/platforms.js +83 -15
- package/dist/src/commands/platforms.js.map +1 -1
- package/dist/src/commands/security-scan.d.ts +27 -0
- package/dist/src/commands/security-scan.d.ts.map +1 -1
- package/dist/src/commands/security-scan.js +192 -127
- package/dist/src/commands/security-scan.js.map +1 -1
- package/dist/src/init/codex-generator.d.ts.map +1 -1
- package/dist/src/init/codex-generator.js +7 -1
- package/dist/src/init/codex-generator.js.map +1 -1
- package/dist/src/init/kimi-generator.d.ts.map +1 -1
- package/dist/src/init/kimi-generator.js +7 -1
- package/dist/src/init/kimi-generator.js.map +1 -1
- package/dist/src/init/managed-block.d.ts +7 -0
- package/dist/src/init/managed-block.d.ts.map +1 -0
- package/dist/src/init/managed-block.js +188 -0
- package/dist/src/init/managed-block.js.map +1 -0
- package/dist/src/init/opencode-generator.d.ts.map +1 -1
- package/dist/src/init/opencode-generator.js +7 -1
- package/dist/src/init/opencode-generator.js.map +1 -1
- package/dist/src/init/shared.d.ts +1 -28
- package/dist/src/init/shared.d.ts.map +1 -1
- package/dist/src/init/shared.js +4 -42
- package/dist/src/init/shared.js.map +1 -1
- package/dist/src/init/statusline-generator.d.ts.map +1 -1
- package/dist/src/init/statusline-generator.js +9 -4
- package/dist/src/init/statusline-generator.js.map +1 -1
- package/dist/src/knowledge/eval/model-presence.d.ts +3 -0
- package/dist/src/knowledge/eval/model-presence.d.ts.map +1 -1
- package/dist/src/knowledge/eval/model-presence.js +25 -1
- package/dist/src/knowledge/eval/model-presence.js.map +1 -1
- package/dist/src/memory/embedding-operations.d.ts.map +1 -1
- package/dist/src/memory/embedding-operations.js +3 -3
- package/dist/src/memory/embedding-operations.js.map +1 -1
- package/dist/src/memory/entity-name-key.d.ts +28 -0
- package/dist/src/memory/entity-name-key.d.ts.map +1 -0
- package/dist/src/memory/entity-name-key.js +71 -0
- package/dist/src/memory/entity-name-key.js.map +1 -0
- package/dist/src/memory/memory-bridge.d.ts +7 -0
- package/dist/src/memory/memory-bridge.d.ts.map +1 -1
- package/dist/src/memory/memory-bridge.js +76 -33
- package/dist/src/memory/memory-bridge.js.map +1 -1
- package/dist/src/memory/memory-kg.d.ts.map +1 -1
- package/dist/src/memory/memory-kg.js +61 -0
- package/dist/src/memory/memory-kg.js.map +1 -1
- package/dist/src/memory/reranker-head.d.ts +37 -0
- package/dist/src/memory/reranker-head.d.ts.map +1 -0
- package/dist/src/memory/reranker-head.js +105 -0
- package/dist/src/memory/reranker-head.js.map +1 -0
- 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 +4 -0
- package/dist/src/orgrt/agent-runner.js.map +1 -1
- package/dist/src/orgrt/cli-sandbox.d.ts +61 -0
- package/dist/src/orgrt/cli-sandbox.d.ts.map +1 -0
- package/dist/src/orgrt/cli-sandbox.js +75 -0
- package/dist/src/orgrt/cli-sandbox.js.map +1 -0
- package/dist/src/orgrt/codex-runner.d.ts.map +1 -1
- package/dist/src/orgrt/codex-runner.js +7 -3
- package/dist/src/orgrt/codex-runner.js.map +1 -1
- package/dist/src/orgrt/daemon.d.ts +3 -0
- package/dist/src/orgrt/daemon.d.ts.map +1 -1
- package/dist/src/orgrt/daemon.js +27 -0
- package/dist/src/orgrt/daemon.js.map +1 -1
- package/dist/src/orgrt/git-guard.d.ts +63 -0
- package/dist/src/orgrt/git-guard.d.ts.map +1 -0
- package/dist/src/orgrt/git-guard.js +329 -0
- package/dist/src/orgrt/git-guard.js.map +1 -0
- package/dist/src/orgrt/grok-runner.d.ts.map +1 -1
- package/dist/src/orgrt/grok-runner.js +7 -1
- package/dist/src/orgrt/grok-runner.js.map +1 -1
- package/dist/src/orgrt/opencode-runner.d.ts.map +1 -1
- package/dist/src/orgrt/opencode-runner.js +60 -11
- package/dist/src/orgrt/opencode-runner.js.map +1 -1
- package/dist/src/orgrt/policy-git.d.ts +2 -0
- package/dist/src/orgrt/policy-git.d.ts.map +1 -0
- package/dist/src/orgrt/policy-git.js +216 -0
- package/dist/src/orgrt/policy-git.js.map +1 -0
- package/dist/src/orgrt/policy.d.ts.map +1 -1
- package/dist/src/orgrt/policy.js +15 -176
- package/dist/src/orgrt/policy.js.map +1 -1
- package/dist/src/orgrt/questions.d.ts +13 -0
- package/dist/src/orgrt/questions.d.ts.map +1 -1
- package/dist/src/orgrt/questions.js +21 -1
- package/dist/src/orgrt/questions.js.map +1 -1
- 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 +11 -1
- package/dist/src/orgrt/reporting.js.map +1 -1
- package/dist/src/orgrt/role-sandbox.d.ts +87 -0
- package/dist/src/orgrt/role-sandbox.d.ts.map +1 -0
- package/dist/src/orgrt/role-sandbox.js +342 -0
- package/dist/src/orgrt/role-sandbox.js.map +1 -0
- package/dist/src/orgrt/session.d.ts +17 -6
- package/dist/src/orgrt/session.d.ts.map +1 -1
- package/dist/src/orgrt/session.js +75 -40
- package/dist/src/orgrt/session.js.map +1 -1
- package/dist/src/orgrt/shell-scan.d.ts +27 -0
- package/dist/src/orgrt/shell-scan.d.ts.map +1 -0
- package/dist/src/orgrt/shell-scan.js +453 -0
- package/dist/src/orgrt/shell-scan.js.map +1 -0
- package/dist/src/orgrt/task-dag.d.ts.map +1 -1
- package/dist/src/orgrt/task-dag.js +8 -0
- package/dist/src/orgrt/task-dag.js.map +1 -1
- package/dist/src/orgrt/templates.d.ts.map +1 -1
- package/dist/src/orgrt/templates.js +11 -5
- package/dist/src/orgrt/templates.js.map +1 -1
- package/dist/src/orgrt/types.d.ts +33 -0
- package/dist/src/orgrt/types.d.ts.map +1 -1
- package/dist/src/orgrt/types.js +17 -0
- package/dist/src/orgrt/types.js.map +1 -1
- package/dist/src/orgrt/vercel-providers.d.ts +5 -0
- package/dist/src/orgrt/vercel-providers.d.ts.map +1 -1
- package/dist/src/orgrt/vercel-providers.js +6 -1
- package/dist/src/orgrt/vercel-providers.js.map +1 -1
- package/dist/src/platform-adapters/migration.d.ts.map +1 -1
- package/dist/src/platform-adapters/migration.js +40 -2
- package/dist/src/platform-adapters/migration.js.map +1 -1
- package/dist/src/pricing/model-pricing.d.ts +0 -12
- package/dist/src/pricing/model-pricing.d.ts.map +1 -1
- package/dist/src/pricing/model-pricing.js +19 -4
- package/dist/src/pricing/model-pricing.js.map +1 -1
- package/dist/src/ui/collector.mjs +7 -4
- package/dist/src/ui/routes-org.mjs +2 -1
- package/dist/src/ui/server.mjs +7 -4
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
|
@@ -0,0 +1,453 @@
|
|
|
1
|
+
// packages/@monomind/cli/src/orgrt/shell-scan.ts
|
|
2
|
+
const MAX_SHELL_NESTING = 32;
|
|
3
|
+
/**
|
|
4
|
+
* Minimal quote-aware split of a shell command into segments (one per
|
|
5
|
+
* `;`, `|`, `&`, `(`, `)` or newline) of whitespace-separated tokens, with
|
|
6
|
+
* quotes and backslash escapes REMOVED from token text. Not a shell parser:
|
|
7
|
+
* it exists only so the classifier sees `sh -c "git push"` as the tokens
|
|
8
|
+
* `sh`, `-c`, `git push`, sees `git pu""sh` as `git push`, and does NOT see
|
|
9
|
+
* `git commit -m "fix: git push hook"` as a second git call.
|
|
10
|
+
*
|
|
11
|
+
* The shell runs a command substitution wherever it appears, so `$(…)`,
|
|
12
|
+
* backticks and `<(…)`/`>(…)` are scanned recursively — unquoted, inside
|
|
13
|
+
* double quotes, in assignments, in `${…}` and in unquoted here-document
|
|
14
|
+
* bodies — and their commands become segments of their own (#257: only an
|
|
15
|
+
* unquoted `$(` used to be seen). The token keeps the raw substitution text,
|
|
16
|
+
* so `git $(echo push)` stays unclassifiable. Only single quotes and quoted
|
|
17
|
+
* here-documents are literal. Comments, here-document bodies and `$'…'` are
|
|
18
|
+
* consumed the way the shell consumes them: a stray `'` in any of them used to
|
|
19
|
+
* swallow every following line into one "quoted" token.
|
|
20
|
+
*/
|
|
21
|
+
export function shellSegments(cmd) {
|
|
22
|
+
const out = { segments: [] };
|
|
23
|
+
scanShell(cmd, 0, out, { depth: 0 });
|
|
24
|
+
return out;
|
|
25
|
+
}
|
|
26
|
+
/** The backtick substitution opening at `cmd[at]`: its body with the escapes
|
|
27
|
+
* the shell removes there, and the index of the closing backtick (-1 when
|
|
28
|
+
* unterminated). The first unescaped backtick closes it, quotes or not. */
|
|
29
|
+
function backtickBody(cmd, at, inDq) {
|
|
30
|
+
let body = '';
|
|
31
|
+
for (let j = at + 1; j < cmd.length; j++) {
|
|
32
|
+
if (cmd[j] === '`')
|
|
33
|
+
return { body, end: j };
|
|
34
|
+
const next = cmd[j + 1];
|
|
35
|
+
if (cmd[j] === '\\' &&
|
|
36
|
+
next !== undefined &&
|
|
37
|
+
('$`\\'.includes(next) || (inDq && next === '"'))) {
|
|
38
|
+
body += next;
|
|
39
|
+
j++;
|
|
40
|
+
}
|
|
41
|
+
else
|
|
42
|
+
body += cmd[j];
|
|
43
|
+
}
|
|
44
|
+
return { body, end: -1 };
|
|
45
|
+
}
|
|
46
|
+
/** The here-document body starting at `from`, up to its delimiter line, and
|
|
47
|
+
* the index just past that line. An unterminated body runs to the end. */
|
|
48
|
+
function readHeredoc(cmd, from, delim, stripTabs) {
|
|
49
|
+
const lines = [];
|
|
50
|
+
let pos = from;
|
|
51
|
+
while (pos < cmd.length) {
|
|
52
|
+
const nl = cmd.indexOf('\n', pos);
|
|
53
|
+
const lineEnd = nl === -1 ? cmd.length : nl;
|
|
54
|
+
const line = cmd.slice(pos, lineEnd);
|
|
55
|
+
pos = lineEnd + 1;
|
|
56
|
+
if ((stripTabs ? line.replace(/^\t+/, '') : line) === delim)
|
|
57
|
+
return { body: lines.join('\n'), end: Math.min(pos, cmd.length) };
|
|
58
|
+
lines.push(line);
|
|
59
|
+
}
|
|
60
|
+
return { body: lines.join('\n'), end: cmd.length };
|
|
61
|
+
}
|
|
62
|
+
/** An unquoted here-document body is expanded, and quotes in it are literal:
|
|
63
|
+
* `'$(git push)'` there still runs. */
|
|
64
|
+
function scanHeredocBody(body, out, depth) {
|
|
65
|
+
for (let i = 0; i < body.length; i++) {
|
|
66
|
+
if (body[i] === '\\')
|
|
67
|
+
i++;
|
|
68
|
+
else if (body[i] === '$' && body[i + 1] === '(') {
|
|
69
|
+
const arith = body[i + 2] === '(';
|
|
70
|
+
i =
|
|
71
|
+
scanShell(body, i + 2, out, {
|
|
72
|
+
close: true,
|
|
73
|
+
arith,
|
|
74
|
+
nested: true,
|
|
75
|
+
depth: depth + 1,
|
|
76
|
+
}) - 1;
|
|
77
|
+
}
|
|
78
|
+
else if (body[i] === '`') {
|
|
79
|
+
const { body: inner, end } = backtickBody(body, i, false);
|
|
80
|
+
if (end < 0) {
|
|
81
|
+
out.opaque ??= 'unterminated backtick substitution';
|
|
82
|
+
return;
|
|
83
|
+
}
|
|
84
|
+
scanShell(inner, 0, out, { nested: true, depth: depth + 1 });
|
|
85
|
+
i = end;
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
}
|
|
89
|
+
/** Scans `cmd` from `start` into `out`; returns the index just past the
|
|
90
|
+
* closing `)` when `ctx.close`, else `cmd.length`. */
|
|
91
|
+
function scanShell(cmd, start, out, ctx) {
|
|
92
|
+
const fail = (why) => {
|
|
93
|
+
out.opaque ??= why;
|
|
94
|
+
};
|
|
95
|
+
if (ctx.depth > MAX_SHELL_NESTING) {
|
|
96
|
+
fail('shell constructs nested too deeply');
|
|
97
|
+
return cmd.length;
|
|
98
|
+
}
|
|
99
|
+
let seg = [];
|
|
100
|
+
let lineSegs = [seg]; // segments begun on this line: a here-document body is their input
|
|
101
|
+
let cur = '';
|
|
102
|
+
let has = false; // current token has content (so `""` yields an empty token)
|
|
103
|
+
let literal = false; // current token used quotes/escapes, so `"2">x` is a word, not an fd
|
|
104
|
+
let redirectTarget = false; // next token is a redirection target, not an argument
|
|
105
|
+
let quote = null;
|
|
106
|
+
let bracketDepth = 0; // an unquoted `[` is open: `a[1<<2]=x` holds a shift, not a here-document
|
|
107
|
+
let heredocStrip = null; // the next word is a here-document delimiter (`<<-` strips tabs)
|
|
108
|
+
const heredocs = [];
|
|
109
|
+
// `case … in pat) … ;; esac`: the `)` that ends an arm's pattern is not a
|
|
110
|
+
// closing paren, so a `case` inside `$(…)` used to end the substitution early
|
|
111
|
+
// and the scan gave up on it (#261). A frame walks 'word' (waiting for the
|
|
112
|
+
// `in`) → 'pattern' (the next word is the arm's pattern, or the `esac` of a
|
|
113
|
+
// case with no arms) → 'arm' (waiting for the `)`) → 'body' (until `;;`,
|
|
114
|
+
// which returns to 'pattern', or the `esac` that pops the frame).
|
|
115
|
+
const caseStack = [];
|
|
116
|
+
const caseKeyword = (word, atCommandPos) => {
|
|
117
|
+
const top = caseStack.length - 1;
|
|
118
|
+
const state = caseStack[top];
|
|
119
|
+
if (state === 'word') {
|
|
120
|
+
if (word === 'in')
|
|
121
|
+
caseStack[top] = 'pattern';
|
|
122
|
+
}
|
|
123
|
+
else if (state === 'pattern') {
|
|
124
|
+
if (word === 'esac')
|
|
125
|
+
caseStack.pop();
|
|
126
|
+
else
|
|
127
|
+
caseStack[top] = 'arm';
|
|
128
|
+
}
|
|
129
|
+
else if (!atCommandPos) {
|
|
130
|
+
/* an argument, never a keyword */
|
|
131
|
+
}
|
|
132
|
+
else if (word === 'esac' && state === 'body')
|
|
133
|
+
caseStack.pop();
|
|
134
|
+
else if (word === 'case' && state !== 'arm')
|
|
135
|
+
caseStack.push('word');
|
|
136
|
+
};
|
|
137
|
+
const flush = () => {
|
|
138
|
+
if (has && heredocStrip !== null) {
|
|
139
|
+
heredocs.push({ delim: cur, quoted: literal, strip: heredocStrip, owner: seg });
|
|
140
|
+
heredocStrip = null;
|
|
141
|
+
}
|
|
142
|
+
else if (has && !redirectTarget) {
|
|
143
|
+
if (!literal)
|
|
144
|
+
caseKeyword(cur, seg.length === 0);
|
|
145
|
+
seg.push(cur);
|
|
146
|
+
}
|
|
147
|
+
if (has)
|
|
148
|
+
redirectTarget = false;
|
|
149
|
+
cur = '';
|
|
150
|
+
has = false;
|
|
151
|
+
literal = false;
|
|
152
|
+
};
|
|
153
|
+
const endSegment = () => {
|
|
154
|
+
flush();
|
|
155
|
+
redirectTarget = false;
|
|
156
|
+
bracketDepth = 0;
|
|
157
|
+
if (seg.length)
|
|
158
|
+
out.segments.push(seg);
|
|
159
|
+
seg = [];
|
|
160
|
+
lineSegs.push(seg);
|
|
161
|
+
};
|
|
162
|
+
const finish = (end) => {
|
|
163
|
+
endSegment();
|
|
164
|
+
if (ctx.nested && heredocStrip !== null)
|
|
165
|
+
fail('here-document operator without a delimiter');
|
|
166
|
+
else if (ctx.nested && heredocs.length > 0) {
|
|
167
|
+
// `echo $(cat <<EOF)` reads the body from the lines after the OUTER
|
|
168
|
+
// command's line, so hand the here-documents back with the segments they
|
|
169
|
+
// feed — the caller has the later lines (#261).
|
|
170
|
+
if (ctx.pending)
|
|
171
|
+
for (const h of heredocs)
|
|
172
|
+
ctx.pending.push({ ...h, siblings: lineSegs.slice(lineSegs.indexOf(h.owner)) });
|
|
173
|
+
else
|
|
174
|
+
fail('here-document left open inside a substitution');
|
|
175
|
+
}
|
|
176
|
+
return end;
|
|
177
|
+
};
|
|
178
|
+
// `$(…)`, `<(…)` or `>(…)` at cmd[at]: its commands become segments, its raw text stays in the token
|
|
179
|
+
const substitution = (at) => {
|
|
180
|
+
const arith = cmd[at] === '$' && cmd[at + 2] === '(';
|
|
181
|
+
const pending = [];
|
|
182
|
+
const end = scanShell(cmd, at + 2, out, {
|
|
183
|
+
close: true,
|
|
184
|
+
arith,
|
|
185
|
+
nested: true,
|
|
186
|
+
pending,
|
|
187
|
+
depth: ctx.depth + 1,
|
|
188
|
+
});
|
|
189
|
+
heredocs.push(...pending);
|
|
190
|
+
cur += cmd.slice(at, end);
|
|
191
|
+
has = true;
|
|
192
|
+
return end - 1;
|
|
193
|
+
};
|
|
194
|
+
/** A `${…}` at cmd[at] (`$` then `{`): quoting RESTARTS inside it, so
|
|
195
|
+
* `"${x:-"$(cmd)"}"` runs cmd and the closing `"` of the default is not the
|
|
196
|
+
* end of the outer quote (#261). Only a nested `${` nests — a bare `{` does
|
|
197
|
+
* not, so `${x:-{a}` ends at that `}`. The raw text stays in the token. */
|
|
198
|
+
const paramExpansion = (at) => {
|
|
199
|
+
let depth = 1;
|
|
200
|
+
let q = null;
|
|
201
|
+
let i = at + 2;
|
|
202
|
+
for (; i < cmd.length; i++) {
|
|
203
|
+
const c = cmd[i];
|
|
204
|
+
if (q === "'") {
|
|
205
|
+
if (c === "'")
|
|
206
|
+
q = null;
|
|
207
|
+
}
|
|
208
|
+
else if (c === '\\' && i + 1 < cmd.length)
|
|
209
|
+
i++;
|
|
210
|
+
else if (c === '$' && cmd[i + 1] === '(') {
|
|
211
|
+
i =
|
|
212
|
+
scanShell(cmd, i + 2, out, {
|
|
213
|
+
close: true,
|
|
214
|
+
arith: cmd[i + 2] === '(',
|
|
215
|
+
nested: true,
|
|
216
|
+
depth: ctx.depth + 1,
|
|
217
|
+
}) - 1;
|
|
218
|
+
}
|
|
219
|
+
else if ((c === '<' || c === '>') && cmd[i + 1] === '(') {
|
|
220
|
+
// `<(…)` runs even inside `${x:-…}`
|
|
221
|
+
i =
|
|
222
|
+
scanShell(cmd, i + 2, out, {
|
|
223
|
+
close: true,
|
|
224
|
+
nested: true,
|
|
225
|
+
depth: ctx.depth + 1,
|
|
226
|
+
}) - 1;
|
|
227
|
+
}
|
|
228
|
+
else if (c === '`') {
|
|
229
|
+
const { body, end } = backtickBody(cmd, i, q === '"');
|
|
230
|
+
if (end < 0) {
|
|
231
|
+
fail('unterminated backtick substitution');
|
|
232
|
+
return cmd.length;
|
|
233
|
+
}
|
|
234
|
+
scanShell(body, 0, out, { nested: true, depth: ctx.depth + 1 });
|
|
235
|
+
i = end;
|
|
236
|
+
}
|
|
237
|
+
else if (q === '"') {
|
|
238
|
+
if (c === '"')
|
|
239
|
+
q = null;
|
|
240
|
+
}
|
|
241
|
+
else if (c === '"' || c === "'")
|
|
242
|
+
q = c;
|
|
243
|
+
else if (c === '$' && cmd[i + 1] === '{') {
|
|
244
|
+
depth++;
|
|
245
|
+
i++;
|
|
246
|
+
}
|
|
247
|
+
else if (c === '}' && --depth === 0)
|
|
248
|
+
break;
|
|
249
|
+
}
|
|
250
|
+
has = true;
|
|
251
|
+
if (i >= cmd.length) {
|
|
252
|
+
fail('unterminated ${…}');
|
|
253
|
+
cur += cmd.slice(at);
|
|
254
|
+
return cmd.length;
|
|
255
|
+
}
|
|
256
|
+
cur += cmd.slice(at, i + 1);
|
|
257
|
+
return i;
|
|
258
|
+
};
|
|
259
|
+
const backtick = (at, inDq) => {
|
|
260
|
+
const { body, end } = backtickBody(cmd, at, inDq);
|
|
261
|
+
if (end < 0) {
|
|
262
|
+
fail('unterminated backtick substitution');
|
|
263
|
+
return cmd.length;
|
|
264
|
+
}
|
|
265
|
+
scanShell(body, 0, out, { nested: true, depth: ctx.depth + 1 });
|
|
266
|
+
cur += cmd.slice(at, end + 1);
|
|
267
|
+
has = true;
|
|
268
|
+
return end;
|
|
269
|
+
};
|
|
270
|
+
const newline = (at) => {
|
|
271
|
+
flush();
|
|
272
|
+
if (heredocStrip !== null) {
|
|
273
|
+
fail('here-document operator without a delimiter');
|
|
274
|
+
heredocStrip = null;
|
|
275
|
+
}
|
|
276
|
+
let pos = at + 1;
|
|
277
|
+
for (const h of heredocs) {
|
|
278
|
+
const { body, end } = readHeredoc(cmd, pos, h.delim, h.strip);
|
|
279
|
+
pos = end;
|
|
280
|
+
if (!h.quoted)
|
|
281
|
+
scanHeredocBody(body, out, ctx.depth);
|
|
282
|
+
// the body is stdin for its line's pipeline: `sh <<EOF`, `cat <<EOF | sh`
|
|
283
|
+
for (const s of h.siblings ?? lineSegs.slice(lineSegs.indexOf(h.owner)))
|
|
284
|
+
if (s.length)
|
|
285
|
+
s.push(body);
|
|
286
|
+
}
|
|
287
|
+
heredocs.length = 0;
|
|
288
|
+
endSegment();
|
|
289
|
+
lineSegs = [seg];
|
|
290
|
+
return pos - 1;
|
|
291
|
+
};
|
|
292
|
+
for (let i = start; i < cmd.length; i++) {
|
|
293
|
+
const c = cmd[i];
|
|
294
|
+
if (quote === "'" && !ctx.arith) {
|
|
295
|
+
if (c === quote)
|
|
296
|
+
quote = null;
|
|
297
|
+
else
|
|
298
|
+
cur += c;
|
|
299
|
+
continue;
|
|
300
|
+
}
|
|
301
|
+
if (quote) {
|
|
302
|
+
// double quotes — and single quotes inside arithmetic, which still expand: `$(( '$(x)' ))`
|
|
303
|
+
if (c === quote)
|
|
304
|
+
quote = null;
|
|
305
|
+
else if (c === '\\' && i + 1 < cmd.length)
|
|
306
|
+
cur += cmd[++i];
|
|
307
|
+
else if (c === '$' && cmd[i + 1] === '(')
|
|
308
|
+
i = substitution(i);
|
|
309
|
+
else if (c === '`')
|
|
310
|
+
i = backtick(i, quote === '"');
|
|
311
|
+
else if (c === '$' && cmd[i + 1] === '{')
|
|
312
|
+
i = paramExpansion(i);
|
|
313
|
+
else
|
|
314
|
+
cur += c;
|
|
315
|
+
continue;
|
|
316
|
+
}
|
|
317
|
+
const procSub = (c === '<' || c === '>') && cmd[i + 1] === '(';
|
|
318
|
+
if (c === '"' || c === "'") {
|
|
319
|
+
quote = c;
|
|
320
|
+
has = true;
|
|
321
|
+
literal = true;
|
|
322
|
+
}
|
|
323
|
+
else if (c === '$' && cmd[i + 1] === "'" && !ctx.arith) {
|
|
324
|
+
// ANSI-C quoting: `\'` does not close it
|
|
325
|
+
let j = i + 2;
|
|
326
|
+
while (j < cmd.length && cmd[j] !== "'")
|
|
327
|
+
j += cmd[j] === '\\' ? 2 : 1;
|
|
328
|
+
if (j >= cmd.length)
|
|
329
|
+
fail('unterminated quote');
|
|
330
|
+
cur += cmd.slice(i + 2, j);
|
|
331
|
+
i = j;
|
|
332
|
+
has = true;
|
|
333
|
+
literal = true;
|
|
334
|
+
}
|
|
335
|
+
else if (c === '\\' && i + 1 < cmd.length) {
|
|
336
|
+
cur += cmd[++i];
|
|
337
|
+
has = true;
|
|
338
|
+
literal = true;
|
|
339
|
+
}
|
|
340
|
+
else if (c === '$' && cmd[i + 1] === '(')
|
|
341
|
+
i = substitution(i);
|
|
342
|
+
else if (c === '`')
|
|
343
|
+
i = backtick(i, false);
|
|
344
|
+
else if (c === '$' && cmd[i + 1] === '{')
|
|
345
|
+
i = paramExpansion(i);
|
|
346
|
+
else if (procSub) {
|
|
347
|
+
flush();
|
|
348
|
+
i = substitution(i);
|
|
349
|
+
}
|
|
350
|
+
else if (c === '<' || c === '>') {
|
|
351
|
+
// Redirection (`2>/dev/null`, `>out`, `2>&1`, `<in`): the fd number and
|
|
352
|
+
// the target are not arguments, and counting them misclassifies a
|
|
353
|
+
// `git config` read as a write. Unquoted only — `"2">x` passes "2".
|
|
354
|
+
if (/^\d+$/.test(cur) && !literal) {
|
|
355
|
+
cur = '';
|
|
356
|
+
has = false;
|
|
357
|
+
}
|
|
358
|
+
else
|
|
359
|
+
flush();
|
|
360
|
+
let op = c;
|
|
361
|
+
while (i + 1 < cmd.length && '<>&|'.includes(cmd[i + 1]))
|
|
362
|
+
op += cmd[++i];
|
|
363
|
+
if (op === '<<' && cmd[i + 1] === '-')
|
|
364
|
+
op += cmd[++i];
|
|
365
|
+
if (op !== '<<' && op !== '<<-') {
|
|
366
|
+
// a here-string's word is content (`sh <<<"git push"`), keep it visible
|
|
367
|
+
redirectTarget = !op.startsWith('<<<');
|
|
368
|
+
}
|
|
369
|
+
else if (ctx.arith || bracketDepth > 0) {
|
|
370
|
+
// `$((1<<2))`, `a[1<<2]=x`: a shift, so no here-document is opened and
|
|
371
|
+
// the lines that follow are ordinary commands the scan reads as such
|
|
372
|
+
// (#261: it used to give up as soon as ANY newline followed).
|
|
373
|
+
redirectTarget = true;
|
|
374
|
+
}
|
|
375
|
+
else
|
|
376
|
+
heredocStrip = op === '<<-';
|
|
377
|
+
}
|
|
378
|
+
else if (c === '#' && !has && (i === start || ' \t\n;&|()<>'.includes(cmd[i - 1]))) {
|
|
379
|
+
if (ctx.arith)
|
|
380
|
+
fail('`#` inside arithmetic');
|
|
381
|
+
// A comment (a `#` starting a word after a blank or operator — not after
|
|
382
|
+
// e.g. a no-break space) runs to the end of the line, and its quotes and
|
|
383
|
+
// parens mean nothing to the shell. Its words stay visible to the classifier.
|
|
384
|
+
const nl = cmd.indexOf('\n', i);
|
|
385
|
+
const end = nl === -1 ? cmd.length : nl;
|
|
386
|
+
const words = cmd
|
|
387
|
+
.slice(i, end)
|
|
388
|
+
.split(/[\s"'`$()<>;|&\\{}]+/)
|
|
389
|
+
.filter(Boolean);
|
|
390
|
+
if (words.length)
|
|
391
|
+
out.segments.push(words);
|
|
392
|
+
i = end - 1;
|
|
393
|
+
}
|
|
394
|
+
else if (c === '[' || c === ']') {
|
|
395
|
+
bracketDepth = Math.max(0, bracketDepth + (c === '[' ? 1 : -1));
|
|
396
|
+
cur += c;
|
|
397
|
+
has = true;
|
|
398
|
+
}
|
|
399
|
+
else if (c === '\n')
|
|
400
|
+
i = newline(i);
|
|
401
|
+
else if (c === '(') {
|
|
402
|
+
// the optional `(` that opens a case pattern is not a subshell
|
|
403
|
+
if (caseStack[caseStack.length - 1] === 'pattern' && !has)
|
|
404
|
+
continue;
|
|
405
|
+
endSegment();
|
|
406
|
+
const arith = ctx.arith || cmd[i + 1] === '(';
|
|
407
|
+
i =
|
|
408
|
+
scanShell(cmd, i + 1, out, {
|
|
409
|
+
close: true,
|
|
410
|
+
arith,
|
|
411
|
+
nested: true,
|
|
412
|
+
depth: ctx.depth + 1,
|
|
413
|
+
}) - 1;
|
|
414
|
+
}
|
|
415
|
+
else if (c === ')') {
|
|
416
|
+
flush(); // the word before it may be the `esac` that ends the case
|
|
417
|
+
const arm = caseStack[caseStack.length - 1];
|
|
418
|
+
if (arm === 'arm' || arm === 'pattern') {
|
|
419
|
+
// the `)` that ends an arm's pattern, not the end of `$(…)`
|
|
420
|
+
endSegment();
|
|
421
|
+
caseStack[caseStack.length - 1] = 'body';
|
|
422
|
+
}
|
|
423
|
+
else if (ctx.close)
|
|
424
|
+
return finish(i + 1);
|
|
425
|
+
else
|
|
426
|
+
endSegment();
|
|
427
|
+
}
|
|
428
|
+
else if (';|&'.includes(c)) {
|
|
429
|
+
flush(); // ditto: `esac;;` leaves the inner case before the outer arm ends
|
|
430
|
+
const top = caseStack.length - 1;
|
|
431
|
+
// `;;`, `;&` and `;;&` all leave an arm's body for the next pattern
|
|
432
|
+
if (c === ';' && caseStack[top] === 'body' && ';&'.includes(cmd[i + 1] ?? '')) {
|
|
433
|
+
caseStack[top] = 'pattern';
|
|
434
|
+
i++;
|
|
435
|
+
if (cmd[i] === ';' && cmd[i + 1] === '&')
|
|
436
|
+
i++;
|
|
437
|
+
}
|
|
438
|
+
endSegment();
|
|
439
|
+
}
|
|
440
|
+
else if (/\s/.test(c))
|
|
441
|
+
flush();
|
|
442
|
+
else {
|
|
443
|
+
cur += c;
|
|
444
|
+
has = true;
|
|
445
|
+
}
|
|
446
|
+
}
|
|
447
|
+
if (quote)
|
|
448
|
+
fail('unterminated quote');
|
|
449
|
+
if (ctx.close)
|
|
450
|
+
fail('unterminated command substitution or subshell');
|
|
451
|
+
return finish(cmd.length);
|
|
452
|
+
}
|
|
453
|
+
//# sourceMappingURL=shell-scan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"shell-scan.js","sourceRoot":"","sources":["../../../src/orgrt/shell-scan.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-dag.d.ts","sourceRoot":"","sources":["../../../src/orgrt/task-dag.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,OAAO,GACP,SAAS,GACT,SAAS,GACT,MAAM,GACN,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,WAAW,CAAC;AAEhB,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;+CAM2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAKD,qBAAa,OAAO;IAClB,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,OAAO,CAAK;IAEpB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,GAAG,OAAO,CAqBjE;IAED,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"task-dag.d.ts","sourceRoot":"","sources":["../../../src/orgrt/task-dag.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,aAAa,GACrB,SAAS,GACT,OAAO,GACP,SAAS,GACT,SAAS,GACT,MAAM,GACN,QAAQ,GACR,OAAO,GACP,QAAQ,GACR,WAAW,CAAC;AAEhB,MAAM,WAAW,OAAO;IACtB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,MAAM,EAAE,aAAa,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,SAAS,EAAE,MAAM,CAAC;IAClB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB;;;;;;+CAM2C;IAC3C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAKD,qBAAa,OAAO;IAClB,OAAO,CAAC,KAAK,CAA8B;IAC3C,OAAO,CAAC,OAAO,CAAK;IAEpB,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,EAAO,GAAG,OAAO,CAqBjE;IAED,QAAQ,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,CAiB/C;IAED,IAAI,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,CAMtC;IAED,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAM5B;IAED;;;0EAGsE;IACtE,OAAO,CAAC,EAAE,EAAE,MAAM,GAAG,IAAI,CAMxB;IAED;;;yCAGqC;IACrC,KAAK,CAAC,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAU3D;IAED;;yEAEqE;IACrE,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAWrC;IAED;;;;;;;;gFAQ4E;IAC5E,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAWnC;IAED,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,GAAG,OAAO,EAAE,CAkDzD;IAED,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CA+DjD;IAED,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,EAAE,CAQ7C;IAED,KAAK,IAAI,OAAO,EAAE,CAEjB;IAED,GAAG,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS,CAEnC;IAED,GAAG,IAAI,OAAO,EAAE,CAEf;IAED,MAAM,IAAI,OAAO,EAAE,CAElB;IAED,MAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,EAAE,GAAG,OAAO,CAQxC;IAED,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,QAAQ;CAqBjB"}
|
|
@@ -29,6 +29,14 @@ export class TaskDag {
|
|
|
29
29
|
const t = this.tasks.get(id);
|
|
30
30
|
if (!t)
|
|
31
31
|
throw new Error(`task "${id}" not found`);
|
|
32
|
+
// Completing a task early would promote its dependents before the work
|
|
33
|
+
// they depend on exists (#246).
|
|
34
|
+
const unmet = t.deps.filter((d) => {
|
|
35
|
+
const dep = this.tasks.get(d);
|
|
36
|
+
return dep === undefined || !SATISFIED.has(dep.status);
|
|
37
|
+
});
|
|
38
|
+
if (unmet.length > 0)
|
|
39
|
+
throw new Error(`task "${id}" cannot be completed: dependencies not done (${unmet.join(', ')})`);
|
|
32
40
|
t.status = 'done';
|
|
33
41
|
t.result = result;
|
|
34
42
|
t.completedAt = Date.now();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"task-dag.js","sourceRoot":"","sources":["../../../src/orgrt/task-dag.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"task-dag.js","sourceRoot":"","sources":["../../../src/orgrt/task-dag.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/orgrt/templates.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,MAAM,EAAgB,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"templates.d.ts","sourceRoot":"","sources":["../../../src/orgrt/templates.ts"],"names":[],"mappings":"AAIA,OAAO,EAAiC,KAAK,MAAM,EAAgB,MAAM,YAAY,CAAC;AAWtF,UAAU,YAAY;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,EAAE,MAAM,EAAE,CAAC;IAC3B,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AACD,UAAU,QAAQ;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,YAAY,EAAE,CAAC;CACvB;AAED,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAyNlD,CAAC;AAEF,wBAAgB,iBAAiB,CAC/B,YAAY,EAAE,MAAM,EACpB,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,MAAM,GACZ,MAAM,GAAG,IAAI,CAoBf"}
|
|
@@ -3,10 +3,13 @@
|
|
|
3
3
|
// Each validates against OrgDefSchema; goal is a placeholder the user edits
|
|
4
4
|
// (or supplies via --goal).
|
|
5
5
|
import { DEFAULT_MAX_TURNS_PER_MESSAGE, OrgDefSchema } from './types.js';
|
|
6
|
-
|
|
7
|
-
//
|
|
8
|
-
//
|
|
9
|
-
//
|
|
6
|
+
import { DEFAULT_CLAUDE_MODEL } from './vercel-providers.js';
|
|
7
|
+
// Per-role model hints keep scheduled-org economics sane: coordinators and
|
|
8
|
+
// executors run on the org runtime default (DEFAULT_CLAUDE_MODEL) since they
|
|
9
|
+
// synthesize and decide; verification and mechanical roles run on Haiku — the
|
|
10
|
+
// dogfooded release-desk run showed review/QA roles spend a third of the
|
|
11
|
+
// tokens for checklist-shaped work. Every built role pins its model explicitly
|
|
12
|
+
// (see buildFromTemplate) so a created org never drifts with a later default.
|
|
10
13
|
const FAST_MODEL = 'claude-haiku-4-5-20251001';
|
|
11
14
|
export const ORG_TEMPLATES = {
|
|
12
15
|
'content-team': {
|
|
@@ -242,7 +245,10 @@ export function buildFromTemplate(templateName, orgName, goal) {
|
|
|
242
245
|
memory_namespace: `org:${orgName}`,
|
|
243
246
|
max_turns_per_message: DEFAULT_MAX_TURNS_PER_MESSAGE,
|
|
244
247
|
},
|
|
245
|
-
roles: t.roles.map(({ model, ...r }) => (
|
|
248
|
+
roles: t.roles.map(({ model, ...r }) => ({
|
|
249
|
+
...r,
|
|
250
|
+
adapter_config: { model: model ?? DEFAULT_CLAUDE_MODEL },
|
|
251
|
+
})),
|
|
246
252
|
});
|
|
247
253
|
}
|
|
248
254
|
//# sourceMappingURL=templates.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../../src/orgrt/templates.ts"],"names":[],"mappings":"AAAA,gDAAgD;AAChD,uEAAuE;AACvE,4EAA4E;AAC5E,4BAA4B;AAC5B,OAAO,EAAE,6BAA6B,EAAe,YAAY,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"templates.js","sourceRoot":"","sources":["../../../src/orgrt/templates.ts"],"names":[],"mappings":"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"}
|