@aligndottech/cli 0.68.0 → 0.68.1
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/dist/commands/connect-agents.d.ts +8 -18
- package/dist/commands/connect-agents.d.ts.map +1 -1
- package/dist/commands/connect-agents.js +32 -19
- package/dist/commands/connect-agents.js.map +1 -1
- package/dist/commands/local.js +2 -2
- package/dist/commands/local.js.map +1 -1
- package/dist/commands/mcp.js +2 -2
- package/dist/commands/mcp.js.map +1 -1
- package/dist/commands/setup.js +2 -2
- package/dist/commands/setup.js.map +1 -1
- package/dist/lib/agent/agent-guidance.d.ts +8 -0
- package/dist/lib/agent/agent-guidance.d.ts.map +1 -0
- package/dist/lib/agent/agent-guidance.js +8 -0
- package/dist/lib/agent/agent-guidance.js.map +1 -0
- package/dist/lib/agent/engines/claude-code-protocol.d.ts.map +1 -1
- package/dist/lib/agent/engines/claude-code-protocol.js +6 -2
- package/dist/lib/agent/engines/claude-code-protocol.js.map +1 -1
- package/dist/lib/agent/engines/pi.d.ts.map +1 -1
- package/dist/lib/agent/engines/pi.js +5 -1
- package/dist/lib/agent/engines/pi.js.map +1 -1
- package/dist/lib/agent/failure-tail.d.ts +9 -0
- package/dist/lib/agent/failure-tail.d.ts.map +1 -0
- package/dist/lib/agent/failure-tail.js +42 -0
- package/dist/lib/agent/failure-tail.js.map +1 -0
- package/dist/lib/agent/git-runs-programs.d.ts +11 -0
- package/dist/lib/agent/git-runs-programs.d.ts.map +1 -0
- package/dist/lib/agent/git-runs-programs.js +25 -0
- package/dist/lib/agent/git-runs-programs.js.map +1 -0
- package/dist/lib/agent/permission-broker.d.ts +2 -0
- package/dist/lib/agent/permission-broker.d.ts.map +1 -1
- package/dist/lib/agent/permission-broker.js +9 -0
- package/dist/lib/agent/permission-broker.js.map +1 -1
- package/dist/lib/agent/read-only-command.d.ts +15 -0
- package/dist/lib/agent/read-only-command.d.ts.map +1 -0
- package/dist/lib/agent/read-only-command.js +102 -0
- package/dist/lib/agent/read-only-command.js.map +1 -0
- package/dist/lib/agent/run-agent-session.d.ts +1 -0
- package/dist/lib/agent/run-agent-session.d.ts.map +1 -1
- package/dist/lib/agent/run-agent-session.js +5 -3
- package/dist/lib/agent/run-agent-session.js.map +1 -1
- package/dist/lib/agent/tui/app.d.ts +1 -0
- package/dist/lib/agent/tui/app.d.ts.map +1 -1
- package/dist/lib/agent/tui/app.js +1 -1
- package/dist/lib/agent/tui/app.js.map +1 -1
- package/dist/lib/agent/tui/cards.d.ts +1 -0
- package/dist/lib/agent/tui/cards.d.ts.map +1 -1
- package/dist/lib/agent/tui/cards.js +4 -2
- package/dist/lib/agent/tui/cards.js.map +1 -1
- package/dist/lib/agent/types.d.ts +4 -1
- package/dist/lib/agent/types.d.ts.map +1 -1
- package/dist/lib/launch/config-writes.d.ts +5 -3
- package/dist/lib/launch/config-writes.d.ts.map +1 -1
- package/dist/lib/launch/config-writes.js +39 -8
- package/dist/lib/launch/config-writes.js.map +1 -1
- package/dist/lib/launch/launch.d.ts +4 -0
- package/dist/lib/launch/launch.d.ts.map +1 -1
- package/dist/lib/launch/launch.js +14 -6
- package/dist/lib/launch/launch.js.map +1 -1
- package/dist/lib/launch/prompts.d.ts +6 -0
- package/dist/lib/launch/prompts.d.ts.map +1 -1
- package/dist/lib/launch/prompts.js +12 -0
- package/dist/lib/launch/prompts.js.map +1 -1
- package/dist/lib/write-confirm.d.ts +1 -1
- package/dist/lib/write-confirm.d.ts.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission-broker.js","sourceRoot":"","sources":["../../../src/lib/agent/permission-broker.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"permission-broker.js","sourceRoot":"","sources":["../../../src/lib/agent/permission-broker.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which shell commands the broker lets through without asking. The rule is an allowlist over a
|
|
3
|
+
* parse that fails toward asking: anything this file cannot positively read as read-only is not.
|
|
4
|
+
*
|
|
5
|
+
* A command is one or more segments joined by `;`, `&&`, `||` or `|`. EVERY segment must be a
|
|
6
|
+
* known read-only command, so an allowed `git status` cannot approve what follows it. Characters
|
|
7
|
+
* that run or write something else (substitution, redirects, background jobs, newlines, escapes)
|
|
8
|
+
* reject the whole line. A quoted `;` splits wrongly, and that only ever produces a segment that
|
|
9
|
+
* fails the allowlist, so the mistake costs a question and never a pass.
|
|
10
|
+
*/
|
|
11
|
+
/** True when any segment of the line runs git, which can run programs the repo's config names. */
|
|
12
|
+
export declare function commandUsesGit(command: string): boolean;
|
|
13
|
+
/** True only when every segment of the line is a known read-only command. */
|
|
14
|
+
export declare function isReadOnlyCommand(command: string): boolean;
|
|
15
|
+
//# sourceMappingURL=read-only-command.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-only-command.d.ts","sourceRoot":"","sources":["../../../src/lib/agent/read-only-command.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAuEH,kGAAkG;AAClG,wBAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAGvD;AAED,6EAA6E;AAC7E,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAI1D"}
|
|
@@ -0,0 +1,102 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Which shell commands the broker lets through without asking. The rule is an allowlist over a
|
|
3
|
+
* parse that fails toward asking: anything this file cannot positively read as read-only is not.
|
|
4
|
+
*
|
|
5
|
+
* A command is one or more segments joined by `;`, `&&`, `||` or `|`. EVERY segment must be a
|
|
6
|
+
* known read-only command, so an allowed `git status` cannot approve what follows it. Characters
|
|
7
|
+
* that run or write something else (substitution, redirects, background jobs, newlines, escapes)
|
|
8
|
+
* reject the whole line. A quoted `;` splits wrongly, and that only ever produces a segment that
|
|
9
|
+
* fails the allowlist, so the mistake costs a question and never a pass.
|
|
10
|
+
*/
|
|
11
|
+
const SHELL_SYNTAX = /[`$<>(){}\\\n\r]/;
|
|
12
|
+
const PLAIN = new Set(['ls', 'pwd', 'head', 'tail', 'wc', 'echo', 'true', 'grep', 'which', 'test']);
|
|
13
|
+
const GIT_READ = new Set(['status', 'log', 'show', 'diff', 'blame', 'rev-parse', 'ls-files', 'ls-tree', 'shortlog', 'describe']);
|
|
14
|
+
const GIT_FLAGS_THAT_RUN_OR_WRITE = ['--output', '--ext-diff', '--textconv', '--exec'];
|
|
15
|
+
const FIND_FLAGS_THAT_RUN_OR_WRITE = ['-exec', '-execdir', '-ok', '-okdir', '-delete', '-fprint', '-fprint0', '-fprintf', '-fls'];
|
|
16
|
+
/** What the shell hands the program: every quote removed, so `-d""elete` reads as `-delete`. */
|
|
17
|
+
const unquote = (t) => t.replace(/["']/g, '');
|
|
18
|
+
/**
|
|
19
|
+
* A git option that runs or writes, including git's unambiguous abbreviations of it
|
|
20
|
+
* (`--outp=x` is `--output=x`). Four characters is the shortest prefix, so `--out` counts.
|
|
21
|
+
*/
|
|
22
|
+
function isRiskyGitFlag(token) {
|
|
23
|
+
const name = token.split('=')[0] ?? '';
|
|
24
|
+
return name.length >= 4 && GIT_FLAGS_THAT_RUN_OR_WRITE.some((f) => f.startsWith(name));
|
|
25
|
+
}
|
|
26
|
+
/**
|
|
27
|
+
* Splits on `;`, `&&`, `||` and `|` that sit outside quotes, so `grep 'a;b' f` stays one command.
|
|
28
|
+
* Returns undefined for an unbalanced quote: a line this cannot read is a line that asks.
|
|
29
|
+
*/
|
|
30
|
+
function splitOutsideQuotes(command) {
|
|
31
|
+
const segments = [];
|
|
32
|
+
let current = '';
|
|
33
|
+
let quote;
|
|
34
|
+
for (let i = 0; i < command.length; i++) {
|
|
35
|
+
const c = command[i];
|
|
36
|
+
if (quote !== undefined) {
|
|
37
|
+
if (c === quote)
|
|
38
|
+
quote = undefined;
|
|
39
|
+
current += c;
|
|
40
|
+
}
|
|
41
|
+
else if (c === "'" || c === '"') {
|
|
42
|
+
quote = c;
|
|
43
|
+
current += c;
|
|
44
|
+
}
|
|
45
|
+
else if (c === ';' || c === '|' || c === '&') {
|
|
46
|
+
const double = command[i + 1] === c && c !== ';';
|
|
47
|
+
// A lone & is a background job. Keep it in the segment so the segment check rejects it.
|
|
48
|
+
if (c === '&' && !double) {
|
|
49
|
+
current += c;
|
|
50
|
+
continue;
|
|
51
|
+
}
|
|
52
|
+
segments.push(current);
|
|
53
|
+
current = '';
|
|
54
|
+
if (double)
|
|
55
|
+
i++;
|
|
56
|
+
}
|
|
57
|
+
else {
|
|
58
|
+
current += c;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (quote !== undefined)
|
|
62
|
+
return undefined;
|
|
63
|
+
segments.push(current);
|
|
64
|
+
return segments;
|
|
65
|
+
}
|
|
66
|
+
/** True when this one command, with no chaining, can only read. */
|
|
67
|
+
function segmentIsReadOnly(segment) {
|
|
68
|
+
if (segment.includes('&'))
|
|
69
|
+
return false;
|
|
70
|
+
const tokens = segment.trim().split(/\s+/).map(unquote).filter((t) => t !== '');
|
|
71
|
+
const [head, second, ...rest] = tokens;
|
|
72
|
+
if (head === undefined)
|
|
73
|
+
return false;
|
|
74
|
+
if (PLAIN.has(head))
|
|
75
|
+
return true;
|
|
76
|
+
if (head === 'command')
|
|
77
|
+
return second === '-v';
|
|
78
|
+
if (head === 'node')
|
|
79
|
+
return second === '--version' || second === '-v';
|
|
80
|
+
if (head === 'find')
|
|
81
|
+
return ![second, ...rest].some((t) => t !== undefined && FIND_FLAGS_THAT_RUN_OR_WRITE.includes(t));
|
|
82
|
+
if (head === 'git') {
|
|
83
|
+
// The subcommand must come first: `git -c core.pager=sh log` would run a program.
|
|
84
|
+
if (second === undefined || !GIT_READ.has(second))
|
|
85
|
+
return false;
|
|
86
|
+
return !rest.some(isRiskyGitFlag);
|
|
87
|
+
}
|
|
88
|
+
return false;
|
|
89
|
+
}
|
|
90
|
+
/** True when any segment of the line runs git, which can run programs the repo's config names. */
|
|
91
|
+
export function commandUsesGit(command) {
|
|
92
|
+
const segments = splitOutsideQuotes(command) ?? [];
|
|
93
|
+
return segments.some((s) => unquote(s.trim().split(/\s+/)[0] ?? '') === 'git');
|
|
94
|
+
}
|
|
95
|
+
/** True only when every segment of the line is a known read-only command. */
|
|
96
|
+
export function isReadOnlyCommand(command) {
|
|
97
|
+
if (command.trim() === '' || SHELL_SYNTAX.test(command))
|
|
98
|
+
return false;
|
|
99
|
+
const segments = splitOutsideQuotes(command);
|
|
100
|
+
return segments !== undefined && segments.every(segmentIsReadOnly);
|
|
101
|
+
}
|
|
102
|
+
//# sourceMappingURL=read-only-command.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"read-only-command.js","sourceRoot":"","sources":["../../../src/lib/agent/read-only-command.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,7 @@ export interface SessionDeps {
|
|
|
23
23
|
projectHasBlock: boolean;
|
|
24
24
|
};
|
|
25
25
|
makeGate: () => (ask: ToolAsk) => Promise<GateOutcome>;
|
|
26
|
+
gitRunsPrograms: () => Promise<boolean>;
|
|
26
27
|
graphTools: () => GraphToolSpec[];
|
|
27
28
|
countDecisions: () => number;
|
|
28
29
|
loadPiEngine: () => Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-agent-session.d.ts","sourceRoot":"","sources":["../../../src/lib/agent/run-agent-session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-agent-session.d.ts","sourceRoot":"","sources":["../../../src/lib/agent/run-agent-session.ts"],"names":[],"mappings":"AAmBA,OAAO,EAAE,KAAK,cAAc,EAA0B,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAE,KAAK,eAAe,EAAkB,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAoB,KAAK,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAE,KAAK,UAAU,EAAgB,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,KAAK,cAAc,EAAc,MAAM,cAAc,CAAC;AAC/D,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAEpE;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IACxC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IACzD,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IAC5B,aAAa,EAAE,MAAM,UAAU,GAAG,SAAS,CAAC;IAC5C,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI,CAAC;IACvC,YAAY,EAAE,MAAM,OAAO,CAAC,eAAe,GAAG,SAAS,CAAC,CAAC;IACzD,UAAU,EAAE,MAAM,MAAM,GAAG,IAAI,CAAC;IAChC,YAAY,EAAE,MAAM;QAAE,aAAa,EAAE,OAAO,CAAC;QAAC,eAAe,EAAE,OAAO,CAAA;KAAE,CAAC;IACzE,QAAQ,EAAE,MAAM,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IACvD,eAAe,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACxC,UAAU,EAAE,MAAM,aAAa,EAAE,CAAC;IAClC,cAAc,EAAE,MAAM,MAAM,CAAC;IAC7B,YAAY,EAAE,MAAM,OAAO,CAAC;QAAE,cAAc,EAAE,CAAC,CAAC,EAAE;YAAE,GAAG,EAAE,MAAM,CAAC;YAAC,QAAQ,EAAE,MAAM,CAAC;YAAC,KAAK,EAAE,eAAe,CAAC;YAAC,KAAK,EAAE,aAAa,EAAE,CAAA;SAAE,KAAK,OAAO,CAAC,WAAW,CAAC,CAAA;KAAE,CAAC,CAAC;IAChK,sBAAsB,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,WAAW,CAAC;IAC3D,UAAU,EAAE,CAAC,CAAC,EAAE,cAAc,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;IACnD,MAAM,EAAE,CAAC,KAAK,EAAE,OAAO,GAAG,aAAa,KAAK,IAAI,CAAC;CAClD;AAsBD,wBAAsB,eAAe,CAAC,IAAI,EAAE;IAAE,MAAM,CAAC,EAAE,UAAU,CAAA;CAAE,EAAE,IAAI,GAAE,WAAkC,GAAG,OAAO,CAAC,MAAM,CAAC,CAwC9H;AAED,wBAAgB,kBAAkB,IAAI,WAAW,CA+ChD"}
|
|
@@ -13,8 +13,10 @@ import { hasConfiguredProvider, probeOllama } from '../local-llm.js';
|
|
|
13
13
|
import { alignConfigDir } from '../private-files.js';
|
|
14
14
|
import { STARTUP_ENV } from '../startup-env.js';
|
|
15
15
|
import { launchAlignEntry } from '../trusted-align-bin.js';
|
|
16
|
+
import { ASK_ONCE_GUIDANCE } from './agent-guidance.js';
|
|
16
17
|
import { gateEdit } from './edit-gate.js';
|
|
17
18
|
import { decisionsThatWroteTheseLines } from './edit-text.js';
|
|
19
|
+
import { gitConfigRunsPrograms } from './git-runs-programs.js';
|
|
18
20
|
import { createClaudeCodeEngine } from './engines/claude-code.js';
|
|
19
21
|
import { resolvePiModel } from './engines/pi-models.js';
|
|
20
22
|
import { createGraphTools } from './graph-tools.js';
|
|
@@ -32,8 +34,7 @@ const CANNOT_RUN = {
|
|
|
32
34
|
};
|
|
33
35
|
function claudeArgs(state) {
|
|
34
36
|
const args = [];
|
|
35
|
-
|
|
36
|
-
args.push('--append-system-prompt', alignNudgeBody());
|
|
37
|
+
args.push('--append-system-prompt', [...(state.projectHasBlock ? [] : [alignNudgeBody()]), ASK_ONCE_GUIDANCE].join('\n\n'));
|
|
37
38
|
// Last, because claude's --mcp-config is variadic. Named align-local so it never replaces a
|
|
38
39
|
// server the user configured as `align` (see adapters/claude-code.ts).
|
|
39
40
|
if (!state.projectHasMcp)
|
|
@@ -79,7 +80,7 @@ export async function runAgentSession(opts, deps = defaultSessionDeps()) {
|
|
|
79
80
|
engine = claude();
|
|
80
81
|
}
|
|
81
82
|
deps.record(agent);
|
|
82
|
-
return deps.runAgentUi({ engine, decisionCount: deps.countDecisions(), gate: deps.makeGate() });
|
|
83
|
+
return deps.runAgentUi({ engine, decisionCount: deps.countDecisions(), gate: deps.makeGate(), gitRunsPrograms: deps.gitRunsPrograms });
|
|
83
84
|
}
|
|
84
85
|
export function defaultSessionDeps() {
|
|
85
86
|
const config = createConfigStore();
|
|
@@ -102,6 +103,7 @@ export function defaultSessionDeps() {
|
|
|
102
103
|
canAdjudicate: () => hasConfiguredProvider(),
|
|
103
104
|
blame: (input, at) => decisionsThatWroteTheseLines(client, input, at),
|
|
104
105
|
}),
|
|
106
|
+
gitRunsPrograms: () => gitConfigRunsPrograms(cwd),
|
|
105
107
|
graphTools: () => createGraphTools({ client, env: localEnv }),
|
|
106
108
|
countDecisions: () => {
|
|
107
109
|
if (!localEnv.localDbPath)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-agent-session.js","sourceRoot":"","sources":["../../../src/lib/agent/run-agent-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAuB,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAwB,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAsB,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAuB,UAAU,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"run-agent-session.js","sourceRoot":"","sources":["../../../src/lib/agent/run-agent-session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,iBAAiB,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AACjE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,qBAAqB,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC3D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAC1C,OAAO,EAAE,4BAA4B,EAAE,MAAM,gBAAgB,CAAC;AAC9D,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AAC/D,OAAO,EAAuB,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACvF,OAAO,EAAwB,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAC9E,OAAO,EAAE,gBAAgB,EAAsB,MAAM,kBAAkB,CAAC;AACxE,OAAO,EAAmB,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAuB,UAAU,EAAE,MAAM,cAAc,CAAC;AA4B/D,MAAM,cAAc,GAAG;IACrB,oEAAoE;IACpE,mCAAmC;IACnC,iDAAiD;IACjD,oFAAoF;CACrF,CAAC;AACF,MAAM,UAAU,GAA+B;IAC7C,KAAK,EAAE,+EAA+E;IACtF,MAAM,EAAE,qDAAqD;CAC9D,CAAC;AAEF,SAAS,UAAU,CAAC,KAA2D;IAC7E,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,IAAI,CAAC,IAAI,CAAC,wBAAwB,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,cAAc,EAAE,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5H,4FAA4F;IAC5F,uEAAuE;IACvE,IAAI,CAAC,KAAK,CAAC,aAAa;QAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,UAAU,EAAE,EAAE,aAAa,EAAE,gBAAgB,CAAC,YAAY,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;IACvI,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,IAA6B,EAAE,OAAoB,kBAAkB,EAAE;IAC3G,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IACpC,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,MAAM,EAAE,UAAU,EAAE,IAAI,CAAC,aAAa,EAAE,EAAE,QAAQ,EAAE,KAAK,KAAK,SAAS,EAAE,YAAY,EAAE,SAAS,KAAK,IAAI,EAAE,CAAC,CAAC;IACtJ,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QAC7B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QACrG,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,IAAI,CAAC,MAAM;QAAE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,GAAgB,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC;QAC5D,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,GAAG,EAAE,SAAS,IAAI,QAAQ;QAC1B,SAAS,EAAE,UAAU,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;QAC1C,wFAAwF;QACxF,4EAA4E;QAC5E,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,CAAC;KACjE,CAAC,CAAC;IAEH,IAAI,MAAmB,CAAC;IACxB,IAAI,KAAK,GAA4B,MAAM,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,aAAa,CAAC;IACzF,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,IAAI,KAAK,EAAE,CAAC;QACvC,IAAI,CAAC;YACH,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,IAAI,CAAC,YAAY,EAAE,CAAC;YACrD,MAAM,GAAG,MAAM,cAAc,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;QAChH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,uCAAwC,GAAa,CAAC,OAAO,EAAE,CAAC,CAAC;gBAC1E,OAAO,CAAC,CAAC;YACX,CAAC;YACD,IAAI,CAAC,GAAG,CAAC,uCAAwC,GAAa,CAAC,OAAO,oCAAoC,CAAC,CAAC;YAC5G,MAAM,GAAG,MAAM,EAAE,CAAC;YAClB,KAAK,GAAG,aAAa,CAAC;QACxB,CAAC;IACH,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,MAAM,EAAE,CAAC;IACpB,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACnB,OAAO,IAAI,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,aAAa,EAAE,IAAI,CAAC,cAAc,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;AACzI,CAAC;AAED,MAAM,UAAU,kBAAkB;IAChC,MAAM,MAAM,GAAG,iBAAiB,EAAE,CAAC;IACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;IAChD,MAAM,MAAM,GAAG,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IAC7C,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAC1B,OAAO;QACL,GAAG;QACH,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,UAAU,EAAE,WAAW;QACvB,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC;QAC1C,aAAa,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,cAAc,EAAE;QAC5C,QAAQ,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,CAAC;QACzC,YAAY,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,EAAE,KAAK,EAAE,cAAc,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC;QAClF,UAAU,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,QAAQ,EAAE,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAC;QACrE,YAAY,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,cAAc,EAAE,EAAE,CAAC;QAC7F,QAAQ,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE;YACrC,MAAM;YACN,GAAG;YACH,aAAa,EAAE,GAAG,EAAE,CAAC,qBAAqB,EAAE;YAC5C,KAAK,EAAE,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE,CAAC,4BAA4B,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;SACtE,CAAC;QACF,eAAe,EAAE,GAAG,EAAE,CAAC,qBAAqB,CAAC,GAAG,CAAC;QACjD,UAAU,EAAE,GAAG,EAAE,CAAC,gBAAgB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC;QAC7D,cAAc,EAAE,GAAG,EAAE;YACnB,IAAI,CAAC,QAAQ,CAAC,WAAW;gBAAE,OAAO,CAAC,CAAC;YACpC,MAAM,EAAE,GAAG,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;YAC/C,IAAI,CAAC;gBAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,SAAS,CAAC;YAAC,CAAC;oBAAS,CAAC;gBAAC,EAAE,CAAC,KAAK,EAAE,CAAC;YAAC,CAAC;QACjE,CAAC;QACD,8FAA8F;QAC9F,oFAAoF;QACpF,YAAY,EAAE,KAAK,IAAI,EAAE;YACvB,MAAM,EAAE,gBAAgB,EAAE,SAAS,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,qBAAqB,CAAC,CAAC;YAC/F,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,gBAAgB,CAAC;gBAC3C,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,EAAE,QAAQ,EAAE,iBAAiB,CAAC;gBACnE,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,IAAI,CAAC,CAAC,CAAC;aACnI,CAAC,CAAC,CAAC;YACJ,MAAM,EAAE,cAAc,EAAE,GAAG,MAAM,MAAM,CAAC,iBAAiB,CAAC,CAAC;YAC3D,OAAO,EAAE,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC;QAC/D,CAAC;QACD,sBAAsB;QACtB,UAAU;QACV,MAAM,EAAE,CAAC,KAAK,EAAE,EAAE;YAChB,KAAK,MAAM,CAAC,uBAAuB,CAAC;iBACjC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,iBAAiB,CAAC,QAAQ,EAAE,gBAAgB,EAAE,OAAO,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC;iBAChF,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -5,6 +5,7 @@ export interface AgentUiOptions {
|
|
|
5
5
|
engine: AgentEngine;
|
|
6
6
|
decisionCount: number;
|
|
7
7
|
gate: (ask: ToolAsk) => Promise<GateOutcome>;
|
|
8
|
+
gitRunsPrograms?: () => Promise<boolean>;
|
|
8
9
|
terminal?: Terminal;
|
|
9
10
|
}
|
|
10
11
|
export declare function runAgentUi(opts: AgentUiOptions): Promise<number>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../../src/lib/agent/tui/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0G,KAAK,QAAQ,EAAuB,MAAM,wBAAwB,CAAC;AAGpL,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAe,OAAO,EAAE,MAAM,aAAa,CAAC;AAKlF,sFAAsF;AACtF,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7C,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAaD,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAgGtE"}
|
|
1
|
+
{"version":3,"file":"app.d.ts","sourceRoot":"","sources":["../../../../src/lib/agent/tui/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0G,KAAK,QAAQ,EAAuB,MAAM,wBAAwB,CAAC;AAGpL,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAe,OAAO,EAAE,MAAM,aAAa,CAAC;AAKlF,sFAAsF;AACtF,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,CAAC;IACpB,aAAa,EAAE,MAAM,CAAC;IACtB,IAAI,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;IAC7C,eAAe,CAAC,EAAE,MAAM,OAAO,CAAC,OAAO,CAAC,CAAC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAaD,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAgGtE"}
|
|
@@ -34,7 +34,7 @@ export async function runAgentUi(opts) {
|
|
|
34
34
|
controller.beginAsk();
|
|
35
35
|
return new Promise((resolve) => { pending = { kind: q.kind, resolve }; });
|
|
36
36
|
};
|
|
37
|
-
const broker = createBroker({ gate: opts.gate, askHuman, onGate: (outcome) => addLines(gateNote(outcome)) });
|
|
37
|
+
const broker = createBroker({ gate: opts.gate, gitRunsPrograms: opts.gitRunsPrograms, askHuman, onGate: (outcome) => addLines(gateNote(outcome)) });
|
|
38
38
|
const onKey = (data) => {
|
|
39
39
|
if (matchesKey(data, 'ctrl+c')) {
|
|
40
40
|
if (controller.ctrlC() === 'exit')
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../src/lib/agent/tui/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAoB,QAAQ,EAAsB,UAAU,EAAE,eAAe,EAAE,MAAM,EAAiB,IAAI,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpL,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAsB,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"app.js","sourceRoot":"","sources":["../../../../src/lib/agent/tui/app.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAoB,QAAQ,EAAsB,UAAU,EAAE,eAAe,EAAE,MAAM,EAAiB,IAAI,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AACpL,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAsB,MAAM,yBAAyB,CAAC;AAE3E,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAC;AACjE,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAWnC,MAAM,aAAa,GAAkB;IACnC,OAAO,EAAE,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAChG,eAAe,EAAE,KAAK,CAAC,GAAG,EAAE,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG;IAC1G,IAAI,EAAE,KAAK,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,CAAC,aAAa,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS;CACvG,CAAC;AAEF,MAAM,WAAW,GAAgB;IAC/B,WAAW,EAAE,KAAK,CAAC,GAAG;IACtB,UAAU,EAAE,EAAE,cAAc,EAAE,KAAK,CAAC,GAAG,EAAE,YAAY,EAAE,KAAK,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,CAAC,GAAG,EAAE,OAAO,EAAE,KAAK,CAAC,GAAG,EAAE;CACxI,CAAC;AAEF,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,IAAoB;IACnD,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC;IACxB,MAAM,GAAG,GAAG,IAAI,aAAa,CAAC,IAAI,CAAC,QAAQ,IAAI,IAAI,eAAe,EAAE,CAAC,CAAC;IACtE,MAAM,UAAU,GAAG,IAAI,SAAS,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAC5C,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;IACtC,IAAI,SAAqD,CAAC;IAC1D,IAAI,OAAoF,CAAC;IACzF,IAAI,MAAM,GAA2B,GAAG,EAAE,GAAE,CAAC,CAAC;IAE9C,MAAM,QAAQ,GAAG,CAAC,KAAe,EAAQ,EAAE;QACzC,SAAS,GAAG,SAAS,CAAC;QACtB,KAAK,MAAM,CAAC,IAAI,KAAK;YAAE,UAAU,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAC9D,GAAG,CAAC,aAAa,EAAE,CAAC;IACtB,CAAC,CAAC;IACF,MAAM,OAAO,GAAG,GAAS,EAAE,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,aAAa,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,CAAC;IAE3G,MAAM,QAAQ,GAAG,CAAC,CAAgB,EAAwB,EAAE;QAC1D,QAAQ,CAAC,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAC1E,UAAU,CAAC,QAAQ,EAAE,CAAC;QACtB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,GAAG,OAAO,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5E,CAAC,CAAC;IACF,MAAM,MAAM,GAAG,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC;IAEpJ,MAAM,KAAK,GAAG,CAAC,IAAY,EAAiC,EAAE;QAC5D,IAAI,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,EAAE,CAAC;YAC/B,IAAI,UAAU,CAAC,KAAK,EAAE,KAAK,MAAM;gBAAE,MAAM,CAAC,CAAC,CAAC,CAAC;;gBACxC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC,CAAC,CAAC;YAC3D,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QACD,UAAU,CAAC,QAAQ,EAAE,CAAC;QACtB,IAAI,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC;YAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAAC,CAAC;QAChI,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,MAAM,GAAG,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAChD,IAAI,MAAM,EAAE,CAAC;gBACX,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;gBAC5B,OAAO,GAAG,SAAS,CAAC;gBACpB,UAAU,CAAC,MAAM,EAAE,CAAC;gBACpB,OAAO,CAAC,MAAM,CAAC,CAAC;YAClB,CAAC;YACD,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAC3B,CAAC;QACD,IAAI,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,UAAU,CAAC,MAAM,EAAE,KAAK,OAAO,EAAE,CAAC;YAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;QAAC,CAAC;QAChH,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC;IAEF,MAAM,CAAC,QAAQ,GAAG,CAAC,IAAI,EAAE,EAAE;QACzB,MAAM,IAAI,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;QACrC,IAAI,IAAI,KAAK,SAAS;YAAE,OAAO;QAC/B,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;QACnB,MAAM,CAAC,aAAa,GAAG,IAAI,CAAC;QAC5B,QAAQ,CAAC,CAAC,EAAE,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC;QAC9C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAU,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClI,CAAC,CAAC;IAEF,GAAG,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACrG,GAAG,CAAC,QAAQ,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC5B,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IACzB,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrB,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACrB,GAAG,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;IAE5B,MAAM,MAAM,GAAG,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,EAAE,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;IACvE,IAAI,MAA0B,CAAC;IAC/B,IAAI,CAAC;QACH,GAAG,CAAC,KAAK,EAAE,CAAC;QACZ,6FAA6F;QAC7F,gFAAgF;QAChF,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACvB,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBACtB,IAAI,CAAC,SAAS,EAAE,CAAC;oBACf,SAAS,GAAG,EAAE,EAAE,EAAE,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,EAAE,aAAa,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC;oBACpE,UAAU,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;gBACpC,CAAC;gBACD,SAAS,CAAC,IAAI,IAAI,CAAC,CAAC,KAAK,CAAC;gBAC1B,SAAS,CAAC,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;YACvC,CAAC;iBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,MAAM,EAAE,CAAC;gBAC7B,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC;YAChC,CAAC;iBAAM,IAAI,CAAC,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;gBAC9B,QAAQ,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACrC,CAAC;iBAAM,CAAC;gBACN,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;gBACtB,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU;oBAAE,OAAO,EAAE,CAAC;YACvC,CAAC;YACD,GAAG,CAAC,aAAa,EAAE,CAAC;QACtB,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC,GAAY,EAAE,EAAE,GAAG,MAAM,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACnG,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YACzB,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC;YAC1B,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;YACrB,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;YAAS,CAAC;QACT,GAAG,CAAC,IAAI,EAAE,CAAC;IACb,CAAC;IACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC;IACpC,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -12,5 +12,6 @@ export declare function commandCard(q: Extract<HumanQuestion, {
|
|
|
12
12
|
}>): string[];
|
|
13
13
|
/** What an allowed edit leaves in the transcript. Never silent when the gate could not check. */
|
|
14
14
|
export declare function gateNote(outcome: GateOutcome): string[];
|
|
15
|
+
/** The transcript line for a tool starting, or for one that failed (with why, when it said). */
|
|
15
16
|
export declare function toolLine(e: AgentUiEvent): string[];
|
|
16
17
|
//# sourceMappingURL=cards.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cards.d.ts","sourceRoot":"","sources":["../../../../src/lib/agent/tui/cards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAgB,WAAW,EAAE,MAAM,aAAa,CAAC;AAG3E,wBAAgB,UAAU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAG9E;AAUD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,EAAE,CAY9E;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,GAAG,MAAM,EAAE,CAEpF;AAED,iGAAiG;AACjG,wBAAgB,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,EAAE,CAKvD;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"cards.d.ts","sourceRoot":"","sources":["../../../../src/lib/agent/tui/cards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,KAAK,EAAE,YAAY,EAAgB,WAAW,EAAE,MAAM,aAAa,CAAC;AAG3E,wBAAgB,UAAU,CAAC,CAAC,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAG9E;AAUD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,GAAG,MAAM,EAAE,CAY9E;AAED,wBAAgB,WAAW,CAAC,CAAC,EAAE,OAAO,CAAC,aAAa,EAAE;IAAE,IAAI,EAAE,SAAS,CAAA;CAAE,CAAC,GAAG,MAAM,EAAE,CAEpF;AAED,iGAAiG;AACjG,wBAAgB,QAAQ,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,EAAE,CAKvD;AAED,gGAAgG;AAChG,wBAAgB,QAAQ,CAAC,CAAC,EAAE,YAAY,GAAG,MAAM,EAAE,CAMlD"}
|
|
@@ -36,11 +36,13 @@ export function gateNote(outcome) {
|
|
|
36
36
|
return [];
|
|
37
37
|
return [theme.dim(`checked against: ${outcome.cards.map((d) => d.title).join(', ')}`)];
|
|
38
38
|
}
|
|
39
|
+
/** The transcript line for a tool starting, or for one that failed (with why, when it said). */
|
|
39
40
|
export function toolLine(e) {
|
|
40
41
|
if (e.type === 'tool-start')
|
|
41
42
|
return [`${theme.dim('•')} ${theme.title(e.tool)} ${theme.dim(e.summary)}`];
|
|
42
|
-
if (e.type === 'tool-end' && !e.ok)
|
|
43
|
-
return [theme.error(' that tool call failed')];
|
|
43
|
+
if (e.type === 'tool-end' && !e.ok) {
|
|
44
|
+
return [theme.error(' that tool call failed'), ...(e.detail ?? '').split('\n').filter((l) => l !== '').map((l) => theme.dim(` ${l}`))];
|
|
45
|
+
}
|
|
44
46
|
return [];
|
|
45
47
|
}
|
|
46
48
|
//# sourceMappingURL=cards.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cards.js","sourceRoot":"","sources":["../../../../src/lib/agent/tui/cards.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAEnC,MAAM,UAAU,UAAU,CAAC,CAA2C;IACpE,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,aAAa,IAAI,CAAC,CAAC,aAAa,KAAK,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;IACnF,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,aAAa,CAAC,CAAe;IACpC,OAAO;QACL,KAAK,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE;QAC3B,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC7C,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,CAA2C;IAClE,MAAM,IAAI,GAAG;QACX,QAAQ,EAAE,qCAAqC;QAC/C,wBAAwB,EAAE,+CAA+C;QACzE,SAAS,EAAE,8EAA8E;KAC1F,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACpB,OAAO;QACL,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;QAChB,GAAG,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,EAAE,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5D,EAAE;QACF,KAAK,CAAC,GAAG,CAAC,2BAA2B,CAAC;KACvC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,CAA8C;IACxE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,mBAAmB,CAAC,EAAE,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAC,CAAC;AAC3H,CAAC;AAED,iGAAiG;AACjG,MAAM,UAAU,QAAQ,CAAC,OAAoB;IAC3C,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO;QAAE,OAAO,EAAE,CAAC;IACxC,IAAI,OAAO,CAAC,IAAI,KAAK,aAAa;QAAE,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,wCAAwC,CAAC,CAAC,CAAC;IACjG,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAC1C,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,oBAAoB,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;AACzF,CAAC;AAED,MAAM,UAAU,QAAQ,CAAC,CAAe;IACtC,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY;QAAE,OAAO,CAAC,GAAG,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;IACzG,IAAI,CAAC,CAAC,IAAI,KAAK,UAAU,IAAI,CAAC,CAAC,CAAC,EAAE;
|
|
1
|
+
{"version":3,"file":"cards.js","sourceRoot":"","sources":["../../../../src/lib/agent/tui/cards.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,10 +54,13 @@ export type AgentUiEvent = {
|
|
|
54
54
|
id: string;
|
|
55
55
|
tool: string;
|
|
56
56
|
summary: string;
|
|
57
|
-
}
|
|
57
|
+
}
|
|
58
|
+
/** detail: the last lines the tool said, only on a failure and only when it said anything. */
|
|
59
|
+
| {
|
|
58
60
|
type: 'tool-end';
|
|
59
61
|
id: string;
|
|
60
62
|
ok: boolean;
|
|
63
|
+
detail?: string;
|
|
61
64
|
} | {
|
|
62
65
|
type: 'gate';
|
|
63
66
|
outcome: GateOutcome;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/agent/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;;;GAIG;AAEH,4EAA4E;AAC5E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,MAAM,WAAW,OAAO;IACtB,0CAA0C;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,wFAAwF;IACxF,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,oDAAoD;AACpD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qGAAqG;IACrG,GAAG,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC;CACxC;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,aAAa,CAAA;CAAE;AAChE,+FAA+F;GAC7F;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,wBAAwB,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC;AAExG,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,eAAe,GAAG,MAAM,CAAC;AAE7D,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/lib/agent/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;;;GAIG;AAEH,4EAA4E;AAC5E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,SAAS,GAAG,MAAM,GAAG,OAAO,CAAC;AAE7D,MAAM,WAAW,OAAO;IACtB,0CAA0C;IAC1C,EAAE,EAAE,MAAM,CAAC;IACX,iFAAiF;IACjF,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,wFAAwF;IACxF,IAAI,CAAC,EAAE,aAAa,CAAC;IACrB,4CAA4C;IAC5C,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,+FAA+F;IAC/F,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,oDAAoD;AACpD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,qGAAqG;IACrG,GAAG,EAAE,OAAO,GAAG,WAAW,GAAG,SAAS,CAAC;CACxC;AAED,MAAM,MAAM,WAAW,GACnB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAC;IAAC,IAAI,CAAC,EAAE,aAAa,CAAA;CAAE;AAChE,+FAA+F;GAC7F;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,UAAU,GAAG,wBAAwB,GAAG,WAAW,CAAC;IAAC,KAAK,EAAE,YAAY,EAAE,CAAA;CAAE,CAAC;AAExG,MAAM,MAAM,WAAW,GAAG,OAAO,GAAG,eAAe,GAAG,MAAM,CAAC;AAE7D,MAAM,MAAM,aAAa,GAAG;IAAE,KAAK,EAAE,IAAI,CAAA;CAAE,GAAG;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEhF,MAAM,MAAM,YAAY,GACpB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GAC/B;IAAE,IAAI,EAAE,YAAY,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE;AACnE,8FAA8F;GAC5F;IAAE,IAAI,EAAE,UAAU,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,OAAO,CAAC;IAAC,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAC9D;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,WAAW,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAA;CAAE,GACzD;IAAE,IAAI,EAAE,UAAU,CAAA;CAAE,GACpB;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;AAEvC,wCAAwC;AACxC,MAAM,WAAW,WAAW;IAC1B,mEAAmE;IACnE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,YAAY,KAAK,IAAI,EAAE,MAAM,EAAE,CAAC,GAAG,EAAE,OAAO,KAAK,OAAO,CAAC,aAAa,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3G,wDAAwD;IACxD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,KAAK,IAAI,IAAI,CAAC;IACd,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB"}
|
|
@@ -34,10 +34,12 @@ export interface RefusedMemo {
|
|
|
34
34
|
remove(file: string): void;
|
|
35
35
|
}
|
|
36
36
|
/**
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
37
|
+
* Whether applyConfigWrite would change the file, decided by the same functions it writes with.
|
|
38
|
+
* The launcher asks before a change to the user's own agent config, and must not ask when the
|
|
39
|
+
* entry is already there. A file that cannot be read or parsed counts as a change: the person
|
|
40
|
+
* is asked, and the write then refuses it as it always has.
|
|
40
41
|
*/
|
|
42
|
+
export declare function configWriteWouldChange(w: ConfigWrite, read?: (file: string) => string | null): boolean;
|
|
41
43
|
export declare function applyConfigWrite(w: ConfigWrite, note: (line: string) => void, memo?: RefusedMemo): void;
|
|
42
44
|
/** The block align owns in a TOML file: `align use --undo` takes out exactly this region. */
|
|
43
45
|
export declare function tomlMarkers(name: string): {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-writes.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"config-writes.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B,8HAA8H;IAC9H,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,yHAAyH;IACzH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qGAAqG;IACrG,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,6IAA6I;IAC7I,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAkBD;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,GAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,GAAG,IAAiB,GAAG,OAAO,CASlH;AASD,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,IAAI,CAkBvG;AAED,6FAA6F;AAC7F,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAExE"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { readFileSync } from 'node:fs';
|
|
1
2
|
import { parse } from 'smol-toml';
|
|
2
3
|
import { BACKUP_SUFFIX, safeWriteJson, safeWriteText } from '../safe-config-write.js';
|
|
3
4
|
const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
|
|
@@ -6,19 +7,49 @@ const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v)
|
|
|
6
7
|
* never touched: this adds, it does not update. Throws on an unparseable or contested file;
|
|
7
8
|
* the caller reports it and launches anyway.
|
|
8
9
|
*/
|
|
10
|
+
/** The JSON config with align's entry added, or undefined when there is nothing to change. */
|
|
11
|
+
function addJsonEntry(w, cur) {
|
|
12
|
+
const servers = isObject(cur[w.topKey]) ? cur[w.topKey] : {};
|
|
13
|
+
if (w.name in servers && !w.replace)
|
|
14
|
+
return undefined;
|
|
15
|
+
if (w.replace && JSON.stringify(servers[w.name]) === JSON.stringify(w.entry))
|
|
16
|
+
return undefined;
|
|
17
|
+
return { ...cur, [w.topKey]: { ...servers, [w.name]: w.entry } };
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* Whether applyConfigWrite would change the file, decided by the same functions it writes with.
|
|
21
|
+
* The launcher asks before a change to the user's own agent config, and must not ask when the
|
|
22
|
+
* entry is already there. A file that cannot be read or parsed counts as a change: the person
|
|
23
|
+
* is asked, and the write then refuses it as it always has.
|
|
24
|
+
*/
|
|
25
|
+
export function configWriteWouldChange(w, read = readOrNull) {
|
|
26
|
+
try {
|
|
27
|
+
const raw = read(w.file);
|
|
28
|
+
if (w.kind === 'toml-mcp-entry')
|
|
29
|
+
return appendTomlServer(w, raw) !== undefined;
|
|
30
|
+
const cur = raw && raw.trim() ? JSON.parse(raw) : {};
|
|
31
|
+
return !isObject(cur) || addJsonEntry(w, cur) !== undefined;
|
|
32
|
+
}
|
|
33
|
+
catch {
|
|
34
|
+
return true;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
function readOrNull(file) {
|
|
38
|
+
try {
|
|
39
|
+
return readFileSync(file, 'utf8');
|
|
40
|
+
}
|
|
41
|
+
catch (e) {
|
|
42
|
+
if (e.code === 'ENOENT')
|
|
43
|
+
return null;
|
|
44
|
+
throw e;
|
|
45
|
+
}
|
|
46
|
+
}
|
|
9
47
|
export function applyConfigWrite(w, note, memo) {
|
|
10
48
|
const quiet = memo?.has(w.file) === true;
|
|
11
49
|
const opts = { note: quiet ? () => undefined : note, ...(w.root ? { root: w.root } : {}) };
|
|
12
50
|
const status = w.kind === 'toml-mcp-entry'
|
|
13
51
|
? safeWriteText(w.file, (cur) => appendTomlServer(w, cur), { ...opts, markers: tomlMarkers(w.name), tomlTable: [w.topKey, w.name] })
|
|
14
|
-
: safeWriteJson(w.file, (cur) => {
|
|
15
|
-
const servers = isObject(cur[w.topKey]) ? cur[w.topKey] : {};
|
|
16
|
-
if (w.name in servers && !w.replace)
|
|
17
|
-
return undefined;
|
|
18
|
-
if (w.replace && JSON.stringify(servers[w.name]) === JSON.stringify(w.entry))
|
|
19
|
-
return undefined;
|
|
20
|
-
return { ...cur, [w.topKey]: { ...servers, [w.name]: w.entry } };
|
|
21
|
-
}, { ...opts, trailingNewline: true, ...(w.invalidJsonAdvice ? { invalidJsonAdvice: w.invalidJsonAdvice } : {}) });
|
|
52
|
+
: safeWriteJson(w.file, (cur) => addJsonEntry(w, cur), { ...opts, trailingNewline: true, ...(w.invalidJsonAdvice ? { invalidJsonAdvice: w.invalidJsonAdvice } : {}) });
|
|
22
53
|
if (status === 'symlink')
|
|
23
54
|
memo?.add(w.file);
|
|
24
55
|
else if (quiet)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config-writes.js","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAwCtF,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAa,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAErG;;;;GAIG;AACH,
|
|
1
|
+
{"version":3,"file":"config-writes.js","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,6 +66,10 @@ export interface LaunchDeps {
|
|
|
66
66
|
readClineState?(cwd: string, home: string, env: Record<string, string | undefined>, platform: string, passthrough: string[]): ClineProjectState;
|
|
67
67
|
/** Add to a file in the user's own agent config, once (C4). Lines go to `note`. */
|
|
68
68
|
applyConfigWrite(w: ConfigWrite, note: (line: string) => void): void;
|
|
69
|
+
/** Whether that write would change the file. Asked first: no question when the entry is already there. */
|
|
70
|
+
configWriteWouldChange(w: ConfigWrite): boolean;
|
|
71
|
+
/** Default-Yes question before that write: true on yes, false on no, null on Ctrl-C. Only asked on a TTY. */
|
|
72
|
+
askConfigWrite(message: string): Promise<boolean | null>;
|
|
69
73
|
cacheDir(env: Record<string, string | undefined>): string;
|
|
70
74
|
writeIfChanged(dir: string, name: string, content: string, opts?: {
|
|
71
75
|
mode?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/launch.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,2BAA2B,CAAC;AAC5D,OAAO,EAAoB,KAAK,WAAW,
|
|
1
|
+
{"version":3,"file":"launch.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/launch.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,14 +4,14 @@ import { performance } from 'node:perf_hooks';
|
|
|
4
4
|
import { createConfigStore } from '../config.js';
|
|
5
5
|
import { resolveEnv } from '../resolve-env.js';
|
|
6
6
|
import { agentByName, byPriority, resolveAgentBin, supportedAgents } from './agents.js';
|
|
7
|
-
import { applyConfigWrite } from './config-writes.js';
|
|
7
|
+
import { applyConfigWrite, configWriteWouldChange } from './config-writes.js';
|
|
8
8
|
import { readCodexState } from './codex-state.js';
|
|
9
9
|
import { readCopilotState } from './copilot-state.js';
|
|
10
10
|
import { readCursorState } from './cursor-state.js';
|
|
11
11
|
import { findOnPath } from './detect.js';
|
|
12
12
|
import { offerInstall } from './install.js';
|
|
13
13
|
import { chooseAgent } from './picker-options.js';
|
|
14
|
-
import { confirmDefaultNo, selectAgent } from './prompts.js';
|
|
14
|
+
import { confirmDefaultNo, confirmDefaultYes, selectAgent } from './prompts.js';
|
|
15
15
|
import { readGeminiState } from './gemini-state.js';
|
|
16
16
|
import { readAmpState } from './amp-state.js';
|
|
17
17
|
import { readDroidState } from './droid-state.js';
|
|
@@ -83,6 +83,8 @@ function defaultDeps() {
|
|
|
83
83
|
readContinueState: (cwd, home, env, platform, passthrough) => readContinueState(cwd, home, { localIsDefault: isLocalDefault() }, env, platform, passthrough),
|
|
84
84
|
readClineState: (cwd, home, env, platform, passthrough) => readClineState(cwd, home, { localIsDefault: isLocalDefault() }, env, platform, passthrough),
|
|
85
85
|
applyConfigWrite: (w, note) => applyConfigWrite(w, note, { has: (f) => config.wasWriteRefused(f), add: (f) => config.markWriteRefused(f), remove: (f) => config.unmarkWriteRefused(f) }),
|
|
86
|
+
configWriteWouldChange: (w) => configWriteWouldChange(w),
|
|
87
|
+
askConfigWrite: (message) => confirmDefaultYes(message, process.stderr),
|
|
86
88
|
cacheDir: launchCacheDir,
|
|
87
89
|
writeIfChanged,
|
|
88
90
|
pruneLaunchFiles,
|
|
@@ -257,11 +259,17 @@ export async function launchIfChosen(overrides = {}) {
|
|
|
257
259
|
}
|
|
258
260
|
if (!stored)
|
|
259
261
|
d.config.setAgent(agent.name);
|
|
260
|
-
// Written-once agents (pi, Cursor): the one place align adds to the user's own config.
|
|
261
|
-
//
|
|
262
|
-
|
|
262
|
+
// Written-once agents (pi, Cursor): the one place align adds to the user's own config. That
|
|
263
|
+
// config is read in every project on the machine, so it is asked (default yes), and with no
|
|
264
|
+
// terminal it is left alone. Not fatal either way: the session opens, just without Align's tools.
|
|
265
|
+
const pending = (spec.writes ?? []).map((w) => ({ ...w, root: d.home })).filter((w) => d.configWriteWouldChange(w));
|
|
266
|
+
const allowWrites = pending.length > 0 && d.isTTY &&
|
|
267
|
+
(await d.askConfigWrite(`Give ${agent.label} Align's tools? Adds one entry to its own config, used in every project on this machine: ${pending.map((w) => w.file).join(', ')} (undo: align use --undo)`)) === true;
|
|
268
|
+
if (pending.length > 0 && !allowWrites)
|
|
269
|
+
d.err(`Left ${agent.label}'s config alone, so it opens without Align's tools. ${d.isTTY ? 'Answer yes next time' : 'Run align in a terminal'} to add them.`);
|
|
270
|
+
for (const w of allowWrites ? pending : []) {
|
|
263
271
|
try {
|
|
264
|
-
d.applyConfigWrite(
|
|
272
|
+
d.applyConfigWrite(w, d.err);
|
|
265
273
|
}
|
|
266
274
|
catch (e) {
|
|
267
275
|
d.err(`Could not update ${w.file} (${e.message}). Opening ${agent.label} without it.`);
|