@with-logic/elwood 0.1.1 → 0.1.3
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/CHANGELOG.md +30 -3
- package/CONTRIBUTING.md +104 -0
- package/README.md +43 -31
- package/SECURITY.md +42 -0
- package/dist/claude/model-picker.d.ts.map +1 -1
- package/dist/claude/model-picker.js +4 -3
- package/dist/claude/model-picker.js.map +1 -1
- package/dist/claude/model-switch-confirmation.js +9 -1
- package/dist/claude/model-switch-confirmation.js.map +1 -1
- package/dist/claude/screen-table.js +1 -1
- package/dist/claude/screen-table.js.map +1 -1
- package/dist/claude/session/build.d.ts.map +1 -1
- package/dist/claude/session/build.js +3 -0
- package/dist/claude/session/build.js.map +1 -1
- package/dist/claude/session/start-or-resume.js +1 -0
- package/dist/claude/session/start-or-resume.js.map +1 -1
- package/dist/cli/help.d.ts +1 -1
- package/dist/cli/help.d.ts.map +1 -1
- package/dist/cli/help.js +13 -10
- package/dist/cli/help.js.map +1 -1
- package/dist/cli/interactive/spawn.d.ts.map +1 -1
- package/dist/cli/interactive/spawn.js +30 -9
- package/dist/cli/interactive/spawn.js.map +1 -1
- package/dist/cli/main.d.ts.map +1 -1
- package/dist/cli/main.js +9 -0
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/models/combined.d.ts +6 -0
- package/dist/cli/models/combined.d.ts.map +1 -0
- package/dist/cli/models/combined.js +92 -0
- package/dist/cli/models/combined.js.map +1 -0
- package/dist/cli/models/index.d.ts +2 -0
- package/dist/cli/models/index.d.ts.map +1 -1
- package/dist/cli/models/index.js +21 -7
- package/dist/cli/models/index.js.map +1 -1
- package/dist/cli/models/render.d.ts +4 -0
- package/dist/cli/models/render.d.ts.map +1 -1
- package/dist/cli/models/render.js +28 -1
- package/dist/cli/models/render.js.map +1 -1
- package/dist/cli/models/result.d.ts +13 -0
- package/dist/cli/models/result.d.ts.map +1 -0
- package/dist/cli/models/result.js +2 -0
- package/dist/cli/models/result.js.map +1 -0
- package/dist/cli/models/settings.d.ts +61 -0
- package/dist/cli/models/settings.d.ts.map +1 -0
- package/dist/cli/models/settings.js +24 -0
- package/dist/cli/models/settings.js.map +1 -0
- package/dist/cli/models/signals.d.ts +11 -0
- package/dist/cli/models/signals.d.ts.map +1 -0
- package/dist/cli/models/signals.js +21 -0
- package/dist/cli/models/signals.js.map +1 -0
- package/dist/cli/request/index.js +1 -1
- package/dist/cli/request/index.js.map +1 -1
- package/dist/cli/request/layers.d.ts +2 -0
- package/dist/cli/request/layers.d.ts.map +1 -1
- package/dist/cli/request/layers.js +9 -5
- package/dist/cli/request/layers.js.map +1 -1
- package/dist/cli/request/validation.d.ts.map +1 -1
- package/dist/cli/request/validation.js +0 -4
- package/dist/cli/request/validation.js.map +1 -1
- package/dist/cli/run/output.d.ts.map +1 -1
- package/dist/cli/run/output.js +3 -6
- package/dist/cli/run/output.js.map +1 -1
- package/dist/cli/sessions/index.d.ts +9 -2
- package/dist/cli/sessions/index.d.ts.map +1 -1
- package/dist/cli/sessions/index.js +2 -6
- package/dist/cli/sessions/index.js.map +1 -1
- package/dist/cli/sessions/settings.d.ts +11 -0
- package/dist/cli/sessions/settings.d.ts.map +1 -0
- package/dist/cli/sessions/settings.js +26 -0
- package/dist/cli/sessions/settings.js.map +1 -0
- package/dist/codex/model-picker.d.ts.map +1 -1
- package/dist/codex/model-picker.js +3 -2
- package/dist/codex/model-picker.js.map +1 -1
- package/dist/codex/session/build.d.ts.map +1 -1
- package/dist/codex/session/build.js +5 -7
- package/dist/codex/session/build.js.map +1 -1
- package/dist/codex/session/start-or-resume.js +1 -0
- package/dist/codex/session/start-or-resume.js.map +1 -1
- package/dist/core/input/index.d.ts.map +1 -1
- package/dist/core/input/index.js +15 -3
- package/dist/core/input/index.js.map +1 -1
- package/dist/core/models/input.d.ts +3 -0
- package/dist/core/models/input.d.ts.map +1 -0
- package/dist/core/models/input.js +9 -0
- package/dist/core/models/input.js.map +1 -0
- package/dist/core/models/picker.d.ts +2 -1
- package/dist/core/models/picker.d.ts.map +1 -1
- package/dist/core/models/picker.js +6 -5
- package/dist/core/models/picker.js.map +1 -1
- package/dist/core/models/tui-screen.d.ts +1 -1
- package/dist/core/models/tui-screen.d.ts.map +1 -1
- package/dist/core/models/tui-screen.js +26 -3
- package/dist/core/models/tui-screen.js.map +1 -1
- package/dist/runtime/session/base.d.ts.map +1 -1
- package/dist/runtime/session/base.js +4 -1
- package/dist/runtime/session/base.js.map +1 -1
- package/dist/runtime/session/commands.d.ts +2 -1
- package/dist/runtime/session/commands.d.ts.map +1 -1
- package/dist/runtime/session/commands.js +10 -4
- package/dist/runtime/session/commands.js.map +1 -1
- package/dist/runtime/session/lifecycle.d.ts +3 -4
- package/dist/runtime/session/lifecycle.d.ts.map +1 -1
- package/dist/runtime/session/lifecycle.js +6 -5
- package/dist/runtime/session/lifecycle.js.map +1 -1
- package/dist/state/directories.d.ts +4 -0
- package/dist/state/directories.d.ts.map +1 -0
- package/dist/state/directories.js +41 -0
- package/dist/state/directories.js.map +1 -0
- package/dist/state/files.d.ts.map +1 -1
- package/dist/state/files.js +25 -11
- package/dist/state/files.js.map +1 -1
- package/dist/state/private-session.d.ts.map +1 -1
- package/dist/state/private-session.js +2 -0
- package/dist/state/private-session.js.map +1 -1
- package/dist/state/store.d.ts.map +1 -1
- package/dist/state/store.js +7 -1
- package/dist/state/store.js.map +1 -1
- package/docs/cli-behavior.md +1 -1
- package/docs/cli-output.md +40 -10
- package/docs/cli.md +3 -2
- package/docs/codex/cli.md +57 -0
- package/docs/codex/config.md +47 -0
- package/docs/codex/hooks.md +70 -0
- package/examples/README.md +56 -0
- package/examples/full.ts +113 -0
- package/examples/minimal.ts +15 -0
- package/examples/stream.ts +39 -0
- package/examples/support.ts +71 -0
- package/package.json +10 -5
- package/prd/01-overview.md +21 -0
- package/prd/02-goals.md +47 -0
- package/prd/03-terminology.md +32 -0
- package/prd/04-architecture.md +121 -0
- package/prd/05-api/5.1-starting-claude.md +108 -0
- package/prd/05-api/5.2-resuming-claude.md +86 -0
- package/prd/05-api/5.3-claude-session-api.md +658 -0
- package/prd/05-api/5.4-events.md +145 -0
- package/prd/05-api/5.5-starting-codex.md +106 -0
- package/prd/05-api/5.6-resuming-codex.md +48 -0
- package/prd/05-api/5.7-codex-session-api.md +425 -0
- package/prd/05-api/5.8-session-api.md +122 -0
- package/prd/05-api/5.9-loops.md +170 -0
- package/prd/05-api/README.md +19 -0
- package/prd/06-claude-hook-bridge.md +164 -0
- package/prd/07-claude-policy.md +15 -0
- package/prd/07a-codex-hook-bridge.md +76 -0
- package/prd/08-state.md +127 -0
- package/prd/09-lifecycle.md +222 -0
- package/prd/10-errors.md +55 -0
- package/prd/11-test-app.md +53 -0
- package/prd/12-e2e.md +23 -0
- package/prd/12a-cli.md +402 -0
- package/prd/13-latitude.md +12 -0
- package/prd/14-conformance.md +333 -0
- package/prd/15-open-notes.md +8 -0
- package/prd/README.md +45 -0
package/dist/cli/help.js
CHANGED
|
@@ -17,14 +17,14 @@ Examples:
|
|
|
17
17
|
elwood "Summarize this repository"
|
|
18
18
|
git diff | elwood "Review this diff for correctness"
|
|
19
19
|
elwood run --output json < prompt.txt
|
|
20
|
-
elwood --
|
|
20
|
+
elwood --output json "Remember this decision"
|
|
21
21
|
|
|
22
22
|
Commands:
|
|
23
23
|
run Run one agent turn (default)
|
|
24
24
|
resume <id> [prompt...] Resume a kept session; same as run --resume <id>
|
|
25
25
|
interactive [id] Open the agent's own TUI here with Elwood's settings
|
|
26
26
|
sessions List Elwood-owned session records; never starts an agent
|
|
27
|
-
models List
|
|
27
|
+
models List both agents' models (starts each briefly)
|
|
28
28
|
config Inspect or update global defaults; see config --help
|
|
29
29
|
help Show this help
|
|
30
30
|
|
|
@@ -41,12 +41,12 @@ Agent and turn options:
|
|
|
41
41
|
--no-defaults Ignore saved config and ELWOOD_* run defaults
|
|
42
42
|
|
|
43
43
|
Continuation and output:
|
|
44
|
-
--keep Preserve Elwood state
|
|
44
|
+
--keep Preserve Elwood state (default)
|
|
45
45
|
--resume <id> Resume the exact stored agent and workspace
|
|
46
|
-
--ephemeral Remove resumed Elwood state afterward
|
|
46
|
+
--ephemeral Remove new or resumed Elwood state afterward
|
|
47
47
|
--output <text|json|jsonl> Stdout protocol (default: text)
|
|
48
48
|
--stream / --no-stream Toggle incremental text output (default: off)
|
|
49
|
-
--verbose / --no-verbose Toggle concise
|
|
49
|
+
--verbose / --no-verbose Toggle warnings and concise progress on stderr (default: off)
|
|
50
50
|
--debug Write full sanitized event details to stderr
|
|
51
51
|
--head View the full agent TUI in this terminal
|
|
52
52
|
--state-dir <path> Override CLI-owned state storage
|
|
@@ -90,11 +90,14 @@ Session listing:
|
|
|
90
90
|
directory is a normal, empty result.
|
|
91
91
|
|
|
92
92
|
Model listing:
|
|
93
|
-
elwood models
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
elwood models probes Claude then Codex, showing each model's agent. --agent
|
|
94
|
+
limits the listing to that agent; saved/environment agent defaults do not.
|
|
95
|
+
Each probe opens and cancels the picker, then removes its session state.
|
|
96
|
+
Text marks current with * and default with (default); JSON emits one models
|
|
97
|
+
document: agents/errors arrays for both, or agent/models with --agent.
|
|
98
|
+
Partial failures retain available models and exit nonzero. --timeout is one
|
|
99
|
+
budget for the whole command; Ctrl-C stops further probes. Honors --cwd,
|
|
100
|
+
--model, --reasoning-effort, --state-dir, trust, and matching posture flags.
|
|
98
101
|
|
|
99
102
|
-h, --help Show this help
|
|
100
103
|
-V, --version Show the Elwood version
|
package/dist/cli/help.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG
|
|
1
|
+
{"version":3,"file":"help.js","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmGtB,CAAC;AAEF,MAAM,CAAC,MAAM,aAAa,GAAG;;;;;;;;;;;;;;;;;;CAkB5B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/spawn.ts"],"names":[],"mappings":"AAAA;;;;GAIG;
|
|
1
|
+
{"version":3,"file":"spawn.d.ts","sourceRoot":"","sources":["../../../src/cli/interactive/spawn.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAMH,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,SAAS,MAAM,EAAE,CAAC;IACjC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,0EAA0E;AAC1E,MAAM,MAAM,kBAAkB,GAAG,CAAC,MAAM,EAAE,iBAAiB,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;AAEhF,eAAO,MAAM,qBAAqB,EAAE,kBAanC,CAAC;AAEF,kFAAkF;AAClF,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,GAAG,IAAI,GAAG,MAAM,CAIrF"}
|
|
@@ -3,18 +3,24 @@
|
|
|
3
3
|
* observation, the agent's own exit status.
|
|
4
4
|
* Implements PRD §12A.9 and C-CLI-25.
|
|
5
5
|
*/
|
|
6
|
-
import { spawn } from "node:child_process";
|
|
6
|
+
import { execFile, spawn } from "node:child_process";
|
|
7
7
|
import { constants } from "node:os";
|
|
8
8
|
import { causeDetails, elwoodError, errnoCode } from "../../core/errors.js";
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
stdio: "inherit",
|
|
9
|
+
import { probeShellCommand, userShell } from "../../runtime/shell.js";
|
|
10
|
+
export const spawnInteractiveAgent = async (launch) => {
|
|
11
|
+
const path = await loginShellPath().catch((error) => {
|
|
12
|
+
throw spawnFailure(launch, error);
|
|
14
13
|
});
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
14
|
+
return new Promise((resolve, reject) => {
|
|
15
|
+
const child = spawn(launch.command, launch.args, {
|
|
16
|
+
cwd: launch.cwd,
|
|
17
|
+
env: { ...process.env, PATH: path },
|
|
18
|
+
stdio: "inherit",
|
|
19
|
+
});
|
|
20
|
+
child.once("error", (error) => reject(spawnFailure(launch, error)));
|
|
21
|
+
child.once("exit", (code, signal) => resolve(exitStatus(code, signal)));
|
|
22
|
+
});
|
|
23
|
+
};
|
|
18
24
|
/** A signal-terminated agent maps to the shell convention 128 + signal number. */
|
|
19
25
|
export function exitStatus(code, signal) {
|
|
20
26
|
if (code !== null)
|
|
@@ -29,4 +35,19 @@ function spawnFailure(launch, error) {
|
|
|
29
35
|
? `The ${launch.command} command is not available on PATH.`
|
|
30
36
|
: `Could not start ${launch.command} in the foreground.`, causeDetails(error));
|
|
31
37
|
}
|
|
38
|
+
/** Match detection PATH without inserting a shell between terminal signals and the agent. */
|
|
39
|
+
function loginShellPath() {
|
|
40
|
+
return new Promise((resolve, reject) => {
|
|
41
|
+
// NUL framing separates the exported PATH from incidental shell-startup stdout.
|
|
42
|
+
execFile(userShell(), probeShellCommand("printf '\\0%s\\0' \"$PATH\""), { timeout: 10_000 }, (error, stdout) => {
|
|
43
|
+
if (error)
|
|
44
|
+
reject(error);
|
|
45
|
+
else {
|
|
46
|
+
const parts = stdout.split("\u0000");
|
|
47
|
+
// Early-exiting shell startup can succeed without running the probe.
|
|
48
|
+
resolve(parts.length >= 3 ? parts.at(-2) : process.env["PATH"]);
|
|
49
|
+
}
|
|
50
|
+
});
|
|
51
|
+
});
|
|
52
|
+
}
|
|
32
53
|
//# sourceMappingURL=spawn.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../../src/cli/interactive/spawn.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"spawn.js","sourceRoot":"","sources":["../../../src/cli/interactive/spawn.ts"],"names":[],"mappings":"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"}
|
package/dist/cli/main.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAS5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAE3E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAG5D,OAAO,EAAmB,KAAK,WAAW,EAAE,MAAM,aAAa,CAAC;AAChE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAG9D,MAAM,MAAM,cAAc,GAAG;IAC3B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC;IAC7B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,WAAW,CAAC,EAAE,OAAO,CAAC;IAC/B,QAAQ,CAAC,GAAG,EAAE,cAAc,CAAC;IAC7B,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,aAAa,CAAC;CAC/B,CAAC;AACF,MAAM,MAAM,mBAAmB,GAAG;IAChC,QAAQ,CAAC,OAAO,EAAE,MAAM,MAAM,CAAC;IAC/B,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,QAAQ,EAAE,OAAO,kBAAkB,CAAC;IAC7C,QAAQ,CAAC,OAAO,EAAE,OAAO,iBAAiB,CAAC;IAC3C,QAAQ,CAAC,OAAO,EAAE,OAAO,UAAU,CAAC;IACpC,QAAQ,CAAC,UAAU,EAAE,OAAO,aAAa,CAAC;IAC1C,QAAQ,CAAC,WAAW,EAAE,OAAO,qBAAqB,CAAC;IACnD,QAAQ,CAAC,GAAG,EAAE,MAAM,MAAM,CAAC;CAC5B,CAAC;AAEF,eAAO,MAAM,wBAAwB,EAAE,OAAO,iBACmB,CAAC;AAElE,eAAO,MAAM,oBAAoB,EAAE,OAAO,UACY,CAAC;AAEvD,eAAO,MAAM,oBAAoB,EAAE,OAAO,aACkB,CAAC;AAE7D,eAAO,MAAM,qBAAqB,EAAE,OAAO,qBAC8B,CAAC;AAa1E,+FAA+F;AAC/F,wBAAsB,IAAI,CACxB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,OAAO,EAAE,cAAc,EACvB,YAAY,GAAE,mBAA8B,GAC3C,OAAO,CAAC,MAAM,CAAC,CAwFjB"}
|
package/dist/cli/main.js
CHANGED
|
@@ -7,9 +7,11 @@ import { runConfigCommand } from "./config/commands.js";
|
|
|
7
7
|
import { HeadedDisplay } from "./head/display.js";
|
|
8
8
|
import { cliHelp } from "./help.js";
|
|
9
9
|
import { agentHint, cliFailure, errorRecord, explicitStructuredOutput, renderErrorRecord, } from "./main-failure.js";
|
|
10
|
+
import { executeCombinedModels } from "./models/combined.js";
|
|
10
11
|
import { resolveRunRequest, resolveRunSettings } from "./request/index.js";
|
|
11
12
|
import { optional, usage } from "./request/values.js";
|
|
12
13
|
import { assertListingOutput, runSessionsCommand } from "./sessions/index.js";
|
|
14
|
+
import { resolveListingSettings } from "./sessions/settings.js";
|
|
13
15
|
import { AsyncOutputSink } from "./stream.js";
|
|
14
16
|
import { readCliVersion } from "./version.js";
|
|
15
17
|
export const prepareDefaultCliSession = async (...args) => (await import("./session/index.js")).prepareCliSession(...args);
|
|
@@ -55,6 +57,13 @@ export async function main(args, context, dependencies = defaults) {
|
|
|
55
57
|
return await dependencies.interactive(parsed, context);
|
|
56
58
|
}
|
|
57
59
|
if (parsed.command === "models") {
|
|
60
|
+
if (parsed.run.flags.agent === undefined) {
|
|
61
|
+
const settings = resolveListingSettings(parsed.run, context);
|
|
62
|
+
output = settings.output;
|
|
63
|
+
agent = null;
|
|
64
|
+
assertListingOutput(settings, "models");
|
|
65
|
+
return await executeCombinedModels(parsed.run, output, context, { stdout, stderr }, dependencies, startedAt);
|
|
66
|
+
}
|
|
58
67
|
const settings = await dependencies.settings(parsed.run, context);
|
|
59
68
|
assertListingOutput(settings, "models");
|
|
60
69
|
output = settings.output;
|
package/dist/cli/main.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAGpC,OAAO,EACL,SAAS,EACT,UAAU,EACV,WAAW,EACX,wBAAwB,EACxB,iBAAiB,GAClB,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"main.js","sourceRoot":"","sources":["../../src/cli/main.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
/** Sequential aggregate model listing with a command-wide deadline (PRD §12A.10, C-CLI-26). */
|
|
2
|
+
import type { CliMainContext, CliMainDependencies } from "../main.ts";
|
|
3
|
+
import type { CliOutputMode, ParsedRunCommand } from "../types.ts";
|
|
4
|
+
import type { ExecuteModelsIo } from "./index.ts";
|
|
5
|
+
export declare function executeCombinedModels(parsed: ParsedRunCommand, output: CliOutputMode, context: CliMainContext, io: ExecuteModelsIo, dependencies: CliMainDependencies, startedAt: number): Promise<number>;
|
|
6
|
+
//# sourceMappingURL=combined.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"combined.d.ts","sourceRoot":"","sources":["../../../src/cli/models/combined.ts"],"names":[],"mappings":"AAAA,+FAA+F;AAG/F,OAAO,KAAK,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,YAAY,CAAC;AAItE,OAAO,KAAK,EAAY,aAAa,EAAE,gBAAgB,EAAsB,MAAM,aAAa,CAAC;AAEjG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAiBlD,wBAAsB,qBAAqB,CACzC,MAAM,EAAE,gBAAgB,EACxB,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,cAAc,EACvB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,mBAAmB,EACjC,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,MAAM,CAAC,CA2EjB"}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
/** Sequential aggregate model listing with a command-wide deadline (PRD §12A.10, C-CLI-26). */
|
|
2
|
+
import { cliFailure, errorRecord } from "../main-failure.js";
|
|
3
|
+
import { cliAgents } from "../types.js";
|
|
4
|
+
import { renderCombinedModels } from "./render.js";
|
|
5
|
+
import { modelAgentInputs } from "./settings.js";
|
|
6
|
+
import { ModelsSignals } from "./signals.js";
|
|
7
|
+
async function teardownPreparedSession(session) {
|
|
8
|
+
try {
|
|
9
|
+
await session.teardown();
|
|
10
|
+
return { action: "teardown", status: "succeeded" };
|
|
11
|
+
}
|
|
12
|
+
catch {
|
|
13
|
+
return { action: "teardown", status: "failed", error: "Cleanup failed." };
|
|
14
|
+
}
|
|
15
|
+
}
|
|
16
|
+
export async function executeCombinedModels(parsed, output, context, io, dependencies, startedAt) {
|
|
17
|
+
const signals = new ModelsSignals(context.signals);
|
|
18
|
+
const results = [];
|
|
19
|
+
let deadline;
|
|
20
|
+
const stopped = () => {
|
|
21
|
+
if (signals.interrupted)
|
|
22
|
+
return { code: "interrupted", message: "Interrupted.", exitCode: 130 };
|
|
23
|
+
if (deadline !== undefined && dependencies.now() >= deadline)
|
|
24
|
+
return { code: "timeout", message: "Timed out.", exitCode: 124 };
|
|
25
|
+
return undefined;
|
|
26
|
+
};
|
|
27
|
+
const failed = (agent, failure, cleanup) => {
|
|
28
|
+
results.push({
|
|
29
|
+
agent,
|
|
30
|
+
error: errorRecord(agent, failure, Math.max(0, dependencies.now() - startedAt), cleanup),
|
|
31
|
+
exitCode: failure.exitCode,
|
|
32
|
+
});
|
|
33
|
+
};
|
|
34
|
+
try {
|
|
35
|
+
// Validate both sets of settings before launching either adapter.
|
|
36
|
+
const settings = new Map();
|
|
37
|
+
const failures = new Map();
|
|
38
|
+
for (const agent of cliAgents) {
|
|
39
|
+
const inputs = modelAgentInputs(parsed, context.env, agent);
|
|
40
|
+
try {
|
|
41
|
+
const request = await dependencies.settings(inputs.parsed, { ...context, env: inputs.env });
|
|
42
|
+
if (request.timeoutMs !== undefined)
|
|
43
|
+
deadline = startedAt + request.timeoutMs;
|
|
44
|
+
settings.set(agent, request);
|
|
45
|
+
}
|
|
46
|
+
catch (error) {
|
|
47
|
+
failures.set(agent, cliFailure(error));
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
for (const agent of cliAgents) {
|
|
51
|
+
const stop = stopped();
|
|
52
|
+
if (stop !== undefined) {
|
|
53
|
+
failed(agent, stop);
|
|
54
|
+
break;
|
|
55
|
+
}
|
|
56
|
+
const invalid = failures.get(agent);
|
|
57
|
+
if (invalid !== undefined) {
|
|
58
|
+
failed(agent, invalid);
|
|
59
|
+
continue;
|
|
60
|
+
}
|
|
61
|
+
let prepared;
|
|
62
|
+
try {
|
|
63
|
+
prepared = await dependencies.prepare(settings.get(agent));
|
|
64
|
+
}
|
|
65
|
+
catch (error) {
|
|
66
|
+
const stop = stopped();
|
|
67
|
+
if (stop !== undefined) {
|
|
68
|
+
failed(agent, stop);
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
failed(agent, cliFailure(error));
|
|
72
|
+
continue;
|
|
73
|
+
}
|
|
74
|
+
const afterPreparation = stopped();
|
|
75
|
+
if (afterPreparation !== undefined) {
|
|
76
|
+
const cleanup = await teardownPreparedSession(prepared.session);
|
|
77
|
+
failed(agent, afterPreparation, cleanup);
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
await dependencies.listModels({
|
|
81
|
+
...prepared.request,
|
|
82
|
+
...(deadline === undefined ? {} : { timeoutMs: deadline - dependencies.now() }),
|
|
83
|
+
}, prepared.session, io, { signals, onResult: (result) => results.push(result) });
|
|
84
|
+
}
|
|
85
|
+
await renderCombinedModels(output, results, io);
|
|
86
|
+
return Math.max(0, ...results.map((result) => ("error" in result ? result.exitCode : 0)));
|
|
87
|
+
}
|
|
88
|
+
finally {
|
|
89
|
+
signals.dispose();
|
|
90
|
+
}
|
|
91
|
+
}
|
|
92
|
+
//# sourceMappingURL=combined.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"combined.js","sourceRoot":"","sources":["../../../src/cli/models/combined.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ import { type CliLifecycleClock, type CliSignalSource } from "../lifecycle/index
|
|
|
8
8
|
import type { CliSessionFacade } from "../session/index.ts";
|
|
9
9
|
import type { AsyncOutputSink } from "../stream.ts";
|
|
10
10
|
import type { EffectiveRunRequest } from "../types.ts";
|
|
11
|
+
import type { ModelsResult } from "./result.ts";
|
|
11
12
|
export type ExecuteModelsIo = {
|
|
12
13
|
readonly stdout: AsyncOutputSink;
|
|
13
14
|
readonly stderr: AsyncOutputSink;
|
|
@@ -15,6 +16,7 @@ export type ExecuteModelsIo = {
|
|
|
15
16
|
export type ExecuteModelsDependencies = {
|
|
16
17
|
readonly signals: CliSignalSource;
|
|
17
18
|
readonly clock?: CliLifecycleClock;
|
|
19
|
+
readonly onResult?: (result: ModelsResult) => void;
|
|
18
20
|
};
|
|
19
21
|
export declare function executeModels(request: EffectiveRunRequest, session: CliSessionFacade, io: ExecuteModelsIo, dependencies: ExecuteModelsDependencies): Promise<number>;
|
|
20
22
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAgB,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAgB,KAAK,iBAAiB,EAAE,KAAK,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAMnG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAC5D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AACpD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAGvD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAEhD,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;IACjC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC;CAClC,CAAC;AACF,MAAM,MAAM,yBAAyB,GAAG;IACtC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC;IAClC,QAAQ,CAAC,KAAK,CAAC,EAAE,iBAAiB,CAAC;IACnC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC,MAAM,EAAE,YAAY,KAAK,IAAI,CAAC;CACpD,CAAC;AAEF,wBAAsB,aAAa,CACjC,OAAO,EAAE,mBAAmB,EAC5B,OAAO,EAAE,gBAAgB,EACzB,EAAE,EAAE,eAAe,EACnB,YAAY,EAAE,yBAAyB,GACtC,OAAO,CAAC,MAAM,CAAC,CA+DjB"}
|
package/dist/cli/models/index.js
CHANGED
|
@@ -13,7 +13,7 @@ import { subscribeRunEvents } from "../run/subscribe.js";
|
|
|
13
13
|
import { CodexUpdateAttentionGuard } from "../update-attention.js";
|
|
14
14
|
import { renderModels } from "./render.js";
|
|
15
15
|
export async function executeModels(request, session, io, dependencies) {
|
|
16
|
-
const lifecycle = new CliLifecycle(request, session, dependencies.signals, dependencies.clock);
|
|
16
|
+
const lifecycle = new CliLifecycle({ ...request, keep: false, ephemeral: true }, session, dependencies.signals, dependencies.clock);
|
|
17
17
|
const clean = createCliSanitizer();
|
|
18
18
|
const warnings = [];
|
|
19
19
|
const updateAttention = request.agent === "codex"
|
|
@@ -21,17 +21,25 @@ export async function executeModels(request, session, io, dependencies) {
|
|
|
21
21
|
: undefined;
|
|
22
22
|
const unsubscribers = subscribeRunEvents(request, session, lifecycle, {
|
|
23
23
|
status: () => undefined,
|
|
24
|
-
warning: (event) =>
|
|
24
|
+
warning: (event) => {
|
|
25
|
+
if (request.verbose || request.debug === true)
|
|
26
|
+
warnings.push(writeWarning(io.stderr, event, clean));
|
|
27
|
+
},
|
|
25
28
|
}, undefined, updateAttention);
|
|
26
29
|
let models;
|
|
27
30
|
lifecycle.start();
|
|
28
31
|
try {
|
|
32
|
+
if (lifecycle.failure !== undefined)
|
|
33
|
+
throw lifecycle.failure;
|
|
29
34
|
lifecycle.beginLaunch();
|
|
30
35
|
const started = await lifecycle.race(session.start());
|
|
31
36
|
if (started.completed) {
|
|
32
|
-
const
|
|
33
|
-
if (
|
|
34
|
-
|
|
37
|
+
const ready = await lifecycle.race(started.value.waitForStatus((status) => status === "ready"));
|
|
38
|
+
if (ready.completed) {
|
|
39
|
+
const listed = await lifecycle.race(started.value.listModels());
|
|
40
|
+
if (listed.completed)
|
|
41
|
+
models = listed.value;
|
|
42
|
+
}
|
|
35
43
|
}
|
|
36
44
|
}
|
|
37
45
|
catch (error) {
|
|
@@ -46,11 +54,17 @@ export async function executeModels(request, session, io, dependencies) {
|
|
|
46
54
|
const failure = lifecycle.failure;
|
|
47
55
|
if (failure === undefined) {
|
|
48
56
|
// Both races completed (the lifecycle only stops on a recorded failure), so rows exist.
|
|
49
|
-
|
|
57
|
+
if (dependencies.onResult === undefined)
|
|
58
|
+
await renderModels(request.output, request.agent, models, io.stdout);
|
|
59
|
+
else
|
|
60
|
+
dependencies.onResult({ agent: request.agent, models: models });
|
|
50
61
|
return 0;
|
|
51
62
|
}
|
|
52
63
|
const record = errorRecord(request.agent, failure, lifecycle.durationMs(), cleanup);
|
|
53
|
-
|
|
64
|
+
if (dependencies.onResult === undefined)
|
|
65
|
+
await renderErrorRecord(request.output, record, io.stdout, io.stderr);
|
|
66
|
+
else
|
|
67
|
+
dependencies.onResult({ agent: request.agent, error: record, exitCode: failure.exitCode });
|
|
54
68
|
return failure.exitCode;
|
|
55
69
|
}
|
|
56
70
|
function writeWarning(stderr, event, clean) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAIH,OAAO,EAAE,YAAY,EAAgD,MAAM,uBAAuB,CAAC;AACnG,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACpE,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC3D,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AAIzD,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/cli/models/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,5 +5,9 @@
|
|
|
5
5
|
import type { AgentModelOption } from "../../core/models/rows.ts";
|
|
6
6
|
import type { AsyncOutputSink } from "../stream.ts";
|
|
7
7
|
import type { CliAgent, CliOutputMode } from "../types.ts";
|
|
8
|
+
import type { ExecuteModelsIo } from "./index.ts";
|
|
9
|
+
import type { ModelsResult } from "./result.ts";
|
|
8
10
|
export declare function renderModels(output: CliOutputMode, agent: CliAgent, models: readonly AgentModelOption[], stdout: AsyncOutputSink): Promise<void>;
|
|
11
|
+
/** Render a combined invocation once, after every started probe has been cleaned up. */
|
|
12
|
+
export declare function renderCombinedModels(output: CliOutputMode, results: readonly ModelsResult[], io: ExecuteModelsIo): Promise<void>;
|
|
9
13
|
//# sourceMappingURL=render.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAEH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAEpD,OAAO,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC3D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAIhD,wBAAsB,YAAY,CAChC,MAAM,EAAE,aAAa,EACrB,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,SAAS,gBAAgB,EAAE,EACnC,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC,CAoBf;AAeD,wFAAwF;AACxF,wBAAsB,oBAAoB,CACxC,MAAM,EAAE,aAAa,EACrB,OAAO,EAAE,SAAS,YAAY,EAAE,EAChC,EAAE,EAAE,eAAe,GAClB,OAAO,CAAC,IAAI,CAAC,CAsCf"}
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
* Table and JSON rendering for `elwood models`.
|
|
3
3
|
* Implements PRD §12A.10 and C-CLI-26.
|
|
4
4
|
*/
|
|
5
|
-
import { createCliSanitizer } from "../output/sanitize.js";
|
|
5
|
+
import { createCliSanitizer, formatDiagnosticValue } from "../output/sanitize.js";
|
|
6
6
|
import { renderTable } from "../table.js";
|
|
7
7
|
const header = ["CURRENT", "ID", "LABEL", "DEFAULT", "DESCRIPTION"];
|
|
8
8
|
export async function renderModels(output, agent, models, stdout) {
|
|
@@ -30,4 +30,31 @@ function sanitizedModel(model, clean) {
|
|
|
30
30
|
raw: clean(model.raw),
|
|
31
31
|
};
|
|
32
32
|
}
|
|
33
|
+
/** Render a combined invocation once, after every started probe has been cleaned up. */
|
|
34
|
+
export async function renderCombinedModels(output, results, io) {
|
|
35
|
+
const clean = createCliSanitizer();
|
|
36
|
+
const agents = results.flatMap((result) => "models" in result
|
|
37
|
+
? [
|
|
38
|
+
{
|
|
39
|
+
agent: result.agent,
|
|
40
|
+
models: result.models.map((model) => sanitizedModel(model, clean)),
|
|
41
|
+
},
|
|
42
|
+
]
|
|
43
|
+
: []);
|
|
44
|
+
const errors = results.flatMap((result) => ("error" in result ? [result.error] : []));
|
|
45
|
+
if (output === "json") {
|
|
46
|
+
await io.stdout.write(`${JSON.stringify({ schemaVersion: 1, type: "models", agents, errors })}\n`);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
await io.stdout.write(renderTable(["AGENT", ...header], agents.flatMap(({ agent, models }) => models.map((model) => [
|
|
50
|
+
agent,
|
|
51
|
+
model.isCurrent ? "*" : "",
|
|
52
|
+
model.id,
|
|
53
|
+
model.label,
|
|
54
|
+
model.isDefault ? "(default)" : "",
|
|
55
|
+
model.description ?? "",
|
|
56
|
+
]))));
|
|
57
|
+
for (const error of errors)
|
|
58
|
+
await io.stderr.write(`elwood: ${error.agent}: ${formatDiagnosticValue(error.error.message, clean)}\n`);
|
|
59
|
+
}
|
|
33
60
|
//# sourceMappingURL=render.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/cli/models/render.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAK1C,MAAM,MAAM,GAAG,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,aAAa,CAAC,CAAC;AAEpE,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,MAAqB,EACrB,KAAe,EACf,MAAmC,EACnC,MAAuB;IAEvB,MAAM,KAAK,GAAG,kBAAkB,EAAE,CAAC;IACnC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;IACjE,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,QAAQ,GAAG,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;QAC3E,MAAM,MAAM,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO;IACT,CAAC;IACD,MAAM,MAAM,CAAC,KAAK,CAChB,WAAW,CACT,MAAM,EACN,IAAI,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QAClB,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC1B,KAAK,CAAC,EAAE;QACR,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAClC,KAAK,CAAC,WAAW,IAAI,EAAE;KACxB,CAAC,CACH,CACF,CAAC;AACJ,CAAC;AAED,SAAS,cAAc,CACrB,KAAuB,EACvB,KAAgC;IAEhC,OAAO;QACL,GAAG,KAAK;QACR,EAAE,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACnB,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC;QACzB,GAAG,CAAC,KAAK,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,KAAK,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE,CAAC;QACrF,GAAG,EAAE,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC;KACtB,CAAC;AACJ,CAAC;AAED,wFAAwF;AACxF,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,MAAqB,EACrB,OAAgC,EAChC,EAAmB;IAEnB,MAAM,KAAK,GAAG,kBAAkB,EAAE,CAAC;IACnC,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CACxC,QAAQ,IAAI,MAAM;QAChB,CAAC,CAAC;YACE;gBACE,KAAK,EAAE,MAAM,CAAC,KAAK;gBACnB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;aACnE;SACF;QACH,CAAC,CAAC,EAAE,CACP,CAAC;IACF,MAAM,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACtF,IAAI,MAAM,KAAK,MAAM,EAAE,CAAC;QACtB,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CACnB,GAAG,IAAI,CAAC,SAAS,CAAC,EAAE,aAAa,EAAE,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,IAAI,CAC5E,CAAC;QACF,OAAO;IACT,CAAC;IACD,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CACnB,WAAW,CACT,CAAC,OAAO,EAAE,GAAG,MAAM,CAAC,EACpB,MAAM,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CACnC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;QACpB,KAAK;QACL,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAC1B,KAAK,CAAC,EAAE;QACR,KAAK,CAAC,KAAK;QACX,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE;QAClC,KAAK,CAAC,WAAW,IAAI,EAAE;KACxB,CAAC,CACH,CACF,CACF,CAAC;IACF,KAAK,MAAM,KAAK,IAAI,MAAM;QACxB,MAAM,EAAE,CAAC,MAAM,CAAC,KAAK,CACnB,WAAW,KAAK,CAAC,KAAK,KAAK,qBAAqB,CAAC,KAAK,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CACjF,CAAC;AACN,CAAC"}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
/** Typed model probe outcomes shared by single and combined listings (PRD §12A.10, C-CLI-26). */
|
|
2
|
+
import type { AgentModelOption } from "../../core/models/rows.ts";
|
|
3
|
+
import type { CliError } from "../output/types.ts";
|
|
4
|
+
import type { CliAgent } from "../types.ts";
|
|
5
|
+
export type ModelsResult = {
|
|
6
|
+
readonly agent: CliAgent;
|
|
7
|
+
readonly models: readonly AgentModelOption[];
|
|
8
|
+
} | {
|
|
9
|
+
readonly agent: CliAgent;
|
|
10
|
+
readonly error: CliError;
|
|
11
|
+
readonly exitCode: number;
|
|
12
|
+
};
|
|
13
|
+
//# sourceMappingURL=result.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"result.d.ts","sourceRoot":"","sources":["../../../src/cli/models/result.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAE5C,MAAM,MAAM,YAAY,GACpB;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,SAAS,gBAAgB,EAAE,CAAA;CAAE,GAC1E;IAAE,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC;IAAC,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"result.js","sourceRoot":"","sources":["../../../src/cli/models/result.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,61 @@
|
|
|
1
|
+
import type { CliAgent, CliEnvironment, ParsedRunCommand } from "../types.ts";
|
|
2
|
+
export declare function modelAgentInputs(parsed: ParsedRunCommand, environment: CliEnvironment, agent: CliAgent): {
|
|
3
|
+
parsed: {
|
|
4
|
+
flags: {
|
|
5
|
+
claudePermissionMode?: string;
|
|
6
|
+
agent: "claude" | "codex";
|
|
7
|
+
output?: string;
|
|
8
|
+
timeout?: string;
|
|
9
|
+
trust?: boolean;
|
|
10
|
+
highTrust?: boolean;
|
|
11
|
+
stateDir?: string;
|
|
12
|
+
verbose?: boolean;
|
|
13
|
+
stream?: boolean;
|
|
14
|
+
debug?: boolean;
|
|
15
|
+
ignoreDefaults?: boolean;
|
|
16
|
+
head?: boolean;
|
|
17
|
+
persona?: string;
|
|
18
|
+
model?: string;
|
|
19
|
+
reasoningEffort?: string;
|
|
20
|
+
cwd?: string;
|
|
21
|
+
images: readonly string[];
|
|
22
|
+
keep?: boolean;
|
|
23
|
+
resume?: string;
|
|
24
|
+
ephemeral?: boolean;
|
|
25
|
+
} | {
|
|
26
|
+
codexApprovalPolicy?: string;
|
|
27
|
+
codexSandbox?: string;
|
|
28
|
+
agent: "claude" | "codex";
|
|
29
|
+
output?: string;
|
|
30
|
+
timeout?: string;
|
|
31
|
+
trust?: boolean;
|
|
32
|
+
highTrust?: boolean;
|
|
33
|
+
stateDir?: string;
|
|
34
|
+
verbose?: boolean;
|
|
35
|
+
stream?: boolean;
|
|
36
|
+
debug?: boolean;
|
|
37
|
+
ignoreDefaults?: boolean;
|
|
38
|
+
head?: boolean;
|
|
39
|
+
persona?: string;
|
|
40
|
+
model?: string;
|
|
41
|
+
reasoningEffort?: string;
|
|
42
|
+
cwd?: string;
|
|
43
|
+
images: readonly string[];
|
|
44
|
+
keep?: boolean;
|
|
45
|
+
resume?: string;
|
|
46
|
+
ephemeral?: boolean;
|
|
47
|
+
};
|
|
48
|
+
command: "run";
|
|
49
|
+
explicit: ReadonlySet<import("../types.ts").RunOptionKey>;
|
|
50
|
+
promptWords: readonly string[];
|
|
51
|
+
};
|
|
52
|
+
env: {
|
|
53
|
+
ELWOOD_CODEX_SANDBOX: undefined;
|
|
54
|
+
ELWOOD_CODEX_APPROVAL_POLICY: undefined;
|
|
55
|
+
ELWOOD_AGENT: undefined;
|
|
56
|
+
} | {
|
|
57
|
+
ELWOOD_CLAUDE_PERMISSION_MODE: undefined;
|
|
58
|
+
ELWOOD_AGENT: undefined;
|
|
59
|
+
};
|
|
60
|
+
};
|
|
61
|
+
//# sourceMappingURL=settings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../../src/cli/models/settings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,QAAQ,EAAE,cAAc,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAE9E,wBAAgB,gBAAgB,CAC9B,MAAM,EAAE,gBAAgB,EACxB,WAAW,EAAE,cAAc,EAC3B,KAAK,EAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAqBhB"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
/** Select only the matching adapter's options for combined model probes (PRD §12A.10). */
|
|
2
|
+
import { optional } from "../request/values.js";
|
|
3
|
+
export function modelAgentInputs(parsed, environment, agent) {
|
|
4
|
+
const { claudePermissionMode, codexSandbox, codexApprovalPolicy, ...shared } = parsed.flags;
|
|
5
|
+
const flags = {
|
|
6
|
+
...shared,
|
|
7
|
+
agent,
|
|
8
|
+
...(agent === "claude"
|
|
9
|
+
? optional(claudePermissionMode, "claudePermissionMode")
|
|
10
|
+
: {
|
|
11
|
+
...optional(codexSandbox, "codexSandbox"),
|
|
12
|
+
...optional(codexApprovalPolicy, "codexApprovalPolicy"),
|
|
13
|
+
}),
|
|
14
|
+
};
|
|
15
|
+
const env = {
|
|
16
|
+
...environment,
|
|
17
|
+
ELWOOD_AGENT: undefined,
|
|
18
|
+
...(agent === "claude"
|
|
19
|
+
? { ELWOOD_CODEX_SANDBOX: undefined, ELWOOD_CODEX_APPROVAL_POLICY: undefined }
|
|
20
|
+
: { ELWOOD_CLAUDE_PERMISSION_MODE: undefined }),
|
|
21
|
+
};
|
|
22
|
+
return { parsed: { ...parsed, flags }, env };
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=settings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../src/cli/models/settings.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,MAAM,UAAU,gBAAgB,CAC9B,MAAwB,EACxB,WAA2B,EAC3B,KAAe;IAEf,MAAM,EAAE,oBAAoB,EAAE,YAAY,EAAE,mBAAmB,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC;IAC5F,MAAM,KAAK,GAAG;QACZ,GAAG,MAAM;QACT,KAAK;QACL,GAAG,CAAC,KAAK,KAAK,QAAQ;YACpB,CAAC,CAAC,QAAQ,CAAC,oBAAoB,EAAE,sBAAsB,CAAC;YACxD,CAAC,CAAC;gBACE,GAAG,QAAQ,CAAC,YAAY,EAAE,cAAc,CAAC;gBACzC,GAAG,QAAQ,CAAC,mBAAmB,EAAE,qBAAqB,CAAC;aACxD,CAAC;KACP,CAAC;IACF,MAAM,GAAG,GAAG;QACV,GAAG,WAAW;QACd,YAAY,EAAE,SAAS;QACvB,GAAG,CAAC,KAAK,KAAK,QAAQ;YACpB,CAAC,CAAC,EAAE,oBAAoB,EAAE,SAAS,EAAE,4BAA4B,EAAE,SAAS,EAAE;YAC9E,CAAC,CAAC,EAAE,6BAA6B,EAAE,SAAS,EAAE,CAAC;KAClD,CAAC;IACF,OAAO,EAAE,MAAM,EAAE,EAAE,GAAG,MAAM,EAAE,KAAK,EAAE,EAAE,GAAG,EAAE,CAAC;AAC/C,CAAC"}
|
|
@@ -0,0 +1,11 @@
|
|
|
1
|
+
/** Keep SIGINT bound between combined probes and replay cancellation at launch (PRD §12A.10). */
|
|
2
|
+
import type { Unsubscribe } from "../../core/types.ts";
|
|
3
|
+
import type { CliSignalSource } from "../lifecycle/index.ts";
|
|
4
|
+
export declare class ModelsSignals implements CliSignalSource {
|
|
5
|
+
interrupted: boolean;
|
|
6
|
+
private readonly handlers;
|
|
7
|
+
readonly dispose: Unsubscribe;
|
|
8
|
+
constructor(source: CliSignalSource);
|
|
9
|
+
onSigint(handler: () => void): Unsubscribe;
|
|
10
|
+
}
|
|
11
|
+
//# sourceMappingURL=signals.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"signals.d.ts","sourceRoot":"","sources":["../../../src/cli/models/signals.ts"],"names":[],"mappings":"AAAA,iGAAiG;AACjG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AAE7D,qBAAa,aAAc,YAAW,eAAe;IACnD,WAAW,UAAS;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAyB;IAClD,QAAQ,CAAC,OAAO,EAAE,WAAW,CAAC;gBAElB,MAAM,EAAE,eAAe;IAOnC,QAAQ,CAAC,OAAO,EAAE,MAAM,IAAI,GAAG,WAAW;CAO3C"}
|