@tickernelz/paperclip-pro-adapter-utils 2026.1006.0 → 2026.1006.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +13 -0
- package/dist/acpx-engine/ephemeral-session-environment.d.ts +4 -0
- package/dist/acpx-engine/ephemeral-session-environment.d.ts.map +1 -0
- package/dist/acpx-engine/ephemeral-session-environment.js +29 -0
- package/dist/acpx-engine/ephemeral-session-environment.js.map +1 -0
- package/dist/acpx-engine/ephemeral-session-environment.test.d.ts +2 -0
- package/dist/acpx-engine/ephemeral-session-environment.test.d.ts.map +1 -0
- package/dist/acpx-engine/ephemeral-session-environment.test.js +177 -0
- package/dist/acpx-engine/ephemeral-session-environment.test.js.map +1 -0
- package/dist/acpx-engine/execute.d.ts +2 -6
- package/dist/acpx-engine/execute.d.ts.map +1 -1
- package/dist/acpx-engine/execute.js +125 -62
- package/dist/acpx-engine/execute.js.map +1 -1
- package/dist/acpx-engine/execute.test.js +299 -3
- package/dist/acpx-engine/execute.test.js.map +1 -1
- package/dist/acpx-engine/session-codec.d.ts.map +1 -1
- package/dist/acpx-engine/session-codec.js +1 -0
- package/dist/acpx-engine/session-codec.js.map +1 -1
- package/dist/acpx-engine/settlement-characterization.test.js +105 -0
- package/dist/acpx-engine/settlement-characterization.test.js.map +1 -1
- package/dist/acpx-engine/spawn-smoke.test.js +16 -7
- package/dist/acpx-engine/spawn-smoke.test.js.map +1 -1
- package/dist/acpx-engine/startup-cancellation.d.ts +1 -0
- package/dist/acpx-engine/startup-cancellation.d.ts.map +1 -1
- package/dist/acpx-engine/startup-cancellation.js +7 -2
- package/dist/acpx-engine/startup-cancellation.js.map +1 -1
- package/dist/acpx-engine/terminal-session-failure.d.ts +18 -0
- package/dist/acpx-engine/terminal-session-failure.d.ts.map +1 -0
- package/dist/acpx-engine/terminal-session-failure.js +106 -0
- package/dist/acpx-engine/terminal-session-failure.js.map +1 -0
- package/dist/acpx-engine/terminal-session-failure.test.d.ts +2 -0
- package/dist/acpx-engine/terminal-session-failure.test.d.ts.map +1 -0
- package/dist/acpx-engine/terminal-session-failure.test.js +139 -0
- package/dist/acpx-engine/terminal-session-failure.test.js.map +1 -0
- package/dist/acpx-engine/turn-characterization.test.js +4 -3
- package/dist/acpx-engine/turn-characterization.test.js.map +1 -1
- package/dist/command-managed-runtime.d.ts +2 -0
- package/dist/command-managed-runtime.d.ts.map +1 -1
- package/dist/command-managed-runtime.js +2 -0
- package/dist/command-managed-runtime.js.map +1 -1
- package/dist/command-redaction.d.ts +2 -0
- package/dist/command-redaction.d.ts.map +1 -1
- package/dist/command-redaction.js +20 -10
- package/dist/command-redaction.js.map +1 -1
- package/dist/command-redaction.test.js +20 -1
- package/dist/command-redaction.test.js.map +1 -1
- package/dist/directory-merge-lock.test.d.ts +2 -0
- package/dist/directory-merge-lock.test.d.ts.map +1 -0
- package/dist/directory-merge-lock.test.js +166 -0
- package/dist/directory-merge-lock.test.js.map +1 -0
- package/dist/execution-phase.d.ts +10 -0
- package/dist/execution-phase.d.ts.map +1 -0
- package/dist/execution-phase.js +27 -0
- package/dist/execution-phase.js.map +1 -0
- package/dist/execution-phase.test.d.ts +2 -0
- package/dist/execution-phase.test.d.ts.map +1 -0
- package/dist/execution-phase.test.js +26 -0
- package/dist/execution-phase.test.js.map +1 -0
- package/dist/execution-target-sandbox.test.js +49 -7
- package/dist/execution-target-sandbox.test.js.map +1 -1
- package/dist/execution-target-stdin-race.test.js +245 -2
- package/dist/execution-target-stdin-race.test.js.map +1 -1
- package/dist/execution-target.d.ts +6 -0
- package/dist/execution-target.d.ts.map +1 -1
- package/dist/execution-target.js +74 -22
- package/dist/execution-target.js.map +1 -1
- package/dist/git-workspace-sync.d.ts +15 -5
- package/dist/git-workspace-sync.d.ts.map +1 -1
- package/dist/git-workspace-sync.js +267 -124
- package/dist/git-workspace-sync.js.map +1 -1
- package/dist/git-workspace-sync.test.js +296 -20
- package/dist/git-workspace-sync.test.js.map +1 -1
- package/dist/github-launcher.d.ts.map +1 -1
- package/dist/github-launcher.js +26 -11
- package/dist/github-launcher.js.map +1 -1
- package/dist/github-launcher.test.js +34 -1
- package/dist/github-launcher.test.js.map +1 -1
- package/dist/index.d.ts +1 -1
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/paperclip-runner-permissions.d.ts +28 -1
- package/dist/paperclip-runner-permissions.d.ts.map +1 -1
- package/dist/paperclip-runner-permissions.js +9 -1
- package/dist/paperclip-runner-permissions.js.map +1 -1
- package/dist/prompt-sections.test.d.ts +2 -0
- package/dist/prompt-sections.test.d.ts.map +1 -0
- package/dist/prompt-sections.test.js +53 -0
- package/dist/prompt-sections.test.js.map +1 -0
- package/dist/provider-stopped-boundary.d.ts +7 -0
- package/dist/provider-stopped-boundary.d.ts.map +1 -0
- package/dist/provider-stopped-boundary.js +22 -0
- package/dist/provider-stopped-boundary.js.map +1 -0
- package/dist/provider-stopped-boundary.test.d.ts +2 -0
- package/dist/provider-stopped-boundary.test.d.ts.map +1 -0
- package/dist/provider-stopped-boundary.test.js +76 -0
- package/dist/provider-stopped-boundary.test.js.map +1 -0
- package/dist/remote-managed-runtime.d.ts +2 -0
- package/dist/remote-managed-runtime.d.ts.map +1 -1
- package/dist/remote-managed-runtime.js +3 -1
- package/dist/remote-managed-runtime.js.map +1 -1
- package/dist/remote-managed-runtime.test.js +25 -0
- package/dist/remote-managed-runtime.test.js.map +1 -1
- package/dist/sandbox-callback-bridge.d.ts +2 -0
- package/dist/sandbox-callback-bridge.d.ts.map +1 -1
- package/dist/sandbox-callback-bridge.js +34 -10
- package/dist/sandbox-callback-bridge.js.map +1 -1
- package/dist/sandbox-callback-bridge.test.js +106 -3
- package/dist/sandbox-callback-bridge.test.js.map +1 -1
- package/dist/sandbox-managed-runtime.d.ts +3 -0
- package/dist/sandbox-managed-runtime.d.ts.map +1 -1
- package/dist/sandbox-managed-runtime.js +749 -718
- package/dist/sandbox-managed-runtime.js.map +1 -1
- package/dist/sandbox-managed-runtime.test.js +171 -2
- package/dist/sandbox-managed-runtime.test.js.map +1 -1
- package/dist/server-utils.d.ts +43 -1
- package/dist/server-utils.d.ts.map +1 -1
- package/dist/server-utils.js +103 -31
- package/dist/server-utils.js.map +1 -1
- package/dist/server-utils.test.js +235 -45
- package/dist/server-utils.test.js.map +1 -1
- package/dist/session-compaction.d.ts.map +1 -1
- package/dist/session-compaction.js +6 -0
- package/dist/session-compaction.js.map +1 -1
- package/dist/ssh-fixture.test.js +22 -0
- package/dist/ssh-fixture.test.js.map +1 -1
- package/dist/ssh.d.ts +2 -0
- package/dist/ssh.d.ts.map +1 -1
- package/dist/ssh.js +2 -2
- package/dist/ssh.js.map +1 -1
- package/dist/test-fixtures/prompt-context.d.ts +54 -0
- package/dist/test-fixtures/prompt-context.d.ts.map +1 -0
- package/dist/test-fixtures/prompt-context.js +55 -0
- package/dist/test-fixtures/prompt-context.js.map +1 -0
- package/dist/types.d.ts +12 -2
- package/dist/types.d.ts.map +1 -1
- package/dist/workspace-git-stream.d.ts +19 -0
- package/dist/workspace-git-stream.d.ts.map +1 -0
- package/dist/workspace-git-stream.js +99 -0
- package/dist/workspace-git-stream.js.map +1 -0
- package/dist/workspace-git-stream.test.d.ts +2 -0
- package/dist/workspace-git-stream.test.d.ts.map +1 -0
- package/dist/workspace-git-stream.test.js +71 -0
- package/dist/workspace-git-stream.test.js.map +1 -0
- package/dist/workspace-manifest.d.ts +61 -0
- package/dist/workspace-manifest.d.ts.map +1 -0
- package/dist/workspace-manifest.js +257 -0
- package/dist/workspace-manifest.js.map +1 -0
- package/dist/workspace-manifest.test.d.ts +2 -0
- package/dist/workspace-manifest.test.d.ts.map +1 -0
- package/dist/workspace-manifest.test.js +160 -0
- package/dist/workspace-manifest.test.js.map +1 -0
- package/dist/workspace-restore-diagnostics.d.ts +34 -0
- package/dist/workspace-restore-diagnostics.d.ts.map +1 -0
- package/dist/workspace-restore-diagnostics.js +238 -0
- package/dist/workspace-restore-diagnostics.js.map +1 -0
- package/dist/workspace-restore-diagnostics.test.d.ts +2 -0
- package/dist/workspace-restore-diagnostics.test.d.ts.map +1 -0
- package/dist/workspace-restore-diagnostics.test.js +258 -0
- package/dist/workspace-restore-diagnostics.test.js.map +1 -0
- package/dist/workspace-restore-merge.d.ts +47 -6
- package/dist/workspace-restore-merge.d.ts.map +1 -1
- package/dist/workspace-restore-merge.js +382 -114
- package/dist/workspace-restore-merge.js.map +1 -1
- package/dist/workspace-restore-merge.test.js +253 -4
- package/dist/workspace-restore-merge.test.js.map +1 -1
- package/dist/workspace-restore-result.d.ts +6 -0
- package/dist/workspace-restore-result.d.ts.map +1 -0
- package/dist/workspace-restore-result.js +72 -0
- package/dist/workspace-restore-result.js.map +1 -0
- package/dist/workspace-restore-result.test.d.ts +2 -0
- package/dist/workspace-restore-result.test.d.ts.map +1 -0
- package/dist/workspace-restore-result.test.js +74 -0
- package/dist/workspace-restore-result.test.js.map +1 -0
- package/dist/workspace-restore-teardown.d.ts.map +1 -1
- package/dist/workspace-restore-teardown.js +5 -3
- package/dist/workspace-restore-teardown.js.map +1 -1
- package/dist/workspace-restore-teardown.test.js +24 -0
- package/dist/workspace-restore-teardown.test.js.map +1 -1
- package/node_modules/acpx/dist/live-checkpoint-ClPCSdrW.js +4 -3
- package/package.json +2 -2
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspace-restore-result.js","sourceRoot":"","sources":["../src/workspace-restore-result.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspace-restore-result.test.d.ts","sourceRoot":"","sources":["../src/workspace-restore-result.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,74 @@
|
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
|
2
|
+
import { applyWorkspaceRestoreFailure, withWorkspaceRestore } from "./workspace-restore-result.js";
|
|
3
|
+
import { withWorkspaceRestoreDiagnostics, withWorkspaceRestoreStep, withWorkspaceRestoreGitCommand } from "./workspace-restore-diagnostics.js";
|
|
4
|
+
const completed = {
|
|
5
|
+
exitCode: 0, signal: null, timedOut: false,
|
|
6
|
+
summary: "The plan is ready.", sessionId: "session", usage: { inputTokens: 4, outputTokens: 9 },
|
|
7
|
+
resultJson: { requestId: "request" },
|
|
8
|
+
};
|
|
9
|
+
const unsafe = new Error("Daytona syncOut refusing tarball link whose target escapes the extraction dir: .claude/skills/paperclip -> /tmp/private-clone/secret-key");
|
|
10
|
+
describe("workspace restore settlement", () => {
|
|
11
|
+
it("retains only the safe failed restore step alongside the original completed turn", async () => {
|
|
12
|
+
const error = Object.assign(new Error("private-restore-path and command"), { code: 1, stderr: "private-restore-output" });
|
|
13
|
+
const result = await withWorkspaceRestore(async () => completed, () => withWorkspaceRestoreDiagnostics("workspace", () => withWorkspaceRestoreStep("index_reset", async () => { throw error; })));
|
|
14
|
+
expect(result.resultJson).toMatchObject({
|
|
15
|
+
workspaceRestoreFailure: "restore_failed",
|
|
16
|
+
workspaceRestoreDiagnostic: { phase: "workspace", step: "index_reset", errorCode: "unknown", exitCode: 1 },
|
|
17
|
+
executionBeforeRestore: { exitCode: 0, timedOut: false, errorCode: null },
|
|
18
|
+
});
|
|
19
|
+
expect(JSON.stringify(result)).not.toContain("private-restore-");
|
|
20
|
+
});
|
|
21
|
+
it("persists only bounded Git evidence without replacing the completed model result", async () => {
|
|
22
|
+
const error = Object.assign(new Error("private-git-command /private/workspace"), {
|
|
23
|
+
code: 1, stdout: "a".repeat(40) + "\nprivate-git-file contents", stderr: "private-git-refs",
|
|
24
|
+
});
|
|
25
|
+
const result = await withWorkspaceRestore(async () => completed, () => withWorkspaceRestoreDiagnostics("workspace", () => withWorkspaceRestoreStep("git_integration", () => withWorkspaceRestoreGitCommand("merge_tree", async () => { throw error; }))));
|
|
26
|
+
expect(result).toMatchObject({
|
|
27
|
+
errorCode: "workspace_restore_failed", exitCode: completed.exitCode, summary: completed.summary, usage: completed.usage,
|
|
28
|
+
resultJson: { requestId: "request", workspaceRestoreFailure: "restore_failed",
|
|
29
|
+
workspaceRestoreDiagnostic: { phase: "workspace", step: "git_integration", errorCode: "unknown", exitCode: 1,
|
|
30
|
+
gitCommand: "merge_tree", gitFailureKind: "merge_conflict" },
|
|
31
|
+
executionBeforeRestore: { exitCode: 0, timedOut: false, errorCode: null } },
|
|
32
|
+
});
|
|
33
|
+
expect(JSON.stringify(result)).not.toContain("private-git-");
|
|
34
|
+
});
|
|
35
|
+
it("retains the completed result and safe member while excluding the unsafe target", async () => {
|
|
36
|
+
const result = await withWorkspaceRestore(async () => completed, async () => { throw unsafe; });
|
|
37
|
+
expect(result).toMatchObject({
|
|
38
|
+
summary: completed.summary, sessionId: "session", usage: completed.usage,
|
|
39
|
+
errorCode: "workspace_restore_failed", timedOut: false,
|
|
40
|
+
resultJson: { requestId: "request", workspaceRestoreFailure: "restore_unsafe_archive",
|
|
41
|
+
workspaceRestorePath: ".claude/skills/paperclip", finalResponseRecorded: true },
|
|
42
|
+
});
|
|
43
|
+
expect(JSON.stringify(result)).not.toMatch(/private-clone|secret-key|\/tmp/);
|
|
44
|
+
expect(applyWorkspaceRestoreFailure(result)).toBe(result);
|
|
45
|
+
});
|
|
46
|
+
it("retains the previous execution failure and restore classification", async () => {
|
|
47
|
+
const result = await withWorkspaceRestore(async () => ({ ...completed, exitCode: 2, errorCode: "model_error", errorMessage: "Model request failed." }), async () => { throw unsafe; });
|
|
48
|
+
expect(result.errorMessage).toContain("Model request failed.");
|
|
49
|
+
expect(result.errorMessage).toContain("Workspace restore failed.");
|
|
50
|
+
expect(result.resultJson?.executionBeforeRestore).toMatchObject({ errorCode: "model_error", exitCode: 2 });
|
|
51
|
+
});
|
|
52
|
+
it("retains a thrown execution error when restore also fails", async () => {
|
|
53
|
+
const result = await withWorkspaceRestore(async () => { throw new Error("Process failed."); }, async () => { throw unsafe; });
|
|
54
|
+
expect(result.errorMessage).toContain("Process failed.");
|
|
55
|
+
expect(result.resultJson).toMatchObject({ finalResponseRecorded: false, executionBeforeRestore: { errorCode: "adapter_failed" } });
|
|
56
|
+
});
|
|
57
|
+
it("keeps timeout evidence while making restore the terminal failure phase", async () => {
|
|
58
|
+
const result = await withWorkspaceRestore(async () => ({ ...completed, timedOut: true }), async () => { throw unsafe; });
|
|
59
|
+
expect(result.timedOut).toBe(false);
|
|
60
|
+
expect(result.resultJson?.executionBeforeRestore).toMatchObject({ timedOut: true });
|
|
61
|
+
});
|
|
62
|
+
it("preserves the original result or thrown error after a clean restore", async () => {
|
|
63
|
+
expect(await withWorkspaceRestore(async () => completed, async () => { })).toBe(completed);
|
|
64
|
+
const error = new Error("execution failed");
|
|
65
|
+
await expect(withWorkspaceRestore(async () => { throw error; }, async () => { })).rejects.toBe(error);
|
|
66
|
+
});
|
|
67
|
+
it.each(["/tmp/private/file", "../escape", "C:\\private\\file"])("omits unsafe member %s", async (member) => {
|
|
68
|
+
const result = await withWorkspaceRestore(async () => completed, async () => {
|
|
69
|
+
throw new Error(`Daytona syncOut refusing tarball link whose target escapes the extraction dir: ${member} -> /secret`);
|
|
70
|
+
});
|
|
71
|
+
expect(result.resultJson?.workspaceRestorePath).toBeUndefined();
|
|
72
|
+
});
|
|
73
|
+
});
|
|
74
|
+
//# sourceMappingURL=workspace-restore-result.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"workspace-restore-result.test.js","sourceRoot":"","sources":["../src/workspace-restore-result.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-restore-teardown.d.ts","sourceRoot":"","sources":["../src/workspace-restore-teardown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-restore-teardown.d.ts","sourceRoot":"","sources":["../src/workspace-restore-teardown.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAEjE,OAAO,EAGL,KAAK,uBAAuB,EAC7B,MAAM,8BAA8B,CAAC;AAEtC;;;GAGG;AACH,MAAM,WAAW,+BAA+B;IAC9C,gBAAgB,CAAC,UAAU,CAAC,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACnE;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,8BAA8B,CAAC,KAAK,EAAE;IACpD,aAAa,EAAE,+BAA+B,CAAC;IAC/C,KAAK,EAAE,CAAC,MAAM,EAAE,QAAQ,GAAG,QAAQ,EAAE,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACrE,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,MAAM,OAAO,CAAC,uBAAuB,CAAC,CAkBzC"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { getWorkspaceRestoreDiagnostic, withWorkspaceRestoreDiagnosticCapture } from "./workspace-restore-diagnostics.js";
|
|
1
2
|
import { classifyWorkspaceRestoreFailure, describeWorkspaceRestoreFailure, } from "./workspace-restore-merge.js";
|
|
2
3
|
/**
|
|
3
4
|
* Builds the shared ACP adapter teardown step. The Claude, Codex, and Gemini
|
|
@@ -14,7 +15,7 @@ import { classifyWorkspaceRestoreFailure, describeWorkspaceRestoreFailure, } fro
|
|
|
14
15
|
*/
|
|
15
16
|
export function createWorkspaceRestoreTeardown(input) {
|
|
16
17
|
const { stagedRuntime, onLog, startMessage, failurePrefix } = input;
|
|
17
|
-
return async () => {
|
|
18
|
+
return () => withWorkspaceRestoreDiagnosticCapture(async () => {
|
|
18
19
|
try {
|
|
19
20
|
await onLog("stdout", startMessage);
|
|
20
21
|
await stagedRuntime.restoreWorkspace((line) => onLog("stdout", line));
|
|
@@ -26,9 +27,10 @@ export function createWorkspaceRestoreTeardown(input) {
|
|
|
26
27
|
// filesystem path or a process id. Log only the fixed, allowlisted
|
|
27
28
|
// diagnostic for the classified code.
|
|
28
29
|
const code = classifyWorkspaceRestoreFailure(err);
|
|
30
|
+
const diagnostic = getWorkspaceRestoreDiagnostic(err);
|
|
29
31
|
await onLog("stderr", `${failurePrefix}: ${describeWorkspaceRestoreFailure(code)}\n`);
|
|
30
|
-
return { ok: false, code };
|
|
32
|
+
return { ok: false, code, ...(diagnostic ? { diagnostic } : {}) };
|
|
31
33
|
}
|
|
32
|
-
};
|
|
34
|
+
});
|
|
33
35
|
}
|
|
34
36
|
//# sourceMappingURL=workspace-restore-teardown.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-restore-teardown.js","sourceRoot":"","sources":["../src/workspace-restore-teardown.ts"],"names":[],"mappings":"AACA,OAAO,EACL,+BAA+B,EAC/B,+BAA+B,GAEhC,MAAM,8BAA8B,CAAC;AAUtC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,8BAA8B,CAAC,KAK9C;IACC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IACpE,OAAO,KAAK,IAAI,EAAE;
|
|
1
|
+
{"version":3,"file":"workspace-restore-teardown.js","sourceRoot":"","sources":["../src/workspace-restore-teardown.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,6BAA6B,EAAE,qCAAqC,EAAE,MAAM,oCAAoC,CAAC;AAC1H,OAAO,EACL,+BAA+B,EAC/B,+BAA+B,GAEhC,MAAM,8BAA8B,CAAC;AAUtC;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,8BAA8B,CAAC,KAK9C;IACC,MAAM,EAAE,aAAa,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IACpE,OAAO,GAAG,EAAE,CAAC,qCAAqC,CAAC,KAAK,IAAI,EAAE;QAC5D,IAAI,CAAC;YACH,MAAM,KAAK,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC;YACpC,MAAM,aAAa,CAAC,gBAAgB,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;YACtE,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,CAAC;QACtB,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,sEAAsE;YACtE,qEAAqE;YACrE,mEAAmE;YACnE,sCAAsC;YACtC,MAAM,IAAI,GAAG,+BAA+B,CAAC,GAAG,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,6BAA6B,CAAC,GAAG,CAAC,CAAC;YACtD,MAAM,KAAK,CAAC,QAAQ,EAAE,GAAG,aAAa,KAAK,+BAA+B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACtF,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;QACpE,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { describe, expect, it } from "vitest";
|
|
2
2
|
import { createWorkspaceRestoreTeardown } from "./workspace-restore-teardown.js";
|
|
3
|
+
import { withWorkspaceRestoreDiagnostics, withWorkspaceRestoreStep } from "./workspace-restore-diagnostics.js";
|
|
3
4
|
// One row per adapter's two message strings, taken verbatim from
|
|
4
5
|
// claude-local, codex-local, and gemini-local. The factory's contract must
|
|
5
6
|
// hold identically for each pair.
|
|
@@ -21,6 +22,29 @@ const ADAPTER_MESSAGE_PAIRS = [
|
|
|
21
22
|
},
|
|
22
23
|
];
|
|
23
24
|
describe.each(ADAPTER_MESSAGE_PAIRS)("createWorkspaceRestoreTeardown ($adapter)", ({ startMessage, failurePrefix }) => {
|
|
25
|
+
it("keeps concurrent settlements separate when a provider reuses an error", async () => {
|
|
26
|
+
const error = Object.assign(new Error("private-restore-path"), { code: 1 });
|
|
27
|
+
let release;
|
|
28
|
+
let started;
|
|
29
|
+
const gate = new Promise((resolve) => { release = resolve; });
|
|
30
|
+
const waiting = new Promise((resolve) => { started = resolve; });
|
|
31
|
+
const first = createWorkspaceRestoreTeardown({
|
|
32
|
+
stagedRuntime: { restoreWorkspace: () => withWorkspaceRestoreDiagnostics("workspace", () => withWorkspaceRestoreStep("git_import", async () => { throw error; }), async () => { started(); await gate; }) },
|
|
33
|
+
onLog: async () => { }, startMessage, failurePrefix,
|
|
34
|
+
})();
|
|
35
|
+
await waiting;
|
|
36
|
+
const second = await createWorkspaceRestoreTeardown({
|
|
37
|
+
stagedRuntime: { restoreWorkspace: () => withWorkspaceRestoreDiagnostics("asset", () => withWorkspaceRestoreStep("asset_restore", async () => { throw error; })) },
|
|
38
|
+
onLog: async () => { }, startMessage, failurePrefix,
|
|
39
|
+
})();
|
|
40
|
+
release();
|
|
41
|
+
expect(await first).toEqual({ ok: false, code: "restore_failed", diagnostic: {
|
|
42
|
+
phase: "workspace", step: "git_import", errorCode: "unknown", exitCode: 1,
|
|
43
|
+
} });
|
|
44
|
+
expect(second).toEqual({ ok: false, code: "restore_failed", diagnostic: {
|
|
45
|
+
phase: "asset", step: "asset_restore", errorCode: "unknown", exitCode: 1,
|
|
46
|
+
} });
|
|
47
|
+
});
|
|
24
48
|
it("logs the start message to stdout and returns ok on a clean restore", async () => {
|
|
25
49
|
const logLines = [];
|
|
26
50
|
const teardown = createWorkspaceRestoreTeardown({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"workspace-restore-teardown.test.js","sourceRoot":"","sources":["../src/workspace-restore-teardown.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AAE9C,OAAO,EAAE,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;
|
|
1
|
+
{"version":3,"file":"workspace-restore-teardown.test.js","sourceRoot":"","sources":["../src/workspace-restore-teardown.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -6122,13 +6122,14 @@ async function runPromptTurn(params) {
|
|
|
6122
6122
|
}).catch(() => {});
|
|
6123
6123
|
const terminalFailureCategory = typedTerminalSessionFailureCategory(response);
|
|
6124
6124
|
if (terminalFailureCategory !== null) {
|
|
6125
|
-
//
|
|
6125
|
+
// Pass complete provider text to the diagnostic callback. Consumers redact
|
|
6126
|
+
// before bounding it; truncating here can split and expose a credential.
|
|
6126
6127
|
const failure = response._meta.jetbrains.air.sessionFailure;
|
|
6127
6128
|
try {
|
|
6128
6129
|
params.onTerminalSessionFailure?.({
|
|
6129
6130
|
category: terminalFailureCategory,
|
|
6130
|
-
...(typeof failure.title === "string" ? { title: failure.title
|
|
6131
|
-
...(typeof failure.details === "string" ? { details: failure.details
|
|
6131
|
+
...(typeof failure.title === "string" ? { title: failure.title } : {}),
|
|
6132
|
+
...(typeof failure.details === "string" ? { details: failure.details } : {})
|
|
6132
6133
|
});
|
|
6133
6134
|
} catch {}
|
|
6134
6135
|
throw new Error(`ACP agent reported a terminal ${terminalFailureCategory} failure.`);
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@tickernelz/paperclip-pro-adapter-utils",
|
|
3
|
-
"version": "2026.1006.
|
|
3
|
+
"version": "2026.1006.2",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"homepage": "https://github.com/tickernelz/paperclip-pro",
|
|
6
6
|
"bugs": {
|
|
@@ -34,7 +34,7 @@
|
|
|
34
34
|
"typecheck": "tsc --noEmit"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@tickernelz/paperclip-pro-shared": "2026.1006.
|
|
37
|
+
"@tickernelz/paperclip-pro-shared": "2026.1006.2",
|
|
38
38
|
"acpx": "0.12.0",
|
|
39
39
|
"picocolors": "^1.1.1"
|
|
40
40
|
},
|