- Move costUsd to top-level return field in parseOpenCodeJsonl (out of usage) - Fix session-not-found regex to match "Session not found" pattern - Use callID for toolUseId in UI stdout parser, add status/metadata header - Fix CLI formatter: separate tool_call/tool_result lines, split step_finish - Enable createIfMissing for cwd validation in environment tests - Add empty OPENAI_API_KEY override detection - Classify ProviderModelNotFoundError as warning during model discovery - Make model discovery best-effort when no model is configured Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
100 lines
2.8 KiB
TypeScript
100 lines
2.8 KiB
TypeScript
import { asNumber, asString, parseJson, parseObject } from "@paperclipai/adapter-utils/server-utils";
|
|
|
|
function errorText(value: unknown): string {
|
|
if (typeof value === "string") return value;
|
|
const rec = parseObject(value);
|
|
const message = asString(rec.message, "").trim();
|
|
if (message) return message;
|
|
const data = parseObject(rec.data);
|
|
const nestedMessage = asString(data.message, "").trim();
|
|
if (nestedMessage) return nestedMessage;
|
|
const name = asString(rec.name, "").trim();
|
|
if (name) return name;
|
|
const code = asString(rec.code, "").trim();
|
|
if (code) return code;
|
|
try {
|
|
return JSON.stringify(rec);
|
|
} catch {
|
|
return "";
|
|
}
|
|
}
|
|
|
|
export function parseOpenCodeJsonl(stdout: string) {
|
|
let sessionId: string | null = null;
|
|
const messages: string[] = [];
|
|
const errors: string[] = [];
|
|
const usage = {
|
|
inputTokens: 0,
|
|
cachedInputTokens: 0,
|
|
outputTokens: 0,
|
|
};
|
|
let costUsd = 0;
|
|
|
|
for (const rawLine of stdout.split(/\r?\n/)) {
|
|
const line = rawLine.trim();
|
|
if (!line) continue;
|
|
|
|
const event = parseJson(line);
|
|
if (!event) continue;
|
|
|
|
const currentSessionId = asString(event.sessionID, "").trim();
|
|
if (currentSessionId) sessionId = currentSessionId;
|
|
|
|
const type = asString(event.type, "");
|
|
|
|
if (type === "text") {
|
|
const part = parseObject(event.part);
|
|
const text = asString(part.text, "").trim();
|
|
if (text) messages.push(text);
|
|
continue;
|
|
}
|
|
|
|
if (type === "step_finish") {
|
|
const part = parseObject(event.part);
|
|
const tokens = parseObject(part.tokens);
|
|
const cache = parseObject(tokens.cache);
|
|
usage.inputTokens += asNumber(tokens.input, 0);
|
|
usage.cachedInputTokens += asNumber(cache.read, 0);
|
|
usage.outputTokens += asNumber(tokens.output, 0) + asNumber(tokens.reasoning, 0);
|
|
costUsd += asNumber(part.cost, 0);
|
|
continue;
|
|
}
|
|
|
|
if (type === "tool_use") {
|
|
const part = parseObject(event.part);
|
|
const state = parseObject(part.state);
|
|
if (asString(state.status, "") === "error") {
|
|
const text = asString(state.error, "").trim();
|
|
if (text) errors.push(text);
|
|
}
|
|
continue;
|
|
}
|
|
|
|
if (type === "error") {
|
|
const text = errorText(event.error ?? event.message).trim();
|
|
if (text) errors.push(text);
|
|
continue;
|
|
}
|
|
}
|
|
|
|
return {
|
|
sessionId,
|
|
summary: messages.join("\n\n").trim(),
|
|
usage,
|
|
costUsd,
|
|
errorMessage: errors.length > 0 ? errors.join("\n") : null,
|
|
};
|
|
}
|
|
|
|
export function isOpenCodeUnknownSessionError(stdout: string, stderr: string): boolean {
|
|
const haystack = `${stdout}\n${stderr}`
|
|
.split(/\r?\n/)
|
|
.map((line) => line.trim())
|
|
.filter(Boolean)
|
|
.join("\n");
|
|
|
|
return /unknown\s+session|session\b.*\bnot\s+found|resource\s+not\s+found:.*[\\/]session[\\/].*\.json|notfounderror|no session/i.test(
|
|
haystack,
|
|
);
|
|
}
|