@tickernelz/wardmote-adapter-omp-local 0.0.0 → 2026.1108.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/LICENSE +22 -0
- package/dist/cli/format-event.d.ts +2 -0
- package/dist/cli/format-event.d.ts.map +1 -0
- package/dist/cli/format-event.js +56 -0
- package/dist/cli/format-event.js.map +1 -0
- package/dist/cli/index.d.ts +2 -0
- package/dist/cli/index.d.ts.map +1 -0
- package/dist/cli/index.js +2 -0
- package/dist/cli/index.js.map +1 -0
- package/dist/index.d.ts +2 -0
- package/dist/index.d.ts.map +1 -0
- package/dist/index.js +2 -0
- package/dist/index.js.map +1 -0
- package/dist/metadata.d.ts +9 -0
- package/dist/metadata.d.ts.map +1 -0
- package/dist/metadata.js +47 -0
- package/dist/metadata.js.map +1 -0
- package/dist/server/config.d.ts +25 -0
- package/dist/server/config.d.ts.map +1 -0
- package/dist/server/config.js +720 -0
- package/dist/server/config.js.map +1 -0
- package/dist/server/config.test.d.ts +2 -0
- package/dist/server/config.test.d.ts.map +1 -0
- package/dist/server/config.test.js +65 -0
- package/dist/server/config.test.js.map +1 -0
- package/dist/server/execute.choices.test.d.ts +2 -0
- package/dist/server/execute.choices.test.d.ts.map +1 -0
- package/dist/server/execute.choices.test.js +113 -0
- package/dist/server/execute.choices.test.js.map +1 -0
- package/dist/server/execute.cwd.test.d.ts +2 -0
- package/dist/server/execute.cwd.test.d.ts.map +1 -0
- package/dist/server/execute.cwd.test.js +88 -0
- package/dist/server/execute.cwd.test.js.map +1 -0
- package/dist/server/execute.d.ts +27 -0
- package/dist/server/execute.d.ts.map +1 -0
- package/dist/server/execute.js +1155 -0
- package/dist/server/execute.js.map +1 -0
- package/dist/server/execute.mcp.test.d.ts +2 -0
- package/dist/server/execute.mcp.test.d.ts.map +1 -0
- package/dist/server/execute.mcp.test.js +512 -0
- package/dist/server/execute.mcp.test.js.map +1 -0
- package/dist/server/execute.model-override.test.d.ts +2 -0
- package/dist/server/execute.model-override.test.d.ts.map +1 -0
- package/dist/server/execute.model-override.test.js +115 -0
- package/dist/server/execute.model-override.test.js.map +1 -0
- package/dist/server/execute.provider-stop.test.d.ts +2 -0
- package/dist/server/execute.provider-stop.test.d.ts.map +1 -0
- package/dist/server/execute.provider-stop.test.js +96 -0
- package/dist/server/execute.provider-stop.test.js.map +1 -0
- package/dist/server/execute.python-env.remote.test.d.ts +2 -0
- package/dist/server/execute.python-env.remote.test.d.ts.map +1 -0
- package/dist/server/execute.python-env.remote.test.js +102 -0
- package/dist/server/execute.python-env.remote.test.js.map +1 -0
- package/dist/server/execute.thinking.test.d.ts +2 -0
- package/dist/server/execute.thinking.test.d.ts.map +1 -0
- package/dist/server/execute.thinking.test.js +23 -0
- package/dist/server/execute.thinking.test.js.map +1 -0
- package/dist/server/execute.toggles.test.d.ts +2 -0
- package/dist/server/execute.toggles.test.d.ts.map +1 -0
- package/dist/server/execute.toggles.test.js +193 -0
- package/dist/server/execute.toggles.test.js.map +1 -0
- package/dist/server/execute.transport.test.d.ts +2 -0
- package/dist/server/execute.transport.test.d.ts.map +1 -0
- package/dist/server/execute.transport.test.js +159 -0
- package/dist/server/execute.transport.test.js.map +1 -0
- package/dist/server/execute.usage-checkpoint.test.d.ts +2 -0
- package/dist/server/execute.usage-checkpoint.test.d.ts.map +1 -0
- package/dist/server/execute.usage-checkpoint.test.js +92 -0
- package/dist/server/execute.usage-checkpoint.test.js.map +1 -0
- package/dist/server/failure.d.ts +22 -0
- package/dist/server/failure.d.ts.map +1 -0
- package/dist/server/failure.js +99 -0
- package/dist/server/failure.js.map +1 -0
- package/dist/server/failure.test.d.ts +2 -0
- package/dist/server/failure.test.d.ts.map +1 -0
- package/dist/server/failure.test.js +37 -0
- package/dist/server/failure.test.js.map +1 -0
- package/dist/server/index.d.ts +7 -0
- package/dist/server/index.d.ts.map +1 -0
- package/dist/server/index.js +101 -0
- package/dist/server/index.js.map +1 -0
- package/dist/server/model-fallback.d.ts +34 -0
- package/dist/server/model-fallback.d.ts.map +1 -0
- package/dist/server/model-fallback.js +115 -0
- package/dist/server/model-fallback.js.map +1 -0
- package/dist/server/model-fallback.test.d.ts +2 -0
- package/dist/server/model-fallback.test.d.ts.map +1 -0
- package/dist/server/model-fallback.test.js +44 -0
- package/dist/server/model-fallback.test.js.map +1 -0
- package/dist/server/models.d.ts +19 -0
- package/dist/server/models.d.ts.map +1 -0
- package/dist/server/models.js +225 -0
- package/dist/server/models.js.map +1 -0
- package/dist/server/paperclip-mcp.d.ts +53 -0
- package/dist/server/paperclip-mcp.d.ts.map +1 -0
- package/dist/server/paperclip-mcp.js +245 -0
- package/dist/server/paperclip-mcp.js.map +1 -0
- package/dist/server/parse.d.ts +45 -0
- package/dist/server/parse.d.ts.map +1 -0
- package/dist/server/parse.js +510 -0
- package/dist/server/parse.js.map +1 -0
- package/dist/server/parse.test.d.ts +2 -0
- package/dist/server/parse.test.d.ts.map +1 -0
- package/dist/server/parse.test.js +108 -0
- package/dist/server/parse.test.js.map +1 -0
- package/dist/server/profile.d.ts +7 -0
- package/dist/server/profile.d.ts.map +1 -0
- package/dist/server/profile.js +40 -0
- package/dist/server/profile.js.map +1 -0
- package/dist/server/progress.d.ts +16 -0
- package/dist/server/progress.d.ts.map +1 -0
- package/dist/server/progress.js +235 -0
- package/dist/server/progress.js.map +1 -0
- package/dist/server/progress.todo.test.d.ts +2 -0
- package/dist/server/progress.todo.test.d.ts.map +1 -0
- package/dist/server/progress.todo.test.js +112 -0
- package/dist/server/progress.todo.test.js.map +1 -0
- package/dist/server/python-env.d.ts +28 -0
- package/dist/server/python-env.d.ts.map +1 -0
- package/dist/server/python-env.js +153 -0
- package/dist/server/python-env.js.map +1 -0
- package/dist/server/python-env.test.d.ts +2 -0
- package/dist/server/python-env.test.d.ts.map +1 -0
- package/dist/server/python-env.test.js +202 -0
- package/dist/server/python-env.test.js.map +1 -0
- package/dist/server/quota.d.ts +4 -0
- package/dist/server/quota.d.ts.map +1 -0
- package/dist/server/quota.js +129 -0
- package/dist/server/quota.js.map +1 -0
- package/dist/server/readiness.d.ts +35 -0
- package/dist/server/readiness.d.ts.map +1 -0
- package/dist/server/readiness.js +196 -0
- package/dist/server/readiness.js.map +1 -0
- package/dist/server/readiness.test.d.ts +2 -0
- package/dist/server/readiness.test.d.ts.map +1 -0
- package/dist/server/readiness.test.js +105 -0
- package/dist/server/readiness.test.js.map +1 -0
- package/dist/server/redaction-repair.d.ts +5 -0
- package/dist/server/redaction-repair.d.ts.map +1 -0
- package/dist/server/redaction-repair.js +122 -0
- package/dist/server/redaction-repair.js.map +1 -0
- package/dist/server/rpc-session.d.ts +64 -0
- package/dist/server/rpc-session.d.ts.map +1 -0
- package/dist/server/rpc-session.js +609 -0
- package/dist/server/rpc-session.js.map +1 -0
- package/dist/server/rpc-session.test.d.ts +2 -0
- package/dist/server/rpc-session.test.d.ts.map +1 -0
- package/dist/server/rpc-session.test.js +803 -0
- package/dist/server/rpc-session.test.js.map +1 -0
- package/dist/server/settings-catalog.d.ts +16 -0
- package/dist/server/settings-catalog.d.ts.map +1 -0
- package/dist/server/settings-catalog.js +86 -0
- package/dist/server/settings-catalog.js.map +1 -0
- package/dist/server/settings-catalog.test.d.ts +2 -0
- package/dist/server/settings-catalog.test.d.ts.map +1 -0
- package/dist/server/settings-catalog.test.js +41 -0
- package/dist/server/settings-catalog.test.js.map +1 -0
- package/dist/server/settings-overlay.d.ts +22 -0
- package/dist/server/settings-overlay.d.ts.map +1 -0
- package/dist/server/settings-overlay.js +131 -0
- package/dist/server/settings-overlay.js.map +1 -0
- package/dist/server/settings-overlay.test.d.ts +2 -0
- package/dist/server/settings-overlay.test.d.ts.map +1 -0
- package/dist/server/settings-overlay.test.js +134 -0
- package/dist/server/settings-overlay.test.js.map +1 -0
- package/dist/server/skills.d.ts +5 -0
- package/dist/server/skills.d.ts.map +1 -0
- package/dist/server/skills.js +111 -0
- package/dist/server/skills.js.map +1 -0
- package/dist/server/skills.test.d.ts +2 -0
- package/dist/server/skills.test.d.ts.map +1 -0
- package/dist/server/skills.test.js +65 -0
- package/dist/server/skills.test.js.map +1 -0
- package/dist/server/test.d.ts +3 -0
- package/dist/server/test.d.ts.map +1 -0
- package/dist/server/test.js +446 -0
- package/dist/server/test.js.map +1 -0
- package/dist/server/tool-guard.d.ts +22 -0
- package/dist/server/tool-guard.d.ts.map +1 -0
- package/dist/server/tool-guard.js +101 -0
- package/dist/server/tool-guard.js.map +1 -0
- package/dist/server/tool-guard.test.d.ts +2 -0
- package/dist/server/tool-guard.test.d.ts.map +1 -0
- package/dist/server/tool-guard.test.js +152 -0
- package/dist/server/tool-guard.test.js.map +1 -0
- package/dist/ui/index.d.ts +2 -0
- package/dist/ui/index.d.ts.map +1 -0
- package/dist/ui/index.js +2 -0
- package/dist/ui/index.js.map +1 -0
- package/dist/ui/parse-stdout.d.ts +4 -0
- package/dist/ui/parse-stdout.d.ts.map +1 -0
- package/dist/ui/parse-stdout.js +493 -0
- package/dist/ui/parse-stdout.js.map +1 -0
- package/dist/ui/parse-stdout.test.d.ts +2 -0
- package/dist/ui/parse-stdout.test.d.ts.map +1 -0
- package/dist/ui/parse-stdout.test.js +107 -0
- package/dist/ui/parse-stdout.test.js.map +1 -0
- package/package.json +56 -10
- package/README.md +0 -8
- package/index.js +0 -1
|
@@ -0,0 +1,193 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
import { parse as parseYaml } from "yaml";
|
|
6
|
+
vi.mock("@tickernelz/wardmote-adapter-utils/execution-target", async (importOriginal) => {
|
|
7
|
+
const actual = (await importOriginal());
|
|
8
|
+
return { ...actual, runAdapterExecutionTargetProcess: vi.fn() };
|
|
9
|
+
});
|
|
10
|
+
import { execute } from "./execute.js";
|
|
11
|
+
import { buildOmpSettingsOverlay, renderOmpSettingsOverlay } from "./settings-overlay.js";
|
|
12
|
+
import { runAdapterExecutionTargetProcess } from "@tickernelz/wardmote-adapter-utils/execution-target";
|
|
13
|
+
const runProcessMock = vi.mocked(runAdapterExecutionTargetProcess);
|
|
14
|
+
describe("OMP local toggle overlay", () => {
|
|
15
|
+
let root;
|
|
16
|
+
let commandPath;
|
|
17
|
+
let workspaceCwd;
|
|
18
|
+
let captured;
|
|
19
|
+
beforeEach(async () => {
|
|
20
|
+
root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-omp-toggles-"));
|
|
21
|
+
workspaceCwd = path.join(root, "workspace");
|
|
22
|
+
commandPath = path.join(root, "fake-omp");
|
|
23
|
+
await fs.mkdir(workspaceCwd, { recursive: true });
|
|
24
|
+
await fs.writeFile(commandPath, "#!/bin/sh\nexit 0\n", "utf8");
|
|
25
|
+
await fs.chmod(commandPath, 0o755);
|
|
26
|
+
captured = null;
|
|
27
|
+
runProcessMock.mockReset();
|
|
28
|
+
runProcessMock.mockImplementation((async (_runId, _target, _command, args, options) => {
|
|
29
|
+
const index = args.indexOf("--config");
|
|
30
|
+
const overlayPath = index >= 0 ? (args[index + 1] ?? null) : null;
|
|
31
|
+
let overlay = null;
|
|
32
|
+
if (overlayPath) {
|
|
33
|
+
overlay = parseYaml(await fs.readFile(overlayPath, "utf8"));
|
|
34
|
+
}
|
|
35
|
+
captured = { args, env: options.env, overlayPath, overlay };
|
|
36
|
+
return {
|
|
37
|
+
exitCode: 0,
|
|
38
|
+
signal: null,
|
|
39
|
+
timedOut: false,
|
|
40
|
+
stdout: "",
|
|
41
|
+
stderr: "",
|
|
42
|
+
pid: 4321,
|
|
43
|
+
startedAt: new Date().toISOString(),
|
|
44
|
+
};
|
|
45
|
+
}));
|
|
46
|
+
});
|
|
47
|
+
afterEach(async () => {
|
|
48
|
+
await fs.rm(root, { recursive: true, force: true });
|
|
49
|
+
});
|
|
50
|
+
async function run(config) {
|
|
51
|
+
await execute({
|
|
52
|
+
runId: "run-toggles",
|
|
53
|
+
agent: {
|
|
54
|
+
id: "agent-1",
|
|
55
|
+
companyId: "company-1",
|
|
56
|
+
name: "OMP",
|
|
57
|
+
adapterType: "omp_local",
|
|
58
|
+
adapterConfig: {},
|
|
59
|
+
},
|
|
60
|
+
runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },
|
|
61
|
+
config: { command: commandPath, noSession: true, cwd: workspaceCwd, ...config },
|
|
62
|
+
context: {},
|
|
63
|
+
onLog: async () => { },
|
|
64
|
+
});
|
|
65
|
+
expect(captured).not.toBeNull();
|
|
66
|
+
return captured;
|
|
67
|
+
}
|
|
68
|
+
it("pins every settings-backed toggle off by default instead of inheriting the global config", async () => {
|
|
69
|
+
const invocation = await run({});
|
|
70
|
+
expect(invocation.overlayPath).toBeTruthy();
|
|
71
|
+
expect(invocation.overlay).toEqual({
|
|
72
|
+
advisor: { enabled: false },
|
|
73
|
+
prewalk: { enabled: false },
|
|
74
|
+
lsp: { enabled: true },
|
|
75
|
+
skills: { enabled: true },
|
|
76
|
+
task: { maxRecursionDepth: 0 },
|
|
77
|
+
compaction: { experimentalContextManagement: true },
|
|
78
|
+
omitThinking: false,
|
|
79
|
+
});
|
|
80
|
+
expect(invocation.args).not.toContain("--advisor");
|
|
81
|
+
});
|
|
82
|
+
it("pins the advisor on and still passes the explicit flag", async () => {
|
|
83
|
+
const invocation = await run({ advisor: true });
|
|
84
|
+
expect(invocation.overlay?.advisor).toEqual({ enabled: true });
|
|
85
|
+
expect(invocation.args).toContain("--advisor");
|
|
86
|
+
});
|
|
87
|
+
it("pins lsp and skills off alongside their disabling flags", async () => {
|
|
88
|
+
const invocation = await run({ noLsp: true, noSkills: true });
|
|
89
|
+
expect(invocation.overlay?.lsp).toEqual({ enabled: false });
|
|
90
|
+
expect(invocation.overlay?.skills).toEqual({ enabled: false });
|
|
91
|
+
expect(invocation.args).toContain("--no-lsp");
|
|
92
|
+
expect(invocation.args).toContain("--no-skills");
|
|
93
|
+
});
|
|
94
|
+
it("pins prewalk on when enabled and off when explicitly disabled", async () => {
|
|
95
|
+
const enabled = await run({ prewalk: true });
|
|
96
|
+
expect(enabled.overlay?.prewalk).toEqual({ enabled: true });
|
|
97
|
+
expect(enabled.args).toContain("--prewalk");
|
|
98
|
+
const disabled = await run({ prewalk: true, noPrewalk: true });
|
|
99
|
+
expect(disabled.overlay?.prewalk).toEqual({ enabled: false });
|
|
100
|
+
expect(disabled.args).toContain("--no-prewalk");
|
|
101
|
+
expect(disabled.args).not.toContain("--prewalk");
|
|
102
|
+
});
|
|
103
|
+
it("hands OMP notes-backed context windows on by default and off when the agent opts out", async () => {
|
|
104
|
+
expect((await run({})).overlay?.compaction).toEqual({ experimentalContextManagement: true });
|
|
105
|
+
expect((await run({ experimentalContextManagement: false })).overlay?.compaction).toEqual({
|
|
106
|
+
experimentalContextManagement: false,
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
it("keeps user config overlays ahead of the generated overlay", async () => {
|
|
110
|
+
const userOverlay = path.join(root, "user.yml");
|
|
111
|
+
await fs.writeFile(userOverlay, "advisor:\n enabled: true\n", "utf8");
|
|
112
|
+
const invocation = await run({ configFiles: userOverlay });
|
|
113
|
+
const positions = invocation.args
|
|
114
|
+
.map((value, index) => ({ value, index }))
|
|
115
|
+
.filter((entry) => entry.value === "--config")
|
|
116
|
+
.map((entry) => entry.index);
|
|
117
|
+
expect(positions).toHaveLength(2);
|
|
118
|
+
expect(invocation.args[positions[0] + 1]).toBe(invocation.overlayPath);
|
|
119
|
+
expect(invocation.args[positions[1] + 1]).toBe(userOverlay);
|
|
120
|
+
});
|
|
121
|
+
it("zeroes OMP task recursion in the overlay handed to the run regardless of adapter config", async () => {
|
|
122
|
+
for (const config of [{}, { task: { maxRecursionDepth: 5 } }, { tools: "read,bash" }]) {
|
|
123
|
+
const invocation = await run(config);
|
|
124
|
+
expect(invocation.overlayPath).toBeTruthy();
|
|
125
|
+
expect(invocation.overlay?.task).toEqual({ maxRecursionDepth: 0 });
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
it("renders task.maxRecursionDepth into the overlay yaml OMP actually parses", () => {
|
|
129
|
+
expect(parseYaml(renderOmpSettingsOverlay({}))).toEqual({
|
|
130
|
+
advisor: { enabled: false },
|
|
131
|
+
prewalk: { enabled: false },
|
|
132
|
+
lsp: { enabled: true },
|
|
133
|
+
skills: { enabled: true },
|
|
134
|
+
task: { maxRecursionDepth: 0 },
|
|
135
|
+
compaction: { experimentalContextManagement: true },
|
|
136
|
+
omitThinking: false,
|
|
137
|
+
});
|
|
138
|
+
});
|
|
139
|
+
it("mirrors the thinking toggle into the setting RPC mode actually honours", async () => {
|
|
140
|
+
expect((await run({})).overlay?.omitThinking).toBe(false);
|
|
141
|
+
expect((await run({ printThoughts: false })).overlay?.omitThinking).toBe(true);
|
|
142
|
+
});
|
|
143
|
+
it("removes the generated overlay once the run finishes", async () => {
|
|
144
|
+
const invocation = await run({});
|
|
145
|
+
await expect(fs.access(invocation.overlayPath)).rejects.toThrow();
|
|
146
|
+
});
|
|
147
|
+
it("pins the pty and title environment instead of inheriting it", async () => {
|
|
148
|
+
process.env.PI_NO_PTY = "1";
|
|
149
|
+
process.env.PI_NO_TITLE = "1";
|
|
150
|
+
try {
|
|
151
|
+
const inherited = await run({ noPty: false, noTitle: false });
|
|
152
|
+
expect(inherited.env.PI_NO_PTY).toBeUndefined();
|
|
153
|
+
expect(inherited.env.PI_NO_TITLE).toBeUndefined();
|
|
154
|
+
const disabled = await run({ noPty: true, noTitle: true });
|
|
155
|
+
expect(disabled.env.PI_NO_PTY).toBe("1");
|
|
156
|
+
expect(disabled.env.PI_NO_TITLE).toBe("1");
|
|
157
|
+
}
|
|
158
|
+
finally {
|
|
159
|
+
delete process.env.PI_NO_PTY;
|
|
160
|
+
delete process.env.PI_NO_TITLE;
|
|
161
|
+
}
|
|
162
|
+
});
|
|
163
|
+
it("makes OMP wait for its MCP servers before the first prompt even when the host sets a window", async () => {
|
|
164
|
+
process.env.OMP_MCP_STARTUP_TIMEOUT_MS = "250";
|
|
165
|
+
try {
|
|
166
|
+
expect((await run({})).env.OMP_MCP_STARTUP_TIMEOUT_MS).toBe("0");
|
|
167
|
+
}
|
|
168
|
+
finally {
|
|
169
|
+
delete process.env.OMP_MCP_STARTUP_TIMEOUT_MS;
|
|
170
|
+
}
|
|
171
|
+
});
|
|
172
|
+
it("maps every toggle to an explicit boolean in the overlay payload", () => {
|
|
173
|
+
expect(buildOmpSettingsOverlay({})).toEqual({
|
|
174
|
+
advisor: { enabled: false },
|
|
175
|
+
prewalk: { enabled: false },
|
|
176
|
+
lsp: { enabled: true },
|
|
177
|
+
skills: { enabled: true },
|
|
178
|
+
task: { maxRecursionDepth: 0 },
|
|
179
|
+
compaction: { experimentalContextManagement: true },
|
|
180
|
+
omitThinking: false,
|
|
181
|
+
});
|
|
182
|
+
expect(buildOmpSettingsOverlay({ advisor: true, noLsp: true, noSkills: true, prewalk: true })).toEqual({
|
|
183
|
+
advisor: { enabled: true },
|
|
184
|
+
prewalk: { enabled: true },
|
|
185
|
+
lsp: { enabled: false },
|
|
186
|
+
skills: { enabled: false },
|
|
187
|
+
task: { maxRecursionDepth: 0 },
|
|
188
|
+
compaction: { experimentalContextManagement: true },
|
|
189
|
+
omitThinking: false,
|
|
190
|
+
});
|
|
191
|
+
});
|
|
192
|
+
});
|
|
193
|
+
//# sourceMappingURL=execute.toggles.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execute.toggles.test.js","sourceRoot":"","sources":["../../src/server/execute.toggles.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execute.transport.test.d.ts","sourceRoot":"","sources":["../../src/server/execute.transport.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,159 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
vi.mock("@tickernelz/wardmote-adapter-utils/execution-target", async (importOriginal) => {
|
|
6
|
+
const actual = (await importOriginal());
|
|
7
|
+
return { ...actual, runAdapterExecutionTargetProcess: vi.fn() };
|
|
8
|
+
});
|
|
9
|
+
import { execute } from "./execute.js";
|
|
10
|
+
import { runAdapterExecutionTargetProcess } from "@tickernelz/wardmote-adapter-utils/execution-target";
|
|
11
|
+
const runProcessMock = vi.mocked(runAdapterExecutionTargetProcess);
|
|
12
|
+
describe("OMP local transport selection", () => {
|
|
13
|
+
let root;
|
|
14
|
+
let commandPath;
|
|
15
|
+
let workspaceCwd;
|
|
16
|
+
let captured;
|
|
17
|
+
beforeEach(async () => {
|
|
18
|
+
root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-omp-transport-"));
|
|
19
|
+
workspaceCwd = path.join(root, "workspace");
|
|
20
|
+
commandPath = path.join(root, "fake-omp");
|
|
21
|
+
await fs.mkdir(workspaceCwd, { recursive: true });
|
|
22
|
+
await fs.writeFile(commandPath, "#!/bin/sh\nexit 0\n", "utf8");
|
|
23
|
+
await fs.chmod(commandPath, 0o755);
|
|
24
|
+
captured = null;
|
|
25
|
+
runProcessMock.mockReset();
|
|
26
|
+
runProcessMock.mockImplementation((async (_runId, target, _command, args) => {
|
|
27
|
+
captured = { args, target };
|
|
28
|
+
return {
|
|
29
|
+
exitCode: 0,
|
|
30
|
+
signal: null,
|
|
31
|
+
timedOut: false,
|
|
32
|
+
stdout: "",
|
|
33
|
+
stderr: "",
|
|
34
|
+
pid: 4321,
|
|
35
|
+
startedAt: new Date().toISOString(),
|
|
36
|
+
};
|
|
37
|
+
}));
|
|
38
|
+
});
|
|
39
|
+
afterEach(async () => {
|
|
40
|
+
await fs.rm(root, { recursive: true, force: true });
|
|
41
|
+
});
|
|
42
|
+
async function run(config, executionTarget) {
|
|
43
|
+
await execute({
|
|
44
|
+
runId: "run-transport",
|
|
45
|
+
agent: {
|
|
46
|
+
id: "agent-1",
|
|
47
|
+
companyId: "company-1",
|
|
48
|
+
name: "OMP",
|
|
49
|
+
adapterType: "omp_local",
|
|
50
|
+
adapterConfig: {},
|
|
51
|
+
},
|
|
52
|
+
runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },
|
|
53
|
+
config: { command: commandPath, noSession: true, cwd: workspaceCwd, ...config },
|
|
54
|
+
context: {},
|
|
55
|
+
...(executionTarget ? { executionTarget } : {}),
|
|
56
|
+
onLog: async () => { },
|
|
57
|
+
});
|
|
58
|
+
expect(captured).not.toBeNull();
|
|
59
|
+
return captured;
|
|
60
|
+
}
|
|
61
|
+
it("runs OMP in RPC mode by default and keeps the prompt out of argv", async () => {
|
|
62
|
+
const invocation = await run({});
|
|
63
|
+
expect(invocation.args).toContain("--mode");
|
|
64
|
+
expect(invocation.args[invocation.args.indexOf("--mode") + 1]).toBe("rpc");
|
|
65
|
+
expect(invocation.args).not.toContain("-p");
|
|
66
|
+
expect(invocation.args).not.toContain("json");
|
|
67
|
+
});
|
|
68
|
+
it("returns to one-shot print mode when rpcSteering is disabled", async () => {
|
|
69
|
+
const invocation = await run({ rpcSteering: false });
|
|
70
|
+
expect(invocation.args[invocation.args.indexOf("--mode") + 1]).toBe("json");
|
|
71
|
+
expect(invocation.args).toContain("-p");
|
|
72
|
+
expect(invocation.args.at(-1)).toContain("Paperclip");
|
|
73
|
+
});
|
|
74
|
+
it("keeps a verbose tool call from pushing resultJson past the safe-result budget", async () => {
|
|
75
|
+
const huge = "y".repeat(200_000);
|
|
76
|
+
runProcessMock.mockImplementation((async (_runId, _target, _command, _args, options) => {
|
|
77
|
+
await options.onLog("stdout", `${JSON.stringify({ type: "tool_execution_start", toolCallId: "t1", toolName: "bash", args: { command: "echo hi" } })}\n`);
|
|
78
|
+
await options.onLog("stdout", `${JSON.stringify({ type: "tool_execution_end", toolCallId: "t1", result: huge, isError: false })}\n`);
|
|
79
|
+
return {
|
|
80
|
+
exitCode: 0,
|
|
81
|
+
signal: null,
|
|
82
|
+
timedOut: false,
|
|
83
|
+
stdout: huge,
|
|
84
|
+
stderr: "",
|
|
85
|
+
pid: 4321,
|
|
86
|
+
startedAt: new Date().toISOString(),
|
|
87
|
+
};
|
|
88
|
+
}));
|
|
89
|
+
const result = await execute({
|
|
90
|
+
runId: "run-transport",
|
|
91
|
+
agent: { id: "agent-1", companyId: "company-1", name: "OMP", adapterType: "omp_local", adapterConfig: {} },
|
|
92
|
+
runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },
|
|
93
|
+
config: { command: commandPath, noSession: true, cwd: workspaceCwd, rpcSteering: false },
|
|
94
|
+
context: {},
|
|
95
|
+
onLog: async () => { },
|
|
96
|
+
});
|
|
97
|
+
const calls = (result.resultJson?.toolCalls ?? []);
|
|
98
|
+
expect(calls).toHaveLength(1);
|
|
99
|
+
expect(calls[0].toolName).toBe("bash");
|
|
100
|
+
expect(String(calls[0].result).length).toBeLessThanOrEqual(4096);
|
|
101
|
+
expect(Buffer.byteLength(JSON.stringify(result.resultJson ?? {}), "utf8")).toBeLessThan(64 * 1024);
|
|
102
|
+
});
|
|
103
|
+
it("keeps a verbose RPC run inside the result budget and retains ompTransport", async () => {
|
|
104
|
+
const blob = "z".repeat(40_000);
|
|
105
|
+
const sink = {
|
|
106
|
+
on: () => { },
|
|
107
|
+
write: (_data, cb) => cb(),
|
|
108
|
+
end: () => { },
|
|
109
|
+
};
|
|
110
|
+
runProcessMock.mockImplementation((async (_runId, _target, _command, _args, options) => {
|
|
111
|
+
options.liveStdin?.bind(sink);
|
|
112
|
+
const emit = (frame) => options.onLog("stdout", `${JSON.stringify(frame)}\n`);
|
|
113
|
+
await emit({
|
|
114
|
+
type: "ready",
|
|
115
|
+
protocolVersion: 1,
|
|
116
|
+
supportedProtocolVersions: [1, 2],
|
|
117
|
+
maxFrameBytes: 1048576,
|
|
118
|
+
maxReassembledFrameBytes: 67108864,
|
|
119
|
+
});
|
|
120
|
+
await emit({ id: "negotiate-1", type: "response", command: "negotiate_protocol", success: true });
|
|
121
|
+
await emit({ id: "state-1", type: "response", command: "get_state", success: true, data: { sessionId: "s-1" } });
|
|
122
|
+
await emit({ id: "prompt-1", type: "response", command: "prompt", success: true });
|
|
123
|
+
for (let index = 0; index < 40; index += 1) {
|
|
124
|
+
await emit({
|
|
125
|
+
type: "message_update",
|
|
126
|
+
message: { role: "assistant", content: [{ type: "text", text: blob }] },
|
|
127
|
+
assistantMessageEvent: { type: "text_delta", delta: blob, partial: { content: [{ type: "text", text: blob }] } },
|
|
128
|
+
});
|
|
129
|
+
}
|
|
130
|
+
await emit({ type: "message_end", message: { role: "assistant", content: [{ type: "text", text: "done" }] } });
|
|
131
|
+
await emit({ type: "agent_end", isTerminal: true, messages: [] });
|
|
132
|
+
return {
|
|
133
|
+
exitCode: 0,
|
|
134
|
+
signal: null,
|
|
135
|
+
timedOut: false,
|
|
136
|
+
stdout: blob.repeat(10),
|
|
137
|
+
stderr: "",
|
|
138
|
+
pid: 4321,
|
|
139
|
+
startedAt: new Date().toISOString(),
|
|
140
|
+
};
|
|
141
|
+
}));
|
|
142
|
+
const result = await execute({
|
|
143
|
+
runId: "run-transport",
|
|
144
|
+
agent: { id: "agent-1", companyId: "company-1", name: "OMP", adapterType: "omp_local", adapterConfig: {} },
|
|
145
|
+
runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },
|
|
146
|
+
config: { command: commandPath, noSession: true, cwd: workspaceCwd },
|
|
147
|
+
context: {},
|
|
148
|
+
onLog: async () => { },
|
|
149
|
+
});
|
|
150
|
+
const resultJson = (result.resultJson ?? {});
|
|
151
|
+
expect(resultJson.ompTransport).toEqual({ mode: "rpc", protocolVersion: 2 });
|
|
152
|
+
expect(String(resultJson.stdout ?? "").length).toBeLessThanOrEqual(16 * 1024);
|
|
153
|
+
expect(String(resultJson.stdout ?? "")).not.toContain("partial");
|
|
154
|
+
expect(resultJson.truncationReason).toBeUndefined();
|
|
155
|
+
expect(resultJson.originalSizeBytes).toBeUndefined();
|
|
156
|
+
expect(Buffer.byteLength(JSON.stringify(resultJson), "utf8")).toBeLessThan(64 * 1024);
|
|
157
|
+
});
|
|
158
|
+
});
|
|
159
|
+
//# sourceMappingURL=execute.transport.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execute.transport.test.js","sourceRoot":"","sources":["../../src/server/execute.transport.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execute.usage-checkpoint.test.d.ts","sourceRoot":"","sources":["../../src/server/execute.usage-checkpoint.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,92 @@
|
|
|
1
|
+
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
2
|
+
import fs from "node:fs/promises";
|
|
3
|
+
import os from "node:os";
|
|
4
|
+
import path from "node:path";
|
|
5
|
+
vi.mock("@tickernelz/wardmote-adapter-utils/execution-target", async (importOriginal) => {
|
|
6
|
+
const actual = (await importOriginal());
|
|
7
|
+
return { ...actual, runAdapterExecutionTargetProcess: vi.fn() };
|
|
8
|
+
});
|
|
9
|
+
import { execute } from "./execute.js";
|
|
10
|
+
import { runAdapterExecutionTargetProcess } from "@tickernelz/wardmote-adapter-utils/execution-target";
|
|
11
|
+
const runProcessMock = vi.mocked(runAdapterExecutionTargetProcess);
|
|
12
|
+
function usageLine(usage) {
|
|
13
|
+
return JSON.stringify({ type: "turn_end", message: { role: "assistant", provider: "tiprouter", model: "m", content: [], ...(usage ? { usage } : {}) } }) + "\n";
|
|
14
|
+
}
|
|
15
|
+
function terminalLines(usage) {
|
|
16
|
+
return usageLine(usage) + JSON.stringify({ type: "agent_end", messages: [] }) + "\n";
|
|
17
|
+
}
|
|
18
|
+
function processResult(overrides = {}) {
|
|
19
|
+
return {
|
|
20
|
+
exitCode: 0,
|
|
21
|
+
signal: null,
|
|
22
|
+
timedOut: false,
|
|
23
|
+
stdout: "",
|
|
24
|
+
stderr: "",
|
|
25
|
+
pid: 4321,
|
|
26
|
+
startedAt: new Date().toISOString(),
|
|
27
|
+
...overrides,
|
|
28
|
+
};
|
|
29
|
+
}
|
|
30
|
+
describe("OMP local usage checkpoint", () => {
|
|
31
|
+
let root;
|
|
32
|
+
let commandPath;
|
|
33
|
+
let receipts;
|
|
34
|
+
beforeEach(async () => {
|
|
35
|
+
root = await fs.mkdtemp(path.join(os.tmpdir(), "paperclip-omp-usage-"));
|
|
36
|
+
commandPath = path.join(root, "fake-omp");
|
|
37
|
+
await fs.writeFile(commandPath, "#!/bin/sh\nexit 0\n", "utf8");
|
|
38
|
+
await fs.chmod(commandPath, 0o755);
|
|
39
|
+
receipts = [];
|
|
40
|
+
runProcessMock.mockReset();
|
|
41
|
+
});
|
|
42
|
+
afterEach(async () => {
|
|
43
|
+
await fs.rm(root, { recursive: true, force: true });
|
|
44
|
+
});
|
|
45
|
+
async function run(overrides, rpcSteering = false) {
|
|
46
|
+
await execute({
|
|
47
|
+
runId: "run-usage",
|
|
48
|
+
agent: { id: "agent-1", companyId: "company-1", name: "OMP", adapterType: "omp_local", adapterConfig: {} },
|
|
49
|
+
runtime: { sessionId: null, sessionParams: null, sessionDisplayId: null, taskKey: null },
|
|
50
|
+
config: { command: commandPath, cwd: root, noSession: true, rpcSteering, ...overrides },
|
|
51
|
+
context: {},
|
|
52
|
+
onLog: async () => { },
|
|
53
|
+
onUsage: async (receipt) => { receipts.push(receipt); },
|
|
54
|
+
});
|
|
55
|
+
return receipts;
|
|
56
|
+
}
|
|
57
|
+
function stdoutWith(withUsage) {
|
|
58
|
+
return async (...args) => {
|
|
59
|
+
const options = args[4];
|
|
60
|
+
await options.onLog("stdout", terminalLines(withUsage ? { inputTokens: 10, outputTokens: 3, cachedInputTokens: 2, costUsd: 0.25 } : null));
|
|
61
|
+
return processResult({ stdout: "" });
|
|
62
|
+
};
|
|
63
|
+
}
|
|
64
|
+
it("checkpoints usage from the print-mode transport", async () => {
|
|
65
|
+
runProcessMock.mockImplementation(stdoutWith(true));
|
|
66
|
+
const received = await run({});
|
|
67
|
+
expect(received.length).toBeGreaterThan(0);
|
|
68
|
+
const last = received[received.length - 1];
|
|
69
|
+
expect(last.usage).toEqual({ inputTokens: 10, outputTokens: 3, cachedInputTokens: 2 });
|
|
70
|
+
expect(last.costUsd).toBe(0.25);
|
|
71
|
+
expect(last.usageBasis).toBe("per_run");
|
|
72
|
+
expect(last.biller).toBe("tiprouter");
|
|
73
|
+
expect(last.attemptId).toBeTruthy();
|
|
74
|
+
expect(last.costStatus).toBeUndefined();
|
|
75
|
+
expect(last.complete).toBe(true);
|
|
76
|
+
});
|
|
77
|
+
it("checkpoints usage from the RPC transport", async () => {
|
|
78
|
+
runProcessMock.mockImplementation(stdoutWith(true));
|
|
79
|
+
const received = await run({}, true);
|
|
80
|
+
expect(received.length).toBeGreaterThan(0);
|
|
81
|
+
expect(received[received.length - 1].usage).toEqual({ inputTokens: 10, outputTokens: 3, cachedInputTokens: 2 });
|
|
82
|
+
});
|
|
83
|
+
it("marks a run with no reported usage unpriced instead of a zero-cost success", async () => {
|
|
84
|
+
runProcessMock.mockImplementation(stdoutWith(false));
|
|
85
|
+
const received = await run({});
|
|
86
|
+
const last = received[received.length - 1];
|
|
87
|
+
expect(last.usage).toBeUndefined();
|
|
88
|
+
expect(last.costStatus).toBe("unpriced");
|
|
89
|
+
expect(last.complete).toBe(false);
|
|
90
|
+
});
|
|
91
|
+
});
|
|
92
|
+
//# sourceMappingURL=execute.usage-checkpoint.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"execute.usage-checkpoint.test.js","sourceRoot":"","sources":["../../src/server/execute.usage-checkpoint.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import type { AdapterExecutionResult } from "@tickernelz/wardmote-adapter-utils";
|
|
2
|
+
type AdapterExecutionErrorFamily = NonNullable<AdapterExecutionResult["errorFamily"]>;
|
|
3
|
+
export interface OmpFailureClassification {
|
|
4
|
+
errorCode: string | null;
|
|
5
|
+
errorFamily: AdapterExecutionErrorFamily | null;
|
|
6
|
+
retryNotBefore: string | null;
|
|
7
|
+
}
|
|
8
|
+
export type OmpFallbackReason = "rate_limit" | "upstream" | "refusal";
|
|
9
|
+
/** Maps the error that made OMP switch models onto the fallback reason shown to operators. */
|
|
10
|
+
export declare function classifyFallbackReason(text: string): OmpFallbackReason;
|
|
11
|
+
/** Provider-requested wait parsed from an error message, in milliseconds. */
|
|
12
|
+
export declare function retryDelayMsFromText(text: string): number | null;
|
|
13
|
+
/** Map OMP failure text onto Paperclip's retry vocabulary. */
|
|
14
|
+
export declare function classifyOmpFailure(input: {
|
|
15
|
+
parsedError: string;
|
|
16
|
+
stderr: string;
|
|
17
|
+
timedOut: boolean;
|
|
18
|
+
exitCode: number;
|
|
19
|
+
signal: string | null;
|
|
20
|
+
}): OmpFailureClassification;
|
|
21
|
+
export {};
|
|
22
|
+
//# sourceMappingURL=failure.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"failure.d.ts","sourceRoot":"","sources":["../../src/server/failure.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oCAAoC,CAAC;AAEjF,KAAK,2BAA2B,GAAG,WAAW,CAAC,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAC;AAEtF,MAAM,WAAW,wBAAwB;IACvC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,WAAW,EAAE,2BAA2B,GAAG,IAAI,CAAC;IAChD,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAgBD,MAAM,MAAM,iBAAiB,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAEtE,8FAA8F;AAC9F,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,CAItE;AAED,6EAA6E;AAC7E,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGhE;AAiCD,8DAA8D;AAC9D,wBAAgB,kBAAkB,CAAC,KAAK,EAAE;IACxC,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;CACvB,GAAG,wBAAwB,CAiC3B"}
|
|
@@ -0,0 +1,99 @@
|
|
|
1
|
+
const QUOTA_RE = /\b(rate[_ -]?limit|quota|too many requests|429|usage limit|insufficient[_ -]?quota|credit balance|out of credits|insufficient (?:credit|balance|funds)|credit insufficient)\b/i;
|
|
2
|
+
const TRANSIENT_RE = /\b(overloaded|server error|internal error|service unavailable|bad gateway|gateway timeout|50[0234]|econnreset|etimedout|econnrefused|enotfound|socket hang up|stream (?:closed|error)|temporarily unavailable)\b/i;
|
|
3
|
+
const REFUSAL_RE = /\b(refus(?:al|ed)|cannot assist|can't assist|content policy|safety (?:policy|filter)|blocked by (?:the )?provider)\b/i;
|
|
4
|
+
const REFRESH_REUSED_RE = /\brefresh token (?:was )?(?:already used|reused|rotation)\b/i;
|
|
5
|
+
const REFRESH_EXPIRED_RE = /\brefresh token (?:has )?expired\b/i;
|
|
6
|
+
const REFRESH_INVALID_RE = /\brefresh token (?:is )?(?:invalid|revoked|invalidated)\b/i;
|
|
7
|
+
const AGENT_START_POLICY_CHANGED_RE = /\bsystem prompt changed repeatedly during before_agent_start\b/i;
|
|
8
|
+
const RETRY_AFTER_SECONDS_RE = /\bretry[- ]?after["':\s]+(\d+(?:\.\d+)?)\b/i;
|
|
9
|
+
const RETRY_IN_RE = /\btry again in (\d+(?:\.\d+)?)\s*(ms|milliseconds?|s|seconds?|m|minutes?|h|hours?)\b/i;
|
|
10
|
+
const RETRY_AT_RE = /\bresets? at (\d{4}-\d{2}-\d{2}T[\d:.]+Z)\b/i;
|
|
11
|
+
const REQUESTED_WAIT_RE = /\bprovider requested (\d+)\s*ms wait\b/i;
|
|
12
|
+
const RETRY_AFTER_MS_RE = /\bretry-after-ms\s*[:=]\s*(\d+)\b/i;
|
|
13
|
+
/** Maps the error that made OMP switch models onto the fallback reason shown to operators. */
|
|
14
|
+
export function classifyFallbackReason(text) {
|
|
15
|
+
if (QUOTA_RE.test(text))
|
|
16
|
+
return "rate_limit";
|
|
17
|
+
if (REFUSAL_RE.test(text) && !TRANSIENT_RE.test(text))
|
|
18
|
+
return "refusal";
|
|
19
|
+
return "upstream";
|
|
20
|
+
}
|
|
21
|
+
/** Provider-requested wait parsed from an error message, in milliseconds. */
|
|
22
|
+
export function retryDelayMsFromText(text) {
|
|
23
|
+
const delay = retryDelayMs(text);
|
|
24
|
+
return delay !== null && Number.isFinite(delay) && delay > 0 ? Math.min(delay, 24 * 3_600_000) : null;
|
|
25
|
+
}
|
|
26
|
+
function retryDelayMs(text) {
|
|
27
|
+
const requested = REQUESTED_WAIT_RE.exec(text)?.[1];
|
|
28
|
+
if (requested)
|
|
29
|
+
return Number(requested);
|
|
30
|
+
const afterMs = RETRY_AFTER_MS_RE.exec(text)?.[1];
|
|
31
|
+
if (afterMs)
|
|
32
|
+
return Number(afterMs);
|
|
33
|
+
const after = RETRY_AFTER_SECONDS_RE.exec(text)?.[1];
|
|
34
|
+
if (after)
|
|
35
|
+
return Number(after) * 1000;
|
|
36
|
+
const relative = RETRY_IN_RE.exec(text);
|
|
37
|
+
const amount = relative?.[1];
|
|
38
|
+
const rawUnit = relative?.[2];
|
|
39
|
+
if (!amount || !rawUnit)
|
|
40
|
+
return null;
|
|
41
|
+
const value = Number(amount);
|
|
42
|
+
const unit = rawUnit.toLowerCase();
|
|
43
|
+
if (unit.startsWith("ms") || unit.startsWith("milli"))
|
|
44
|
+
return value;
|
|
45
|
+
if (unit.startsWith("s"))
|
|
46
|
+
return value * 1000;
|
|
47
|
+
if (unit.startsWith("m"))
|
|
48
|
+
return value * 60_000;
|
|
49
|
+
return value * 3_600_000;
|
|
50
|
+
}
|
|
51
|
+
function retryNotBefore(text) {
|
|
52
|
+
const absolute = RETRY_AT_RE.exec(text);
|
|
53
|
+
const stamp = absolute?.[1];
|
|
54
|
+
if (stamp) {
|
|
55
|
+
const parsed = new Date(stamp);
|
|
56
|
+
if (!Number.isNaN(parsed.getTime()))
|
|
57
|
+
return parsed.toISOString();
|
|
58
|
+
}
|
|
59
|
+
const delay = retryDelayMs(text);
|
|
60
|
+
if (delay === null || !Number.isFinite(delay) || delay <= 0)
|
|
61
|
+
return null;
|
|
62
|
+
return new Date(Date.now() + Math.min(delay, 24 * 3_600_000)).toISOString();
|
|
63
|
+
}
|
|
64
|
+
/** Map OMP failure text onto Paperclip's retry vocabulary. */
|
|
65
|
+
export function classifyOmpFailure(input) {
|
|
66
|
+
if (input.timedOut) {
|
|
67
|
+
return { errorCode: "omp_timeout", errorFamily: null, retryNotBefore: null };
|
|
68
|
+
}
|
|
69
|
+
const text = `${input.parsedError}\n${input.stderr}`;
|
|
70
|
+
if (REFRESH_REUSED_RE.test(text)) {
|
|
71
|
+
return { errorCode: "omp_refresh_token_reused", errorFamily: "refresh_token_reused", retryNotBefore: null };
|
|
72
|
+
}
|
|
73
|
+
if (REFRESH_EXPIRED_RE.test(text)) {
|
|
74
|
+
return { errorCode: "omp_refresh_token_expired", errorFamily: "refresh_token_expired", retryNotBefore: null };
|
|
75
|
+
}
|
|
76
|
+
if (REFRESH_INVALID_RE.test(text)) {
|
|
77
|
+
return { errorCode: "omp_refresh_token_invalidated", errorFamily: "refresh_token_invalidated", retryNotBefore: null };
|
|
78
|
+
}
|
|
79
|
+
if (QUOTA_RE.test(text)) {
|
|
80
|
+
return { errorCode: "omp_provider_quota", errorFamily: "provider_quota", retryNotBefore: retryNotBefore(text) };
|
|
81
|
+
}
|
|
82
|
+
if (TRANSIENT_RE.test(text)) {
|
|
83
|
+
return { errorCode: "omp_transient_upstream", errorFamily: "transient_upstream", retryNotBefore: retryNotBefore(text) };
|
|
84
|
+
}
|
|
85
|
+
if (AGENT_START_POLICY_CHANGED_RE.test(text)) {
|
|
86
|
+
return { errorCode: "omp_agent_start_policy_changed", errorFamily: "transient_upstream", retryNotBefore: null };
|
|
87
|
+
}
|
|
88
|
+
if (REFUSAL_RE.test(text)) {
|
|
89
|
+
return { errorCode: "omp_model_refusal", errorFamily: "model_refusal", retryNotBefore: null };
|
|
90
|
+
}
|
|
91
|
+
if (input.signal) {
|
|
92
|
+
return { errorCode: `omp_signal_${input.signal.toLowerCase()}`, errorFamily: null, retryNotBefore: null };
|
|
93
|
+
}
|
|
94
|
+
if (input.exitCode !== 0) {
|
|
95
|
+
return { errorCode: `omp_exit_${input.exitCode}`, errorFamily: null, retryNotBefore: null };
|
|
96
|
+
}
|
|
97
|
+
return { errorCode: null, errorFamily: null, retryNotBefore: null };
|
|
98
|
+
}
|
|
99
|
+
//# sourceMappingURL=failure.js.map
|