@galaxy-stack/ai-coder-core 0.3.1 → 0.3.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.d/2026-09-30-baseline-review-bo-qua-thay-doi-generated.md +23 -0
- package/CHANGELOG.d/2026-09-30-galaxy-credentials.md +15 -0
- package/CHANGELOG.d/2026-09-30-shell-persistent-giong-dsh.md +25 -0
- package/CHANGELOG.d/2026-09-30-timeout-do-agent-tu-quyet.md +23 -0
- package/CHANGELOG.d/2026-09-30-timeout-giong-dsh.md +26 -0
- package/CHANGELOG.md +19 -0
- package/dist/adapters/node/config/galaxy-credentials.d.ts +58 -0
- package/dist/adapters/node/config/galaxy-credentials.d.ts.map +1 -0
- package/dist/adapters/node/config/galaxy-credentials.js +216 -0
- package/dist/adapters/node/config/galaxy-credentials.js.map +1 -0
- package/dist/adapters/node/host/node-command-port.d.ts +16 -0
- package/dist/adapters/node/host/node-command-port.d.ts.map +1 -1
- package/dist/adapters/node/host/node-command-port.js +74 -3
- package/dist/adapters/node/host/node-command-port.js.map +1 -1
- package/dist/adapters/node/host/node-persistent-shell.d.ts +35 -0
- package/dist/adapters/node/host/node-persistent-shell.d.ts.map +1 -0
- package/dist/adapters/node/host/node-persistent-shell.js +182 -0
- package/dist/adapters/node/host/node-persistent-shell.js.map +1 -0
- package/dist/adapters/node/tools/tool-executor.d.ts.map +1 -1
- package/dist/adapters/node/tools/tool-executor.js +10 -1
- package/dist/adapters/node/tools/tool-executor.js.map +1 -1
- package/dist/adapters/node/tools/workspace-review.d.ts +11 -0
- package/dist/adapters/node/tools/workspace-review.d.ts.map +1 -1
- package/dist/adapters/node/tools/workspace-review.js +61 -12
- package/dist/adapters/node/tools/workspace-review.js.map +1 -1
- package/dist/runtime/run-controller.d.ts.map +1 -1
- package/dist/runtime/run-controller.js +6 -1
- package/dist/runtime/run-controller.js.map +1 -1
- package/dist/tools/tool-registry.js +2 -2
- package/dist/tools/tool-registry.js.map +1 -1
- package/dist/tools/tool-timeouts.d.ts +21 -0
- package/dist/tools/tool-timeouts.d.ts.map +1 -0
- package/dist/tools/tool-timeouts.js +26 -0
- package/dist/tools/tool-timeouts.js.map +1 -0
- package/package.json +1 -1
|
@@ -1,8 +1,28 @@
|
|
|
1
1
|
import { sha256Text } from "../host/content-hash.js";
|
|
2
2
|
import { DEPENDENCY_AWARE_WORKSPACE_SNAPSHOT_OPTIONS, diffNodeWorkspaceSnapshots, NodeWorkspaceSnapshotter } from "../host/node-workspace-snapshot.js";
|
|
3
3
|
const MAX_BASELINE_BYTES = 8 * 1024 * 1024;
|
|
4
|
+
const MAX_BASELINE_ATTEMPTS = 3;
|
|
5
|
+
const BASELINE_RETRY_DELAY_MS = 250;
|
|
4
6
|
const MAX_REVIEW_BYTES = 24000;
|
|
5
7
|
const definition = { type: "function", function: { name: "review_changes", description: "Review final workspace changes against the start of this task, without Git. Returns verified before/after file contents and hashes. Call after all writes and validation, before the final report. If truncated, no review evidence is granted.", parameters: { type: "object", properties: {}, additionalProperties: false } } };
|
|
8
|
+
/**
|
|
9
|
+
* Fingerprint of the entries a review can actually report: durable files only.
|
|
10
|
+
*
|
|
11
|
+
* A background install or build rewrites derived paths (node_modules, dist) while the
|
|
12
|
+
* baseline is being captured. Hashing those too made the workspace look like it was
|
|
13
|
+
* being edited, and the executor then threw from its factory — outside any tool call —
|
|
14
|
+
* which killed the whole run with "Workspace changed while capturing review baseline".
|
|
15
|
+
* Measured: a full E2E run died that way while bun install finished in the background.
|
|
16
|
+
*/
|
|
17
|
+
export function durableBaselineFingerprint(snapshot) {
|
|
18
|
+
const parts = [];
|
|
19
|
+
for (const entry of snapshot.entries) {
|
|
20
|
+
if (entry.evidenceClass !== "durable")
|
|
21
|
+
continue;
|
|
22
|
+
parts.push(entry.path + "\u0000" + entry.kind + "\u0000" + entry.comparisonFingerprint);
|
|
23
|
+
}
|
|
24
|
+
return sha256Text(parts.join("\n"));
|
|
25
|
+
}
|
|
6
26
|
/** Host-owned comparison for scratch projects. Never creates .git or weakens the completion gate. */
|
|
7
27
|
export class NodeWorkspaceReviewExecutor {
|
|
8
28
|
workspace;
|
|
@@ -17,21 +37,50 @@ export class NodeWorkspaceReviewExecutor {
|
|
|
17
37
|
}
|
|
18
38
|
static async create(workspace, context) {
|
|
19
39
|
const snapshotter = await NodeWorkspaceSnapshotter.create(context.workspaceRoot, DEPENDENCY_AWARE_WORKSPACE_SNAPSHOT_OPTIONS);
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
40
|
+
let lastFingerprint = "";
|
|
41
|
+
for (let attempt = 1; attempt <= MAX_BASELINE_ATTEMPTS; attempt += 1) {
|
|
42
|
+
// A capture itself can hit CONFLICT when a background writer touches a file between
|
|
43
|
+
// the host's own lstats; retrying the attempt is the correct answer for generated
|
|
44
|
+
// churn, which the review never reports.
|
|
45
|
+
let baseline;
|
|
46
|
+
try {
|
|
47
|
+
baseline = await snapshotter.capture(context);
|
|
48
|
+
}
|
|
49
|
+
catch (error) {
|
|
50
|
+
if (attempt >= MAX_BASELINE_ATTEMPTS)
|
|
51
|
+
throw error;
|
|
52
|
+
await new Promise((resolve) => setTimeout(resolve, BASELINE_RETRY_DELAY_MS * attempt));
|
|
25
53
|
continue;
|
|
26
|
-
const read = await workspace.readText({ path: entry.path, maxBytes: 128 * 1024 }, { ...context, toolCallId: "host-baseline", idempotencyKey: "host-baseline" });
|
|
27
|
-
if (read.ok && !read.data.truncated && read.data.contentSha256 === entry.comparisonFingerprint && bytes + Buffer.byteLength(read.data.content) <= MAX_BASELINE_BYTES) {
|
|
28
|
-
bytes += Buffer.byteLength(read.data.content);
|
|
29
|
-
contents.set(entry.path, read.data.content);
|
|
30
54
|
}
|
|
55
|
+
const contents = new Map();
|
|
56
|
+
let bytes = 0;
|
|
57
|
+
for (const entry of baseline.entries) {
|
|
58
|
+
if (entry.evidenceClass !== "durable" || entry.kind !== "file" || bytes >= MAX_BASELINE_BYTES)
|
|
59
|
+
continue;
|
|
60
|
+
const read = await workspace.readText({ path: entry.path, maxBytes: 128 * 1024 }, { ...context, toolCallId: "host-baseline", idempotencyKey: "host-baseline" });
|
|
61
|
+
if (read.ok && !read.data.truncated && read.data.contentSha256 === entry.comparisonFingerprint && bytes + Buffer.byteLength(read.data.content) <= MAX_BASELINE_BYTES) {
|
|
62
|
+
bytes += Buffer.byteLength(read.data.content);
|
|
63
|
+
contents.set(entry.path, read.data.content);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
const fingerprint = durableBaselineFingerprint(baseline);
|
|
67
|
+
let stillStable = false;
|
|
68
|
+
try {
|
|
69
|
+
stillStable = durableBaselineFingerprint(await snapshotter.capture(context)) === fingerprint;
|
|
70
|
+
}
|
|
71
|
+
catch (error) {
|
|
72
|
+
if (attempt >= MAX_BASELINE_ATTEMPTS)
|
|
73
|
+
throw error;
|
|
74
|
+
}
|
|
75
|
+
if (stillStable)
|
|
76
|
+
return new NodeWorkspaceReviewExecutor(workspace, snapshotter, baseline, contents);
|
|
77
|
+
lastFingerprint = fingerprint;
|
|
78
|
+
if (attempt < MAX_BASELINE_ATTEMPTS)
|
|
79
|
+
await new Promise((resolve) => setTimeout(resolve, BASELINE_RETRY_DELAY_MS * attempt));
|
|
31
80
|
}
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
81
|
+
throw new Error("Workspace source files kept changing while the review baseline was captured (attempt " +
|
|
82
|
+
MAX_BASELINE_ATTEMPTS + ", last durable fingerprint " + lastFingerprint.slice(0, 12) +
|
|
83
|
+
"). Generated paths such as node_modules and dist are ignored; a background process is probably still writing source files. Stop it, then retry the step.");
|
|
35
84
|
}
|
|
36
85
|
async getToolSet() {
|
|
37
86
|
return { definitions: [definition], canonicalToolIds: { review_changes: "workspace.review" }, effectCapabilities: { "workspace.review": ["inspect", "diff_review"] }, snapshotHash: sha256Text(JSON.stringify(definition)) };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-review.js","sourceRoot":"","sources":["../../../../src/adapters/node/tools/workspace-review.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AACrD,OAAO,EAAE,2CAA2C,EAAE,0BAA0B,EAAE,wBAAwB,EAA8B,MAAM,oCAAoC,CAAC;AAEnL,MAAM,kBAAkB,GAAG,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC;AAC3C,MAAM,gBAAgB,GAAG,KAAK,CAAC;AAC/B,MAAM,UAAU,GAAG,EAAE,IAAI,EAAE,UAAmB,EAAE,QAAQ,EAAE,EAAE,IAAI,EAAE,gBAAgB,EAAE,WAAW,EAAE,iPAAiP,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,oBAAoB,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;AAEpa,qGAAqG;AACrG,MAAM,OAAO,2BAA2B;IACD;IAA2C;IAAwD;IAAkD;IAA1L,YAAqC,SAAwB,EAAmB,WAAqC,EAAmB,QAA+B,EAAmB,QAAqC;QAA1L,cAAS,GAAT,SAAS,CAAe;QAAmB,gBAAW,GAAX,WAAW,CAA0B;QAAmB,aAAQ,GAAR,QAAQ,CAAuB;QAAmB,aAAQ,GAAR,QAAQ,CAA6B;IAAG,CAAC;IACnO,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,SAAwB,EAAE,OAA4B;QACxE,MAAM,WAAW,GAAG,MAAM,wBAAwB,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,2CAA2C,CAAC,CAAC;QAC9H,
|
|
1
|
+
{"version":3,"file":"workspace-review.js","sourceRoot":"","sources":["../../../../src/adapters/node/tools/workspace-review.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run-controller.d.ts","sourceRoot":"","sources":["../../src/runtime/run-controller.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"run-controller.d.ts","sourceRoot":"","sources":["../../src/runtime/run-controller.ts"],"names":[],"mappings":"AAsDA,OAAO,KAAK,EAGV,oBAAoB,EAEpB,sBAAsB,EACtB,gBAAgB,EAChB,iBAAiB,EASlB,MAAM,oBAAoB,CAAC;AAszB5B,qBAAa,oBAAoB;IAMnB,OAAO,CAAC,QAAQ,CAAC,YAAY;IALzC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAiC;IACxD,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAsB;IAC5C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAe;IACzC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAA+D;gBAExD,YAAY,EAAE,sBAAsB;IAMjE,KAAK,CAAC,OAAO,EAAE,iBAAiB,GAAG,gBAAgB;IAInD,MAAM,CAAC,OAAO,EAAE,oBAAoB,GAAG,gBAAgB;IAIvD,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,SAAwB,GAAG,OAAO;IAO9D,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,SAAsB,GAAG,OAAO;IAOrD,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,SAAS,GAAG,OAAO,CAAC,OAAO,CAAC;IAwBzG,OAAO,CAAC,MAAM;IA4Ed,OAAO,CAAC,cAAc;YAMR,MAAM;YAoBN,UAAU;IAOxB,OAAO,CAAC,YAAY;YAWN,gBAAgB;YAsBhB,kBAAkB;IAKhC,OAAO,CAAC,wBAAwB;IAmBhC,OAAO,CAAC,WAAW;YAaL,uBAAuB;YAuBvB,OAAO;IAkBrB,OAAO,CAAC,mBAAmB;YA6Bb,kBAAkB;YAclB,YAAY;YAgCZ,OAAO;IAiIrB,OAAO,CAAC,mBAAmB;IA0B3B,OAAO,CAAC,6BAA6B;YA+BvB,qBAAqB;YAuBrB,eAAe;YAyGf,OAAO;YA4KP,aAAa;IAuK3B,OAAO,CAAC,wBAAwB;IAoBhC,OAAO,CAAC,sBAAsB;IAU9B,OAAO,CAAC,wBAAwB;IAoBhC;;;OAGG;YACW,mBAAmB;YA8BnB,mBAAmB;IAIjC,OAAO,CAAC,yBAAyB;IAMjC,OAAO,CAAC,qBAAqB;YAYf,oBAAoB;IA6DlC;;;;OAIG;YACW,sBAAsB;YAwBtB,eAAe;YAsTf,6BAA6B;YAsD7B,eAAe;IAmB7B,OAAO,CAAC,wBAAwB;IA4DhC,OAAO,CAAC,4BAA4B;YAyBtB,2BAA2B;YAkD3B,gBAAgB;IAuT9B,OAAO,CAAC,kBAAkB;YA8BZ,uBAAuB;YAoCvB,WAAW;YAuJX,cAAc;YAoMd,eAAe;IAyC7B,OAAO,CAAC,MAAM;CAkBf"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { AiCoderContextBudgetError, AiCoderContextManager, } from "../context/context-manager.js";
|
|
2
2
|
import { compareAiCoderText } from "../deterministic-order.js";
|
|
3
|
+
import { dispatchGuardMs } from "../tools/tool-timeouts.js";
|
|
3
4
|
import { isGeneratedWorkspacePath } from "./workspace-generated-path.js";
|
|
4
5
|
import { assertAiCoderRunCheckpoint, createAiCoderRunCheckpoint, hashAiCoderCanonicalValue, isAiCoderWorkspaceMutationEvidence, canonicalJson, redactAiCoderCheckpointText, } from "../context/checkpoint.js";
|
|
5
6
|
import { boundAiCoderToolOutput } from "../context/tool-output.js";
|
|
@@ -1791,7 +1792,11 @@ export class AiCoderRunController {
|
|
|
1791
1792
|
* diagnosable code instead.
|
|
1792
1793
|
*/
|
|
1793
1794
|
async executeToolCallGuarded(session, prepared, roundToolSet) {
|
|
1794
|
-
|
|
1795
|
+
// The agent decides how long its command may take; the guard only has to outlive that
|
|
1796
|
+
// choice so the tool returns its own timeout result instead of being killed from here.
|
|
1797
|
+
const guardArguments = prepared.call.arguments;
|
|
1798
|
+
const requestedTimeoutMs = typeof guardArguments?.timeoutMs === "number" ? guardArguments.timeoutMs : undefined;
|
|
1799
|
+
const timeoutMs = dispatchGuardMs(requestedTimeoutMs);
|
|
1795
1800
|
let timer;
|
|
1796
1801
|
try {
|
|
1797
1802
|
return await Promise.race([
|