@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,196 @@
|
|
|
1
|
+
import { execFile } from "node:child_process";
|
|
2
|
+
import { constants as fsConstants } from "node:fs";
|
|
3
|
+
import fs from "node:fs/promises";
|
|
4
|
+
import os from "node:os";
|
|
5
|
+
import path from "node:path";
|
|
6
|
+
import { ensurePathInEnv } from "@tickernelz/wardmote-adapter-utils/server-utils";
|
|
7
|
+
import { parse as parseYaml } from "yaml";
|
|
8
|
+
import { OMP_CONTEXT_MANAGEMENT_MIN_VERSION, ompVersionAtLeast } from "./settings-overlay.js";
|
|
9
|
+
export const OMP_MIN_VERSION = OMP_CONTEXT_MANAGEMENT_MIN_VERSION;
|
|
10
|
+
export const OMP_UPDATE_COMMAND = "omp update";
|
|
11
|
+
export const OMP_BUNDLED_VERSION_ENV = "PAPERCLIP_OMP_BUNDLED_VERSION";
|
|
12
|
+
export function ompInstallCommand(platform = process.platform) {
|
|
13
|
+
return platform === "win32" ? "irm https://omp.sh/install.ps1 | iex" : "curl -fsSL https://omp.sh/install | sh";
|
|
14
|
+
}
|
|
15
|
+
export function bundledOmpVersion(env = process.env) {
|
|
16
|
+
const value = env[OMP_BUNDLED_VERSION_ENV]?.trim();
|
|
17
|
+
return value ? value : null;
|
|
18
|
+
}
|
|
19
|
+
export function parseOmpVersion(output) {
|
|
20
|
+
return /(\d+\.\d+\.\d+)/.exec(output)?.[1] ?? null;
|
|
21
|
+
}
|
|
22
|
+
export function classifyOmpVersion(version) {
|
|
23
|
+
if (!version)
|
|
24
|
+
return "unknown_version";
|
|
25
|
+
return ompVersionAtLeast(version, OMP_MIN_VERSION) ? "ready" : "too_old";
|
|
26
|
+
}
|
|
27
|
+
function executableNames(platform, env) {
|
|
28
|
+
if (platform !== "win32")
|
|
29
|
+
return ["omp"];
|
|
30
|
+
const extensions = (env.PATHEXT ?? ".EXE;.CMD;.BAT").split(";").filter(Boolean);
|
|
31
|
+
return extensions.map((extension) => `omp${extension.toLowerCase()}`);
|
|
32
|
+
}
|
|
33
|
+
async function isExecutableFile(candidate, platform) {
|
|
34
|
+
try {
|
|
35
|
+
const stats = await fs.stat(candidate);
|
|
36
|
+
if (!stats.isFile())
|
|
37
|
+
return false;
|
|
38
|
+
if (platform !== "win32")
|
|
39
|
+
await fs.access(candidate, fsConstants.X_OK);
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
catch {
|
|
43
|
+
return false;
|
|
44
|
+
}
|
|
45
|
+
}
|
|
46
|
+
export async function findOmpExecutables(env = process.env, platform = process.platform) {
|
|
47
|
+
const resolvedEnv = ensurePathInEnv({ ...env });
|
|
48
|
+
const searchPath = resolvedEnv.PATH ?? resolvedEnv.Path ?? "";
|
|
49
|
+
const delimiter = platform === "win32" ? ";" : ":";
|
|
50
|
+
const found = [];
|
|
51
|
+
const seen = new Set();
|
|
52
|
+
for (const directory of searchPath.split(delimiter)) {
|
|
53
|
+
if (!directory)
|
|
54
|
+
continue;
|
|
55
|
+
for (const name of executableNames(platform, resolvedEnv)) {
|
|
56
|
+
const candidate = path.join(directory, name);
|
|
57
|
+
if (!(await isExecutableFile(candidate, platform)))
|
|
58
|
+
continue;
|
|
59
|
+
const real = await fs.realpath(candidate).catch(() => candidate);
|
|
60
|
+
if (seen.has(real))
|
|
61
|
+
continue;
|
|
62
|
+
seen.add(real);
|
|
63
|
+
found.push(candidate);
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
return found;
|
|
67
|
+
}
|
|
68
|
+
export function readOmpVersion(command, env, timeoutMs) {
|
|
69
|
+
return new Promise((resolve) => {
|
|
70
|
+
execFile(command, ["--version"], { env, timeout: timeoutMs, windowsHide: true }, (error, stdout, stderr) => {
|
|
71
|
+
if (error) {
|
|
72
|
+
resolve(null);
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
75
|
+
resolve(parseOmpVersion(`${stdout}\n${stderr}`));
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
}
|
|
79
|
+
export async function probeOmpInstall(options = {}) {
|
|
80
|
+
const env = ensurePathInEnv({ ...(options.env ?? process.env) });
|
|
81
|
+
const platform = options.platform ?? process.platform;
|
|
82
|
+
const timeoutMs = options.timeoutMs ?? 15_000;
|
|
83
|
+
const command = options.command?.trim() || env.PAPERCLIP_OMP_COMMAND?.trim() || null;
|
|
84
|
+
const isPath = command !== null && (path.isAbsolute(command) || command.includes("/") || command.includes("\\"));
|
|
85
|
+
const candidates = isPath
|
|
86
|
+
? ((await isExecutableFile(command, platform)) ? [command] : [])
|
|
87
|
+
: command && command !== "omp"
|
|
88
|
+
? []
|
|
89
|
+
: await findOmpExecutables(env, platform);
|
|
90
|
+
if (candidates.length === 0) {
|
|
91
|
+
return { state: "missing", minVersion: OMP_MIN_VERSION, path: null, version: null, copies: [] };
|
|
92
|
+
}
|
|
93
|
+
const copies = await Promise.all(candidates.map(async (candidate) => ({ path: candidate, version: await readOmpVersion(candidate, env, timeoutMs) })));
|
|
94
|
+
const first = copies[0];
|
|
95
|
+
return {
|
|
96
|
+
state: classifyOmpVersion(first.version),
|
|
97
|
+
minVersion: OMP_MIN_VERSION,
|
|
98
|
+
path: first.path,
|
|
99
|
+
version: first.version,
|
|
100
|
+
copies,
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
export function ompGateFailure(probe, platform = process.platform) {
|
|
104
|
+
switch (probe.state) {
|
|
105
|
+
case "ready":
|
|
106
|
+
return null;
|
|
107
|
+
case "missing":
|
|
108
|
+
return `OMP was not found. Install it with: ${ompInstallCommand(platform)}`;
|
|
109
|
+
case "too_old":
|
|
110
|
+
return `OMP ${probe.version} is older than ${OMP_MIN_VERSION}. Update it with: ${OMP_UPDATE_COMMAND}`;
|
|
111
|
+
case "unknown_version":
|
|
112
|
+
return `Could not read the version of ${probe.path}. OMP ${OMP_MIN_VERSION} or newer is required. Update it with: ${OMP_UPDATE_COMMAND}`;
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
export function ompAgentDir(env = process.env, home = os.homedir()) {
|
|
116
|
+
return env.PI_CODING_AGENT_DIR?.trim() || env.PAPERCLIP_OMP_AGENT_DIR?.trim() || path.join(home, ".omp", "agent");
|
|
117
|
+
}
|
|
118
|
+
async function sessionCwd(file) {
|
|
119
|
+
const handle = await fs.open(file, "r").catch(() => null);
|
|
120
|
+
if (!handle)
|
|
121
|
+
return null;
|
|
122
|
+
try {
|
|
123
|
+
const buffer = Buffer.alloc(4096);
|
|
124
|
+
const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
|
|
125
|
+
for (const line of buffer.subarray(0, bytesRead).toString("utf8").split("\n")) {
|
|
126
|
+
try {
|
|
127
|
+
const entry = JSON.parse(line);
|
|
128
|
+
if (entry.type === "session" && typeof entry.cwd === "string")
|
|
129
|
+
return entry.cwd;
|
|
130
|
+
}
|
|
131
|
+
catch {
|
|
132
|
+
continue;
|
|
133
|
+
}
|
|
134
|
+
}
|
|
135
|
+
return null;
|
|
136
|
+
}
|
|
137
|
+
finally {
|
|
138
|
+
await handle.close();
|
|
139
|
+
}
|
|
140
|
+
}
|
|
141
|
+
async function newestEntries(directory, filter) {
|
|
142
|
+
const names = await fs.readdir(directory).catch(() => []);
|
|
143
|
+
const stamped = await Promise.all(names.filter(filter).map(async (name) => {
|
|
144
|
+
const full = path.join(directory, name);
|
|
145
|
+
const stats = await fs.stat(full).catch(() => null);
|
|
146
|
+
return stats ? { full, mtime: stats.mtimeMs } : null;
|
|
147
|
+
}));
|
|
148
|
+
return stamped
|
|
149
|
+
.filter((entry) => entry !== null)
|
|
150
|
+
.sort((a, b) => b.mtime - a.mtime)
|
|
151
|
+
.map((entry) => entry.full);
|
|
152
|
+
}
|
|
153
|
+
export async function detectRecentProjectFolder(env = process.env, home = os.homedir(), limit = 20) {
|
|
154
|
+
const temp = path.resolve(os.tmpdir());
|
|
155
|
+
const homeRoot = path.resolve(home);
|
|
156
|
+
const sessionDirs = (await newestEntries(path.join(ompAgentDir(env, home), "sessions"), () => true)).slice(0, limit);
|
|
157
|
+
for (const directory of sessionDirs) {
|
|
158
|
+
const [newest] = await newestEntries(directory, (name) => name.endsWith(".jsonl"));
|
|
159
|
+
if (!newest)
|
|
160
|
+
continue;
|
|
161
|
+
const cwd = await sessionCwd(newest);
|
|
162
|
+
if (!cwd || !path.isAbsolute(cwd))
|
|
163
|
+
continue;
|
|
164
|
+
const resolved = path.resolve(cwd);
|
|
165
|
+
const inTemp = resolved === temp || (resolved.startsWith(temp + path.sep) && !resolved.startsWith(homeRoot + path.sep));
|
|
166
|
+
if (resolved === homeRoot || inTemp)
|
|
167
|
+
continue;
|
|
168
|
+
const stats = await fs.stat(resolved).catch(() => null);
|
|
169
|
+
if (stats?.isDirectory())
|
|
170
|
+
return resolved;
|
|
171
|
+
}
|
|
172
|
+
return null;
|
|
173
|
+
}
|
|
174
|
+
export async function readOmpDefaultModel(env = process.env, home = os.homedir()) {
|
|
175
|
+
const text = await fs.readFile(path.join(ompAgentDir(env, home), "config.yml"), "utf8").catch(() => null);
|
|
176
|
+
if (!text)
|
|
177
|
+
return null;
|
|
178
|
+
try {
|
|
179
|
+
const config = parseYaml(text);
|
|
180
|
+
const value = config?.modelRoles?.default;
|
|
181
|
+
if (typeof value !== "string" || !value.trim())
|
|
182
|
+
return null;
|
|
183
|
+
return value.trim().replace(/:(off|minimal|low|medium|high|xhigh|max)$/, "");
|
|
184
|
+
}
|
|
185
|
+
catch {
|
|
186
|
+
return null;
|
|
187
|
+
}
|
|
188
|
+
}
|
|
189
|
+
export function recommendOmpModel(models, defaultModel) {
|
|
190
|
+
if (models.length === 0)
|
|
191
|
+
return null;
|
|
192
|
+
if (defaultModel && models.some((model) => model.id === defaultModel))
|
|
193
|
+
return defaultModel;
|
|
194
|
+
return models[0].id;
|
|
195
|
+
}
|
|
196
|
+
//# sourceMappingURL=readiness.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readiness.js","sourceRoot":"","sources":["../../src/server/readiness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,IAAI,WAAW,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,KAAK,IAAI,SAAS,EAAE,MAAM,MAAM,CAAC;AAC1C,OAAO,EAAE,kCAAkC,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAE9F,MAAM,CAAC,MAAM,eAAe,GAAG,kCAAkC,CAAC;AAClE,MAAM,CAAC,MAAM,kBAAkB,GAAG,YAAY,CAAC;AAC/C,MAAM,CAAC,MAAM,uBAAuB,GAAG,+BAA+B,CAAC;AAiBvE,MAAM,UAAU,iBAAiB,CAAC,QAAQ,GAAoB,OAAO,CAAC,QAAQ;IAC5E,OAAO,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,sCAAsC,CAAC,CAAC,CAAC,wCAAwC,CAAC;AAClH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,GAAG,GAAsB,OAAO,CAAC,GAAG;IACpE,MAAM,KAAK,GAAG,GAAG,CAAC,uBAAuB,CAAC,EAAE,IAAI,EAAE,CAAC;IACnD,OAAO,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;AAC9B,CAAC;AAED,MAAM,UAAU,eAAe,CAAC,MAAc;IAC5C,OAAO,iBAAiB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC;AACrD,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,OAAsB;IACvD,IAAI,CAAC,OAAO;QAAE,OAAO,iBAAiB,CAAC;IACvC,OAAO,iBAAiB,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;AAC3E,CAAC;AAED,SAAS,eAAe,CAAC,QAAyB,EAAE,GAAsB;IACxE,IAAI,QAAQ,KAAK,OAAO;QAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,UAAU,GAAG,CAAC,GAAG,CAAC,OAAO,IAAI,gBAAgB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IAChF,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,SAAS,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AACxE,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,SAAiB,EAAE,QAAyB;IAC1E,IAAI,CAAC;QACH,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACvC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAAE,OAAO,KAAK,CAAC;QAClC,IAAI,QAAQ,KAAK,OAAO;YAAE,MAAM,EAAE,CAAC,MAAM,CAAC,SAAS,EAAE,WAAW,CAAC,IAAI,CAAC,CAAC;QACvE,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,GAAG,GAAsB,OAAO,CAAC,GAAG,EACpC,QAAQ,GAAoB,OAAO,CAAC,QAAQ;IAE5C,MAAM,WAAW,GAAG,eAAe,CAAC,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC;IAChD,MAAM,UAAU,GAAG,WAAW,CAAC,IAAI,IAAI,WAAW,CAAC,IAAI,IAAI,EAAE,CAAC;IAC9D,MAAM,SAAS,GAAG,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;IACnD,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,MAAM,IAAI,GAAG,IAAI,GAAG,EAAU,CAAC;IAC/B,KAAK,MAAM,SAAS,IAAI,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE,CAAC;QACpD,IAAI,CAAC,SAAS;YAAE,SAAS;QACzB,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,QAAQ,EAAE,WAAW,CAAC,EAAE,CAAC;YAC1D,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;YAC7C,IAAI,CAAC,CAAC,MAAM,gBAAgB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBAAE,SAAS;YAC7D,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACjE,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;gBAAE,SAAS;YAC7B,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;QACxB,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAe,EAAE,GAAsB,EAAE,SAAiB;IACvF,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC7B,QAAQ,CAAC,OAAO,EAAE,CAAC,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE;YACzG,IAAI,KAAK,EAAE,CAAC;gBACV,OAAO,CAAC,IAAI,CAAC,CAAC;gBACd,OAAO;YACT,CAAC;YACD,OAAO,CAAC,eAAe,CAAC,GAAG,MAAM,KAAK,MAAM,EAAE,CAAC,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,OAAO,GAKzC,EAAE;IACJ,MAAM,GAAG,GAAG,eAAe,CAAC,EAAE,GAAG,CAAC,OAAO,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IACjE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC;IACtD,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,IAAI,MAAM,CAAC;IAC9C,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,qBAAqB,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC;IACrF,MAAM,MAAM,GAAG,OAAO,KAAK,IAAI,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IACjH,MAAM,UAAU,GAAG,MAAM;QACvB,CAAC,CAAC,CAAC,CAAC,MAAM,gBAAgB,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAChE,CAAC,CAAC,OAAO,IAAI,OAAO,KAAK,KAAK;YAC5B,CAAC,CAAC,EAAE;YACJ,CAAC,CAAC,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC;IAC9C,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;IAClG,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAC9B,UAAU,CAAC,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC,SAAS,EAAE,GAAG,EAAE,SAAS,CAAC,EAAE,CAAC,CAAC,CACrH,CAAC;IACF,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;IACzB,OAAO;QACL,KAAK,EAAE,kBAAkB,CAAC,KAAK,CAAC,OAAO,CAAC;QACxC,UAAU,EAAE,eAAe;QAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;QAChB,OAAO,EAAE,KAAK,CAAC,OAAO;QACtB,MAAM;KACP,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,KAAsB,EAAE,QAAQ,GAAoB,OAAO,CAAC,QAAQ;IACjG,QAAQ,KAAK,CAAC,KAAK,EAAE,CAAC;QACpB,KAAK,OAAO;YACV,OAAO,IAAI,CAAC;QACd,KAAK,SAAS;YACZ,OAAO,uCAAuC,iBAAiB,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC9E,KAAK,SAAS;YACZ,OAAO,OAAO,KAAK,CAAC,OAAO,kBAAkB,eAAe,qBAAqB,kBAAkB,EAAE,CAAC;QACxG,KAAK,iBAAiB;YACpB,OAAO,iCAAiC,KAAK,CAAC,IAAI,SAAS,eAAe,0CAA0C,kBAAkB,EAAE,CAAC;IAC7I,CAAC;AACH,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,GAAG,GAAsB,OAAO,CAAC,GAAG,EAAE,IAAI,GAAW,EAAE,CAAC,OAAO,EAAE;IAC3F,OAAO,GAAG,CAAC,mBAAmB,EAAE,IAAI,EAAE,IAAI,GAAG,CAAC,uBAAuB,EAAE,IAAI,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;AACpH,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,IAAY;IACpC,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1D,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAClC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC;QACrE,KAAK,MAAM,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9E,IAAI,CAAC;gBACH,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAsC,CAAC;gBACpE,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,IAAI,OAAO,KAAK,CAAC,GAAG,KAAK,QAAQ;oBAAE,OAAO,KAAK,CAAC,GAAG,CAAC;YAClF,CAAC;YAAC,MAAM,CAAC;gBACP,SAAS;YACX,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;YAAS,CAAC;QACT,MAAM,MAAM,CAAC,KAAK,EAAE,CAAC;IACvB,CAAC;AACH,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,SAAiB,EAAE,MAAiC;IAC/E,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAc,CAAC,CAAC;IACtE,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,GAAG,CAC/B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACvD,CAAC,CAAC,CACH,CAAC;IACF,OAAO,OAAO;SACX,MAAM,CAAC,CAAC,KAAK,EAA4C,EAAE,CAAC,KAAK,KAAK,IAAI,CAAC;SAC3E,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC;SACjC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;AAChC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAC7C,GAAG,GAAsB,OAAO,CAAC,GAAG,EACpC,IAAI,GAAW,EAAE,CAAC,OAAO,EAAE,EAC3B,KAAK,GAAG,EAAE;IAEV,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,CAAC;IACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACpC,MAAM,WAAW,GAAG,CAAC,MAAM,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,UAAU,CAAC,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACrH,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE,CAAC;QACpC,MAAM,CAAC,MAAM,CAAC,GAAG,MAAM,aAAa,CAAC,SAAS,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;QACnF,IAAI,CAAC,MAAM;YAAE,SAAS;QACtB,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,MAAM,CAAC,CAAC;QACrC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,SAAS;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,MAAM,GAAG,QAAQ,KAAK,IAAI,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;QACxH,IAAI,QAAQ,KAAK,QAAQ,IAAI,MAAM;YAAE,SAAS;QAC9C,MAAM,KAAK,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,KAAK,EAAE,WAAW,EAAE;YAAE,OAAO,QAAQ,CAAC;IAC5C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,GAAG,GAAsB,OAAO,CAAC,GAAG,EAAE,IAAI,GAAW,EAAE,CAAC,OAAO,EAAE;IACzG,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,YAAY,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;IAC1G,IAAI,CAAC,IAAI;QAAE,OAAO,IAAI,CAAC;IACvB,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,CAAkD,CAAC;QAChF,MAAM,KAAK,GAAG,MAAM,EAAE,UAAU,EAAE,OAAO,CAAC;QAC1C,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;YAAE,OAAO,IAAI,CAAC;QAC5D,OAAO,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,2CAA2C,EAAE,EAAE,CAAC,CAAC;IAC/E,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC;IACd,CAAC;AACH,CAAC;AAED,MAAM,UAAU,iBAAiB,CAAC,MAA6B,EAAE,YAA2B;IAC1F,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACrC,IAAI,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,EAAE,KAAK,YAAY,CAAC;QAAE,OAAO,YAAY,CAAC;IAC3F,OAAO,MAAM,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;AACvB,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readiness.test.d.ts","sourceRoot":"","sources":["../../src/server/readiness.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import fs from "node:fs/promises";
|
|
2
|
+
import os from "node:os";
|
|
3
|
+
import path from "node:path";
|
|
4
|
+
import { afterEach, describe, expect, it } from "vitest";
|
|
5
|
+
import { bundledOmpVersion, detectRecentProjectFolder, ompGateFailure, probeOmpInstall, readOmpDefaultModel, recommendOmpModel, } from "./readiness.js";
|
|
6
|
+
const dirs = [];
|
|
7
|
+
async function fakeOmp(output, exitCode = 0) {
|
|
8
|
+
const dir = await fs.mkdtemp(path.join(os.tmpdir(), "omp-readiness-"));
|
|
9
|
+
dirs.push(dir);
|
|
10
|
+
const file = path.join(dir, "omp");
|
|
11
|
+
await fs.writeFile(file, `#!/bin/sh\necho '${output}'\nexit ${exitCode}\n`, { mode: 0o755 });
|
|
12
|
+
return dir;
|
|
13
|
+
}
|
|
14
|
+
afterEach(async () => {
|
|
15
|
+
await Promise.all(dirs.splice(0).map((dir) => fs.rm(dir, { recursive: true, force: true })));
|
|
16
|
+
});
|
|
17
|
+
describe.skipIf(process.platform === "win32")("probeOmpInstall", () => {
|
|
18
|
+
it("rejects an OMP older than 18.1.16 with the update command", async () => {
|
|
19
|
+
const dir = await fakeOmp("omp/18.1.15");
|
|
20
|
+
const probe = await probeOmpInstall({ env: { PATH: dir } });
|
|
21
|
+
expect(probe).toMatchObject({ state: "too_old", version: "18.1.15", path: path.join(dir, "omp") });
|
|
22
|
+
expect(ompGateFailure(probe)).toBe("OMP 18.1.15 is older than 18.1.16. Update it with: omp update");
|
|
23
|
+
});
|
|
24
|
+
it("accepts exactly the minimum and newer versions", async () => {
|
|
25
|
+
const exact = await probeOmpInstall({ env: { PATH: await fakeOmp("omp/18.1.16") } });
|
|
26
|
+
const newer = await probeOmpInstall({ env: { PATH: await fakeOmp("omp/19.0.0") } });
|
|
27
|
+
expect([exact.state, newer.state]).toEqual(["ready", "ready"]);
|
|
28
|
+
expect(ompGateFailure(exact)).toBeNull();
|
|
29
|
+
});
|
|
30
|
+
it("reports a missing OMP with the install command", async () => {
|
|
31
|
+
const empty = await fs.mkdtemp(path.join(os.tmpdir(), "omp-readiness-"));
|
|
32
|
+
dirs.push(empty);
|
|
33
|
+
const probe = await probeOmpInstall({ env: { PATH: empty }, platform: "linux" });
|
|
34
|
+
expect(probe.state).toBe("missing");
|
|
35
|
+
expect(ompGateFailure(probe, "linux")).toBe("OMP was not found. Install it with: curl -fsSL https://omp.sh/install | sh");
|
|
36
|
+
});
|
|
37
|
+
it("lists every copy on PATH in order and gates on the first one", async () => {
|
|
38
|
+
const old = await fakeOmp("omp/18.0.2");
|
|
39
|
+
const current = await fakeOmp("omp/18.18.0");
|
|
40
|
+
const probe = await probeOmpInstall({ env: { PATH: `${old}:${current}` } });
|
|
41
|
+
expect(probe.state).toBe("too_old");
|
|
42
|
+
expect(probe.copies.map((copy) => copy.version)).toEqual(["18.0.2", "18.18.0"]);
|
|
43
|
+
});
|
|
44
|
+
it("treats a binary that fails --version as an unknown version", async () => {
|
|
45
|
+
const probe = await probeOmpInstall({ env: { PATH: await fakeOmp("boom", 2) } });
|
|
46
|
+
expect(probe.state).toBe("unknown_version");
|
|
47
|
+
expect(ompGateFailure(probe)).toContain("omp update");
|
|
48
|
+
});
|
|
49
|
+
it("probes an explicitly chosen file instead of PATH", async () => {
|
|
50
|
+
const dir = await fakeOmp("omp/18.2.0");
|
|
51
|
+
const probe = await probeOmpInstall({ command: path.join(dir, "omp"), env: { PATH: "" } });
|
|
52
|
+
expect(probe).toMatchObject({ state: "ready", version: "18.2.0" });
|
|
53
|
+
expect((await probeOmpInstall({ command: path.join(dir, "missing"), env: { PATH: dir } })).state).toBe("missing");
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
async function sessionFile(agentDir, slug, cwd, mtime) {
|
|
57
|
+
const dir = path.join(agentDir, "sessions", slug);
|
|
58
|
+
await fs.mkdir(dir, { recursive: true });
|
|
59
|
+
const file = path.join(dir, "s.jsonl");
|
|
60
|
+
await fs.writeFile(file, `{"type":"title","title":"x"}\n{"type":"session","cwd":${JSON.stringify(cwd)}}\n`);
|
|
61
|
+
const when = new Date(mtime);
|
|
62
|
+
await fs.utimes(file, when, when);
|
|
63
|
+
await fs.utimes(dir, when, when);
|
|
64
|
+
}
|
|
65
|
+
describe("detectRecentProjectFolder", () => {
|
|
66
|
+
it("returns the newest OMP session folder that still exists, skipping home and temp", async () => {
|
|
67
|
+
const home = await fs.mkdtemp(path.join(os.tmpdir(), "omp-home-"));
|
|
68
|
+
dirs.push(home);
|
|
69
|
+
const projects = path.join(home, "Projects");
|
|
70
|
+
const acme = path.join(projects, "acme");
|
|
71
|
+
const older = path.join(projects, "older");
|
|
72
|
+
await fs.mkdir(acme, { recursive: true });
|
|
73
|
+
await fs.mkdir(older, { recursive: true });
|
|
74
|
+
const agentDir = path.join(home, ".omp", "agent");
|
|
75
|
+
await sessionFile(agentDir, "a", older, 1_000_000);
|
|
76
|
+
await sessionFile(agentDir, "b", acme, 2_000_000);
|
|
77
|
+
await sessionFile(agentDir, "c", path.join(projects, "deleted"), 3_000_000);
|
|
78
|
+
await sessionFile(agentDir, "d", home, 4_000_000);
|
|
79
|
+
await sessionFile(agentDir, "e", os.tmpdir(), 5_000_000);
|
|
80
|
+
expect(await detectRecentProjectFolder({}, home)).toBe(acme);
|
|
81
|
+
expect(await detectRecentProjectFolder({}, path.join(home, "nobody"))).toBeNull();
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
describe("OMP default model", () => {
|
|
85
|
+
it("reads modelRoles.default without the thinking suffix and prefers it when listed", async () => {
|
|
86
|
+
const home = await fs.mkdtemp(path.join(os.tmpdir(), "omp-home-"));
|
|
87
|
+
dirs.push(home);
|
|
88
|
+
await fs.mkdir(path.join(home, ".omp", "agent"), { recursive: true });
|
|
89
|
+
await fs.writeFile(path.join(home, ".omp", "agent", "config.yml"), "modelRoles:\n default: anthropic/claude-opus-5-5:high\n");
|
|
90
|
+
const preferred = await readOmpDefaultModel({}, home);
|
|
91
|
+
expect(preferred).toBe("anthropic/claude-opus-5-5");
|
|
92
|
+
const models = [{ id: "openai/gpt-6" }, { id: "anthropic/claude-opus-5-5" }];
|
|
93
|
+
expect(recommendOmpModel(models, preferred)).toBe("anthropic/claude-opus-5-5");
|
|
94
|
+
expect(recommendOmpModel(models, "gone/model")).toBe("openai/gpt-6");
|
|
95
|
+
expect(recommendOmpModel([], preferred)).toBeNull();
|
|
96
|
+
});
|
|
97
|
+
});
|
|
98
|
+
describe("bundledOmpVersion", () => {
|
|
99
|
+
it("reads the Docker pin and ignores blanks", () => {
|
|
100
|
+
expect(bundledOmpVersion({ PAPERCLIP_OMP_BUNDLED_VERSION: "18.18.0" })).toBe("18.18.0");
|
|
101
|
+
expect(bundledOmpVersion({ PAPERCLIP_OMP_BUNDLED_VERSION: " " })).toBeNull();
|
|
102
|
+
expect(bundledOmpVersion({})).toBeNull();
|
|
103
|
+
});
|
|
104
|
+
});
|
|
105
|
+
//# sourceMappingURL=readiness.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"readiness.test.js","sourceRoot":"","sources":["../../src/server/readiness.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
export declare const REDACTED_LOG_MARKER = "***REDACTED***";
|
|
2
|
+
/** Rebuild a JSON line whose escapes Paperclip's log redaction swallowed, or null when unrecoverable. */
|
|
3
|
+
export declare function repairRedactedJsonLine(line: string): string | null;
|
|
4
|
+
export declare function salvageRedactedEvents(line: string): Record<string, unknown>[];
|
|
5
|
+
//# sourceMappingURL=redaction-repair.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redaction-repair.d.ts","sourceRoot":"","sources":["../../src/server/redaction-repair.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,mBAAmB,mBAAmB,CAAC;AAqCpD,yGAAyG;AACzG,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CA2BlE;AA2BD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAqB7E"}
|
|
@@ -0,0 +1,122 @@
|
|
|
1
|
+
export const REDACTED_LOG_MARKER = "***REDACTED***";
|
|
2
|
+
const REPAIR_MAX_STEPS = 16;
|
|
3
|
+
function jsonErrorPosition(line) {
|
|
4
|
+
try {
|
|
5
|
+
JSON.parse(line);
|
|
6
|
+
return -1;
|
|
7
|
+
}
|
|
8
|
+
catch (error) {
|
|
9
|
+
const match = /position (\d+)/.exec(error instanceof Error ? error.message : String(error));
|
|
10
|
+
return match ? Number(match[1]) : line.length;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
function markerPositions(line) {
|
|
14
|
+
const positions = [];
|
|
15
|
+
let index = line.indexOf(REDACTED_LOG_MARKER);
|
|
16
|
+
while (index >= 0) {
|
|
17
|
+
positions.push(index);
|
|
18
|
+
index = line.indexOf(REDACTED_LOG_MARKER, index + REDACTED_LOG_MARKER.length);
|
|
19
|
+
}
|
|
20
|
+
return positions;
|
|
21
|
+
}
|
|
22
|
+
function repairCandidates(line, at) {
|
|
23
|
+
const end = at + REDACTED_LOG_MARKER.length;
|
|
24
|
+
const head = line.slice(0, end);
|
|
25
|
+
const rest = line.slice(end);
|
|
26
|
+
const candidates = [];
|
|
27
|
+
if (rest.startsWith("\\\""))
|
|
28
|
+
candidates.push(`${head}"${rest.slice(2)}`);
|
|
29
|
+
if (rest.startsWith("\""))
|
|
30
|
+
candidates.push(`${head}\\"${rest.slice(1)}`);
|
|
31
|
+
if (rest.startsWith("}") || rest.startsWith("]") || rest.startsWith(",")) {
|
|
32
|
+
candidates.push(`${head}"${rest}`);
|
|
33
|
+
}
|
|
34
|
+
return candidates;
|
|
35
|
+
}
|
|
36
|
+
/** Rebuild a JSON line whose escapes Paperclip's log redaction swallowed, or null when unrecoverable. */
|
|
37
|
+
export function repairRedactedJsonLine(line) {
|
|
38
|
+
if (!line.includes(REDACTED_LOG_MARKER))
|
|
39
|
+
return null;
|
|
40
|
+
let current = line;
|
|
41
|
+
let position = jsonErrorPosition(current);
|
|
42
|
+
if (position < 0)
|
|
43
|
+
return current;
|
|
44
|
+
for (let step = 0; step < REPAIR_MAX_STEPS; step += 1) {
|
|
45
|
+
const markers = markerPositions(current);
|
|
46
|
+
const preceding = markers.filter((marker) => marker <= position);
|
|
47
|
+
const at = preceding.length > 0 ? preceding[preceding.length - 1] : markers[0];
|
|
48
|
+
if (at === undefined)
|
|
49
|
+
return null;
|
|
50
|
+
let best = null;
|
|
51
|
+
let bestPosition = position;
|
|
52
|
+
for (const candidate of repairCandidates(current, at)) {
|
|
53
|
+
const candidatePosition = jsonErrorPosition(candidate);
|
|
54
|
+
if (candidatePosition < 0)
|
|
55
|
+
return candidate;
|
|
56
|
+
if (candidatePosition > bestPosition) {
|
|
57
|
+
best = candidate;
|
|
58
|
+
bestPosition = candidatePosition;
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
if (best === null)
|
|
62
|
+
return null;
|
|
63
|
+
current = best;
|
|
64
|
+
position = bestPosition;
|
|
65
|
+
}
|
|
66
|
+
return jsonErrorPosition(current) < 0 ? current : null;
|
|
67
|
+
}
|
|
68
|
+
const SALVAGE_EVENT_PREFIX = '{"type":"';
|
|
69
|
+
const SALVAGE_MAX_EVENTS = 8;
|
|
70
|
+
function balancedObjectEnd(line, start) {
|
|
71
|
+
let depth = 0;
|
|
72
|
+
let inString = false;
|
|
73
|
+
let escaped = false;
|
|
74
|
+
for (let index = start; index < line.length; index += 1) {
|
|
75
|
+
const char = line[index];
|
|
76
|
+
if (inString) {
|
|
77
|
+
if (escaped)
|
|
78
|
+
escaped = false;
|
|
79
|
+
else if (char === "\\")
|
|
80
|
+
escaped = true;
|
|
81
|
+
else if (char === '"')
|
|
82
|
+
inString = false;
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
if (char === '"')
|
|
86
|
+
inString = true;
|
|
87
|
+
else if (char === "{")
|
|
88
|
+
depth += 1;
|
|
89
|
+
else if (char === "}") {
|
|
90
|
+
depth -= 1;
|
|
91
|
+
if (depth === 0)
|
|
92
|
+
return index + 1;
|
|
93
|
+
}
|
|
94
|
+
}
|
|
95
|
+
return -1;
|
|
96
|
+
}
|
|
97
|
+
export function salvageRedactedEvents(line) {
|
|
98
|
+
if (!line.includes(REDACTED_LOG_MARKER))
|
|
99
|
+
return [];
|
|
100
|
+
const events = [];
|
|
101
|
+
let cursor = line.indexOf(REDACTED_LOG_MARKER);
|
|
102
|
+
while (cursor >= 0 && events.length < SALVAGE_MAX_EVENTS) {
|
|
103
|
+
const start = line.indexOf(SALVAGE_EVENT_PREFIX, cursor + REDACTED_LOG_MARKER.length);
|
|
104
|
+
if (start < 0)
|
|
105
|
+
break;
|
|
106
|
+
const end = balancedObjectEnd(line, start);
|
|
107
|
+
if (end > start) {
|
|
108
|
+
try {
|
|
109
|
+
const parsed = JSON.parse(line.slice(start, end));
|
|
110
|
+
if (parsed !== null && typeof parsed === "object" && !Array.isArray(parsed)) {
|
|
111
|
+
events.push(parsed);
|
|
112
|
+
}
|
|
113
|
+
}
|
|
114
|
+
catch {
|
|
115
|
+
break;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
cursor = line.indexOf(REDACTED_LOG_MARKER, start);
|
|
119
|
+
}
|
|
120
|
+
return events;
|
|
121
|
+
}
|
|
122
|
+
//# sourceMappingURL=redaction-repair.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"redaction-repair.js","sourceRoot":"","sources":["../../src/server/redaction-repair.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,64 @@
|
|
|
1
|
+
import type { AdapterExecutionTarget } from "@tickernelz/wardmote-adapter-utils/execution-target";
|
|
2
|
+
import { runAdapterExecutionTargetProcess } from "@tickernelz/wardmote-adapter-utils/execution-target";
|
|
3
|
+
import type { RunProcessResult } from "@tickernelz/wardmote-adapter-utils/server-utils";
|
|
4
|
+
/** Mirrors print mode's event shaping: drop `message_update` snapshots and `providerPayload`. */
|
|
5
|
+
export declare function shapeOmpRpcFrame(frame: Record<string, unknown>): Record<string, unknown>;
|
|
6
|
+
export declare class OmpRpcChunkAssembler {
|
|
7
|
+
private pending;
|
|
8
|
+
push(frame: Record<string, unknown>): Record<string, unknown> | null;
|
|
9
|
+
}
|
|
10
|
+
export interface OmpRpcSteerSession {
|
|
11
|
+
readonly closed: boolean;
|
|
12
|
+
setWriter(write: ((data: string) => Promise<void>) | null): void;
|
|
13
|
+
observeFrame(frame: Record<string, unknown>): void;
|
|
14
|
+
close(): void;
|
|
15
|
+
capabilities(): Promise<{
|
|
16
|
+
steering: boolean;
|
|
17
|
+
}>;
|
|
18
|
+
snapshot(): Promise<{
|
|
19
|
+
activeTurnId: string | null;
|
|
20
|
+
}>;
|
|
21
|
+
onceTurnActive(listener: () => void): () => void;
|
|
22
|
+
steer(input: {
|
|
23
|
+
turnId: string;
|
|
24
|
+
message: {
|
|
25
|
+
role: "user";
|
|
26
|
+
text: string;
|
|
27
|
+
};
|
|
28
|
+
correlationId?: string;
|
|
29
|
+
ackTimeoutMs?: number;
|
|
30
|
+
}): Promise<void>;
|
|
31
|
+
whenSteersSettled(): Promise<void>;
|
|
32
|
+
}
|
|
33
|
+
export declare function createOmpRpcSteerSession(): OmpRpcSteerSession;
|
|
34
|
+
export interface OmpRpcRunInput {
|
|
35
|
+
runId: string;
|
|
36
|
+
command: string;
|
|
37
|
+
args: string[];
|
|
38
|
+
cwd: string;
|
|
39
|
+
env: Record<string, string>;
|
|
40
|
+
timeoutSec: number;
|
|
41
|
+
graceSec: number;
|
|
42
|
+
prompt: string;
|
|
43
|
+
runtimeTarget: AdapterExecutionTarget | null | undefined;
|
|
44
|
+
onLog: (stream: "stdout" | "stderr", chunk: string) => Promise<void>;
|
|
45
|
+
onSpawn?: (meta: {
|
|
46
|
+
pid: number;
|
|
47
|
+
processGroupId: number | null;
|
|
48
|
+
startedAt: string;
|
|
49
|
+
}) => Promise<void>;
|
|
50
|
+
onRuntimeProgress?: Parameters<typeof runAdapterExecutionTargetProcess>[4]["onRuntimeProgress"];
|
|
51
|
+
session: OmpRpcSteerSession;
|
|
52
|
+
onProcessStopped?: () => void;
|
|
53
|
+
continuationIdleMs?: number;
|
|
54
|
+
idleRecheckMs?: number;
|
|
55
|
+
}
|
|
56
|
+
export interface OmpRpcRunResult {
|
|
57
|
+
proc: RunProcessResult;
|
|
58
|
+
promptAcknowledged: boolean;
|
|
59
|
+
promptError: string | null;
|
|
60
|
+
protocolVersion: number | null;
|
|
61
|
+
sessionId: string | null;
|
|
62
|
+
}
|
|
63
|
+
export declare function runOmpRpcSession(input: OmpRpcRunInput): Promise<OmpRpcRunResult>;
|
|
64
|
+
//# sourceMappingURL=rpc-session.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"rpc-session.d.ts","sourceRoot":"","sources":["../../src/server/rpc-session.ts"],"names":[],"mappings":"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"}
|