@dirgha/code 1.42.14 → 1.43.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -0
- package/dist/cli/config.d.ts +17 -0
- package/dist/cli/config.js +14 -16
- package/dist/cli/config.js.map +1 -1
- package/dist/cli/first-run.js +1 -1
- package/dist/cli/first-run.js.map +1 -1
- package/dist/cli/flows/wizard.js +1 -1
- package/dist/cli/flows/wizard.js.map +1 -1
- package/dist/cli/interactive.js +1 -1
- package/dist/cli/interactive.js.map +1 -1
- package/dist/cli/main.js +26 -28
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/setup.js +1 -1
- package/dist/cli/setup.js.map +1 -1
- package/dist/cli/subcommands/ask.js +3 -3
- package/dist/cli/subcommands/ask.js.map +1 -1
- package/dist/cli/subcommands/index.js +1 -1
- package/dist/cli/subcommands/index.js.map +1 -1
- package/dist/cli/subcommands/verify.js +3 -3
- package/dist/cli/subcommands/verify.js.map +1 -1
- package/dist/fleet/worktree.js +49 -2
- package/dist/fleet/worktree.js.map +1 -1
- package/dist/gpu/market.js +43 -17
- package/dist/gpu/market.js.map +1 -1
- package/dist/intelligence/prices.js +2 -5
- package/dist/intelligence/prices.js.map +1 -1
- package/dist/kernel/agent-loop.d.ts +18 -0
- package/dist/kernel/agent-loop.js +84 -64
- package/dist/kernel/agent-loop.js.map +1 -1
- package/dist/kernel/message.js +10 -0
- package/dist/kernel/message.js.map +1 -1
- package/dist/orchestra/agent/dirgha.d.ts +21 -0
- package/dist/orchestra/agent/dirgha.js +36 -0
- package/dist/orchestra/agent/dirgha.js.map +1 -0
- package/dist/orchestra/agent/manager.d.ts +44 -0
- package/dist/orchestra/agent/manager.js +154 -0
- package/dist/orchestra/agent/manager.js.map +1 -0
- package/dist/orchestra/bin.d.ts +23 -0
- package/dist/orchestra/bin.js +225 -0
- package/dist/orchestra/bin.js.map +1 -0
- package/dist/orchestra/core/registry.d.ts +27 -0
- package/dist/orchestra/core/registry.js +100 -0
- package/dist/orchestra/core/registry.js.map +1 -0
- package/dist/orchestra/core/store.d.ts +15 -0
- package/dist/orchestra/core/store.js +44 -0
- package/dist/orchestra/core/store.js.map +1 -0
- package/dist/orchestra/core/types.d.ts +62 -0
- package/dist/orchestra/core/types.js +10 -0
- package/dist/orchestra/core/types.js.map +1 -0
- package/dist/orchestra/orchestration/log.d.ts +21 -0
- package/dist/orchestra/orchestration/log.js +68 -0
- package/dist/orchestra/orchestration/log.js.map +1 -0
- package/dist/providers/deepseek-catalogue.js +6 -4
- package/dist/providers/deepseek-catalogue.js.map +1 -1
- package/dist/providers/dispatch.js +3 -5
- package/dist/providers/dispatch.js.map +1 -1
- package/dist/subagents/delegator.d.ts +10 -1
- package/dist/subagents/delegator.js +28 -6
- package/dist/subagents/delegator.js.map +1 -1
- package/dist/tools/shell.js +21 -8
- package/dist/tools/shell.js.map +1 -1
- package/dist/tui/ink/App.js +70 -34
- package/dist/tui/ink/App.js.map +1 -1
- package/dist/tui/ink/components/ApprovalPrompt.js +1 -1
- package/dist/tui/ink/components/ApprovalPrompt.js.map +1 -1
- package/dist/tui/ink/components/InputBox.d.ts +2 -3
- package/dist/tui/ink/components/InputBox.js +75 -57
- package/dist/tui/ink/components/InputBox.js.map +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js +1 -1
- package/dist/tui/ink/components/KeySetOverlay.js.map +1 -1
- package/dist/tui/ink/components/ModelPicker.js +11 -1
- package/dist/tui/ink/components/ModelPicker.js.map +1 -1
- package/dist/tui/ink/components/OpenRouterCompanyPicker.js +3 -1
- package/dist/tui/ink/components/OpenRouterCompanyPicker.js.map +1 -1
- package/dist/tui/ink/components/PasteCollapse.d.ts +1 -1
- package/dist/tui/ink/components/PasteCollapse.js +3 -1
- package/dist/tui/ink/components/PasteCollapse.js.map +1 -1
- package/dist/tui/ink/components/ProviderPicker.js +11 -1
- package/dist/tui/ink/components/ProviderPicker.js.map +1 -1
- package/dist/tui/ink/components/SlashComplete.js +5 -6
- package/dist/tui/ink/components/SlashComplete.js.map +1 -1
- package/dist/tui/ink/components/SubagentDashboard.d.ts +20 -0
- package/dist/tui/ink/components/SubagentDashboard.js +159 -0
- package/dist/tui/ink/components/SubagentDashboard.js.map +1 -0
- package/dist/tui/ink/components/VirtualTranscript.d.ts +6 -5
- package/dist/tui/ink/components/VirtualTranscript.js +12 -10
- package/dist/tui/ink/components/VirtualTranscript.js.map +1 -1
- package/dist/tui/ink/use-event-projection.js +45 -15
- package/dist/tui/ink/use-event-projection.js.map +1 -1
- package/dist/tui/ink/use-tool-progress.d.ts +1 -0
- package/dist/tui/ink/use-tool-progress.js +63 -23
- package/dist/tui/ink/use-tool-progress.js.map +1 -1
- package/dist/tui/ink/use-transcript-scroll.d.ts +14 -5
- package/dist/tui/ink/use-transcript-scroll.js +46 -28
- package/dist/tui/ink/use-transcript-scroll.js.map +1 -1
- package/package.json +3 -2
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* orchestra/core/store.ts — Orchestration state persistence.
|
|
3
|
+
*
|
|
4
|
+
* Persists sessions to ~/.dirgha/orchestra.json so they survive CLI restarts.
|
|
5
|
+
* P1 enhancement: SQLite-backed with history replay.
|
|
6
|
+
*/
|
|
7
|
+
import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
8
|
+
import { join } from "node:path";
|
|
9
|
+
import { homedir } from "node:os";
|
|
10
|
+
const STORE_DIR = join(homedir(), ".dirgha");
|
|
11
|
+
const STORE_FILE = join(STORE_DIR, "orchestra.json");
|
|
12
|
+
function ensureDir() {
|
|
13
|
+
if (!existsSync(STORE_DIR)) {
|
|
14
|
+
mkdirSync(STORE_DIR, { recursive: true });
|
|
15
|
+
}
|
|
16
|
+
}
|
|
17
|
+
export function loadSessions() {
|
|
18
|
+
try {
|
|
19
|
+
ensureDir();
|
|
20
|
+
if (!existsSync(STORE_FILE))
|
|
21
|
+
return [];
|
|
22
|
+
const raw = readFileSync(STORE_FILE, "utf-8");
|
|
23
|
+
const store = JSON.parse(raw);
|
|
24
|
+
return store.sessions ?? [];
|
|
25
|
+
}
|
|
26
|
+
catch {
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
}
|
|
30
|
+
export function saveSessions(sessions) {
|
|
31
|
+
ensureDir();
|
|
32
|
+
const store = { version: 1, sessions };
|
|
33
|
+
writeFileSync(STORE_FILE, JSON.stringify(store, null, 2), "utf-8");
|
|
34
|
+
}
|
|
35
|
+
export function appendSession(session) {
|
|
36
|
+
const existing = loadSessions().filter((s) => s.id !== session.id);
|
|
37
|
+
existing.push(session);
|
|
38
|
+
saveSessions(existing);
|
|
39
|
+
}
|
|
40
|
+
export function removeStoredSession(id) {
|
|
41
|
+
const existing = loadSessions().filter((s) => s.id !== id);
|
|
42
|
+
saveSessions(existing);
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=store.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"store.js","sourceRoot":"","sources":["../../../src/orchestra/core/store.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAGlC,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,SAAS,CAAC,CAAC;AAC7C,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC;AAOrD,SAAS,SAAS;IAChB,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;QAC3B,SAAS,CAAC,SAAS,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY;IAC1B,IAAI,CAAC;QACH,SAAS,EAAE,CAAC;QACZ,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC;YAAE,OAAO,EAAE,CAAC;QACvC,MAAM,GAAG,GAAG,YAAY,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;QAC9C,MAAM,KAAK,GAAmB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC9C,OAAO,KAAK,CAAC,QAAQ,IAAI,EAAE,CAAC;IAC9B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,MAAM,UAAU,YAAY,CAAC,QAA4B;IACvD,SAAS,EAAE,CAAC;IACZ,MAAM,KAAK,GAAmB,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvD,aAAa,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;AACrE,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,OAAyB;IACrD,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAC,CAAC;IACnE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvB,YAAY,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,EAAU;IAC5C,MAAM,QAAQ,GAAG,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAC3D,YAAY,CAAC,QAAQ,CAAC,CAAC;AACzB,CAAC"}
|
|
@@ -0,0 +1,62 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* orchestra/core/types.ts — Types for the dirgha orchestra multi-agent system.
|
|
3
|
+
*
|
|
4
|
+
* An "orchestration" is a named collection of N agent subprocesses managed
|
|
5
|
+
* by the dirgha CLI itself. Each agent runs in its own subprocess
|
|
6
|
+
* (child_process.spawn), its stdout/stderr is piped into an Ink TUI pane.
|
|
7
|
+
* The parent process is the multiplexer — no tmux, no external window mgr.
|
|
8
|
+
*/
|
|
9
|
+
export interface AgentSlot {
|
|
10
|
+
/** Short unique id ("agent-1" or short uuid). */
|
|
11
|
+
id: string;
|
|
12
|
+
/** Human-readable label shown in the TUI pane border. */
|
|
13
|
+
label: string;
|
|
14
|
+
/** The task/prompt this agent was given. */
|
|
15
|
+
task: string;
|
|
16
|
+
/** Agent adapter kind. */
|
|
17
|
+
adapter: "dirgha" | "claude" | "codex" | "generic";
|
|
18
|
+
/** Child process PID (0 if not yet spawned). */
|
|
19
|
+
pid: number;
|
|
20
|
+
/** Current lifecycle status. */
|
|
21
|
+
status: AgentStatus;
|
|
22
|
+
/** Exit code (null while running). */
|
|
23
|
+
exitCode: number | null;
|
|
24
|
+
/** Spawn timestamp (epoch ms). */
|
|
25
|
+
startedAt: number;
|
|
26
|
+
/** Wall time in ms (set on exit). */
|
|
27
|
+
elapsedMs: number | null;
|
|
28
|
+
/** Model name reported by the agent, if known. */
|
|
29
|
+
model?: string;
|
|
30
|
+
/** Cost in USD, if tracked. */
|
|
31
|
+
cost?: number;
|
|
32
|
+
/** Token count, if tracked. */
|
|
33
|
+
tokens?: number;
|
|
34
|
+
/** Last N lines of output (ring buffer for TUI display). */
|
|
35
|
+
outputBuffer: string[];
|
|
36
|
+
/** Whether this agent accepts keyboard input. */
|
|
37
|
+
hasFocus: boolean;
|
|
38
|
+
}
|
|
39
|
+
export type AgentStatus = "pending" | "spawning" | "running" | "done" | "failed" | "killed";
|
|
40
|
+
export interface OrchestraSession {
|
|
41
|
+
/** Short unique id. */
|
|
42
|
+
id: string;
|
|
43
|
+
/** Human title. */
|
|
44
|
+
title: string;
|
|
45
|
+
/** All agent slots in this orchestration. */
|
|
46
|
+
agents: AgentSlot[];
|
|
47
|
+
/** Whether the TUI dashboard is active. */
|
|
48
|
+
active: boolean;
|
|
49
|
+
/** Creation timestamp (epoch ms). */
|
|
50
|
+
createdAt: number;
|
|
51
|
+
/** Last update timestamp (epoch ms). */
|
|
52
|
+
updatedAt: number;
|
|
53
|
+
}
|
|
54
|
+
export interface LogEntry {
|
|
55
|
+
timestamp: string;
|
|
56
|
+
sessionId: string;
|
|
57
|
+
agentId: string;
|
|
58
|
+
event: "spawn" | "output" | "exit" | "error" | "watcher" | "system";
|
|
59
|
+
payload: Record<string, unknown>;
|
|
60
|
+
}
|
|
61
|
+
/** Verb for the orchestra subcommand. */
|
|
62
|
+
export type OrchestraVerb = "up" | "attach" | "list" | "kill" | "down" | "log" | "web";
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* orchestra/core/types.ts — Types for the dirgha orchestra multi-agent system.
|
|
3
|
+
*
|
|
4
|
+
* An "orchestration" is a named collection of N agent subprocesses managed
|
|
5
|
+
* by the dirgha CLI itself. Each agent runs in its own subprocess
|
|
6
|
+
* (child_process.spawn), its stdout/stderr is piped into an Ink TUI pane.
|
|
7
|
+
* The parent process is the multiplexer — no tmux, no external window mgr.
|
|
8
|
+
*/
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=types.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/orchestra/core/types.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG"}
|
|
@@ -0,0 +1,21 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* orchestra/orchestration/log.ts — Structured NDJSON orchestration log.
|
|
3
|
+
*
|
|
4
|
+
* Every agent event (spawn, output, exit, error, watcher) is written as
|
|
5
|
+
* a newline-delimited JSON line to /tmp/orchestra-{sessionId}.ndjson.
|
|
6
|
+
* This is the single source of truth for observability — the TUI reads
|
|
7
|
+
* this file for replay, the web bridge streams it, and the CLI tails it.
|
|
8
|
+
*/
|
|
9
|
+
import type { LogEntry } from "../core/types.js";
|
|
10
|
+
/** Return the log file path for a session. */
|
|
11
|
+
export declare function logPath(sessionId: string): string;
|
|
12
|
+
/** Create a fresh log file (overwrites any existing). */
|
|
13
|
+
export declare function createLog(sessionId: string): string;
|
|
14
|
+
/** Append a single log entry to the session log. */
|
|
15
|
+
export declare function appendLog(entry: LogEntry): void;
|
|
16
|
+
/** Convenience: build and write a structured entry in one call. */
|
|
17
|
+
export declare function writeLog(sessionId: string, agentId: string, event: LogEntry["event"], payload?: Record<string, unknown>): void;
|
|
18
|
+
/** Read all entries from a session log file. */
|
|
19
|
+
export declare function readLog(sessionId: string): LogEntry[];
|
|
20
|
+
/** Stream log entries matching a filter (returns latest N). */
|
|
21
|
+
export declare function tailLog(sessionId: string, n?: number, filter?: (e: LogEntry) => boolean): LogEntry[];
|
|
@@ -0,0 +1,68 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* orchestra/orchestration/log.ts — Structured NDJSON orchestration log.
|
|
3
|
+
*
|
|
4
|
+
* Every agent event (spawn, output, exit, error, watcher) is written as
|
|
5
|
+
* a newline-delimited JSON line to /tmp/orchestra-{sessionId}.ndjson.
|
|
6
|
+
* This is the single source of truth for observability — the TUI reads
|
|
7
|
+
* this file for replay, the web bridge streams it, and the CLI tails it.
|
|
8
|
+
*/
|
|
9
|
+
import { appendFileSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
|
|
10
|
+
import { tmpdir } from "node:os";
|
|
11
|
+
import { join } from "node:path";
|
|
12
|
+
/** Return the log file path for a session. */
|
|
13
|
+
export function logPath(sessionId) {
|
|
14
|
+
return join(tmpdir(), `orchestra-${sessionId}.ndjson`);
|
|
15
|
+
}
|
|
16
|
+
/** Create a fresh log file (overwrites any existing). */
|
|
17
|
+
export function createLog(sessionId) {
|
|
18
|
+
const path = logPath(sessionId);
|
|
19
|
+
const dir = tmpdir();
|
|
20
|
+
if (!existsSync(dir))
|
|
21
|
+
mkdirSync(dir, { recursive: true });
|
|
22
|
+
writeFileSync(path, "", "utf-8");
|
|
23
|
+
return path;
|
|
24
|
+
}
|
|
25
|
+
/** Append a single log entry to the session log. */
|
|
26
|
+
export function appendLog(entry) {
|
|
27
|
+
try {
|
|
28
|
+
const path = logPath(entry.sessionId);
|
|
29
|
+
appendFileSync(path, JSON.stringify(entry) + "\n", "utf-8");
|
|
30
|
+
}
|
|
31
|
+
catch {
|
|
32
|
+
// Non-fatal — log writes must never crash the orchestrator.
|
|
33
|
+
}
|
|
34
|
+
}
|
|
35
|
+
/** Convenience: build and write a structured entry in one call. */
|
|
36
|
+
export function writeLog(sessionId, agentId, event, payload = {}) {
|
|
37
|
+
appendLog({
|
|
38
|
+
timestamp: new Date().toISOString(),
|
|
39
|
+
sessionId,
|
|
40
|
+
agentId,
|
|
41
|
+
event,
|
|
42
|
+
payload,
|
|
43
|
+
});
|
|
44
|
+
}
|
|
45
|
+
/** Read all entries from a session log file. */
|
|
46
|
+
export function readLog(sessionId) {
|
|
47
|
+
try {
|
|
48
|
+
const path = logPath(sessionId);
|
|
49
|
+
if (!existsSync(path))
|
|
50
|
+
return [];
|
|
51
|
+
const raw = readFileSync(path, "utf-8");
|
|
52
|
+
return raw
|
|
53
|
+
.trim()
|
|
54
|
+
.split("\n")
|
|
55
|
+
.filter(Boolean)
|
|
56
|
+
.map((line) => JSON.parse(line));
|
|
57
|
+
}
|
|
58
|
+
catch {
|
|
59
|
+
return [];
|
|
60
|
+
}
|
|
61
|
+
}
|
|
62
|
+
/** Stream log entries matching a filter (returns latest N). */
|
|
63
|
+
export function tailLog(sessionId, n = 50, filter) {
|
|
64
|
+
const all = readLog(sessionId);
|
|
65
|
+
const filtered = filter ? all.filter(filter) : all;
|
|
66
|
+
return filtered.slice(-n);
|
|
67
|
+
}
|
|
68
|
+
//# sourceMappingURL=log.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"log.js","sourceRoot":"","sources":["../../../src/orchestra/orchestration/log.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAC7F,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AAGjC,8CAA8C;AAC9C,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,OAAO,IAAI,CAAC,MAAM,EAAE,EAAE,aAAa,SAAS,SAAS,CAAC,CAAC;AACzD,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,SAAS,CAAC,SAAiB;IACzC,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAChC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAC;IACrB,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;QAAE,SAAS,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,aAAa,CAAC,IAAI,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IACjC,OAAO,IAAI,CAAC;AACd,CAAC;AAED,oDAAoD;AACpD,MAAM,UAAU,SAAS,CAAC,KAAe;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACtC,cAAc,CAAC,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAAC,MAAM,CAAC;QACP,4DAA4D;IAC9D,CAAC;AACH,CAAC;AAED,mEAAmE;AACnE,MAAM,UAAU,QAAQ,CACtB,SAAiB,EACjB,OAAe,EACf,KAAwB,EACxB,UAAmC,EAAE;IAErC,SAAS,CAAC;QACR,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;QACnC,SAAS;QACT,OAAO;QACP,KAAK;QACL,OAAO;KACR,CAAC,CAAC;AACL,CAAC;AAED,gDAAgD;AAChD,MAAM,UAAU,OAAO,CAAC,SAAiB;IACvC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;QAChC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,OAAO,EAAE,CAAC;QACjC,MAAM,GAAG,GAAG,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QACxC,OAAO,GAAG;aACP,IAAI,EAAE;aACN,KAAK,CAAC,IAAI,CAAC;aACX,MAAM,CAAC,OAAO,CAAC;aACf,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC,CAAC;IACzD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,EAAE,CAAC;IACZ,CAAC;AACH,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,OAAO,CACrB,SAAiB,EACjB,IAAY,EAAE,EACd,MAAiC;IAEjC,MAAM,GAAG,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IAC/B,MAAM,QAAQ,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IACnD,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;AAC5B,CAAC"}
|
|
@@ -22,7 +22,6 @@ export const DEEPSEEK_CATALOGUE = [
|
|
|
22
22
|
inputPerM: 0.27,
|
|
23
23
|
outputPerM: 1.10,
|
|
24
24
|
cachedInputPerM: 0.07,
|
|
25
|
-
defaultModel: true,
|
|
26
25
|
notes: 'aka deepseek-v3; general-purpose flagship',
|
|
27
26
|
tags: ['coding'],
|
|
28
27
|
},
|
|
@@ -52,9 +51,11 @@ export const DEEPSEEK_CATALOGUE = [
|
|
|
52
51
|
vision: false,
|
|
53
52
|
thinkingMode: 'opt-in',
|
|
54
53
|
thinkingParam: DEEPSEEK_THINKING_PARAM,
|
|
55
|
-
inputPerM: 0.
|
|
56
|
-
outputPerM:
|
|
57
|
-
cachedInputPerM: 0.
|
|
54
|
+
inputPerM: 0.43,
|
|
55
|
+
outputPerM: 0.87,
|
|
56
|
+
cachedInputPerM: 0.11,
|
|
57
|
+
defaultModel: true,
|
|
58
|
+
notes: 'flagship v4 model; api.deepseek.com direct',
|
|
58
59
|
tags: ['agents'],
|
|
59
60
|
},
|
|
60
61
|
{
|
|
@@ -70,6 +71,7 @@ export const DEEPSEEK_CATALOGUE = [
|
|
|
70
71
|
inputPerM: 0.07,
|
|
71
72
|
outputPerM: 0.28,
|
|
72
73
|
cachedInputPerM: 0.02,
|
|
74
|
+
notes: 'fast v4 variant; api.deepseek.com direct',
|
|
73
75
|
tags: ['fast'],
|
|
74
76
|
},
|
|
75
77
|
];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deepseek-catalogue.js","sourceRoot":"","sources":["../../src/providers/deepseek-catalogue.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,uBAAuB,GAAG,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;AAE7E,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACnD;QACE,EAAE,EAAE,eAAe;QACnB,KAAK,EAAE,oBAAoB;QAC3B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,KAAK;QACtB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,MAAM;QACpB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,
|
|
1
|
+
{"version":3,"file":"deepseek-catalogue.js","sourceRoot":"","sources":["../../src/providers/deepseek-catalogue.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAEvE,MAAM,uBAAuB,GAAG,EAAE,oBAAoB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;AAE7E,MAAM,CAAC,MAAM,kBAAkB,GAAsB;IACnD;QACE,EAAE,EAAE,eAAe;QACnB,KAAK,EAAE,oBAAoB;QAC3B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,KAAK;QACtB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,MAAM;QACpB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,2CAA2C;QAClD,IAAI,EAAE,CAAC,QAAQ,CAAC;KACjB;IACD;QACE,EAAE,EAAE,mBAAmB;QACvB,KAAK,EAAE,wBAAwB;QAC/B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,MAAM;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,WAAW;QACzB,aAAa,EAAE,IAAI;QACnB,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,6CAA6C;QACpD,IAAI,EAAE,CAAC,WAAW,CAAC;KACpB;IACD;QACE,EAAE,EAAE,iBAAiB;QACrB,KAAK,EAAE,iBAAiB;QACxB,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,MAAM;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,QAAQ;QACtB,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,YAAY,EAAE,IAAI;QAClB,KAAK,EAAE,4CAA4C;QACnD,IAAI,EAAE,CAAC,QAAQ,CAAC;KACjB;IACD;QACE,EAAE,EAAE,mBAAmB;QACvB,KAAK,EAAE,mBAAmB;QAC1B,MAAM,EAAE,UAAU;QAClB,aAAa,EAAE,MAAM;QACrB,eAAe,EAAE,MAAM;QACvB,KAAK,EAAE,IAAI;QACX,MAAM,EAAE,KAAK;QACb,YAAY,EAAE,QAAQ;QACtB,aAAa,EAAE,uBAAuB;QACtC,SAAS,EAAE,IAAI;QACf,UAAU,EAAE,IAAI;QAChB,eAAe,EAAE,IAAI;QACrB,KAAK,EAAE,0CAA0C;QACjD,IAAI,EAAE,CAAC,MAAM,CAAC;KACf;CACF,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,SAAS,CAAC,kBAAkB,CAAC,CAAC;AAC5D,MAAM,CAAC,MAAM,gBAAgB,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AACjE,MAAM,CAAC,MAAM,eAAe,GAAG,YAAY,CAAC,kBAAkB,CAAC,CAAC;AAEhE,mDAAmD;AACnD,MAAM,CAAC,MAAM,kBAAkB,GAAG,IAAI,GAAG,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC"}
|
|
@@ -6,7 +6,6 @@
|
|
|
6
6
|
* "nvidia/..."); bare ids fall through to the catch-all rules at the
|
|
7
7
|
* end.
|
|
8
8
|
*/
|
|
9
|
-
import { migrateDeprecatedModel } from "../intelligence/prices.js";
|
|
10
9
|
import { NIM_CATALOGUE } from "./nim-catalogue.js";
|
|
11
10
|
// Specific model IDs that NVIDIA NIM serves — derived from the NIM_CATALOGUE
|
|
12
11
|
// so there is a single source of truth. Also include NIM-hosted models that
|
|
@@ -104,15 +103,14 @@ const RULES = [
|
|
|
104
103
|
},
|
|
105
104
|
];
|
|
106
105
|
export function routeModel(modelId) {
|
|
107
|
-
const migrated = migrateDeprecatedModel(modelId);
|
|
108
106
|
for (const rule of RULES) {
|
|
109
|
-
if (rule.match(
|
|
107
|
+
if (rule.match(modelId))
|
|
110
108
|
return rule.provider;
|
|
111
109
|
}
|
|
112
|
-
throw new Error(`No provider configured for model "${
|
|
110
|
+
throw new Error(`No provider configured for model "${modelId}". Add a routing rule in providers/dispatch.ts.`);
|
|
113
111
|
}
|
|
114
112
|
export function resolveModelForDispatch(modelId) {
|
|
115
|
-
return
|
|
113
|
+
return modelId;
|
|
116
114
|
}
|
|
117
115
|
export function isKnownProvider(id) {
|
|
118
116
|
return (id === "anthropic" ||
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"dispatch.js","sourceRoot":"","sources":["../../src/providers/dispatch.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,11 +8,15 @@
|
|
|
8
8
|
*/
|
|
9
9
|
import type { Provider, UsageTotal, Message } from "../kernel/types.js";
|
|
10
10
|
import type { ToolRegistry } from "../tools/registry.js";
|
|
11
|
+
import type { ProviderRegistry } from "../providers/index.js";
|
|
11
12
|
/**
|
|
12
13
|
* Safe default tool allowlist for sub-agents. Covers read/write/search and
|
|
13
14
|
* common dev operations while excluding high-privilege tools (e.g. network
|
|
14
15
|
* requests, approval bypass, registry mutation). A parent agent can grant
|
|
15
16
|
* additional tools by supplying an explicit toolAllowlist on SubagentRequest.
|
|
17
|
+
*
|
|
18
|
+
* NOTE: these names MUST match the actual tool.name in the registry.
|
|
19
|
+
* See src/tools/registry.ts for the canonical list.
|
|
16
20
|
*/
|
|
17
21
|
export declare const DEFAULT_SUBAGENT_TOOLS: Set<string>;
|
|
18
22
|
export interface SubagentRequest {
|
|
@@ -32,7 +36,12 @@ export interface SubagentResult {
|
|
|
32
36
|
}
|
|
33
37
|
export interface DelegatorOptions {
|
|
34
38
|
registry: ToolRegistry;
|
|
35
|
-
provider
|
|
39
|
+
/** ProviderRegistry for model-aware routing. When set, `provider` is
|
|
40
|
+
* ignored and the provider is resolved via `providers.forModel()`. */
|
|
41
|
+
providers?: ProviderRegistry;
|
|
42
|
+
/** @deprecated use providers instead — kept for backward compat with
|
|
43
|
+
* callers that resolve a single Provider upfront (e.g. slash/spawn.ts). */
|
|
44
|
+
provider?: Provider;
|
|
36
45
|
defaultModel: string;
|
|
37
46
|
cwd: string;
|
|
38
47
|
parentSessionId: string;
|
|
@@ -18,11 +18,14 @@ import { createSessionStore } from "../context/session.js";
|
|
|
18
18
|
* common dev operations while excluding high-privilege tools (e.g. network
|
|
19
19
|
* requests, approval bypass, registry mutation). A parent agent can grant
|
|
20
20
|
* additional tools by supplying an explicit toolAllowlist on SubagentRequest.
|
|
21
|
+
*
|
|
22
|
+
* NOTE: these names MUST match the actual tool.name in the registry.
|
|
23
|
+
* See src/tools/registry.ts for the canonical list.
|
|
21
24
|
*/
|
|
22
25
|
export const DEFAULT_SUBAGENT_TOOLS = new Set([
|
|
23
|
-
'
|
|
24
|
-
'shell', 'browser', 'go_to_definition', 'find_references', '
|
|
25
|
-
'
|
|
26
|
+
'fs_read', 'fs_write', 'fs_edit', 'search_grep', 'search_glob',
|
|
27
|
+
'shell', 'browser', 'go_to_definition', 'find_references', 'hover_documentation',
|
|
28
|
+
'document_symbols', 'git', 'task', 'rtk',
|
|
26
29
|
]);
|
|
27
30
|
export class SubagentDelegator {
|
|
28
31
|
opts;
|
|
@@ -72,13 +75,20 @@ export class SubagentDelegator {
|
|
|
72
75
|
// Append the initial user prompt so the session has a recoverable prefix.
|
|
73
76
|
void subSession.append({ type: "message", ts: new Date().toISOString(), message: messages[messages.length - 1] });
|
|
74
77
|
const loopDetector = new LoopDetector();
|
|
78
|
+
// Resolve the provider for the requested model. When providers is given,
|
|
79
|
+
// route through the registry so different models reach different providers.
|
|
80
|
+
// Fall back to the deprecated single-provider field for backward compat.
|
|
81
|
+
const resolvedModel = req.model ?? this.opts.defaultModel;
|
|
82
|
+
const provider = this.opts.providers
|
|
83
|
+
? this.opts.providers.forModel(resolvedModel)
|
|
84
|
+
: this.opts.provider;
|
|
75
85
|
const result = await runAgentLoop({
|
|
76
86
|
sessionId,
|
|
77
|
-
model:
|
|
87
|
+
model: resolvedModel,
|
|
78
88
|
messages,
|
|
79
89
|
tools: sanitized.definitions,
|
|
80
90
|
maxTurns: req.maxTurns ?? 6,
|
|
81
|
-
provider
|
|
91
|
+
provider,
|
|
82
92
|
toolExecutor: executor,
|
|
83
93
|
events,
|
|
84
94
|
session: subSession,
|
|
@@ -92,8 +102,20 @@ export class SubagentDelegator {
|
|
|
92
102
|
const lastAssistant = [...result.messages]
|
|
93
103
|
.reverse()
|
|
94
104
|
.find((m) => m.role === "assistant");
|
|
105
|
+
// Include the raw error message when the loop errored with no output
|
|
106
|
+
let output = "";
|
|
107
|
+
if (lastAssistant) {
|
|
108
|
+
output = extractText(lastAssistant);
|
|
109
|
+
}
|
|
110
|
+
else if (result.stopReason === "error") {
|
|
111
|
+
// Try to extract an error message from the last user/tool messages
|
|
112
|
+
const lastMsg = result.messages[result.messages.length - 1];
|
|
113
|
+
output = lastMsg && lastMsg.role === "tool"
|
|
114
|
+
? `[sub-agent error] ${extractText(lastMsg).slice(0, 500)}`
|
|
115
|
+
: `[sub-agent error] loop stopped with reason: ${result.stopReason}`;
|
|
116
|
+
}
|
|
95
117
|
const returnValue = {
|
|
96
|
-
output
|
|
118
|
+
output,
|
|
97
119
|
usage: result.usage,
|
|
98
120
|
transcript: result.messages,
|
|
99
121
|
stopReason: result.stopReason,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"delegator.js","sourceRoot":"","sources":["../../src/subagents/delegator.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAOzC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"delegator.js","sourceRoot":"","sources":["../../src/subagents/delegator.ts"],"names":[],"mappings":"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"}
|
package/dist/tools/shell.js
CHANGED
|
@@ -63,7 +63,7 @@ async function resolveWindowsShell() {
|
|
|
63
63
|
return windowsShellPromise;
|
|
64
64
|
}
|
|
65
65
|
const DEFAULT_TIMEOUT_MS = 120_000;
|
|
66
|
-
const MAX_OUTPUT_BYTES =
|
|
66
|
+
const MAX_OUTPUT_BYTES = 32 * 1024; // 32 KB — keeps 2 shell calls per context window
|
|
67
67
|
export const shellTool = {
|
|
68
68
|
name: "shell",
|
|
69
69
|
description: process.platform === "win32"
|
|
@@ -183,6 +183,7 @@ export const shellTool = {
|
|
|
183
183
|
cwd,
|
|
184
184
|
env: ctx.env,
|
|
185
185
|
stdio: ["pipe", "pipe", "pipe"],
|
|
186
|
+
detached: true, // own process group — kill(-pgid) reaches piped descendants
|
|
186
187
|
});
|
|
187
188
|
const childProcess = await (child instanceof Promise
|
|
188
189
|
? child
|
|
@@ -227,21 +228,33 @@ export const shellTool = {
|
|
|
227
228
|
childProcess.stderr.on("data", onData(stderrChunks, stderrDecoder, (n) => {
|
|
228
229
|
stderrBytes += n;
|
|
229
230
|
}, "STDERR"));
|
|
230
|
-
/**
|
|
231
|
-
|
|
232
|
-
|
|
231
|
+
/**
|
|
232
|
+
* Terminate the child. Kills the entire process group (via -pgid) so
|
|
233
|
+
* piped commands (sh -c "curl … | jq …") don't orphan descendants.
|
|
234
|
+
*
|
|
235
|
+
* Grace period: 250 ms on user abort (ESC feels instant), 2 s on
|
|
236
|
+
* timeout (child may be mid-network-call, needs a moment to flush).
|
|
237
|
+
*/
|
|
238
|
+
const killChild = (reason) => {
|
|
239
|
+
try {
|
|
240
|
+
process.kill(-childProcess.pid, "SIGTERM");
|
|
241
|
+
}
|
|
242
|
+
catch {
|
|
243
|
+
/* already gone */
|
|
244
|
+
}
|
|
245
|
+
const graceMs = reason === "abort" ? 250 : 2_000;
|
|
233
246
|
setTimeout(() => {
|
|
234
247
|
try {
|
|
235
|
-
|
|
248
|
+
process.kill(-childProcess.pid, "SIGKILL");
|
|
236
249
|
}
|
|
237
250
|
catch {
|
|
238
251
|
/* already gone */
|
|
239
252
|
}
|
|
240
|
-
},
|
|
253
|
+
}, graceMs);
|
|
241
254
|
};
|
|
242
|
-
const timer = setTimeout(killChild, timeoutMs);
|
|
255
|
+
const timer = setTimeout(() => killChild("timeout"), timeoutMs);
|
|
243
256
|
const onAbort = () => {
|
|
244
|
-
killChild();
|
|
257
|
+
killChild("abort");
|
|
245
258
|
};
|
|
246
259
|
if (ctx.signal) {
|
|
247
260
|
ctx.signal.addEventListener("abort", onAbort, { once: true });
|
package/dist/tools/shell.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAU1C,0EAA0E;AAC1E,IAAI,kBAAkB,GAGX,IAAI,CAAC;AAChB,IAAI,mBAAmB,GAGX,IAAI,CAAC;AAEjB,KAAK,UAAU,mBAAmB;IAIhC,IAAI,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,mBAAmB,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,aAAa,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE;wBAC1D,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;oBACH,kBAAkB,GAAG;wBACnB,GAAG,EAAE,GAAG;wBACR,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC;4BAClC,SAAS;4BACT,YAAY;4BACZ,iBAAiB;4BACjB,eAAe;4BACf,MAAM;4BACN,UAAU;4BACV,MAAM;yBACP;qBACF,CAAC;oBACF,OAAO,kBAAkB,CAAC;gBAC5B,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACZ,CAAC;YACD,kBAAkB,GAAG;gBACnB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS;gBACrC,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;aAC/D,CAAC;YACF,OAAO,kBAAkB,CAAC;QAC5B,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AASD,MAAM,kBAAkB,GAAG,OAAO,CAAC;AACnC,MAAM,gBAAgB,GAAG,
|
|
1
|
+
{"version":3,"file":"shell.js","sourceRoot":"","sources":["../../src/tools/shell.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAItC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;AAU1C,0EAA0E;AAC1E,IAAI,kBAAkB,GAGX,IAAI,CAAC;AAChB,IAAI,mBAAmB,GAGX,IAAI,CAAC;AAEjB,KAAK,UAAU,mBAAmB;IAIhC,IAAI,kBAAkB;QAAE,OAAO,kBAAkB,CAAC;IAClD,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,mBAAmB,GAAG,CAAC,KAAK,IAAI,EAAE;YAChC,KAAK,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC;gBACzC,IAAI,CAAC;oBACH,MAAM,aAAa,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,UAAU,EAAE,QAAQ,CAAC,EAAE;wBAC1D,OAAO,EAAE,IAAI;qBACd,CAAC,CAAC;oBACH,kBAAkB,GAAG;wBACnB,GAAG,EAAE,GAAG;wBACR,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC;4BAClC,SAAS;4BACT,YAAY;4BACZ,iBAAiB;4BACjB,eAAe;4BACf,MAAM;4BACN,UAAU;4BACV,MAAM;yBACP;qBACF,CAAC;oBACF,OAAO,kBAAkB,CAAC;gBAC5B,CAAC;gBAAC,MAAM,CAAC,CAAA,CAAC;YACZ,CAAC;YACD,kBAAkB,GAAG;gBACnB,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,OAAO,IAAI,SAAS;gBACrC,IAAI,EAAE,CAAC,MAAc,EAAY,EAAE,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC;aAC/D,CAAC;YACF,OAAO,kBAAkB,CAAC;QAC5B,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AASD,MAAM,kBAAkB,GAAG,OAAO,CAAC;AACnC,MAAM,gBAAgB,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC,iDAAiD;AAErF,MAAM,CAAC,MAAM,SAAS,GAAS;IAC7B,IAAI,EAAE,OAAO;IACb,WAAW,EACT,OAAO,CAAC,QAAQ,KAAK,OAAO;QAC1B,CAAC,CAAC,2UAA2U;QAC7U,CAAC,CAAC,6GAA6G;IACnH,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE;YACV,OAAO,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YAC3B,GAAG,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE;YACvB,SAAS,EAAE;gBACT,IAAI,EAAE,SAAS;gBACf,OAAO,EAAE,IAAI;gBACb,WAAW,EACT,sEAAsE;oBACtE,0CAA0C;aAC7C;YACD,YAAY,EAAE;gBACZ,IAAI,EAAE,SAAS;gBACf,WAAW,EACT,kEAAkE;oBAClE,sDAAsD;oBACtD,4DAA4D;oBAC5D,iBAAiB;aACpB;SACF;QACD,QAAQ,EAAE,CAAC,SAAS,CAAC;KACtB;IACD,SAAS,EAAE,OAAO,EAAE,mEAAmE;IACvF,gBAAgB,EAAE,GAAG,EAAE,CAAC,IAAI;IAC5B,KAAK,CAAC,OAAO,CAAC,QAAiB,EAAE,GAAG;QAClC,MAAM,KAAK,GAAG,QAAiB,CAAC;QAChC,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC;QACjC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,IAAI,kBAAkB,CAAC;QACxD,MAAM,YAAY,GAAG,KAAK,CAAC,YAAY,IAAI,KAAK,CAAC;QAEjD,CAAC;YACC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;YACjC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YACrC,MAAM,OAAO,GAAG,WAAW,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,WAAW,GAAG,GAAG,CAAC;YAC5E,IAAI,WAAW,KAAK,WAAW,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE,CAAC;gBACpE,OAAO,EAAE,OAAO,EAAE,0BAA0B,GAAG,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;YACrE,CAAC;QACH,CAAC;QAED,kEAAkE;QAClE,8DAA8D;QAC9D,6DAA6D;QAC7D,gEAAgE;QAChE,2DAA2D;QAC3D,MAAM,aAAa,GACjB,CAAC,GAAG,CAAC,WAAW,KAAK,MAAM,IAAI,GAAG,CAAC,WAAW,KAAK,QAAQ,CAAC;YAC5D,GAAG,CAAC,OAAO,KAAK,IAAI,CAAC;QACvB,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,CAAC;QAC5B,IACE,aAAa;YACb,OAAO,KAAK,IAAI;YAChB,CAAC,MAAM,OAAO,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC,EAC9C,CAAC;YACD,MAAM,GAAG,GACP,OAAO,CAAC,QAAQ,KAAK,OAAO;gBAC1B,CAAC,CAAC,CAAC,MAAM,mBAAmB,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC;gBACnD,CAAC,CAAC,CAAC,SAAS,EAAE,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;YACvC,MAAM,OAAO,GACX,OAAO,CAAC,QAAQ,KAAK,OAAO;gBAC1B,CAAC,CAAC,CAAC,CAAC,MAAM,mBAAmB,EAAE,CAAC,CAAC,GAAG,EAAE,GAAG,GAAG,CAAC;gBAC7C,CAAC,CAAC,GAAG,CAAC;YACV,IAAI,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC;oBAChC,OAAO,EAAE,OAAO;oBAChB,GAAG;oBACH,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,aAAa,EAAE,CAAC,GAAG,CAAC;oBACpB,cAAc,EAAE,GAAG,CAAC,WAAW,KAAK,QAAQ;oBAC5C,SAAS;oBACT,MAAM,EAAE,GAAG,CAAC,MAAM;iBACnB,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,gBAAgB;oBACpD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC;oBAC1C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;gBAClB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,gBAAgB;oBACpD,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC;oBAC1C,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC;gBAClB,MAAM,SAAS,GACb,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,gBAAgB;oBACvC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,gBAAgB,CAAC;gBAC1C,MAAM,YAAY,GAAG,aAAa,MAAM,CAAC,QAAQ,IAAI,GAAG,CAAC,WAAW,GAAG,CAAC;gBACxE,MAAM,OAAO,GACX;oBACE,YAAY;oBACZ,MAAM,IAAI,YAAY,MAAM,EAAE;oBAC9B,MAAM,IAAI,YAAY,MAAM,EAAE;oBAC9B,SAAS,MAAM,CAAC,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,EAAE;oBAChE,SAAS,IAAI,oBAAoB;iBAClC;qBACE,MAAM,CAAC,OAAO,CAAC;qBACf,IAAI,CAAC,MAAM,CAAC,IAAI,YAAY,CAAC;gBAClC,OAAO;oBACL,OAAO;oBACP,OAAO,EAAE,MAAM,CAAC,QAAQ,KAAK,CAAC;oBAC9B,IAAI,EAAE;wBACJ,QAAQ,EAAE,MAAM,CAAC,QAAQ;wBACzB,WAAW,EAAE,MAAM,CAAC,MAAM;wBAC1B,WAAW,EAAE,MAAM,CAAC,MAAM;wBAC1B,SAAS;qBACV;iBACF,CAAC;YACJ,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,GAAG,GAAG,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;gBAC7D,OAAO;oBACL,OAAO,EAAE,wBAAwB,GAAG,CAAC,WAAW,MAAM,GAAG,EAAE;oBAC3D,OAAO,EAAE,IAAI;iBACd,CAAC;YACJ,CAAC;QACH,CAAC;QAED,MAAM,KAAK,GACT,OAAO,CAAC,QAAQ,KAAK,OAAO;YAC1B,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;gBACV,MAAM,KAAK,GAAG,MAAM,mBAAmB,EAAE,CAAC;gBAC1C,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE;oBACjD,GAAG;oBACH,GAAG,EAAE,GAAG,CAAC,GAAG;oBACZ,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;oBAC/B,WAAW,EAAE,IAAI;iBAClB,CAAC,CAAC;YACL,CAAC,CAAC,EAAE;YACN,CAAC,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,KAAK,CAAC,OAAO,CAAC,EAAE;gBACtC,GAAG;gBACH,GAAG,EAAE,GAAG,CAAC,GAAG;gBACZ,KAAK,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC;gBAC/B,QAAQ,EAAE,IAAI,EAAE,4DAA4D;aAC7E,CAAC,CAAC;QAET,MAAM,YAAY,GAAG,MAAM,CAAC,KAAK,YAAY,OAAO;YAClD,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;QAE5B,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,MAAM,YAAY,GAAa,EAAE,CAAC;QAClC,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,IAAI,SAAS,GAAG,KAAK,CAAC;QAEtB,IAAI,UAAU,GAAG,CAAC,CAAC;QAEnB,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;QAChD,MAAM,aAAa,GAAG,IAAI,aAAa,CAAC,MAAM,CAAC,CAAC;QAEhD,MAAM,MAAM,GACV,CACE,MAAgB,EAChB,OAAsB,EACtB,UAA+B,EAC/B,KAA0B,EAC1B,EAAE,CACJ,CAAC,GAAW,EAAE,EAAE;YACd,MAAM,SAAS,GAAG,gBAAgB,GAAG,UAAU,CAAC;YAChD,IAAI,SAAS,IAAI,CAAC,EAAE,CAAC;gBACnB,SAAS,GAAG,IAAI,CAAC;gBACjB,OAAO;YACT,CAAC;YACD,MAAM,KAAK,GACT,GAAG,CAAC,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;YAC7D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YACnB,UAAU,IAAI,KAAK,CAAC,MAAM,CAAC;YAC3B,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACzB,IAAI,GAAG,CAAC,MAAM,GAAG,SAAS;gBAAE,SAAS,GAAG,IAAI,CAAC;YAC7C,MAAM,IAAI,GAAG,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAClC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC3B,+DAA+D;gBAC/D,4DAA4D;gBAC5D,6DAA6D;gBAC7D,6DAA6D;gBAC7D,IAAI,YAAY,EAAE,CAAC;oBACjB,GAAG,CAAC,UAAU,EAAE,CACd,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,YAAY,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,CACnE,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,GAAG,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC;QACH,CAAC,CAAC;QAEJ,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;YACxC,WAAW,IAAI,CAAC,CAAC;QACnB,CAAC,EAAE,QAAQ,CAAC,CACb,CAAC;QACF,YAAY,CAAC,MAAM,CAAC,EAAE,CACpB,MAAM,EACN,MAAM,CAAC,YAAY,EAAE,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;YACxC,WAAW,IAAI,CAAC,CAAC;QACnB,CAAC,EAAE,QAAQ,CAAC,CACb,CAAC;QAEF;;;;;;WAMG;QACH,MAAM,SAAS,GAAG,CAAC,MAA2B,EAAQ,EAAE;YACtD,IAAI,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAI,EAAE,SAAS,CAAC,CAAC;YAC9C,CAAC;YAAC,MAAM,CAAC;gBACP,kBAAkB;YACpB,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC;YACjD,UAAU,CAAC,GAAG,EAAE;gBACd,IAAI,CAAC;oBACH,OAAO,CAAC,IAAI,CAAC,CAAC,YAAY,CAAC,GAAI,EAAE,SAAS,CAAC,CAAC;gBAC9C,CAAC;gBAAC,MAAM,CAAC;oBACP,kBAAkB;gBACpB,CAAC;YACH,CAAC,EAAE,OAAO,CAAC,CAAC;QACd,CAAC,CAAC;QAEF,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,SAAS,CAAC,EAAE,SAAS,CAAC,CAAC;QAEhE,MAAM,OAAO,GAAG,GAAS,EAAE;YACzB,SAAS,CAAC,OAAO,CAAC,CAAC;QACrB,CAAC,CAAC;QACF,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;QAChE,CAAC;QAED,MAAM,QAAQ,GAAW,MAAM,IAAI,OAAO,CAAC,CAAC,WAAW,EAAE,EAAE;YACzD,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAClD,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC,CAAC;QACH,YAAY,CAAC,KAAK,CAAC,CAAC;QACpB,IAAI,GAAG,CAAC,MAAM,EAAE,CAAC;YACf,GAAG,CAAC,MAAM,CAAC,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACnD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,YAAgD,CACjD,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAC1B,YAAgD,CACjD,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACnB,MAAM,MAAM,GAAG,QAAQ,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC;QAC3E,MAAM,IAAI,GAAG;YACX,MAAM;YACN,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;YAC7C,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE;SAC9C;aACE,MAAM,CAAC,OAAO,CAAC;aACf,IAAI,CAAC,MAAM,CAAC,CAAC;QAEhB,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM;YACxC,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE,WAAW,EAAE,SAAS,EAAE;YACvD,OAAO,EAAE,QAAQ,KAAK,CAAC;SACxB,CAAC;IACJ,CAAC;CACF,CAAC"}
|