@nodetool-ai/cli 0.8.1 → 0.8.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/README.md +31 -1
- package/dist/.nodetool-build-stamp +1 -1
- package/dist/affected/affected.d.ts +11 -13
- package/dist/affected/affected.d.ts.map +1 -1
- package/dist/affected/affected.js +51 -2
- package/dist/affected/affected.js.map +1 -1
- package/dist/app-debug/app-target.d.ts +1 -1
- package/dist/app-debug/app-target.d.ts.map +1 -1
- package/dist/app-debug/harness.d.ts +3 -1
- package/dist/app-debug/harness.d.ts.map +1 -1
- package/dist/app-debug/harness.js +23 -0
- package/dist/app-debug/harness.js.map +1 -1
- package/dist/app.d.ts.map +1 -1
- package/dist/app.js +2 -1
- package/dist/app.js.map +1 -1
- package/dist/chat-codeact.d.ts +8 -0
- package/dist/chat-codeact.d.ts.map +1 -1
- package/dist/chat-codeact.js +59 -21
- package/dist/chat-codeact.js.map +1 -1
- package/dist/chat-context.d.ts.map +1 -1
- package/dist/chat-context.js +7 -2
- package/dist/chat-context.js.map +1 -1
- package/dist/child-exit.d.ts +3 -0
- package/dist/child-exit.d.ts.map +1 -0
- package/dist/child-exit.js +17 -0
- package/dist/child-exit.js.map +1 -0
- package/dist/commands/__tests__/timeline-render-audio.test.js +1 -1
- package/dist/commands/__tests__/timeline-render-audio.test.js.map +1 -1
- package/dist/commands/__tests__/timeline-render-completeness.test.d.ts +2 -0
- package/dist/commands/__tests__/timeline-render-completeness.test.d.ts.map +1 -0
- package/dist/commands/__tests__/timeline-render-completeness.test.js +117 -0
- package/dist/commands/__tests__/timeline-render-completeness.test.js.map +1 -0
- package/dist/commands/__tests__/timeline-score.test.d.ts +2 -0
- package/dist/commands/__tests__/timeline-score.test.d.ts.map +1 -0
- package/dist/commands/__tests__/timeline-score.test.js +100 -0
- package/dist/commands/__tests__/timeline-score.test.js.map +1 -0
- package/dist/commands/affected.d.ts.map +1 -1
- package/dist/commands/affected.js +10 -5
- package/dist/commands/affected.js.map +1 -1
- package/dist/commands/agent.d.ts.map +1 -1
- package/dist/commands/agent.js +12 -2
- package/dist/commands/agent.js.map +1 -1
- package/dist/commands/app.d.ts.map +1 -1
- package/dist/commands/app.js +29 -5
- package/dist/commands/app.js.map +1 -1
- package/dist/commands/apps.d.ts.map +1 -1
- package/dist/commands/apps.js +126 -32
- package/dist/commands/apps.js.map +1 -1
- package/dist/commands/debug-summary-output.d.ts +22 -0
- package/dist/commands/debug-summary-output.d.ts.map +1 -0
- package/dist/commands/debug-summary-output.js +28 -0
- package/dist/commands/debug-summary-output.js.map +1 -0
- package/dist/commands/deploy-helpers.d.ts +2 -1
- package/dist/commands/deploy-helpers.d.ts.map +1 -1
- package/dist/commands/errors.d.ts +11 -0
- package/dist/commands/errors.d.ts.map +1 -0
- package/dist/commands/errors.js +177 -0
- package/dist/commands/errors.js.map +1 -0
- package/dist/commands/eval.d.ts.map +1 -1
- package/dist/commands/eval.js +4 -1
- package/dist/commands/eval.js.map +1 -1
- package/dist/commands/extension.d.ts +12 -0
- package/dist/commands/extension.d.ts.map +1 -0
- package/dist/commands/extension.js +30 -0
- package/dist/commands/extension.js.map +1 -0
- package/dist/commands/game-benchmark.d.ts +34 -0
- package/dist/commands/game-benchmark.d.ts.map +1 -0
- package/dist/commands/game-benchmark.js +95 -0
- package/dist/commands/game-benchmark.js.map +1 -0
- package/dist/commands/game-smoke.d.ts +3 -0
- package/dist/commands/game-smoke.d.ts.map +1 -0
- package/dist/commands/game-smoke.js +23 -0
- package/dist/commands/game-smoke.js.map +1 -0
- package/dist/commands/game.d.ts.map +1 -1
- package/dist/commands/game.js +291 -20
- package/dist/commands/game.js.map +1 -1
- package/dist/commands/harness.d.ts +50 -0
- package/dist/commands/harness.d.ts.map +1 -1
- package/dist/commands/harness.js +289 -73
- package/dist/commands/harness.js.map +1 -1
- package/dist/commands/js-script.d.ts.map +1 -1
- package/dist/commands/js-script.js +6 -22
- package/dist/commands/js-script.js.map +1 -1
- package/dist/commands/mcp.d.ts +21 -0
- package/dist/commands/mcp.d.ts.map +1 -0
- package/dist/commands/mcp.js +166 -0
- package/dist/commands/mcp.js.map +1 -0
- package/dist/commands/output.d.ts +8 -0
- package/dist/commands/output.d.ts.map +1 -1
- package/dist/commands/output.js +18 -0
- package/dist/commands/output.js.map +1 -1
- package/dist/commands/package.d.ts.map +1 -1
- package/dist/commands/package.js +12 -12
- package/dist/commands/package.js.map +1 -1
- package/dist/commands/resource-read.d.ts.map +1 -1
- package/dist/commands/resource-read.js +5 -1
- package/dist/commands/resource-read.js.map +1 -1
- package/dist/commands/runs.d.ts +7 -0
- package/dist/commands/runs.d.ts.map +1 -0
- package/dist/commands/runs.js +302 -0
- package/dist/commands/runs.js.map +1 -0
- package/dist/commands/sketch.d.ts.map +1 -1
- package/dist/commands/sketch.js +6 -22
- package/dist/commands/sketch.js.map +1 -1
- package/dist/commands/timeline-render.d.ts +6 -1
- package/dist/commands/timeline-render.d.ts.map +1 -1
- package/dist/commands/timeline-render.js +15 -25
- package/dist/commands/timeline-render.js.map +1 -1
- package/dist/commands/timeline-score.d.ts +16 -0
- package/dist/commands/timeline-score.d.ts.map +1 -0
- package/dist/commands/timeline-score.js +90 -0
- package/dist/commands/timeline-score.js.map +1 -0
- package/dist/commands/timeline.d.ts.map +1 -1
- package/dist/commands/timeline.js +8 -22
- package/dist/commands/timeline.js.map +1 -1
- package/dist/commands/version-commands.d.ts +2 -5
- package/dist/commands/version-commands.d.ts.map +1 -1
- package/dist/commands/version-commands.js.map +1 -1
- package/dist/commands/worker.js +1 -1
- package/dist/commands/worker.js.map +1 -1
- package/dist/debug/server-runner.d.ts +2 -0
- package/dist/debug/server-runner.d.ts.map +1 -1
- package/dist/debug/server-runner.js +45 -4
- package/dist/debug/server-runner.js.map +1 -1
- package/dist/debug-bundle.d.ts +12 -0
- package/dist/debug-bundle.d.ts.map +1 -0
- package/dist/debug-bundle.js +23 -0
- package/dist/debug-bundle.js.map +1 -0
- package/dist/document-json.d.ts +11 -0
- package/dist/document-json.d.ts.map +1 -0
- package/dist/document-json.js +27 -0
- package/dist/document-json.js.map +1 -0
- package/dist/harness/capability-coverage.d.ts +1 -1
- package/dist/harness/capability-coverage.d.ts.map +1 -1
- package/dist/harness/capability-coverage.js +1 -1
- package/dist/harness/capability-coverage.js.map +1 -1
- package/dist/harness/capability-table.d.ts.map +1 -1
- package/dist/harness/capability-table.js +365 -35
- package/dist/harness/capability-table.js.map +1 -1
- package/dist/harness/changed-files.d.ts +2 -0
- package/dist/harness/changed-files.d.ts.map +1 -1
- package/dist/harness/changed-files.js +14 -0
- package/dist/harness/changed-files.js.map +1 -1
- package/dist/harness/registry.d.ts +32 -4
- package/dist/harness/registry.d.ts.map +1 -1
- package/dist/harness/registry.js +377 -33
- package/dist/harness/registry.js.map +1 -1
- package/dist/index.js +4 -3
- package/dist/index.js.map +1 -1
- package/dist/interaction-script.d.ts +23 -0
- package/dist/interaction-script.d.ts.map +1 -1
- package/dist/interaction-script.js +50 -1
- package/dist/interaction-script.js.map +1 -1
- package/dist/js-script-debug/harness.d.ts +29 -1
- package/dist/js-script-debug/harness.d.ts.map +1 -1
- package/dist/js-script-debug/harness.js +29 -72
- package/dist/js-script-debug/harness.js.map +1 -1
- package/dist/js-script-debug/target.d.ts.map +1 -1
- package/dist/js-script-debug/target.js +1 -24
- package/dist/js-script-debug/target.js.map +1 -1
- package/dist/local-model-interfaces.d.ts.map +1 -1
- package/dist/local-model-interfaces.js +1 -24
- package/dist/local-model-interfaces.js.map +1 -1
- package/dist/node-registry.d.ts +14 -0
- package/dist/node-registry.d.ts.map +1 -1
- package/dist/node-registry.js +15 -18
- package/dist/node-registry.js.map +1 -1
- package/dist/nodetool-main.d.ts +15 -0
- package/dist/nodetool-main.d.ts.map +1 -0
- package/dist/nodetool-main.js +1411 -0
- package/dist/nodetool-main.js.map +1 -0
- package/dist/nodetool.d.ts +0 -13
- package/dist/nodetool.d.ts.map +1 -1
- package/dist/nodetool.js +17 -1683
- package/dist/nodetool.js.map +1 -1
- package/dist/package-assets.d.ts +8 -0
- package/dist/package-assets.d.ts.map +1 -0
- package/dist/package-assets.js +21 -0
- package/dist/package-assets.js.map +1 -0
- package/dist/providers.d.ts +1 -1
- package/dist/providers.d.ts.map +1 -1
- package/dist/providers.js +15 -1
- package/dist/providers.js.map +1 -1
- package/dist/run-dsl.d.ts +6 -0
- package/dist/run-dsl.d.ts.map +1 -1
- package/dist/run-dsl.js +4 -1
- package/dist/run-dsl.js.map +1 -1
- package/dist/sandbox-catalog.d.ts +15 -1
- package/dist/sandbox-catalog.d.ts.map +1 -1
- package/dist/sandbox-catalog.js +58 -2
- package/dist/sandbox-catalog.js.map +1 -1
- package/dist/settings.d.ts.map +1 -1
- package/dist/settings.js +2 -0
- package/dist/settings.js.map +1 -1
- package/dist/sketch-debug/harness.d.ts +14 -0
- package/dist/sketch-debug/harness.d.ts.map +1 -1
- package/dist/sketch-debug/harness.js +11 -66
- package/dist/sketch-debug/harness.js.map +1 -1
- package/dist/sketch-debug/target.d.ts.map +1 -1
- package/dist/sketch-debug/target.js +1 -24
- package/dist/sketch-debug/target.js.map +1 -1
- package/dist/stdin.d.ts +6 -1
- package/dist/stdin.d.ts.map +1 -1
- package/dist/stdin.js +10 -1
- package/dist/stdin.js.map +1 -1
- package/dist/timeline-debug/harness.d.ts +14 -0
- package/dist/timeline-debug/harness.d.ts.map +1 -1
- package/dist/timeline-debug/harness.js +11 -66
- package/dist/timeline-debug/harness.js.map +1 -1
- package/dist/timeline-debug/target.d.ts.map +1 -1
- package/dist/timeline-debug/target.js +1 -24
- package/dist/timeline-debug/target.js.map +1 -1
- package/package.json +39 -35
package/dist/chat-codeact.js
CHANGED
|
@@ -17,7 +17,8 @@
|
|
|
17
17
|
* context, which cannot ride the JSON observation envelope.
|
|
18
18
|
*/
|
|
19
19
|
import { DIRECT_TOOL_NAMES } from "@nodetool-ai/runtime";
|
|
20
|
-
import { BackgroundSubtaskRegistry, contextSecretAvailability, createCapabilityRun,
|
|
20
|
+
import { BackgroundSubtaskRegistry, contextSecretAvailability, createCapabilityRun, gateLegacyTools, capabilityRunForLegacyTool, Tool, toolForCapabilityName, createChatCodeActSession, formatSkillCatalogForPrompt, mergeSystemSkills } from "@nodetool-ai/agents";
|
|
21
|
+
import { Skill } from "@nodetool-ai/models";
|
|
21
22
|
import { isNonBlankString } from "./predicates.js";
|
|
22
23
|
/** The tool that stays a direct provider tool alongside `execute_code`. */
|
|
23
24
|
const VIEW_IMAGE_TOOL = "view_image";
|
|
@@ -42,16 +43,20 @@ class ExecuteCodeTool extends Tool {
|
|
|
42
43
|
}
|
|
43
44
|
userMessage(params) {
|
|
44
45
|
const title = params["title"];
|
|
45
|
-
return isNonBlankString(title)
|
|
46
|
-
? title.trim()
|
|
47
|
-
: "Executing code action";
|
|
46
|
+
return isNonBlankString(title) ? title.trim() : "Executing code action";
|
|
48
47
|
}
|
|
49
48
|
}
|
|
50
49
|
export function createCliCodeActTurn(options) {
|
|
51
50
|
const byName = new Map(options.tools.map((tool) => [tool.name, tool]));
|
|
52
|
-
const directTools = options.tools.filter((t) => t.name !== VIEW_IMAGE_TOOL &&
|
|
51
|
+
const directTools = options.tools.filter((t) => t.name !== VIEW_IMAGE_TOOL &&
|
|
52
|
+
(t.name === "bash" || DIRECT_TOOL_NAMES.has(t.name)));
|
|
53
53
|
const beltTools = options.tools.filter((t) => t.name !== VIEW_IMAGE_TOOL);
|
|
54
|
+
const firstTool = options.tools[0];
|
|
55
|
+
const capabilityRun = firstTool
|
|
56
|
+
? capabilityRunForLegacyTool(firstTool, options.context)
|
|
57
|
+
: undefined;
|
|
54
58
|
const session = createChatCodeActSession({
|
|
59
|
+
capabilityRun,
|
|
55
60
|
tools: beltTools.map((tool) => ({
|
|
56
61
|
name: tool.name,
|
|
57
62
|
description: tool.description,
|
|
@@ -62,6 +67,14 @@ export function createCliCodeActTurn(options) {
|
|
|
62
67
|
const tool = byName.get(call.name);
|
|
63
68
|
if (!tool)
|
|
64
69
|
throw new Error(`Tool "${call.name}" not available`);
|
|
70
|
+
const run = capabilityRunForLegacyTool(tool, options.context);
|
|
71
|
+
if (run) {
|
|
72
|
+
const args = { ...Tool.stripMessage(call.args) };
|
|
73
|
+
if (tool.needsToolCallId) {
|
|
74
|
+
args["_tool_call_id"] = call.id;
|
|
75
|
+
}
|
|
76
|
+
return run.invoke(tool.name, args);
|
|
77
|
+
}
|
|
65
78
|
return Tool.executeTool(tool, options.context, call.args, {
|
|
66
79
|
toolCallId: call.id
|
|
67
80
|
});
|
|
@@ -74,7 +87,25 @@ export function createCliCodeActTurn(options) {
|
|
|
74
87
|
const viewImage = byName.get(VIEW_IMAGE_TOOL);
|
|
75
88
|
if (viewImage)
|
|
76
89
|
tools.push(viewImage);
|
|
77
|
-
|
|
90
|
+
const systemPrompt = options.skillCatalog
|
|
91
|
+
? `${session.systemPromptSection}\n\n${options.skillCatalog}`
|
|
92
|
+
: session.systemPromptSection;
|
|
93
|
+
return { tools, systemPrompt, session };
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* The skill catalog a server chat turn carries: the user's skills plus the
|
|
97
|
+
* shipped ones. Without it the turn has `load_skill` but no list of names to
|
|
98
|
+
* load. A database failure costs the user's rows, not the shipped skills.
|
|
99
|
+
*/
|
|
100
|
+
export async function loadCliSkillCatalog(userId) {
|
|
101
|
+
let rows = [];
|
|
102
|
+
try {
|
|
103
|
+
rows = await Skill.listByUser(userId);
|
|
104
|
+
}
|
|
105
|
+
catch {
|
|
106
|
+
// The shipped skills still apply.
|
|
107
|
+
}
|
|
108
|
+
return formatSkillCatalogForPrompt(mergeSystemSkills(rows.map((row) => ({ name: row.name, description: row.description }))));
|
|
78
109
|
}
|
|
79
110
|
/**
|
|
80
111
|
* The toolbelt a local CLI loop runs on: the platform tools plus the
|
|
@@ -88,11 +119,11 @@ export function createCliCodeActTurn(options) {
|
|
|
88
119
|
*/
|
|
89
120
|
export function buildCliAgentBelt(options) {
|
|
90
121
|
const { baseTools, provider, model, forwardMessage, gate } = options;
|
|
91
|
-
// The belt runs through the ladder, as chat's does: `
|
|
122
|
+
// The belt runs through the ladder, as chat's does: `gateLegacyTools` is the door
|
|
92
123
|
// a `Tool` takes into `decidePermission` (invariant I-1). A delegated loop
|
|
93
124
|
// is handed the gated belt, not the raw one, so approving `run_subtask` is
|
|
94
125
|
// not approval for whatever the child then calls.
|
|
95
|
-
const gatedBase =
|
|
126
|
+
const gatedBase = gateLegacyTools(baseTools, gate);
|
|
96
127
|
const subAgent = {
|
|
97
128
|
provider,
|
|
98
129
|
model,
|
|
@@ -101,17 +132,24 @@ export function buildCliAgentBelt(options) {
|
|
|
101
132
|
background: new BackgroundSubtaskRegistry(),
|
|
102
133
|
...(options.budget !== undefined && { budget: options.budget })
|
|
103
134
|
};
|
|
104
|
-
const
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
135
|
+
const delegationRuns = new WeakMap();
|
|
136
|
+
const delegationRun = (context) => {
|
|
137
|
+
const cached = delegationRuns.get(context);
|
|
138
|
+
if (cached) {
|
|
139
|
+
return cached;
|
|
140
|
+
}
|
|
141
|
+
const run = createCapabilityRun({
|
|
142
|
+
context,
|
|
143
|
+
gate,
|
|
144
|
+
availableSecrets: contextSecretAvailability(context),
|
|
145
|
+
subAgent,
|
|
146
|
+
...(options.budget !== undefined && { budget: options.budget })
|
|
147
|
+
});
|
|
148
|
+
delegationRuns.set(context, run);
|
|
149
|
+
return run;
|
|
150
|
+
};
|
|
151
|
+
// Delegation and planning retain their read category. The child executes
|
|
152
|
+
// mutations through gatedBase under the same permission policy.
|
|
115
153
|
const spawned = [];
|
|
116
154
|
if (options.readOnlySearch !== false) {
|
|
117
155
|
spawned.push(toolForCapabilityName("run_search", delegationRun));
|
|
@@ -123,9 +161,9 @@ export function buildCliAgentBelt(options) {
|
|
|
123
161
|
// action but every action in the plan. In plan mode the ladder answers
|
|
124
162
|
// `blocked_in_plan_mode`, which tells the model to have the user switch
|
|
125
163
|
// out; elsewhere it asks once.
|
|
126
|
-
spawned.push(
|
|
164
|
+
spawned.push(toolForCapabilityName("execute_plan", delegationRun));
|
|
127
165
|
}
|
|
128
|
-
return [...spawned, ...
|
|
166
|
+
return gateLegacyTools([...spawned, ...baseTools], gate);
|
|
129
167
|
}
|
|
130
168
|
/**
|
|
131
169
|
* Put `systemPrompt` at the head of the history, replacing the previous
|
package/dist/chat-codeact.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-codeact.js","sourceRoot":"","sources":["../src/chat-codeact.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AASH,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EACL,yBAAyB,EACzB,yBAAyB,EACzB,mBAAmB,EACnB,
|
|
1
|
+
{"version":3,"file":"chat-codeact.js","sourceRoot":"","sources":["../src/chat-codeact.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-context.d.ts","sourceRoot":"","sources":["../src/chat-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAwB,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"chat-context.d.ts","sourceRoot":"","sources":["../src/chat-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAwB,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAK/E,wBAAsB,iBAAiB,CAAC,IAAI,EAAE;IAC5C,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,GAAG,OAAO,CAAC,iBAAiB,CAAC,CAa7B"}
|
package/dist/chat-context.js
CHANGED
|
@@ -10,8 +10,10 @@
|
|
|
10
10
|
* folder the user happened to start the chat in, with no `asset://` URI for
|
|
11
11
|
* anything downstream to reference.
|
|
12
12
|
*/
|
|
13
|
-
import {
|
|
13
|
+
import { getDefaultAssetsPath } from "@nodetool-ai/config";
|
|
14
14
|
import { createLocalWorkspace, ProcessingContext } from "@nodetool-ai/runtime";
|
|
15
|
+
import { FileStorageAdapter } from "@nodetool-ai/storage";
|
|
16
|
+
import { resolveLocalSecret } from "./local-secrets.js";
|
|
15
17
|
import { localModelInterfaces } from "./local-model-interfaces.js";
|
|
16
18
|
export async function createChatContext(opts) {
|
|
17
19
|
const workspaceDir = opts.workspaceDir ?? null;
|
|
@@ -19,7 +21,10 @@ export async function createChatContext(opts) {
|
|
|
19
21
|
jobId: crypto.randomUUID(),
|
|
20
22
|
userId: opts.userId ?? "1",
|
|
21
23
|
workspace: workspaceDir ? createLocalWorkspace(workspaceDir) : null,
|
|
22
|
-
secretResolver: resolveLocalSecret
|
|
24
|
+
secretResolver: resolveLocalSecret,
|
|
25
|
+
// The store `createAsset` writes to. Without it a turn cannot read back
|
|
26
|
+
// an asset it made unless a server answers on port 7777.
|
|
27
|
+
storage: new FileStorageAdapter(getDefaultAssetsPath())
|
|
23
28
|
});
|
|
24
29
|
context.setModelInterfaces(await localModelInterfaces());
|
|
25
30
|
return context;
|
package/dist/chat-context.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"chat-context.js","sourceRoot":"","sources":["../src/chat-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"chat-context.js","sourceRoot":"","sources":["../src/chat-context.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AACxD,OAAO,EAAE,oBAAoB,EAAE,MAAM,6BAA6B,CAAC;AAEnE,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,IAGvC;IACC,MAAM,YAAY,GAAG,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC;IAC/C,MAAM,OAAO,GAAG,IAAI,iBAAiB,CAAC;QACpC,KAAK,EAAE,MAAM,CAAC,UAAU,EAAE;QAC1B,MAAM,EAAE,IAAI,CAAC,MAAM,IAAI,GAAG;QAC1B,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC,oBAAoB,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI;QACnE,cAAc,EAAE,kBAAkB;QAClC,wEAAwE;QACxE,yDAAyD;QACzD,OAAO,EAAE,IAAI,kBAAkB,CAAC,oBAAoB,EAAE,CAAC;KACxD,CAAC,CAAC;IACH,OAAO,CAAC,kBAAkB,CAAC,MAAM,oBAAoB,EAAE,CAAC,CAAC;IACzD,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"child-exit.d.ts","sourceRoot":"","sources":["../src/child-exit.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAE3D,wBAAgB,aAAa,CAC3B,MAAM,EAAE,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAC,GACrE,MAAM,CAIR"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* The exit code to pass on for a child run with `spawnSync`.
|
|
3
|
+
*
|
|
4
|
+
* `result.status` is null when the child was killed by a signal or never
|
|
5
|
+
* started (`result.error`), so `status ?? 0` reported a crashed or missing
|
|
6
|
+
* server as success. A signal maps to the shell's `128 + n`; anything else
|
|
7
|
+
* without a status is a failure.
|
|
8
|
+
*/
|
|
9
|
+
import { constants } from "node:os";
|
|
10
|
+
export function childExitCode(result) {
|
|
11
|
+
if (result.status !== null)
|
|
12
|
+
return result.status;
|
|
13
|
+
if (result.signal)
|
|
14
|
+
return 128 + (constants.signals[result.signal] ?? 0);
|
|
15
|
+
return 1;
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=child-exit.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"child-exit.js","sourceRoot":"","sources":["../src/child-exit.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,MAAM,UAAU,aAAa,CAC3B,MAAsE;IAEtE,IAAI,MAAM,CAAC,MAAM,KAAK,IAAI;QAAE,OAAO,MAAM,CAAC,MAAM,CAAC;IACjD,IAAI,MAAM,CAAC,MAAM;QAAE,OAAO,GAAG,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;IACxE,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -30,7 +30,7 @@ describe("timeline render audio export", () => {
|
|
|
30
30
|
"-v", "error", "-y", "-f", "lavfi", "-i", "color=c=black:s=32x32:r=10",
|
|
31
31
|
"-t", String(durationMs / 1000), "-an", "-c:v", "libx264", outPath
|
|
32
32
|
]);
|
|
33
|
-
return { totalFrames: 20, skippedClips: [] };
|
|
33
|
+
return { totalFrames: 20, skippedClips: [], fontsUnavailable: [], complete: true, diagnostics: [] };
|
|
34
34
|
});
|
|
35
35
|
const streams = JSON.parse(execFileSync("ffprobe", [
|
|
36
36
|
"-v", "error", "-show_streams", "-of", "json", output
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"timeline-render-audio.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/timeline-render-audio.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,OAAO,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAEzD,MAAM,EAAE,iBAAiB,EAAE,GAAG,MAAM,MAAM,CAAC,uBAAuB,CAAC,CAAC;AACpE,MAAM,IAAI,GAAa,EAAE,CAAC;AAC1B,SAAS,CAAC,KAAK,IAAI,EAAE;IACnB,MAAM,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,8BAA8B,EAAE,GAAG,EAAE;IAC5C,EAAE,CAAC,0CAA0C,EAAE,KAAK,IAAI,EAAE;QACxD,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,qBAAqB,CAAC,CAAC,CAAC;QACzE,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,eAAe,CAAC,CAAC;QAC9C,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAC5C,MAAM,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,SAAS,CAAC;YACpC,IAAI,EAAE,gBAAgB,EAAE,GAAG,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI;YACxE,QAAQ,EAAE;gBACR,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;gBAChE,KAAK,EAAE,CAAC;wBACN,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM;wBAC7D,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,IAAI;wBAC9B,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,EAAE,YAAY,EAAE,GAAG,EAAE,CAAC;qBACjF,CAAC,EAAE,OAAO,EAAE,EAAE;aAChB;SACF,CAAC,CAAC,CAAC;QACJ,MAAM,iBAAiB,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,EAAE,KAAK,IAAI,EAAE,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE;YAClG,YAAY,CAAC,QAAQ,EAAE;gBACrB,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,4BAA4B;gBACtE,IAAI,EAAE,MAAM,CAAC,UAAU,GAAG,IAAI,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,OAAO;aACnE,CAAC,CAAC;YACH,OAAO,EAAE,WAAW,EAAE,EAAE,EAAE,YAAY,EAAE,EAAE,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"timeline-render-audio.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/timeline-render-audio.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeline-render-completeness.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/timeline-render-completeness.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,117 @@
|
|
|
1
|
+
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { describe, expect, it, vi } from "vitest";
|
|
5
|
+
import { Command } from "commander";
|
|
6
|
+
import { registerTimelineRenderCommand, runTimelineRender } from "../timeline-render.js";
|
|
7
|
+
const incompleteRenderer = async ({ outPath, writeFrame }) => {
|
|
8
|
+
if (writeFrame) {
|
|
9
|
+
await writeFrame(0, new Uint8Array(16 * 16 * 4));
|
|
10
|
+
}
|
|
11
|
+
else {
|
|
12
|
+
await writeFile(outPath, "retained incomplete artifact");
|
|
13
|
+
}
|
|
14
|
+
return {
|
|
15
|
+
totalFrames: 1,
|
|
16
|
+
skippedClips: ["missing-clip"],
|
|
17
|
+
fontsUnavailable: [],
|
|
18
|
+
complete: false,
|
|
19
|
+
diagnostics: [
|
|
20
|
+
{
|
|
21
|
+
clipId: "missing-clip",
|
|
22
|
+
startMs: 0,
|
|
23
|
+
endMs: 1000,
|
|
24
|
+
reason: "missing_asset",
|
|
25
|
+
detail: "No current asset is available."
|
|
26
|
+
}
|
|
27
|
+
]
|
|
28
|
+
};
|
|
29
|
+
};
|
|
30
|
+
describe("timeline export completeness", () => {
|
|
31
|
+
it("preserves missing-content diagnostics in preview results", async () => {
|
|
32
|
+
const directory = await mkdtemp(path.join(os.tmpdir(), "timeline-completeness-"));
|
|
33
|
+
try {
|
|
34
|
+
const input = path.join(directory, "timeline.json");
|
|
35
|
+
await writeFile(input, JSON.stringify({
|
|
36
|
+
name: "Missing content",
|
|
37
|
+
width: 16,
|
|
38
|
+
height: 16,
|
|
39
|
+
fps: 30,
|
|
40
|
+
durationMs: 1000,
|
|
41
|
+
document: { tracks: [], clips: [], markers: [] }
|
|
42
|
+
}));
|
|
43
|
+
const diagnostics = [
|
|
44
|
+
{
|
|
45
|
+
clipId: "missing-clip",
|
|
46
|
+
startMs: 0,
|
|
47
|
+
endMs: 1000,
|
|
48
|
+
reason: "missing_asset",
|
|
49
|
+
detail: "No current asset is available."
|
|
50
|
+
}
|
|
51
|
+
];
|
|
52
|
+
const result = await runTimelineRender(input, { out: path.join(directory, "stills"), stills: true, frames: "0" }, async () => null, async () => ({
|
|
53
|
+
totalFrames: 1,
|
|
54
|
+
skippedClips: ["missing-clip"],
|
|
55
|
+
fontsUnavailable: [],
|
|
56
|
+
complete: false,
|
|
57
|
+
diagnostics
|
|
58
|
+
}));
|
|
59
|
+
expect(result).toMatchObject({
|
|
60
|
+
complete: false,
|
|
61
|
+
diagnostics,
|
|
62
|
+
skippedClips: ["missing-clip"]
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
finally {
|
|
66
|
+
await rm(directory, { recursive: true, force: true });
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
it.each([
|
|
70
|
+
{ stills: false, exitCode: 1 },
|
|
71
|
+
{ stills: true, exitCode: 0 }
|
|
72
|
+
])("reports incomplete content with stills=$stills and exit=$exitCode", async ({ stills, exitCode }) => {
|
|
73
|
+
const directory = await mkdtemp(path.join(os.tmpdir(), "timeline-completeness-command-"));
|
|
74
|
+
const exit = vi
|
|
75
|
+
.spyOn(process, "exit")
|
|
76
|
+
.mockImplementation(() => undefined);
|
|
77
|
+
const log = vi.spyOn(console, "log").mockImplementation(() => { });
|
|
78
|
+
const error = vi.spyOn(console, "error").mockImplementation(() => { });
|
|
79
|
+
try {
|
|
80
|
+
const input = path.join(directory, "timeline.json");
|
|
81
|
+
await writeFile(input, JSON.stringify({
|
|
82
|
+
name: "Missing content",
|
|
83
|
+
width: 16,
|
|
84
|
+
height: 16,
|
|
85
|
+
fps: 30,
|
|
86
|
+
durationMs: 1000,
|
|
87
|
+
document: { tracks: [], clips: [], markers: [] }
|
|
88
|
+
}));
|
|
89
|
+
const command = new Command();
|
|
90
|
+
registerTimelineRenderCommand(command, async () => async () => null, incompleteRenderer);
|
|
91
|
+
await command.parseAsync([
|
|
92
|
+
"render",
|
|
93
|
+
input,
|
|
94
|
+
"--out",
|
|
95
|
+
path.join(directory, stills ? "stills" : "frames.zip"),
|
|
96
|
+
"--format",
|
|
97
|
+
"png_sequence",
|
|
98
|
+
"--frames",
|
|
99
|
+
"0",
|
|
100
|
+
"--json",
|
|
101
|
+
...(stills ? ["--stills"] : [])
|
|
102
|
+
], { from: "user" });
|
|
103
|
+
expect(exit).toHaveBeenCalledExactlyOnceWith(exitCode);
|
|
104
|
+
expect(JSON.parse(String(log.mock.calls[0][0]))).toMatchObject({
|
|
105
|
+
complete: false,
|
|
106
|
+
diagnostics: [{ clipId: "missing-clip", reason: "missing_asset" }]
|
|
107
|
+
});
|
|
108
|
+
}
|
|
109
|
+
finally {
|
|
110
|
+
exit.mockRestore();
|
|
111
|
+
log.mockRestore();
|
|
112
|
+
error.mockRestore();
|
|
113
|
+
await rm(directory, { recursive: true, force: true });
|
|
114
|
+
}
|
|
115
|
+
});
|
|
116
|
+
});
|
|
117
|
+
//# sourceMappingURL=timeline-render-completeness.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeline-render-completeness.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/timeline-render-completeness.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeline-score.test.d.ts","sourceRoot":"","sources":["../../../src/commands/__tests__/timeline-score.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { evenlySpacedFrames, renderTimelineScore } from "../timeline-score.js";
|
|
3
|
+
const metric = (overrides) => ({
|
|
4
|
+
metric: "animationsPerSecond",
|
|
5
|
+
value: 1,
|
|
6
|
+
referenceMedian: 1,
|
|
7
|
+
ratio: 1,
|
|
8
|
+
credit: 1,
|
|
9
|
+
...overrides
|
|
10
|
+
});
|
|
11
|
+
const result = (overrides = {}) => ({
|
|
12
|
+
score: 80,
|
|
13
|
+
rawScore: 80,
|
|
14
|
+
penalty: 0,
|
|
15
|
+
metrics: {
|
|
16
|
+
clipCount: 2,
|
|
17
|
+
visibleSeconds: 2,
|
|
18
|
+
animationsPerSecond: 1,
|
|
19
|
+
keyframesPerSecond: 1,
|
|
20
|
+
distinctAnimatedProperties: 1,
|
|
21
|
+
distinctEffectTypes: 1,
|
|
22
|
+
featureFlagsUsed: 1,
|
|
23
|
+
styleTracks: 1,
|
|
24
|
+
textAnimators: 1,
|
|
25
|
+
authoredTransitions: 1,
|
|
26
|
+
sceneCount: 1
|
|
27
|
+
},
|
|
28
|
+
metricScores: [metric({})],
|
|
29
|
+
reference: { entries: [{ slug: "kite", metrics: {} }], median: {} },
|
|
30
|
+
showcaseWarnings: [],
|
|
31
|
+
showcaseWarningCodeCounts: {},
|
|
32
|
+
validation: { ok: true, errors: [], warnings: [] },
|
|
33
|
+
...overrides
|
|
34
|
+
});
|
|
35
|
+
describe("evenlySpacedFrames", () => {
|
|
36
|
+
it("spans first to last frame inclusive, deduped and sorted", () => {
|
|
37
|
+
expect(evenlySpacedFrames(100, 5)).toEqual([0, 25, 50, 74, 99]);
|
|
38
|
+
});
|
|
39
|
+
it("never asks for more frames than the timeline has", () => {
|
|
40
|
+
expect(evenlySpacedFrames(3, 12)).toEqual([0, 1, 2]);
|
|
41
|
+
});
|
|
42
|
+
it("returns frame 0 for a single-frame or empty timeline", () => {
|
|
43
|
+
expect(evenlySpacedFrames(1, 12)).toEqual([0]);
|
|
44
|
+
expect(evenlySpacedFrames(0, 12)).toEqual([0]);
|
|
45
|
+
});
|
|
46
|
+
});
|
|
47
|
+
describe("renderTimelineScore", () => {
|
|
48
|
+
it("reports the score, penalty and reference band", () => {
|
|
49
|
+
const lines = renderTimelineScore(result());
|
|
50
|
+
expect(lines[0]).toContain("80.0/100");
|
|
51
|
+
expect(lines[0]).toContain("raw 80.0");
|
|
52
|
+
expect(lines.find((l) => l.includes("Reference band"))).toContain("kite");
|
|
53
|
+
});
|
|
54
|
+
it("lists showcase warnings when present, penalizing once per distinct code", () => {
|
|
55
|
+
const lines = renderTimelineScore(result({
|
|
56
|
+
score: 65,
|
|
57
|
+
rawScore: 75,
|
|
58
|
+
penalty: 10,
|
|
59
|
+
showcaseWarnings: [
|
|
60
|
+
{
|
|
61
|
+
severity: "warning",
|
|
62
|
+
code: "showcase_text_collision",
|
|
63
|
+
message: "text overlaps text 1"
|
|
64
|
+
},
|
|
65
|
+
{
|
|
66
|
+
severity: "warning",
|
|
67
|
+
code: "showcase_text_collision",
|
|
68
|
+
message: "text overlaps text 2"
|
|
69
|
+
},
|
|
70
|
+
{
|
|
71
|
+
severity: "warning",
|
|
72
|
+
code: "showcase_camera_missing",
|
|
73
|
+
message: "no camera moves the scene"
|
|
74
|
+
}
|
|
75
|
+
],
|
|
76
|
+
showcaseWarningCodeCounts: {
|
|
77
|
+
showcase_text_collision: 2,
|
|
78
|
+
showcase_camera_missing: 1
|
|
79
|
+
}
|
|
80
|
+
}));
|
|
81
|
+
expect(lines[0]).toContain("65.0/100");
|
|
82
|
+
expect(lines[0]).toContain("-10 for 2 distinct showcase warning code(s)");
|
|
83
|
+
expect(lines.some((l) => l.includes("showcase_text_collision ×2"))).toBe(true);
|
|
84
|
+
expect(lines.some((l) => l.includes("showcase_camera_missing ×1"))).toBe(true);
|
|
85
|
+
expect(lines.some((l) => l.includes("[showcase_text_collision] text overlaps text 1"))).toBe(true);
|
|
86
|
+
});
|
|
87
|
+
it("flags a document that failed validation", () => {
|
|
88
|
+
const lines = renderTimelineScore(result({
|
|
89
|
+
validation: {
|
|
90
|
+
ok: false,
|
|
91
|
+
errors: [
|
|
92
|
+
{ severity: "error", code: "schema_invalid", message: "bad" }
|
|
93
|
+
],
|
|
94
|
+
warnings: []
|
|
95
|
+
}
|
|
96
|
+
}));
|
|
97
|
+
expect(lines.some((l) => l.includes("1 validation error"))).toBe(true);
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
//# sourceMappingURL=timeline-score.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"timeline-score.test.js","sourceRoot":"","sources":["../../../src/commands/__tests__/timeline-score.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.d.ts","sourceRoot":"","sources":["../../src/commands/affected.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,
|
|
1
|
+
{"version":3,"file":"affected.d.ts","sourceRoot":"","sources":["../../src/commands/affected.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAczC,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA6G9D"}
|
|
@@ -10,7 +10,7 @@ export function registerAffectedCommand(program) {
|
|
|
10
10
|
const { readFileSync, readdirSync, existsSync } = await import("node:fs");
|
|
11
11
|
const { join, resolve, dirname } = await import("node:path");
|
|
12
12
|
const { fileURLToPath } = await import("node:url");
|
|
13
|
-
const {
|
|
13
|
+
const { execFileSync } = await import("node:child_process");
|
|
14
14
|
const here = dirname(fileURLToPath(import.meta.url));
|
|
15
15
|
// dist layout: packages/cli/dist/commands → repo root is four up.
|
|
16
16
|
const repoRoot = resolve(here, "..", "..", "..", "..");
|
|
@@ -66,10 +66,15 @@ export function registerAffectedCommand(program) {
|
|
|
66
66
|
}
|
|
67
67
|
let changedFiles = files;
|
|
68
68
|
if (changedFiles.length === 0) {
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
69
|
+
// argv, never a shell line: `--base` is a git ref, and ref names
|
|
70
|
+
// may carry `;`, `$(…)` and backticks.
|
|
71
|
+
const args = opts.base
|
|
72
|
+
? ["diff", "--name-only", `${opts.base}...HEAD`]
|
|
73
|
+
: ["status", "--porcelain"];
|
|
74
|
+
const out = execFileSync("git", args, {
|
|
75
|
+
cwd: repoRoot,
|
|
76
|
+
encoding: "utf8"
|
|
77
|
+
});
|
|
73
78
|
changedFiles = opts.base
|
|
74
79
|
? out.split("\n").map((l) => l.trim()).filter(Boolean)
|
|
75
80
|
: out
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../src/commands/affected.ts"],"names":[],"mappings":"AAOA,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,oBAAoB,EAGrB,MAAM,yBAAyB,CAAC;AAOjC,MAAM,UAAU,uBAAuB,CAAC,OAAgB;IACtD,OAAO;SACJ,OAAO,CAAC,qBAAqB,CAAC;SAC9B,WAAW,CACV,+FAA+F,CAChG;SACA,MAAM,CACL,cAAc,EACd,mEAAmE,CACpE;SACA,MAAM,CAAC,QAAQ,EAAE,0BAA0B,CAAC;SAC5C,MAAM,CAAC,KAAK,EAAE,KAAe,EAAE,IAAwB,EAAE,EAAE;QAC1D,IAAI,CAAC;YACH,MAAM,EAAE,YAAY,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,MAAM,MAAM,CAC5D,SAAS,CACV,CAAC;YACF,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,GAAG,MAAM,MAAM,CAAC,WAAW,CAAC,CAAC;YAC7D,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,CAAC;YACnD,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"affected.js","sourceRoot":"","sources":["../../src/commands/affected.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"agent.d.ts","sourceRoot":"","sources":["../../src/commands/agent.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;GAaG;AAKH,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AA8JpC,MAAM,WAAW,UAAU;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6EAA6E;IAC7E,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAcD,4EAA4E;AAC5E,wBAAsB,eAAe,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,MAAM,CAAC,CAwOvE;AAgJD,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CA+D5D"}
|
package/dist/commands/agent.js
CHANGED
|
@@ -24,12 +24,13 @@ import { getDefaultDbPath, configureLogging } from "@nodetool-ai/config";
|
|
|
24
24
|
import { createProvider, buildConfiguredProviders } from "../providers.js";
|
|
25
25
|
import { buildFullRegistry } from "../node-registry.js";
|
|
26
26
|
import { buildCliToolbelt } from "../agent-toolbelt.js";
|
|
27
|
-
import { applySystemPrompt, buildCliAgentBelt, createCliCodeActTurn } from "../chat-codeact.js";
|
|
27
|
+
import { applySystemPrompt, buildCliAgentBelt, createCliCodeActTurn, loadCliSkillCatalog } from "../chat-codeact.js";
|
|
28
28
|
import { createChatContext } from "../chat-context.js";
|
|
29
29
|
import { budgetStopReason, budgetSummaryLine, createCliRunBudget } from "../run-budget.js";
|
|
30
30
|
import { createCliPermissionGate, parsePermissionMode, PERMISSION_MODE_NAMES } from "../permission-gate.js";
|
|
31
31
|
import { diagnoseRun, renderDiagnosis } from "../diagnose.js";
|
|
32
32
|
import { isRecord, isString } from "../predicates.js";
|
|
33
|
+
import { parseNumericOption } from "../numeric-options.js";
|
|
33
34
|
const PROVIDER_ALIASES = {
|
|
34
35
|
google: "gemini",
|
|
35
36
|
googleai: "gemini",
|
|
@@ -155,6 +156,14 @@ export async function runAgentCommand(opts) {
|
|
|
155
156
|
if (!modelId) {
|
|
156
157
|
throw new Error("No model specified. Use --model <id>.");
|
|
157
158
|
}
|
|
159
|
+
// `Number("ten")` is NaN, and a NaN round limit runs no rounds at all: the
|
|
160
|
+
// run then failed as if the model had answered nothing.
|
|
161
|
+
const maxIterations = opts.maxIterations === undefined
|
|
162
|
+
? undefined
|
|
163
|
+
: parseNumericOption(opts.maxIterations, "--max-iterations", {
|
|
164
|
+
integer: true,
|
|
165
|
+
min: 1
|
|
166
|
+
});
|
|
158
167
|
const objective = opts.objective ?? (await readObjectiveFromStdin());
|
|
159
168
|
if (!objective) {
|
|
160
169
|
throw new Error('No objective provided. Use --objective "..." or pipe it via stdin.');
|
|
@@ -242,6 +251,7 @@ export async function runAgentCommand(opts) {
|
|
|
242
251
|
const turn = createCliCodeActTurn({
|
|
243
252
|
tools: belt,
|
|
244
253
|
context,
|
|
254
|
+
skillCatalog: await loadCliSkillCatalog(context.userId),
|
|
245
255
|
// Calls the sandbox makes have no provider tool-call id of their own.
|
|
246
256
|
onToolCall: ({ name, args }) => {
|
|
247
257
|
emit({ type: "tool_call_update", name, args });
|
|
@@ -259,7 +269,7 @@ export async function runAgentCommand(opts) {
|
|
|
259
269
|
context,
|
|
260
270
|
tools: turn.tools,
|
|
261
271
|
turnBudget: budget,
|
|
262
|
-
maxIterations
|
|
272
|
+
maxIterations,
|
|
263
273
|
callbacks: {
|
|
264
274
|
onChunk: (content) => {
|
|
265
275
|
emit({ type: "chunk", content, done: false });
|