@tea-agent/loop-agent 0.39.0-next.27 → 0.39.0-next.28
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/AGENTS.md +3 -0
- package/CHANGELOG.md +143 -96
- package/README.md +8 -4
- package/dist/build-stamp.json +3 -3
- package/dist/cli/command-definitions.js +16 -5
- package/dist/cli/program.js +16 -2
- package/dist/cli/update/notifier.js +2 -2
- package/dist/cli.js +2 -1
- package/dist/commands/init-model-catalog.js +464 -0
- package/dist/commands/init-upgrade.js +265 -97
- package/dist/commands/init.js +428 -27
- package/dist/commands/inspect-next.js +8 -0
- package/dist/executors/dag-pi-executor.js +18 -9
- package/dist/executors/shell-executor.js +50 -6
- package/dist/shared/operator/capabilities.js +7 -0
- package/dist/shared/update/console-notifier.js +100 -0
- package/dist/{cli → shared}/update/npm-client.js +41 -8
- package/dist/{cli → shared}/update/state.js +41 -13
- package/dist/worker/cli.js +31 -1
- package/dist/worker/console/chat/routes.js +1 -0
- package/dist/worker/console/operator-user-error.js +1 -1
- package/dist/worker/console/routes.js +3 -0
- package/dist/worker/console/security.js +53 -5
- package/dist/worker/console/server.js +10 -4
- package/dist/worker/console/static/assets/{abnfDiagram-N423BO3Z-C4kVYweA.js → abnfDiagram-N423BO3Z-DGn9iNrd.js} +1 -1
- package/dist/worker/console/static/assets/{arc-Bj2M8iO5.js → arc-Dc0C2Nyv.js} +1 -1
- package/dist/worker/console/static/assets/{architectureDiagram-T3A2C74G-CLlXe4-6.js → architectureDiagram-T3A2C74G-COnz_Bhe.js} +1 -1
- package/dist/worker/console/static/assets/{blockDiagram-VBNYF7ZC-psEp5xH0.js → blockDiagram-VBNYF7ZC-VhIP6vgf.js} +1 -1
- package/dist/worker/console/static/assets/{c4Diagram-5PPSVZJV-DeKcOCGJ.js → c4Diagram-5PPSVZJV-D74lpmlb.js} +1 -1
- package/dist/worker/console/static/assets/channel-DWcZjWB3.js +1 -0
- package/dist/worker/console/static/assets/{chunk-2GRJ4B5K-K0C744p1.js → chunk-2GRJ4B5K-BxmiogQE.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-2Q5K7J3B-xbNw4J9-.js → chunk-2Q5K7J3B-C00Oi-2I.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-5RXB4S5H-DjLaSDUO.js → chunk-5RXB4S5H-DTrT1Vze.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-5VM5RSS4-CtiPlKel.js → chunk-5VM5RSS4-DdKW7-fL.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-6Q2QTUOP-DZtolir7.js → chunk-6Q2QTUOP-D0q1WN6w.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-GF5L2VYU-CPcdNeew.js → chunk-GF5L2VYU-DBa14MSI.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-JWPE2WC7-NgHc6V37.js → chunk-JWPE2WC7-DkP-pEox.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-KBJHAD2P-DQ_T-hg8.js → chunk-KBJHAD2P-lgPogpcX.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-RYQCIY6F-DgLsxcVP.js → chunk-RYQCIY6F-D-apZer0.js} +1 -1
- package/dist/worker/console/static/assets/{chunk-XXDRQBXY-UrVoM9z1.js → chunk-XXDRQBXY-B1T2yAIe.js} +1 -1
- package/dist/worker/console/static/assets/classDiagram-JCYQIIEL-IjoI3dqU.js +1 -0
- package/dist/worker/console/static/assets/classDiagram-v2-OCEON4UE-IjoI3dqU.js +1 -0
- package/dist/worker/console/static/assets/{cose-bilkent-JH36ORCC-CLkYvTb3.js → cose-bilkent-JH36ORCC-0P6hi3jF.js} +1 -1
- package/dist/worker/console/static/assets/{cynefin-VYW2F7L2-BwT_xKrE.js → cynefin-VYW2F7L2-CntzMSR8.js} +1 -1
- package/dist/worker/console/static/assets/{cynefinDiagram-MW4NZA55-Bi9tuzif.js → cynefinDiagram-MW4NZA55-C9zmXJtG.js} +1 -1
- package/dist/worker/console/static/assets/{dagre-VZM6K2ZE-BCIqkWBV.js → dagre-VZM6K2ZE-DfBCZqZw.js} +1 -1
- package/dist/worker/console/static/assets/{diagram-7IWD3JNH-Dip6l9_Z.js → diagram-7IWD3JNH-DLp-bhGL.js} +1 -1
- package/dist/worker/console/static/assets/{diagram-B4RE2ZJO-B-xkh_wK.js → diagram-B4RE2ZJO-BksDcwZm.js} +1 -1
- package/dist/worker/console/static/assets/{diagram-LBJQPF4R-DZO0kTt_.js → diagram-LBJQPF4R-Bdag7DYP.js} +1 -1
- package/dist/worker/console/static/assets/{diagram-Q27KOJAE-D6ZplNbZ.js → diagram-Q27KOJAE-CoY5uNbk.js} +1 -1
- package/dist/worker/console/static/assets/{diagram-UB23O5K3-BPekbhoS.js → diagram-UB23O5K3-KcgrDXHt.js} +1 -1
- package/dist/worker/console/static/assets/{ebnfDiagram-BXEA7PRR-BtmaJpK5.js → ebnfDiagram-BXEA7PRR-CikErwJb.js} +1 -1
- package/dist/worker/console/static/assets/{erDiagram-JOGREHBK-6DS0Xc44.js → erDiagram-JOGREHBK-DqmwwzvZ.js} +1 -1
- package/dist/worker/console/static/assets/{flowDiagram-UKHOOZJN-CihnROSm.js → flowDiagram-UKHOOZJN-35krh9WG.js} +1 -1
- package/dist/worker/console/static/assets/{ganttDiagram-PKOTCBZU-CZC4zOE2.js → ganttDiagram-PKOTCBZU-CvTF1gJ4.js} +1 -1
- package/dist/worker/console/static/assets/{gitGraphDiagram-DS77QQ5N-Dq1fhzGN.js → gitGraphDiagram-DS77QQ5N-BiOWWClJ.js} +1 -1
- package/dist/worker/console/static/assets/{index-DTZOKgAn.js → index-CqWlWE4l.js} +3 -3
- package/dist/worker/console/static/assets/{infoDiagram-6WML65LV-DlSl4BGx.js → infoDiagram-6WML65LV-Crha5dcA.js} +1 -1
- package/dist/worker/console/static/assets/{ishikawaDiagram-WSZJBQD7-snnzFl_U.js → ishikawaDiagram-WSZJBQD7-DEtbscOZ.js} +1 -1
- package/dist/worker/console/static/assets/{journeyDiagram-NVQOT4AX-BDE7qpMx.js → journeyDiagram-NVQOT4AX-D2YYzx3z.js} +1 -1
- package/dist/worker/console/static/assets/{kanban-definition-27J2QSJJ-CD2Ci04G.js → kanban-definition-27J2QSJJ-C7x18ttQ.js} +1 -1
- package/dist/worker/console/static/assets/{linear-DdnapKIH.js → linear-CCLZkz45.js} +1 -1
- package/dist/worker/console/static/assets/{mermaid.core-BVjAT9b8.js → mermaid.core-Dmy4lSGv.js} +5 -5
- package/dist/worker/console/static/assets/{mindmap-definition-FAOFIHXS-D0yJk-zA.js → mindmap-definition-FAOFIHXS-CmvIol59.js} +1 -1
- package/dist/worker/console/static/assets/{pegDiagram-VL7TDLO6-BVo9tFP-.js → pegDiagram-VL7TDLO6-DVpEdirN.js} +1 -1
- package/dist/worker/console/static/assets/{pieDiagram-7S7Q4E2Y-DnOV-mZ_.js → pieDiagram-7S7Q4E2Y-cKQy456v.js} +1 -1
- package/dist/worker/console/static/assets/{quadrantDiagram-CIZ2JOQS-CzUJo58i.js → quadrantDiagram-CIZ2JOQS-bx06I38m.js} +1 -1
- package/dist/worker/console/static/assets/{railroadDiagram-AXF67PYL-Bvikrolh.js → railroadDiagram-AXF67PYL-BjfIVIJr.js} +1 -1
- package/dist/worker/console/static/assets/{requirementDiagram-LRYGKXZP-DtaSVCap.js → requirementDiagram-LRYGKXZP-DcuPGbKM.js} +1 -1
- package/dist/worker/console/static/assets/{sankeyDiagram-W5VNT64P-C2c9A0wW.js → sankeyDiagram-W5VNT64P-DvgVeDoV.js} +1 -1
- package/dist/worker/console/static/assets/{sequenceDiagram-SI44F4Z6-DmXJcU7r.js → sequenceDiagram-SI44F4Z6-DLBG9nm-.js} +1 -1
- package/dist/worker/console/static/assets/{sizeCapture-X5ZJPWSS-B4GUFW92.js → sizeCapture-X5ZJPWSS-D33L7FBF.js} +1 -1
- package/dist/worker/console/static/assets/{stateDiagram-OKZ733FA-Dsad2MXf.js → stateDiagram-OKZ733FA-hvqD9TpS.js} +1 -1
- package/dist/worker/console/static/assets/stateDiagram-v2-UEYNNEHI-C6MII0D1.js +1 -0
- package/dist/worker/console/static/assets/{swimlanes-SLNWSIFB-DGq48Fbi.js → swimlanes-SLNWSIFB-BtjH81Mz.js} +2 -2
- package/dist/worker/console/static/assets/swimlanesDiagram-ULZ7WXOC-D_tk0V8D.js +8 -0
- package/dist/worker/console/static/assets/{timeline-definition-Z64GVDOM-CSSi6OFf.js → timeline-definition-Z64GVDOM-CJ47Kraf.js} +1 -1
- package/dist/worker/console/static/assets/{vennDiagram-T6HMQDX7-BqyzPrWv.js → vennDiagram-T6HMQDX7-COVPl-wh.js} +1 -1
- package/dist/worker/console/static/assets/{wardleyDiagram-T6FBY63Y-DlznVb6S.js → wardleyDiagram-T6FBY63Y-CCoQJLUY.js} +1 -1
- package/dist/worker/console/static/assets/{xychartDiagram-ELKLHX3M-CfBcgJ_K.js → xychartDiagram-ELKLHX3M-DTWJvfAd.js} +1 -1
- package/dist/worker/console/static/index.html +1 -1
- package/dist/worker/console/static-src/operator-chat/mutation-gate.js +1 -1
- package/dist/worker/observe/static/views/dag-inspector.js +3 -1
- package/dist/worker/observe/static/views/session-timeline.js +60 -4
- package/dist/workflows/dag/failure-category.js +1 -0
- package/dist/workflows/dag/frontend-implementation-contract.js +5 -1
- package/dist/workflows/dag/init-hybrid.js +35 -10
- package/dist/workflows/dag/node-execution.js +20 -2
- package/dist/workflows/dag/retry-policy.js +91 -0
- package/dist/workflows/dag/types.js +9 -1
- package/docs/init-surface.manifest.json +5 -0
- package/docs/operations/README.md +1 -1
- package/docs/templates/init-managed-agents.md +13 -3
- package/package.json +5 -1
- package/scripts/next-info.mjs +356 -0
- package/scripts/next-publish-gate.mjs +238 -0
- package/scripts/release-source-binding.mjs +251 -0
- package/skills/loop-agent/references/command-reference.md +11 -4
- package/dist/worker/console/static/assets/channel-CPF4N7pf.js +0 -1
- package/dist/worker/console/static/assets/classDiagram-JCYQIIEL-C2DwA_Y1.js +0 -1
- package/dist/worker/console/static/assets/classDiagram-v2-OCEON4UE-C2DwA_Y1.js +0 -1
- package/dist/worker/console/static/assets/stateDiagram-v2-UEYNNEHI-B8FB_cNk.js +0 -1
- package/dist/worker/console/static/assets/swimlanesDiagram-ULZ7WXOC-CrZYaWfx.js +0 -8
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { collectNextInfo, formatNextInfo, } from "../../scripts/next-info.mjs";
|
|
2
|
+
export async function runInspectNext(repoRoot, args = []) {
|
|
3
|
+
const json = args.includes("--json");
|
|
4
|
+
const result = collectNextInfo({ cwd: repoRoot });
|
|
5
|
+
process.stdout.write(formatNextInfo(result, { json }));
|
|
6
|
+
if (!result.ok)
|
|
7
|
+
process.exitCode = result.exitCode || 1;
|
|
8
|
+
}
|
|
@@ -9,7 +9,7 @@ import { cleanupPlaywrightCliDefaultSession, createPlaywrightCliTool, PI_COMMAND
|
|
|
9
9
|
import { dagCommandPolicyAllows, resolveDagCommandPolicy, } from "../workflows/dag/types.js";
|
|
10
10
|
import { redactPromptForLog, truncateOutput, } from "../shared/output-truncation.js";
|
|
11
11
|
import { GitStatusUnavailableError, pathsChangedDuringRun, readGitStatusPorcelain, recoverRootNulArtifact, snapshotGitStatusPathFingerprints, snapshotGitStatusPorcelain, validateShellWriteGuard, } from "./shell-write-guard.js";
|
|
12
|
-
import { isWriterEmptyDiffRetryCandidate, isWriterTransportRetryCandidate, INCOMPLETE_WRITE_SET_RETRY_CATEGORY, WRITER_CLEAN_TIMEOUT_RETRY_CATEGORY, WRITER_EMPTY_DIFF_RETRY_CATEGORY, } from "../workflows/dag/retry-policy.js";
|
|
12
|
+
import { isTargetTemplateTransientRetryNode, isWriterEmptyDiffRetryCandidate, isWriterTransportRetryCandidate, INCOMPLETE_WRITE_SET_RETRY_CATEGORY, WRITER_CLEAN_TIMEOUT_RETRY_CATEGORY, WRITER_EMPTY_DIFF_RETRY_CATEGORY, } from "../workflows/dag/retry-policy.js";
|
|
13
13
|
import { assessBackendTestMdPlanCompleteness, assessBackendTestMdWriterCompleteness, assessBackendTestPytestPlanCompleteness, assessBackendTestPytestWriterCompleteness, assessBackendTestShardChildCompleteness, backendTestWriterProgressRoleForTask, classifyBackendTestWriterCompletenessFailure, isBackendTestCompletenessRetryCandidate, isBackendTestMdPlanTask, isBackendTestPytestPlanTask, isBackendTestShardChildTask, writeBackendTestWriterProgressArtifacts, } from "../workflows/dag/backend-test-writer-completeness.js";
|
|
14
14
|
import { resolveBackendTestLayout } from "../workflows/dag/backend-test-layout.js";
|
|
15
15
|
import { redactSecrets, truncateUtf8Preview } from "../shared/preview.js";
|
|
@@ -942,22 +942,31 @@ export async function executeDagPiNode(input, meta, piStepFn = executePiStep, wr
|
|
|
942
942
|
if (meta.writeGuardAttribution === "best-effort") {
|
|
943
943
|
stderrParts.push("write guard note: concurrent rank writers use best-effort per-node attribution; keep same-rank writeSet entries disjoint");
|
|
944
944
|
}
|
|
945
|
-
|
|
946
|
-
|
|
947
|
-
|
|
948
|
-
const writerCleanTimeout = !mapped.ok &&
|
|
949
|
-
mapped.failureCategory === "timeout" &&
|
|
950
|
-
writeGuardOk &&
|
|
945
|
+
const rawFailureCategory = mapped.failureCategory;
|
|
946
|
+
const writeToolCallCount = readWriterThinkingExhaustionEvidence(result).writeToolCallCount;
|
|
947
|
+
const zeroSideEffects = writeGuardOk &&
|
|
951
948
|
!completenessFailure &&
|
|
952
949
|
!writerThinkingExhausted &&
|
|
953
|
-
|
|
950
|
+
!writerOutcomeViolation &&
|
|
954
951
|
changeManifestChangedFiles !== undefined &&
|
|
955
952
|
changeManifestChangedFiles.length === 0 &&
|
|
956
|
-
|
|
953
|
+
writeToolCallCount === 0;
|
|
954
|
+
const targetCleanTransport = !mapped.ok &&
|
|
955
|
+
isTargetTemplateTransientRetryNode(input.task) &&
|
|
956
|
+
rawFailureCategory !== undefined &&
|
|
957
|
+
["timeout", "network", "rate-limit", "unavailable"].includes(rawFailureCategory) &&
|
|
958
|
+
zeroSideEffects;
|
|
959
|
+
const frontendCleanTimeout = !mapped.ok &&
|
|
960
|
+
rawFailureCategory === "timeout" &&
|
|
961
|
+
isWriterTransportRetryCandidate(input.task) &&
|
|
962
|
+
!isTargetTemplateTransientRetryNode(input.task) &&
|
|
963
|
+
zeroSideEffects;
|
|
964
|
+
const writerCleanTimeout = targetCleanTransport || frontendCleanTimeout;
|
|
957
965
|
return {
|
|
958
966
|
...mapped,
|
|
959
967
|
ok: false,
|
|
960
968
|
stderr: stderrParts.filter(Boolean).join("\n\n"),
|
|
969
|
+
...(rawFailureCategory ? { rawFailureCategory } : {}),
|
|
961
970
|
failureCategory: mapped.ok
|
|
962
971
|
? writeGuardOk
|
|
963
972
|
? completenessFailure
|
|
@@ -123,6 +123,39 @@ function shouldReuseSuccessfulShellCommands(shell) {
|
|
|
123
123
|
const DEFAULT_SHELL_TIMEOUT_MS = 300_000;
|
|
124
124
|
const SUMMARY_STDOUT_MAX = 4_000;
|
|
125
125
|
const SUMMARY_STDERR_MAX = 2_000;
|
|
126
|
+
const TEST_TIMEOUT_CLASSIFY_MAX_CHARS = 8_000;
|
|
127
|
+
const TEST_TIMEOUT_MARKERS = [
|
|
128
|
+
/Test timed out in \d+ms/i,
|
|
129
|
+
/Timeout of \d+ms exceeded/i,
|
|
130
|
+
];
|
|
131
|
+
const DETERMINISTIC_NON_TIMEOUT_FAILURE_MARKERS = [
|
|
132
|
+
/AssertionError/i,
|
|
133
|
+
/expected:?\s/i,
|
|
134
|
+
/received:?\s/i,
|
|
135
|
+
/Snapshot /i,
|
|
136
|
+
/toMatchSnapshot/i,
|
|
137
|
+
/SyntaxError/i,
|
|
138
|
+
/TS\d{4}/,
|
|
139
|
+
/error TS/i,
|
|
140
|
+
/eslint/i,
|
|
141
|
+
/compile error/i,
|
|
142
|
+
/Failed to compile/i,
|
|
143
|
+
];
|
|
144
|
+
function isIdentifiedTestCommand(command) {
|
|
145
|
+
return /(?:^|[\s"'`])(?:npx\s+)?vitest(?:\s|$)|(?:^|[\s"'`])npm(?:\.cmd)?\s+test(?:\s|$)|(?:^|[\s"'`])pnpm(?:\.cmd)?\s+test(?:\s|$)|(?:^|[\s"'`])yarn(?:\.cmd)?\s+test(?:\s|$)/i.test(command);
|
|
146
|
+
}
|
|
147
|
+
function classifyShellCommandFailure(input) {
|
|
148
|
+
if (input.processCategory !== "nonzero-exit")
|
|
149
|
+
return input.processCategory;
|
|
150
|
+
if (!isIdentifiedTestCommand(input.command))
|
|
151
|
+
return "nonzero-exit";
|
|
152
|
+
const sample = `${input.stdout}\n${input.stderr}`.slice(0, TEST_TIMEOUT_CLASSIFY_MAX_CHARS);
|
|
153
|
+
const hasTimeoutMarker = TEST_TIMEOUT_MARKERS.some((marker) => marker.test(sample));
|
|
154
|
+
if (!hasTimeoutMarker)
|
|
155
|
+
return "nonzero-exit";
|
|
156
|
+
const mixedDeterministicFailure = DETERMINISTIC_NON_TIMEOUT_FAILURE_MARKERS.some((marker) => marker.test(sample));
|
|
157
|
+
return mixedDeterministicFailure ? "nonzero-exit" : "test-timeout";
|
|
158
|
+
}
|
|
126
159
|
const NODE_STDOUT_MAX = 12_000;
|
|
127
160
|
const NODE_STDERR_MAX = 8_000;
|
|
128
161
|
const MAX_BUFFERED_OUTPUT_BYTES = 64 * 1024;
|
|
@@ -329,16 +362,21 @@ export async function executeShellCommand(input) {
|
|
|
329
362
|
});
|
|
330
363
|
});
|
|
331
364
|
child.on("close", (code) => {
|
|
332
|
-
let
|
|
365
|
+
let processCategory = "nonzero-exit";
|
|
333
366
|
if (timedOut) {
|
|
334
|
-
|
|
367
|
+
processCategory = "timeout";
|
|
335
368
|
}
|
|
336
369
|
else if (code === 0) {
|
|
337
|
-
|
|
370
|
+
processCategory = "success";
|
|
338
371
|
}
|
|
339
372
|
finish({
|
|
340
373
|
exitCode: code,
|
|
341
|
-
failureCategory
|
|
374
|
+
failureCategory: classifyShellCommandFailure({
|
|
375
|
+
command: input.command,
|
|
376
|
+
processCategory,
|
|
377
|
+
stdout: formatBoundedOutput(stdout),
|
|
378
|
+
stderr: formatBoundedOutput(stderr),
|
|
379
|
+
}),
|
|
342
380
|
ok: code === 0 && !timedOut,
|
|
343
381
|
});
|
|
344
382
|
});
|
|
@@ -2878,6 +2916,7 @@ export async function executeDagShellNode(input, meta) {
|
|
|
2878
2916
|
const cwd = resolveShellCwd(input.cwd, shell.cwd);
|
|
2879
2917
|
const timeoutMs = shell.timeoutMs ?? DEFAULT_SHELL_TIMEOUT_MS;
|
|
2880
2918
|
const failFast = shell.failFast !== false;
|
|
2919
|
+
const attemptNumber = input.attempt ?? 1;
|
|
2881
2920
|
const results = [];
|
|
2882
2921
|
const executedCommandKeys = new Set();
|
|
2883
2922
|
let beforeStatus;
|
|
@@ -2973,8 +3012,8 @@ export async function executeDagShellNode(input, meta) {
|
|
|
2973
3012
|
dagRunMeta: { runDir: meta.runDir, runId: meta.runId },
|
|
2974
3013
|
reportActivity: input.reportActivity,
|
|
2975
3014
|
outputArtifacts: {
|
|
2976
|
-
stdoutPath: path.join(meta.runDir, input.task.id, "commands", `${commandNumber}.stdout.txt`),
|
|
2977
|
-
stderrPath: path.join(meta.runDir, input.task.id, "commands", `${commandNumber}.stderr.txt`),
|
|
3015
|
+
stdoutPath: path.join(meta.runDir, input.task.id, `attempt-${attemptNumber}`, "commands", `${commandNumber}.stdout.txt`),
|
|
3016
|
+
stderrPath: path.join(meta.runDir, input.task.id, `attempt-${attemptNumber}`, "commands", `${commandNumber}.stderr.txt`),
|
|
2978
3017
|
},
|
|
2979
3018
|
});
|
|
2980
3019
|
results.push(result);
|
|
@@ -3033,6 +3072,7 @@ export async function executeDagShellNode(input, meta) {
|
|
|
3033
3072
|
schemaVersion: 1,
|
|
3034
3073
|
runId: meta.runId,
|
|
3035
3074
|
nodeId: input.task.id,
|
|
3075
|
+
attempt: attemptNumber,
|
|
3036
3076
|
workspaceFingerprint: workspaceFingerprint ?? null,
|
|
3037
3077
|
failFast,
|
|
3038
3078
|
commands: results.map((result) => ({
|
|
@@ -3051,6 +3091,7 @@ export async function executeDagShellNode(input, meta) {
|
|
|
3051
3091
|
subchecks: parseCheckRepoSubcheckDurations(result),
|
|
3052
3092
|
})),
|
|
3053
3093
|
};
|
|
3094
|
+
await writeDagNodeJsonArtifact(meta.runDir, input.task.id, path.posix.join(`attempt-${attemptNumber}`, "shell-command-receipt.json"), receipt);
|
|
3054
3095
|
await writeDagNodeJsonArtifact(meta.runDir, input.task.id, "shell-command-receipt.json", receipt);
|
|
3055
3096
|
const summaryMarkdown = buildShellResultSummaryMarkdown({
|
|
3056
3097
|
nodeId: input.task.id,
|
|
@@ -3102,6 +3143,9 @@ export async function executeDagShellNode(input, meta) {
|
|
|
3102
3143
|
stdout: `${recordPrefix}${reuseNote}${aggregate.stdout}`,
|
|
3103
3144
|
stderr: stderrParts.filter(Boolean).join("\n\n"),
|
|
3104
3145
|
failureCategory,
|
|
3146
|
+
...(firstFailure?.failureCategory
|
|
3147
|
+
? { rawFailureCategory: firstFailure.failureCategory }
|
|
3148
|
+
: {}),
|
|
3105
3149
|
durationMs: Date.now() - started,
|
|
3106
3150
|
// extra field consumed by node-execution if supported; also embedded in stdout marker
|
|
3107
3151
|
...{ commandResults },
|
|
@@ -1822,6 +1822,13 @@ export const OPERATOR_COMMAND_COVERAGE = Object.freeze([
|
|
|
1822
1822
|
source: "loop-agent",
|
|
1823
1823
|
exclusionReason: "Not exposed to Operator Chat in M5.",
|
|
1824
1824
|
},
|
|
1825
|
+
{
|
|
1826
|
+
command: "loop-agent init model-catalog",
|
|
1827
|
+
coverage: "excluded",
|
|
1828
|
+
action: null,
|
|
1829
|
+
source: "loop-agent",
|
|
1830
|
+
exclusionReason: "Not exposed to Operator Chat in M5.",
|
|
1831
|
+
},
|
|
1825
1832
|
{
|
|
1826
1833
|
command: "loop-agent init doctor",
|
|
1827
1834
|
coverage: "excluded",
|
|
@@ -0,0 +1,100 @@
|
|
|
1
|
+
import { createInterface } from "node:readline/promises";
|
|
2
|
+
import semver from "semver";
|
|
3
|
+
import { acquireUpdateLock, readUpdateState, updateLockPath, updateStatePath, writeUpdateState, } from "./state.js";
|
|
4
|
+
export async function runConsoleDailyUpdateCheck(options) {
|
|
5
|
+
void options.writeStdout;
|
|
6
|
+
void options.packageRoot;
|
|
7
|
+
void options.cwd;
|
|
8
|
+
const writeStderr = options.writeStderr ?? ((chunk) => process.stderr.write(chunk));
|
|
9
|
+
const now = options.now ?? (() => new Date());
|
|
10
|
+
try {
|
|
11
|
+
if (!canPromptInteractively(options))
|
|
12
|
+
return;
|
|
13
|
+
const statePath = updateStatePath(options.homeDir);
|
|
14
|
+
const today = formatLocalDate(now());
|
|
15
|
+
const existing = await readUpdateState(statePath);
|
|
16
|
+
if (existing.lastPromptedLocalDate === today)
|
|
17
|
+
return;
|
|
18
|
+
const release = await acquireUpdateLock(updateLockPath(options.homeDir), {
|
|
19
|
+
now,
|
|
20
|
+
});
|
|
21
|
+
if (!release)
|
|
22
|
+
return;
|
|
23
|
+
try {
|
|
24
|
+
const state = await readUpdateState(statePath);
|
|
25
|
+
if (state.lastPromptedLocalDate === today)
|
|
26
|
+
return;
|
|
27
|
+
const check = await options.client.latestVersionCheck();
|
|
28
|
+
if (!check.ok)
|
|
29
|
+
return;
|
|
30
|
+
if (!semver.gt(check.version, options.currentVersion))
|
|
31
|
+
return;
|
|
32
|
+
const parsedLatest = semver.parse(check.version);
|
|
33
|
+
if (!parsedLatest || parsedLatest.prerelease.length > 0)
|
|
34
|
+
return;
|
|
35
|
+
await markPromptedToday(statePath, state, today);
|
|
36
|
+
const answer = await ask(options, `loop-agent 有新版本:${options.currentVersion} → ${check.version}\n现在更新到 ${check.version}?[y/N] `);
|
|
37
|
+
if (!isYes(answer))
|
|
38
|
+
return;
|
|
39
|
+
const proof = await options.client.canAutoInstall();
|
|
40
|
+
if (!proof.ok) {
|
|
41
|
+
writeStderr(`当前 loop-agent 不是由此 npm 的正式全局安装管理,无法自动升级。\n请运行:npm install -g @tea-agent/loop-agent@${check.version}\n`);
|
|
42
|
+
return;
|
|
43
|
+
}
|
|
44
|
+
const install = await options.client.installExact(check.version);
|
|
45
|
+
if (!install.ok) {
|
|
46
|
+
writeStderr(`loop-agent 更新失败:${install.reason}\n`);
|
|
47
|
+
return;
|
|
48
|
+
}
|
|
49
|
+
const verified = await options.client.verifyInstalled(check.version);
|
|
50
|
+
if (!verified.ok) {
|
|
51
|
+
writeStderr(`loop-agent 已尝试安装,但验证失败:${verified.reason}\n`);
|
|
52
|
+
return;
|
|
53
|
+
}
|
|
54
|
+
writeStderr(`loop-agent 已更新到 ${check.version};新版本将在下一次命令调用时完全生效。\n`);
|
|
55
|
+
}
|
|
56
|
+
finally {
|
|
57
|
+
await release().catch(() => undefined);
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
catch (error) {
|
|
61
|
+
writeStderr(`loop-agent 更新检查已跳过:${error instanceof Error ? error.message : String(error)}\n`);
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
function canPromptInteractively(options) {
|
|
65
|
+
if (!options.stdinIsTTY || !options.stderrIsTTY)
|
|
66
|
+
return false;
|
|
67
|
+
if (options.env.CI)
|
|
68
|
+
return false;
|
|
69
|
+
if (options.env.LOOP_AGENT_DISABLE_UPDATE_CHECK === "1")
|
|
70
|
+
return false;
|
|
71
|
+
return true;
|
|
72
|
+
}
|
|
73
|
+
function formatLocalDate(date) {
|
|
74
|
+
const year = date.getFullYear();
|
|
75
|
+
const month = String(date.getMonth() + 1).padStart(2, "0");
|
|
76
|
+
const day = String(date.getDate()).padStart(2, "0");
|
|
77
|
+
return `${year}-${month}-${day}`;
|
|
78
|
+
}
|
|
79
|
+
async function markPromptedToday(statePath, state, today) {
|
|
80
|
+
await writeUpdateState(statePath, {
|
|
81
|
+
...state,
|
|
82
|
+
lastPromptedLocalDate: today,
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
async function ask(options, prompt) {
|
|
86
|
+
if (options.readLine) {
|
|
87
|
+
options.writeStderr?.(prompt);
|
|
88
|
+
return options.readLine(prompt);
|
|
89
|
+
}
|
|
90
|
+
const rl = createInterface({ input: process.stdin, output: process.stderr });
|
|
91
|
+
try {
|
|
92
|
+
return await rl.question(prompt);
|
|
93
|
+
}
|
|
94
|
+
finally {
|
|
95
|
+
rl.close();
|
|
96
|
+
}
|
|
97
|
+
}
|
|
98
|
+
function isYes(answer) {
|
|
99
|
+
return /^(y|yes)$/i.test(answer.trim());
|
|
100
|
+
}
|
|
@@ -3,25 +3,48 @@ import { lstat, readFile, realpath } from "node:fs/promises";
|
|
|
3
3
|
import path from "node:path";
|
|
4
4
|
import semver from "semver";
|
|
5
5
|
const PACKAGE_NAME = "@tea-agent/loop-agent";
|
|
6
|
+
export const DEFAULT_NPM_QUERY_TIMEOUT_MS = 15_000;
|
|
6
7
|
export function createNpmUpdateClient(options) {
|
|
7
8
|
const npmCommand = options.npmCommand ?? "npm";
|
|
8
9
|
const loopAgentCommand = options.loopAgentCommand ?? "loop-agent";
|
|
9
10
|
const runner = options.runner ?? runCommand;
|
|
10
|
-
const timeoutMs = options.timeoutMs ??
|
|
11
|
+
const timeoutMs = options.timeoutMs ?? DEFAULT_NPM_QUERY_TIMEOUT_MS;
|
|
12
|
+
const cwd = options.cwd;
|
|
11
13
|
const env = options.env;
|
|
14
|
+
const latestVersionCheck = async () => {
|
|
15
|
+
let result;
|
|
16
|
+
try {
|
|
17
|
+
result = await runner(npmCommand, ["view", PACKAGE_NAME, "dist-tags.latest", "--json"], { timeoutMs, cwd, env });
|
|
18
|
+
}
|
|
19
|
+
catch {
|
|
20
|
+
return { ok: false, reason: "spawn-failure" };
|
|
21
|
+
}
|
|
22
|
+
if (result.timedOut)
|
|
23
|
+
return { ok: false, reason: "timeout" };
|
|
24
|
+
if (result.exitCode === null) {
|
|
25
|
+
return { ok: false, reason: "spawn-failure" };
|
|
26
|
+
}
|
|
27
|
+
if (result.exitCode !== 0) {
|
|
28
|
+
return { ok: false, reason: "command-failed" };
|
|
29
|
+
}
|
|
30
|
+
const version = parseNpmViewLatest(result.stdout);
|
|
31
|
+
return version
|
|
32
|
+
? { ok: true, version }
|
|
33
|
+
: { ok: false, reason: "invalid-response" };
|
|
34
|
+
};
|
|
12
35
|
return {
|
|
13
36
|
async latestVersion() {
|
|
14
|
-
const result = await
|
|
15
|
-
|
|
16
|
-
return undefined;
|
|
17
|
-
return parseNpmViewLatest(result.stdout);
|
|
37
|
+
const result = await latestVersionCheck();
|
|
38
|
+
return result.ok ? result.version : undefined;
|
|
18
39
|
},
|
|
40
|
+
latestVersionCheck,
|
|
19
41
|
async canAutoInstall() {
|
|
20
42
|
return proveGlobalNpmInstall({
|
|
21
43
|
currentVersion: options.currentVersion,
|
|
22
44
|
packageRoot: options.packageRoot,
|
|
23
45
|
npmCommand,
|
|
24
46
|
runner,
|
|
47
|
+
cwd,
|
|
25
48
|
env,
|
|
26
49
|
timeoutMs,
|
|
27
50
|
});
|
|
@@ -29,17 +52,25 @@ export function createNpmUpdateClient(options) {
|
|
|
29
52
|
async installExact(version) {
|
|
30
53
|
if (!isStrictRelease(version))
|
|
31
54
|
return { ok: false, reason: "invalid-version" };
|
|
32
|
-
const result = await runner(npmCommand, buildExactInstallArgs(version), {
|
|
55
|
+
const result = await runner(npmCommand, buildExactInstallArgs(version), {
|
|
56
|
+
timeoutMs: Math.max(timeoutMs, 120000),
|
|
57
|
+
cwd,
|
|
58
|
+
env,
|
|
59
|
+
});
|
|
33
60
|
if (result.exitCode !== 0 || result.timedOut)
|
|
34
61
|
return { ok: false, reason: "install-failed" };
|
|
35
62
|
return { ok: true };
|
|
36
63
|
},
|
|
37
64
|
async verifyInstalled(version) {
|
|
38
|
-
const list = await runner(npmCommand, ["list", "-g", PACKAGE_NAME, "--depth=0", "--json"], { timeoutMs, env });
|
|
65
|
+
const list = await runner(npmCommand, ["list", "-g", PACKAGE_NAME, "--depth=0", "--json"], { timeoutMs, cwd, env });
|
|
39
66
|
if (list.exitCode !== 0 || !verifyNpmListVersion(list.stdout, version)) {
|
|
40
67
|
return { ok: false, reason: "npm-list-version-mismatch" };
|
|
41
68
|
}
|
|
42
|
-
const pathVersion = await runner(loopAgentCommand, ["--version"], {
|
|
69
|
+
const pathVersion = await runner(loopAgentCommand, ["--version"], {
|
|
70
|
+
timeoutMs,
|
|
71
|
+
cwd,
|
|
72
|
+
env,
|
|
73
|
+
});
|
|
43
74
|
if (pathVersion.exitCode !== 0 || !verifyPathVersion(pathVersion.stdout, version)) {
|
|
44
75
|
return { ok: false, reason: "path-version-mismatch" };
|
|
45
76
|
}
|
|
@@ -80,6 +111,7 @@ export function verifyPathVersion(stdout, expectedVersion) {
|
|
|
80
111
|
async function proveGlobalNpmInstall(options) {
|
|
81
112
|
const root = await options.runner(options.npmCommand, ["root", "-g"], {
|
|
82
113
|
timeoutMs: options.timeoutMs,
|
|
114
|
+
cwd: options.cwd,
|
|
83
115
|
env: options.env,
|
|
84
116
|
});
|
|
85
117
|
if (root.exitCode !== 0 || root.timedOut)
|
|
@@ -113,6 +145,7 @@ function isStrictRelease(version) {
|
|
|
113
145
|
async function runCommand(command, args, options) {
|
|
114
146
|
return new Promise((resolve) => {
|
|
115
147
|
const child = spawn(command, [...args], {
|
|
148
|
+
cwd: options.cwd,
|
|
116
149
|
env: options.env ? { ...process.env, ...options.env } : process.env,
|
|
117
150
|
stdio: ["ignore", "pipe", "pipe"],
|
|
118
151
|
shell: false,
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
|
|
1
|
+
import { mkdir, readFile, rename, rm, stat, writeFile } from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
export function updateStatePath(homeDir) {
|
|
4
4
|
return path.join(homeDir, ".loop-agent", "update-state.json");
|
|
@@ -18,6 +18,7 @@ export async function readUpdateState(statePath) {
|
|
|
18
18
|
latestVersion: stringOrUndefined(parsed.latestVersion),
|
|
19
19
|
dismissedVersion: stringOrUndefined(parsed.dismissedVersion),
|
|
20
20
|
retryAfter: stringOrUndefined(parsed.retryAfter),
|
|
21
|
+
lastPromptedLocalDate: stringOrUndefined(parsed.lastPromptedLocalDate),
|
|
21
22
|
};
|
|
22
23
|
}
|
|
23
24
|
catch {
|
|
@@ -36,28 +37,55 @@ export async function acquireUpdateLock(lockPath, options = {}) {
|
|
|
36
37
|
await mkdir(path.dirname(lockPath), { recursive: true });
|
|
37
38
|
try {
|
|
38
39
|
await mkdir(lockPath);
|
|
40
|
+
return await claimLock(lockPath, now);
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
if (await isFreshLock(lockPath, now, staleMs))
|
|
44
|
+
return undefined;
|
|
45
|
+
try {
|
|
46
|
+
await rm(lockPath, { recursive: true, force: true });
|
|
47
|
+
await mkdir(lockPath);
|
|
48
|
+
return await claimLock(lockPath, now);
|
|
49
|
+
}
|
|
50
|
+
catch {
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
}
|
|
54
|
+
}
|
|
55
|
+
async function claimLock(lockPath, now) {
|
|
56
|
+
try {
|
|
39
57
|
await writeFile(path.join(lockPath, "owner.json"), JSON.stringify({ pid: process.pid, at: now().toISOString() }), "utf-8");
|
|
40
58
|
return async () => {
|
|
41
59
|
await rm(lockPath, { recursive: true, force: true });
|
|
42
60
|
};
|
|
43
61
|
}
|
|
62
|
+
catch {
|
|
63
|
+
await rm(lockPath, { recursive: true, force: true }).catch(() => undefined);
|
|
64
|
+
return undefined;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
async function isFreshLock(lockPath, now, staleMs) {
|
|
68
|
+
try {
|
|
69
|
+
const ownerRaw = await readFile(path.join(lockPath, "owner.json"), "utf-8");
|
|
70
|
+
const owner = JSON.parse(ownerRaw);
|
|
71
|
+
if (typeof owner.at !== "string")
|
|
72
|
+
return false;
|
|
73
|
+
const at = Date.parse(owner.at);
|
|
74
|
+
if (!Number.isFinite(at))
|
|
75
|
+
return false;
|
|
76
|
+
return now().getTime() - at <= staleMs;
|
|
77
|
+
}
|
|
44
78
|
catch {
|
|
45
79
|
try {
|
|
46
|
-
const
|
|
47
|
-
const
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
await writeFile(path.join(lockPath, "owner.json"), JSON.stringify({ pid: process.pid, at: now().toISOString() }), "utf-8");
|
|
52
|
-
return async () => {
|
|
53
|
-
await rm(lockPath, { recursive: true, force: true });
|
|
54
|
-
};
|
|
55
|
-
}
|
|
80
|
+
const info = await stat(lockPath);
|
|
81
|
+
const mtime = Number.isFinite(info.mtimeMs)
|
|
82
|
+
? info.mtimeMs
|
|
83
|
+
: info.mtime.getTime();
|
|
84
|
+
return now().getTime() - mtime <= staleMs;
|
|
56
85
|
}
|
|
57
86
|
catch {
|
|
58
|
-
return
|
|
87
|
+
return false;
|
|
59
88
|
}
|
|
60
|
-
return undefined;
|
|
61
89
|
}
|
|
62
90
|
}
|
|
63
91
|
function emptyState() {
|
package/dist/worker/cli.js
CHANGED
|
@@ -1,8 +1,11 @@
|
|
|
1
1
|
#!/usr/bin/env node
|
|
2
2
|
import { readFile } from "node:fs/promises";
|
|
3
|
+
import os from "node:os";
|
|
3
4
|
import path from "node:path";
|
|
4
5
|
import { fileURLToPath } from "node:url";
|
|
5
6
|
import { Command } from "commander";
|
|
7
|
+
import { createNpmUpdateClient } from "../shared/update/npm-client.js";
|
|
8
|
+
import { runConsoleDailyUpdateCheck } from "../shared/update/console-notifier.js";
|
|
6
9
|
import { readPackageVersion } from "../shared/package-metadata.js";
|
|
7
10
|
import YAML from "yaml";
|
|
8
11
|
import { LoopAgentClient } from "./loop-agent/loop-agent-client.js";
|
|
@@ -838,10 +841,33 @@ function parseOptionalTimeoutMs(raw) {
|
|
|
838
841
|
return value;
|
|
839
842
|
}
|
|
840
843
|
/** Console HTTP entry for bare `agent-worker console` (listen first, then optional browser open). */
|
|
841
|
-
async function runConsoleServe(options) {
|
|
844
|
+
export async function runConsoleServe(options) {
|
|
842
845
|
const { createConsoleServer } = await import("./console/server.js");
|
|
843
846
|
const { maybeOpenConsoleBrowser } = await import("./console/open-browser.js");
|
|
844
847
|
try {
|
|
848
|
+
try {
|
|
849
|
+
const packageRoot = path.dirname(path.dirname(path.dirname(fileURLToPath(import.meta.url))));
|
|
850
|
+
const currentVersion = readPackageVersion(packageRoot) ?? "0.0.0";
|
|
851
|
+
await runConsoleDailyUpdateCheck({
|
|
852
|
+
currentVersion,
|
|
853
|
+
packageRoot,
|
|
854
|
+
homeDir: os.homedir(),
|
|
855
|
+
cwd: options.repoRoot,
|
|
856
|
+
env: process.env,
|
|
857
|
+
stdinIsTTY: process.stdin.isTTY === true,
|
|
858
|
+
stderrIsTTY: process.stderr.isTTY === true,
|
|
859
|
+
client: createNpmUpdateClient({
|
|
860
|
+
currentVersion,
|
|
861
|
+
packageRoot,
|
|
862
|
+
cwd: options.repoRoot,
|
|
863
|
+
env: process.env,
|
|
864
|
+
}),
|
|
865
|
+
});
|
|
866
|
+
}
|
|
867
|
+
catch (error) {
|
|
868
|
+
const detail = error instanceof Error ? error.message : String(error);
|
|
869
|
+
process.stderr.write(`loop-agent 更新检查已跳过:${detail}\n`);
|
|
870
|
+
}
|
|
845
871
|
const server = await createConsoleServer({
|
|
846
872
|
repoRoot: options.repoRoot,
|
|
847
873
|
host: options.host,
|
|
@@ -857,6 +883,10 @@ async function runConsoleServe(options) {
|
|
|
857
883
|
noOpen: options.noOpen === true,
|
|
858
884
|
serverUrl: server.url,
|
|
859
885
|
});
|
|
886
|
+
if (options.holdUntilSignal === false) {
|
|
887
|
+
await server.close();
|
|
888
|
+
return;
|
|
889
|
+
}
|
|
860
890
|
await new Promise((resolve) => {
|
|
861
891
|
const shutdown = () => resolve();
|
|
862
892
|
process.once("SIGINT", shutdown);
|
|
@@ -270,6 +270,7 @@ export function parseChatImages(value) {
|
|
|
270
270
|
}
|
|
271
271
|
function gateMutation(req, deps) {
|
|
272
272
|
const failure = evaluateMutationGate(req, {
|
|
273
|
+
cookieName: deps.bootToken.cookieName,
|
|
273
274
|
bootToken: deps.bootToken.value,
|
|
274
275
|
confirmationToken: deps.bootToken.confirmationToken,
|
|
275
276
|
consoleOrigin: deps.getConsoleOrigin(),
|
|
@@ -3,7 +3,7 @@ import { rewriteRecoveryOperatorError } from "./recovery-error-copy.js";
|
|
|
3
3
|
const MUTATION_GATE_COPY = [
|
|
4
4
|
{
|
|
5
5
|
pattern: /invalid (boot capability|confirmation header) token/i,
|
|
6
|
-
copy: "
|
|
6
|
+
copy: "页面凭证已失效(控制台可能已重启),请刷新页面(F5)后重试。",
|
|
7
7
|
},
|
|
8
8
|
{
|
|
9
9
|
pattern: /mutation requires boot capability cookie|mutation requires confirmation header token/i,
|
|
@@ -116,6 +116,7 @@ async function handleRecoveryCandidates(_req, res, ctx, url) {
|
|
|
116
116
|
}
|
|
117
117
|
async function handleSessionPing(req, res, ctx) {
|
|
118
118
|
const failure = evaluateMutationGate(req, {
|
|
119
|
+
cookieName: ctx.bootToken.cookieName,
|
|
119
120
|
bootToken: ctx.bootToken.value,
|
|
120
121
|
confirmationToken: ctx.bootToken.confirmationToken,
|
|
121
122
|
consoleOrigin: ctx.getConsoleOrigin(),
|
|
@@ -142,6 +143,7 @@ async function handleCreateOperation(req, res, ctx) {
|
|
|
142
143
|
return;
|
|
143
144
|
}
|
|
144
145
|
const failure = evaluateMutationGate(req, {
|
|
146
|
+
cookieName: ctx.bootToken.cookieName,
|
|
145
147
|
bootToken: ctx.bootToken.value,
|
|
146
148
|
confirmationToken: ctx.bootToken.confirmationToken,
|
|
147
149
|
consoleOrigin: ctx.getConsoleOrigin(),
|
|
@@ -428,6 +430,7 @@ export async function handleConsoleOperatorRequest(req, res, ctx) {
|
|
|
428
430
|
}
|
|
429
431
|
if (isMutationMethod(method)) {
|
|
430
432
|
const failure = evaluateMutationGate(req, {
|
|
433
|
+
cookieName: ctx.bootToken.cookieName,
|
|
431
434
|
bootToken: ctx.bootToken.value,
|
|
432
435
|
confirmationToken: ctx.bootToken.confirmationToken,
|
|
433
436
|
consoleOrigin: ctx.getConsoleOrigin(),
|
|
@@ -1,19 +1,67 @@
|
|
|
1
|
-
import { randomBytes, timingSafeEqual } from "node:crypto";
|
|
1
|
+
import { createHash, randomBytes, timingSafeEqual } from "node:crypto";
|
|
2
2
|
import { isLoopbackHost } from "./loopback.js";
|
|
3
|
+
/** Prefix for instance-scoped Cookie names; not a lookup name. */
|
|
3
4
|
export const BOOT_CAPABILITY_COOKIE = "loop_console_capability";
|
|
4
5
|
/** Custom mutation confirmation header (design §9). JS-readable; not the HttpOnly boot cookie. */
|
|
5
6
|
export const CONFIRMATION_TOKEN_HEADER = "x-loop-console-confirmation";
|
|
7
|
+
function normalizeInstanceScope(scope) {
|
|
8
|
+
const repoFingerprint = scope.repoFingerprint.trim();
|
|
9
|
+
if (!repoFingerprint) {
|
|
10
|
+
throw new Error("console instance scope requires a non-empty repoFingerprint");
|
|
11
|
+
}
|
|
12
|
+
const bindHost = scope.bindHost.trim();
|
|
13
|
+
if (!bindHost) {
|
|
14
|
+
throw new Error("console instance scope requires a non-empty bindHost");
|
|
15
|
+
}
|
|
16
|
+
if (!Number.isInteger(scope.configuredPort) || scope.configuredPort < 0) {
|
|
17
|
+
throw new Error(`console instance scope configuredPort must be an integer >= 0, got ${String(scope.configuredPort)}`);
|
|
18
|
+
}
|
|
19
|
+
const instanceNonce = scope.instanceNonce?.trim();
|
|
20
|
+
if (scope.configuredPort === 0) {
|
|
21
|
+
if (!instanceNonce) {
|
|
22
|
+
throw new Error("console instance scope requires a non-empty instanceNonce when configuredPort is 0");
|
|
23
|
+
}
|
|
24
|
+
return {
|
|
25
|
+
repoFingerprint,
|
|
26
|
+
bindHost,
|
|
27
|
+
configuredPort: 0,
|
|
28
|
+
instanceNonce,
|
|
29
|
+
};
|
|
30
|
+
}
|
|
31
|
+
return {
|
|
32
|
+
repoFingerprint,
|
|
33
|
+
bindHost,
|
|
34
|
+
configuredPort: scope.configuredPort,
|
|
35
|
+
};
|
|
36
|
+
}
|
|
37
|
+
/** Deterministic Cookie name for one Console instance; never includes repo path or token. */
|
|
38
|
+
export function deriveBootCapabilityCookieName(scope) {
|
|
39
|
+
const normalized = normalizeInstanceScope(scope);
|
|
40
|
+
const digest = createHash("sha256")
|
|
41
|
+
.update("loop-console-capability-v1\0", "utf8")
|
|
42
|
+
.update(normalized.repoFingerprint, "utf8")
|
|
43
|
+
.update("\0", "utf8")
|
|
44
|
+
.update(normalized.bindHost, "utf8")
|
|
45
|
+
.update("\0", "utf8")
|
|
46
|
+
.update(String(normalized.configuredPort), "utf8")
|
|
47
|
+
.update("\0", "utf8")
|
|
48
|
+
.update(normalized.instanceNonce ?? "", "utf8")
|
|
49
|
+
.digest("hex")
|
|
50
|
+
.slice(0, 32);
|
|
51
|
+
return `${BOOT_CAPABILITY_COOKIE}_${digest}`;
|
|
52
|
+
}
|
|
6
53
|
/** Issue per-process unguessable boot capability + confirmation tokens. */
|
|
7
|
-
export function issueBootCapabilityToken() {
|
|
54
|
+
export function issueBootCapabilityToken(scope) {
|
|
55
|
+
const cookieName = deriveBootCapabilityCookieName(scope);
|
|
8
56
|
const value = randomBytes(32).toString("base64url");
|
|
9
57
|
const confirmationToken = randomBytes(32).toString("base64url");
|
|
10
58
|
const setCookieHeader = [
|
|
11
|
-
`${
|
|
59
|
+
`${cookieName}=${value}`,
|
|
12
60
|
"HttpOnly",
|
|
13
61
|
"SameSite=Strict",
|
|
14
62
|
"Path=/",
|
|
15
63
|
].join("; ");
|
|
16
|
-
return { value, setCookieHeader, confirmationToken };
|
|
64
|
+
return { cookieName, value, setCookieHeader, confirmationToken };
|
|
17
65
|
}
|
|
18
66
|
/** Inject confirmation token into HTML so the SPA can send the mutation header. */
|
|
19
67
|
export function injectConfirmationTokenScript(html, confirmationToken) {
|
|
@@ -74,7 +122,7 @@ function loopbackOriginMatches(origin, consoleOrigin) {
|
|
|
74
122
|
return originKey !== null && consoleKey !== null && originKey === consoleKey;
|
|
75
123
|
}
|
|
76
124
|
export function evaluateMutationGate(req, ctx) {
|
|
77
|
-
const cookieToken = parseCookieHeader(req.headers.cookie,
|
|
125
|
+
const cookieToken = parseCookieHeader(req.headers.cookie, ctx.cookieName);
|
|
78
126
|
if (!cookieToken) {
|
|
79
127
|
return {
|
|
80
128
|
status: 403,
|