@polyweave/preston 0.0.0-stage → 1.1.0
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 +21 -0
- package/README.md +119 -2
- package/assets/logo.png +0 -0
- package/assets/logo.webp +0 -0
- package/dist/agents/migration.js +29 -0
- package/dist/agents/migration.js.map +1 -0
- package/dist/agents/updater.js +385 -0
- package/dist/agents/updater.js.map +1 -0
- package/dist/channels/chat.js +236 -0
- package/dist/channels/chat.js.map +1 -0
- package/dist/channels/discord/index.js +491 -0
- package/dist/channels/discord/index.js.map +1 -0
- package/dist/channels/discord/transport.js +130 -0
- package/dist/channels/discord/transport.js.map +1 -0
- package/dist/channels/fake/index.js +104 -0
- package/dist/channels/fake/index.js.map +1 -0
- package/dist/channels/hub.js +153 -0
- package/dist/channels/hub.js.map +1 -0
- package/dist/channels/outbox.js +219 -0
- package/dist/channels/outbox.js.map +1 -0
- package/dist/channels/registry.js +67 -0
- package/dist/channels/registry.js.map +1 -0
- package/dist/channels/router.js +50 -0
- package/dist/channels/router.js.map +1 -0
- package/dist/channels/shared/delivery.js +74 -0
- package/dist/channels/shared/delivery.js.map +1 -0
- package/dist/channels/shared/files.js +87 -0
- package/dist/channels/shared/files.js.map +1 -0
- package/dist/channels/shared/pairing.js +99 -0
- package/dist/channels/shared/pairing.js.map +1 -0
- package/dist/channels/shared/secrets.js +75 -0
- package/dist/channels/shared/secrets.js.map +1 -0
- package/dist/channels/shared/text.js +68 -0
- package/dist/channels/shared/text.js.map +1 -0
- package/dist/channels/shared/typing.js +59 -0
- package/dist/channels/shared/typing.js.map +1 -0
- package/dist/channels/slack/index.js +560 -0
- package/dist/channels/slack/index.js.map +1 -0
- package/dist/channels/slack/transport.js +184 -0
- package/dist/channels/slack/transport.js.map +1 -0
- package/dist/channels/terminal.js +67 -0
- package/dist/channels/terminal.js.map +1 -0
- package/dist/channels/types.js +6 -0
- package/dist/channels/types.js.map +1 -0
- package/dist/cli-args.js +92 -0
- package/dist/cli-args.js.map +1 -0
- package/dist/cli.js +120 -0
- package/dist/cli.js.map +1 -0
- package/dist/clock.js +76 -0
- package/dist/clock.js.map +1 -0
- package/dist/config/config.js +184 -0
- package/dist/config/config.js.map +1 -0
- package/dist/config/schema.js +209 -0
- package/dist/config/schema.js.map +1 -0
- package/dist/coordinator/coordinator.js +494 -0
- package/dist/coordinator/coordinator.js.map +1 -0
- package/dist/coordinator/inbox.js +64 -0
- package/dist/coordinator/inbox.js.map +1 -0
- package/dist/coordinator/input.js +75 -0
- package/dist/coordinator/input.js.map +1 -0
- package/dist/daemon/daemon.js +228 -0
- package/dist/daemon/daemon.js.map +1 -0
- package/dist/daemon/ensure.js +87 -0
- package/dist/daemon/ensure.js.map +1 -0
- package/dist/daemon/lock.js +54 -0
- package/dist/daemon/lock.js.map +1 -0
- package/dist/daemon/start-at-login.js +20 -0
- package/dist/daemon/start-at-login.js.map +1 -0
- package/dist/daemon/stop.js +51 -0
- package/dist/daemon/stop.js.map +1 -0
- package/dist/goals/agents.js +36 -0
- package/dist/goals/agents.js.map +1 -0
- package/dist/goals/brief.js +51 -0
- package/dist/goals/brief.js.map +1 -0
- package/dist/goals/checks.js +75 -0
- package/dist/goals/checks.js.map +1 -0
- package/dist/goals/engine.js +1253 -0
- package/dist/goals/engine.js.map +1 -0
- package/dist/goals/messages.js +110 -0
- package/dist/goals/messages.js.map +1 -0
- package/dist/goals/status.js +118 -0
- package/dist/goals/status.js.map +1 -0
- package/dist/goals/store.js +285 -0
- package/dist/goals/store.js.map +1 -0
- package/dist/home.js +52 -0
- package/dist/home.js.map +1 -0
- package/dist/i18n/index.js +37 -0
- package/dist/i18n/index.js.map +1 -0
- package/dist/ipc/client.js +82 -0
- package/dist/ipc/client.js.map +1 -0
- package/dist/ipc/private-dir.js +23 -0
- package/dist/ipc/private-dir.js.map +1 -0
- package/dist/ipc/protocol.js +50 -0
- package/dist/ipc/protocol.js.map +1 -0
- package/dist/ipc/server.js +110 -0
- package/dist/ipc/server.js.map +1 -0
- package/dist/landing/exec.js +38 -0
- package/dist/landing/exec.js.map +1 -0
- package/dist/landing/git.js +93 -0
- package/dist/landing/git.js.map +1 -0
- package/dist/landing/github.js +154 -0
- package/dist/landing/github.js.map +1 -0
- package/dist/landing/hooks.js +2 -0
- package/dist/landing/hooks.js.map +1 -0
- package/dist/landing/landing.js +777 -0
- package/dist/landing/landing.js.map +1 -0
- package/dist/landing/messages.js +157 -0
- package/dist/landing/messages.js.map +1 -0
- package/dist/landing/migration.js +50 -0
- package/dist/landing/migration.js.map +1 -0
- package/dist/landing/paths.js +54 -0
- package/dist/landing/paths.js.map +1 -0
- package/dist/landing/project.js +95 -0
- package/dist/landing/project.js.map +1 -0
- package/dist/landing/publishing.js +208 -0
- package/dist/landing/publishing.js.map +1 -0
- package/dist/landing/stage.js +129 -0
- package/dist/landing/stage.js.map +1 -0
- package/dist/landing/store.js +160 -0
- package/dist/landing/store.js.map +1 -0
- package/dist/landing/tools.js +38 -0
- package/dist/landing/tools.js.map +1 -0
- package/dist/landing/workspace.js +349 -0
- package/dist/landing/workspace.js.map +1 -0
- package/dist/log.js +77 -0
- package/dist/log.js.map +1 -0
- package/dist/mcp/coordinator-tools.js +500 -0
- package/dist/mcp/coordinator-tools.js.map +1 -0
- package/dist/mcp/names.js +8 -0
- package/dist/mcp/names.js.map +1 -0
- package/dist/mcp/owner-turn.js +15 -0
- package/dist/mcp/owner-turn.js.map +1 -0
- package/dist/mcp/setup-tools.js +243 -0
- package/dist/mcp/setup-tools.js.map +1 -0
- package/dist/mcp/stdio.js +74 -0
- package/dist/mcp/stdio.js.map +1 -0
- package/dist/mcp/tools.js +76 -0
- package/dist/mcp/tools.js.map +1 -0
- package/dist/mcp/worker-tools.js +53 -0
- package/dist/mcp/worker-tools.js.map +1 -0
- package/dist/memory/files.js +183 -0
- package/dist/memory/files.js.map +1 -0
- package/dist/memory/index.js +174 -0
- package/dist/memory/index.js.map +1 -0
- package/dist/memory/service.js +319 -0
- package/dist/memory/service.js.map +1 -0
- package/dist/memory/tools.js +82 -0
- package/dist/memory/tools.js.map +1 -0
- package/dist/notify/index.js +122 -0
- package/dist/notify/index.js.map +1 -0
- package/dist/prompts/coordinator.js +76 -0
- package/dist/prompts/coordinator.js.map +1 -0
- package/dist/prompts/grilling.js +8 -0
- package/dist/prompts/grilling.js.map +1 -0
- package/dist/prompts/teaching.js +17 -0
- package/dist/prompts/teaching.js.map +1 -0
- package/dist/prompts/worker.js +50 -0
- package/dist/prompts/worker.js.map +1 -0
- package/dist/questions/questions.js +209 -0
- package/dist/questions/questions.js.map +1 -0
- package/dist/quota/monitor.js +399 -0
- package/dist/quota/monitor.js.map +1 -0
- package/dist/quota/schedule.js +38 -0
- package/dist/quota/schedule.js.map +1 -0
- package/dist/quota/store.js +94 -0
- package/dist/quota/store.js.map +1 -0
- package/dist/quota/time.js +41 -0
- package/dist/quota/time.js.map +1 -0
- package/dist/review/digest.js +202 -0
- package/dist/review/digest.js.map +1 -0
- package/dist/review/reviewer.js +113 -0
- package/dist/review/reviewer.js.map +1 -0
- package/dist/runtime.js +456 -0
- package/dist/runtime.js.map +1 -0
- package/dist/schedule/cron.js +354 -0
- package/dist/schedule/cron.js.map +1 -0
- package/dist/schedule/service.js +425 -0
- package/dist/schedule/service.js.map +1 -0
- package/dist/schedule/store.js +210 -0
- package/dist/schedule/store.js.map +1 -0
- package/dist/schedule/tools.js +246 -0
- package/dist/schedule/tools.js.map +1 -0
- package/dist/selfupdate/npm.js +114 -0
- package/dist/selfupdate/npm.js.map +1 -0
- package/dist/selfupdate/start.js +113 -0
- package/dist/selfupdate/start.js.map +1 -0
- package/dist/selfupdate/state.js +22 -0
- package/dist/selfupdate/state.js.map +1 -0
- package/dist/selfupdate/updater.js +120 -0
- package/dist/selfupdate/updater.js.map +1 -0
- package/dist/service/host.js +46 -0
- package/dist/service/host.js.map +1 -0
- package/dist/service/index.js +142 -0
- package/dist/service/index.js.map +1 -0
- package/dist/service/launchd.js +88 -0
- package/dist/service/launchd.js.map +1 -0
- package/dist/service/spec.js +9 -0
- package/dist/service/spec.js.map +1 -0
- package/dist/service/systemd.js +90 -0
- package/dist/service/systemd.js.map +1 -0
- package/dist/service/windows.js +122 -0
- package/dist/service/windows.js.map +1 -0
- package/dist/setup/pairing.js +143 -0
- package/dist/setup/pairing.js.map +1 -0
- package/dist/setup/setup.js +76 -0
- package/dist/setup/setup.js.map +1 -0
- package/dist/standing/defaults.js +80 -0
- package/dist/standing/defaults.js.map +1 -0
- package/dist/standing/model.js +72 -0
- package/dist/standing/model.js.map +1 -0
- package/dist/standing/service.js +228 -0
- package/dist/standing/service.js.map +1 -0
- package/dist/standing/tools.js +184 -0
- package/dist/standing/tools.js.map +1 -0
- package/dist/store/db.js +67 -0
- package/dist/store/db.js.map +1 -0
- package/dist/store/migrations.js +280 -0
- package/dist/store/migrations.js.map +1 -0
- package/dist/supervisor/processes.js +128 -0
- package/dist/supervisor/processes.js.map +1 -0
- package/dist/supervisor/stalls.js +103 -0
- package/dist/supervisor/stalls.js.map +1 -0
- package/dist/terminal/activity.js +97 -0
- package/dist/terminal/activity.js.map +1 -0
- package/dist/terminal/conversation.js +231 -0
- package/dist/terminal/conversation.js.map +1 -0
- package/dist/util/async-queue.js +41 -0
- package/dist/util/async-queue.js.map +1 -0
- package/dist/util/command.js +29 -0
- package/dist/util/command.js.map +1 -0
- package/dist/util/ids.js +9 -0
- package/dist/util/ids.js.map +1 -0
- package/dist/util/process-tree.js +62 -0
- package/dist/util/process-tree.js.map +1 -0
- package/dist/util/secrets.js +31 -0
- package/dist/util/secrets.js.map +1 -0
- package/dist/version.js +5 -0
- package/dist/version.js.map +1 -0
- package/dist/workers/claude/classify.js +172 -0
- package/dist/workers/claude/classify.js.map +1 -0
- package/dist/workers/claude/index.js +440 -0
- package/dist/workers/claude/index.js.map +1 -0
- package/dist/workers/claude/process.js +135 -0
- package/dist/workers/claude/process.js.map +1 -0
- package/dist/workers/claude/quota.js +37 -0
- package/dist/workers/claude/quota.js.map +1 -0
- package/dist/workers/claude/stream.js +286 -0
- package/dist/workers/claude/stream.js.map +1 -0
- package/dist/workers/codex/index.js +181 -0
- package/dist/workers/codex/index.js.map +1 -0
- package/dist/workers/codex/mapping.js +166 -0
- package/dist/workers/codex/mapping.js.map +1 -0
- package/dist/workers/codex/process.js +124 -0
- package/dist/workers/codex/process.js.map +1 -0
- package/dist/workers/codex/protocol.js +7 -0
- package/dist/workers/codex/protocol.js.map +1 -0
- package/dist/workers/codex/rpc.js +145 -0
- package/dist/workers/codex/rpc.js.map +1 -0
- package/dist/workers/codex/run.js +556 -0
- package/dist/workers/codex/run.js.map +1 -0
- package/dist/workers/env.js +49 -0
- package/dist/workers/env.js.map +1 -0
- package/dist/workers/fake/index.js +283 -0
- package/dist/workers/fake/index.js.map +1 -0
- package/dist/workers/models.js +171 -0
- package/dist/workers/models.js.map +1 -0
- package/dist/workers/registry.js +63 -0
- package/dist/workers/registry.js.map +1 -0
- package/dist/workers/types.js +6 -0
- package/dist/workers/types.js.map +1 -0
- package/package.json +66 -4
|
@@ -0,0 +1,286 @@
|
|
|
1
|
+
import { classifyFailure, normaliseResetsAt, } from "./classify.js";
|
|
2
|
+
const isObject = (v) => typeof v === "object" && v !== null && !Array.isArray(v);
|
|
3
|
+
const str = (v) => (typeof v === "string" ? v : undefined);
|
|
4
|
+
const num = (v) => typeof v === "number" && Number.isFinite(v) ? v : undefined;
|
|
5
|
+
export class ClaudeStreamMapper {
|
|
6
|
+
now;
|
|
7
|
+
sessionId;
|
|
8
|
+
openTools = new Map();
|
|
9
|
+
rejected;
|
|
10
|
+
heldError;
|
|
11
|
+
resultTerminal;
|
|
12
|
+
interrupted = false;
|
|
13
|
+
lastRetry;
|
|
14
|
+
constructor(now) {
|
|
15
|
+
this.now = now;
|
|
16
|
+
}
|
|
17
|
+
get knownSessionId() {
|
|
18
|
+
return this.sessionId;
|
|
19
|
+
}
|
|
20
|
+
get sawResult() {
|
|
21
|
+
return this.resultTerminal !== undefined;
|
|
22
|
+
}
|
|
23
|
+
markInterrupted() {
|
|
24
|
+
this.interrupted = true;
|
|
25
|
+
}
|
|
26
|
+
/** Parses one stdout line. Malformed lines yield no events. */
|
|
27
|
+
handleLine(line) {
|
|
28
|
+
const trimmed = line.trim();
|
|
29
|
+
if (!trimmed.startsWith("{"))
|
|
30
|
+
return [];
|
|
31
|
+
let message;
|
|
32
|
+
try {
|
|
33
|
+
message = JSON.parse(trimmed);
|
|
34
|
+
}
|
|
35
|
+
catch {
|
|
36
|
+
return [];
|
|
37
|
+
}
|
|
38
|
+
if (!isObject(message))
|
|
39
|
+
return [];
|
|
40
|
+
return this.handleMessage(message);
|
|
41
|
+
}
|
|
42
|
+
at() {
|
|
43
|
+
return this.now().toISOString();
|
|
44
|
+
}
|
|
45
|
+
handleMessage(m) {
|
|
46
|
+
const events = [];
|
|
47
|
+
const sid = str(m.session_id);
|
|
48
|
+
if (sid && !this.sessionId) {
|
|
49
|
+
this.sessionId = sid;
|
|
50
|
+
events.push({ type: "started", at: this.at(), sessionId: sid });
|
|
51
|
+
}
|
|
52
|
+
switch (m.type) {
|
|
53
|
+
case "assistant":
|
|
54
|
+
events.push(...this.onAssistant(m));
|
|
55
|
+
break;
|
|
56
|
+
case "user":
|
|
57
|
+
events.push(...this.onUser(m));
|
|
58
|
+
break;
|
|
59
|
+
case "tool_progress": {
|
|
60
|
+
const name = str(m.tool_name) ?? "tool";
|
|
61
|
+
const elapsed = num(m.elapsed_time_seconds);
|
|
62
|
+
events.push({
|
|
63
|
+
type: "activity",
|
|
64
|
+
at: this.at(),
|
|
65
|
+
kind: "tool_progress",
|
|
66
|
+
summary: elapsed === undefined ? `${name} running` : `${name} running (${elapsed}s)`,
|
|
67
|
+
toolRunning: true,
|
|
68
|
+
});
|
|
69
|
+
break;
|
|
70
|
+
}
|
|
71
|
+
case "rate_limit_event":
|
|
72
|
+
this.onRateLimit(m);
|
|
73
|
+
break;
|
|
74
|
+
case "auth_status": {
|
|
75
|
+
const error = str(m.error);
|
|
76
|
+
if (error)
|
|
77
|
+
this.heldError = { type: "auth_error", detail: error };
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
80
|
+
case "system":
|
|
81
|
+
if (m.subtype === "api_retry")
|
|
82
|
+
events.push(this.onApiRetry(m));
|
|
83
|
+
break;
|
|
84
|
+
case "result":
|
|
85
|
+
this.onResult(m);
|
|
86
|
+
break;
|
|
87
|
+
default:
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
return events;
|
|
91
|
+
}
|
|
92
|
+
onAssistant(m) {
|
|
93
|
+
const message = isObject(m.message) ? m.message : {};
|
|
94
|
+
const content = Array.isArray(message.content) ? message.content.filter(isObject) : [];
|
|
95
|
+
const text = content
|
|
96
|
+
.filter((b) => b.type === "text")
|
|
97
|
+
.map((b) => str(b.text) ?? "")
|
|
98
|
+
.join("\n")
|
|
99
|
+
.trim();
|
|
100
|
+
const error = str(m.error);
|
|
101
|
+
if (error) {
|
|
102
|
+
this.heldError = classifyFailure({
|
|
103
|
+
code: error,
|
|
104
|
+
text,
|
|
105
|
+
rejected: this.rejected,
|
|
106
|
+
now: this.now(),
|
|
107
|
+
defaultRetryable: true,
|
|
108
|
+
});
|
|
109
|
+
return [];
|
|
110
|
+
}
|
|
111
|
+
const events = [];
|
|
112
|
+
for (const block of content) {
|
|
113
|
+
if (block.type !== "tool_use")
|
|
114
|
+
continue;
|
|
115
|
+
const id = str(block.id);
|
|
116
|
+
const name = str(block.name) ?? "tool";
|
|
117
|
+
if (id)
|
|
118
|
+
this.openTools.set(id, name);
|
|
119
|
+
events.push({
|
|
120
|
+
type: "activity",
|
|
121
|
+
at: this.at(),
|
|
122
|
+
kind: "tool_use",
|
|
123
|
+
summary: summariseToolUse(name, block.input),
|
|
124
|
+
toolRunning: true,
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
if (text && m.parent_tool_use_id == null) {
|
|
128
|
+
events.unshift({ type: "message", at: this.at(), text });
|
|
129
|
+
}
|
|
130
|
+
return events;
|
|
131
|
+
}
|
|
132
|
+
onUser(m) {
|
|
133
|
+
const message = isObject(m.message) ? m.message : {};
|
|
134
|
+
const content = Array.isArray(message.content) ? message.content.filter(isObject) : [];
|
|
135
|
+
const events = [];
|
|
136
|
+
for (const block of content) {
|
|
137
|
+
if (block.type !== "tool_result")
|
|
138
|
+
continue;
|
|
139
|
+
const id = str(block.tool_use_id);
|
|
140
|
+
const name = (id && this.openTools.get(id)) || "tool";
|
|
141
|
+
if (id)
|
|
142
|
+
this.openTools.delete(id);
|
|
143
|
+
events.push({
|
|
144
|
+
type: "activity",
|
|
145
|
+
at: this.at(),
|
|
146
|
+
kind: "tool_result",
|
|
147
|
+
summary: `${name} ${block.is_error === true ? "failed" : "finished"}`,
|
|
148
|
+
toolRunning: this.openTools.size > 0,
|
|
149
|
+
});
|
|
150
|
+
}
|
|
151
|
+
return events;
|
|
152
|
+
}
|
|
153
|
+
onRateLimit(m) {
|
|
154
|
+
const info = isObject(m.rate_limit_info) ? m.rate_limit_info : {};
|
|
155
|
+
if (info.status === "rejected") {
|
|
156
|
+
const rateLimitType = str(info.rateLimitType);
|
|
157
|
+
const resetsAt = normaliseResetsAt(info.resetsAt);
|
|
158
|
+
this.rejected = {
|
|
159
|
+
...(rateLimitType ? { rateLimitType } : {}),
|
|
160
|
+
...(resetsAt ? { resetsAt } : {}),
|
|
161
|
+
};
|
|
162
|
+
}
|
|
163
|
+
else if (info.status === "allowed" || info.status === "allowed_warning") {
|
|
164
|
+
this.rejected = undefined;
|
|
165
|
+
}
|
|
166
|
+
}
|
|
167
|
+
onApiRetry(m) {
|
|
168
|
+
const category = str(m.error) ?? "unknown";
|
|
169
|
+
const status = num(m.error_status);
|
|
170
|
+
const attempt = num(m.attempt);
|
|
171
|
+
const max = num(m.max_retries);
|
|
172
|
+
this.lastRetry = `${category}${status === undefined ? "" : ` (HTTP ${status})`}`;
|
|
173
|
+
return {
|
|
174
|
+
type: "activity",
|
|
175
|
+
at: this.at(),
|
|
176
|
+
kind: "api_retry",
|
|
177
|
+
summary: `Claude API ${this.lastRetry}; retry ${attempt ?? "?"}/${max ?? "?"}`,
|
|
178
|
+
toolRunning: this.openTools.size > 0,
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
onResult(m) {
|
|
182
|
+
if (this.interrupted) {
|
|
183
|
+
this.resultTerminal = interruptedFailure();
|
|
184
|
+
return;
|
|
185
|
+
}
|
|
186
|
+
const subtype = str(m.subtype);
|
|
187
|
+
if (m.is_error !== true && subtype === "success") {
|
|
188
|
+
this.resultTerminal = {
|
|
189
|
+
type: "completed",
|
|
190
|
+
finalText: str(m.result) ?? "",
|
|
191
|
+
usage: mapUsage(m),
|
|
192
|
+
};
|
|
193
|
+
}
|
|
194
|
+
else if (this.heldError) {
|
|
195
|
+
this.resultTerminal = this.heldError;
|
|
196
|
+
}
|
|
197
|
+
else {
|
|
198
|
+
const errors = Array.isArray(m.errors) ? m.errors.filter((e) => typeof e === "string") : [];
|
|
199
|
+
const text = [str(m.result), ...errors].filter(Boolean).join("\n") || subtype || "";
|
|
200
|
+
this.resultTerminal = classifyFailure({
|
|
201
|
+
text,
|
|
202
|
+
httpStatus: num(m.api_error_status) ?? null,
|
|
203
|
+
rejected: this.rejected,
|
|
204
|
+
now: this.now(),
|
|
205
|
+
defaultRetryable: subtype === "error_during_execution",
|
|
206
|
+
});
|
|
207
|
+
}
|
|
208
|
+
// A later turn (started by background work) is judged on its own.
|
|
209
|
+
this.heldError = undefined;
|
|
210
|
+
this.rejected = undefined;
|
|
211
|
+
}
|
|
212
|
+
/** The terminal event once the process has exited. */
|
|
213
|
+
finish(exit) {
|
|
214
|
+
if (this.resultTerminal)
|
|
215
|
+
return this.resultTerminal;
|
|
216
|
+
if (this.interrupted)
|
|
217
|
+
return interruptedFailure();
|
|
218
|
+
if (this.heldError)
|
|
219
|
+
return this.heldError;
|
|
220
|
+
const how = exit.signal !== null ? `signal ${exit.signal}` : `exit code ${exit.code ?? "unknown"}`;
|
|
221
|
+
const stderr = exit.stderr.trim();
|
|
222
|
+
const fromStderr = stderr
|
|
223
|
+
? classifyFailure({
|
|
224
|
+
text: stderr,
|
|
225
|
+
rejected: this.rejected,
|
|
226
|
+
now: this.now(),
|
|
227
|
+
defaultRetryable: true,
|
|
228
|
+
})
|
|
229
|
+
: undefined;
|
|
230
|
+
if (fromStderr && fromStderr.type !== "failed")
|
|
231
|
+
return fromStderr;
|
|
232
|
+
const retry = this.lastRetry ? ` after API errors: ${this.lastRetry}` : "";
|
|
233
|
+
return {
|
|
234
|
+
type: "failed",
|
|
235
|
+
error: `Claude Code exited before finishing (${how})${retry}${stderr ? `: ${stderr}` : ""}`,
|
|
236
|
+
retryable: true,
|
|
237
|
+
};
|
|
238
|
+
}
|
|
239
|
+
}
|
|
240
|
+
function interruptedFailure() {
|
|
241
|
+
return { type: "failed", error: "Run interrupted by Preston", retryable: true };
|
|
242
|
+
}
|
|
243
|
+
function summariseToolUse(name, input) {
|
|
244
|
+
if (!isObject(input))
|
|
245
|
+
return name;
|
|
246
|
+
const detail = str(input.command) ??
|
|
247
|
+
str(input.file_path) ??
|
|
248
|
+
str(input.notebook_path) ??
|
|
249
|
+
str(input.path) ??
|
|
250
|
+
str(input.pattern) ??
|
|
251
|
+
str(input.url) ??
|
|
252
|
+
str(input.query) ??
|
|
253
|
+
str(input.description);
|
|
254
|
+
if (!detail)
|
|
255
|
+
return name;
|
|
256
|
+
const oneLine = detail.replace(/\s+/g, " ").trim();
|
|
257
|
+
return `${name}: ${oneLine.length > 80 ? `${oneLine.slice(0, 79)}…` : oneLine}`;
|
|
258
|
+
}
|
|
259
|
+
/**
|
|
260
|
+
* Token counts for this invocation. `inputTokens` includes cache reads and writes;
|
|
261
|
+
* `cachedInputTokens` is the cache-read share. `total_cost_usd` covers the whole conversation on
|
|
262
|
+
* resume (documented), so the per-invocation `model_usage_since_last_result` costs are preferred.
|
|
263
|
+
*/
|
|
264
|
+
function mapUsage(m) {
|
|
265
|
+
const usage = isObject(m.usage) ? m.usage : undefined;
|
|
266
|
+
const result = {};
|
|
267
|
+
if (usage) {
|
|
268
|
+
const input = num(usage.input_tokens) ?? 0;
|
|
269
|
+
const cacheWrite = num(usage.cache_creation_input_tokens) ?? 0;
|
|
270
|
+
const cacheRead = num(usage.cache_read_input_tokens) ?? 0;
|
|
271
|
+
result.inputTokens = input + cacheWrite + cacheRead;
|
|
272
|
+
result.cachedInputTokens = cacheRead;
|
|
273
|
+
const output = num(usage.output_tokens);
|
|
274
|
+
if (output !== undefined)
|
|
275
|
+
result.outputTokens = output;
|
|
276
|
+
}
|
|
277
|
+
const sinceLast = isObject(m.model_usage_since_last_result)
|
|
278
|
+
? Object.values(m.model_usage_since_last_result).filter(isObject)
|
|
279
|
+
: [];
|
|
280
|
+
const costs = sinceLast.map((u) => num(u.costUSD)).filter((c) => c !== undefined);
|
|
281
|
+
const cost = costs.length > 0 ? costs.reduce((a, b) => a + b, 0) : num(m.total_cost_usd);
|
|
282
|
+
if (cost !== undefined)
|
|
283
|
+
result.costUsd = cost;
|
|
284
|
+
return Object.keys(result).length > 0 ? result : undefined;
|
|
285
|
+
}
|
|
286
|
+
//# sourceMappingURL=stream.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"stream.js","sourceRoot":"","sources":["../../../src/workers/claude/stream.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,181 @@
|
|
|
1
|
+
import { quotaReadings, toModelInfo } from "./mapping.js";
|
|
2
|
+
import { defaultSpawn, resolveExecutable, runCaptured, shutdownChild, } from "./process.js";
|
|
3
|
+
import { AppServerConnection, RpcError } from "./rpc.js";
|
|
4
|
+
import { startCodexRun } from "./run.js";
|
|
5
|
+
const COMMAND_TIMEOUT_MS = 15_000;
|
|
6
|
+
const UPDATE_TIMEOUT_MS = 10 * 60_000;
|
|
7
|
+
const REQUEST_TIMEOUT_MS = 20_000;
|
|
8
|
+
function parseVersion(output) {
|
|
9
|
+
return output.match(/\d+\.\d+\.\d+[\w.+-]*/)?.[0];
|
|
10
|
+
}
|
|
11
|
+
function tail(text) {
|
|
12
|
+
return text.trim().slice(-500);
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Drives the user's installed `codex` CLI through `codex app-server` (ADR 0002). Preston never
|
|
16
|
+
* touches Codex credentials; login state comes from `codex login status`.
|
|
17
|
+
*/
|
|
18
|
+
export function createCodexAdapter(opts = {}) {
|
|
19
|
+
const executable = opts.executable ?? "codex";
|
|
20
|
+
const env = opts.env ?? process.env;
|
|
21
|
+
const spawn = opts.spawn ?? defaultSpawn;
|
|
22
|
+
const now = opts.now ?? (() => new Date());
|
|
23
|
+
const shutdownGraceMs = opts.shutdownGraceMs ?? 3000;
|
|
24
|
+
const interruptTimeoutMs = opts.interruptTimeoutMs ?? 5000;
|
|
25
|
+
const resolve = () => resolveExecutable(executable, env);
|
|
26
|
+
async function version() {
|
|
27
|
+
const run = await runCaptured(spawn, resolve(), ["--version"], env, COMMAND_TIMEOUT_MS);
|
|
28
|
+
return run.code === 0 ? parseVersion(run.stdout) : undefined;
|
|
29
|
+
}
|
|
30
|
+
/** A short-lived App Server for token-free reads, shut down afterwards. */
|
|
31
|
+
async function withAppServer(fn) {
|
|
32
|
+
const exe = resolve();
|
|
33
|
+
let startError;
|
|
34
|
+
const child = spawn(exe.command, ["app-server"], { env, shell: exe.shell });
|
|
35
|
+
const exited = new Promise((done) => {
|
|
36
|
+
child.on("exit", (code, signal) => done({ code, signal }));
|
|
37
|
+
child.on("error", (error) => {
|
|
38
|
+
startError = error;
|
|
39
|
+
done({ code: null, signal: null });
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
child.stderr.resume();
|
|
43
|
+
const conn = new AppServerConnection(child, {
|
|
44
|
+
onNotification: () => { },
|
|
45
|
+
onRequest: (r) => conn.respondError(r.id, -32601, `Preston does not handle ${r.method}`),
|
|
46
|
+
});
|
|
47
|
+
void exited.then(() => conn.close());
|
|
48
|
+
try {
|
|
49
|
+
await conn.initialize();
|
|
50
|
+
return await fn(conn);
|
|
51
|
+
}
|
|
52
|
+
catch (error) {
|
|
53
|
+
if (startError)
|
|
54
|
+
throw new Error(`Could not start Codex: ${startError.message}`);
|
|
55
|
+
throw error;
|
|
56
|
+
}
|
|
57
|
+
finally {
|
|
58
|
+
await shutdownChild(child, exited, shutdownGraceMs);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
return {
|
|
62
|
+
agent: "codex",
|
|
63
|
+
async detect() {
|
|
64
|
+
const exe = resolve();
|
|
65
|
+
const run = await runCaptured(spawn, exe, ["--version"], env, COMMAND_TIMEOUT_MS);
|
|
66
|
+
if (run.error || run.code !== 0) {
|
|
67
|
+
const missing = run.error?.code === "ENOENT";
|
|
68
|
+
return {
|
|
69
|
+
installed: false,
|
|
70
|
+
...(exe.path ? { path: exe.path } : {}),
|
|
71
|
+
problem: missing
|
|
72
|
+
? "Codex isn't installed (no `codex` command was found). Install the Codex CLI, then run `codex login`."
|
|
73
|
+
: `Codex is installed but won't start: ${run.error?.message ?? (tail(run.stderr) || `exit code ${run.code}`)}`,
|
|
74
|
+
};
|
|
75
|
+
}
|
|
76
|
+
const detection = {
|
|
77
|
+
installed: true,
|
|
78
|
+
...(exe.path ? { path: exe.path } : {}),
|
|
79
|
+
};
|
|
80
|
+
const found = parseVersion(run.stdout);
|
|
81
|
+
if (found)
|
|
82
|
+
detection.version = found;
|
|
83
|
+
// Prints to stderr; exits 0 when signed in and 1 with "Not logged in" otherwise.
|
|
84
|
+
const login = await runCaptured(spawn, exe, ["login", "status"], env, COMMAND_TIMEOUT_MS);
|
|
85
|
+
const output = `${login.stdout}\n${login.stderr}`;
|
|
86
|
+
if (login.code === 0) {
|
|
87
|
+
detection.loggedIn = true;
|
|
88
|
+
}
|
|
89
|
+
else if (/not logged in/i.test(output)) {
|
|
90
|
+
detection.loggedIn = false;
|
|
91
|
+
detection.problem =
|
|
92
|
+
"Codex is installed but not signed in. Run `codex login` in a terminal to sign in.";
|
|
93
|
+
}
|
|
94
|
+
else {
|
|
95
|
+
detection.loggedIn = "unknown";
|
|
96
|
+
}
|
|
97
|
+
return detection;
|
|
98
|
+
},
|
|
99
|
+
startRun(input) {
|
|
100
|
+
return startCodexRun(input, {
|
|
101
|
+
spawn,
|
|
102
|
+
exe: resolve(),
|
|
103
|
+
env,
|
|
104
|
+
now,
|
|
105
|
+
shutdownGraceMs,
|
|
106
|
+
interruptTimeoutMs,
|
|
107
|
+
});
|
|
108
|
+
},
|
|
109
|
+
async readQuota() {
|
|
110
|
+
return withAppServer(async (conn) => {
|
|
111
|
+
try {
|
|
112
|
+
const response = await conn.request("account/rateLimits/read", null, REQUEST_TIMEOUT_MS);
|
|
113
|
+
return quotaReadings(response, now().toISOString());
|
|
114
|
+
}
|
|
115
|
+
catch (error) {
|
|
116
|
+
// API-key logins (and signed-out CLIs) have no plan windows to report.
|
|
117
|
+
if (error instanceof RpcError)
|
|
118
|
+
return [];
|
|
119
|
+
throw error;
|
|
120
|
+
}
|
|
121
|
+
});
|
|
122
|
+
},
|
|
123
|
+
async listModels() {
|
|
124
|
+
return withAppServer(async (conn) => {
|
|
125
|
+
const models = [];
|
|
126
|
+
let cursor;
|
|
127
|
+
for (let page = 0; page < 10; page++) {
|
|
128
|
+
const response = await conn.request("model/list", cursor ? { cursor } : {}, REQUEST_TIMEOUT_MS);
|
|
129
|
+
for (const model of response.data ?? []) {
|
|
130
|
+
if (!model.hidden)
|
|
131
|
+
models.push(toModelInfo(model));
|
|
132
|
+
}
|
|
133
|
+
cursor = response.nextCursor;
|
|
134
|
+
if (!cursor)
|
|
135
|
+
break;
|
|
136
|
+
}
|
|
137
|
+
return models;
|
|
138
|
+
});
|
|
139
|
+
},
|
|
140
|
+
async update() {
|
|
141
|
+
const fromVersion = await version();
|
|
142
|
+
// The standalone updater honours CODEX_NON_INTERACTIVE; npm/brew installs never prompt.
|
|
143
|
+
const run = await runCaptured(spawn, resolve(), ["update"], { ...env, CODEX_NON_INTERACTIVE: "1" }, UPDATE_TIMEOUT_MS);
|
|
144
|
+
const toVersion = await version();
|
|
145
|
+
const versions = {
|
|
146
|
+
...(fromVersion ? { fromVersion } : {}),
|
|
147
|
+
...(toVersion ? { toVersion } : {}),
|
|
148
|
+
};
|
|
149
|
+
if (run.error || run.timedOut || run.code !== 0) {
|
|
150
|
+
const why = run.error
|
|
151
|
+
? run.error.message
|
|
152
|
+
: run.timedOut
|
|
153
|
+
? "it timed out"
|
|
154
|
+
: `exit code ${run.code}: ${tail(`${run.stdout}\n${run.stderr}`)}`;
|
|
155
|
+
return {
|
|
156
|
+
updated: false,
|
|
157
|
+
failed: true,
|
|
158
|
+
...versions,
|
|
159
|
+
detail: `codex update failed (${why})`,
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
if (!toVersion) {
|
|
163
|
+
return {
|
|
164
|
+
updated: false,
|
|
165
|
+
failed: true,
|
|
166
|
+
...versions,
|
|
167
|
+
detail: "codex update finished but `codex --version` no longer runs",
|
|
168
|
+
};
|
|
169
|
+
}
|
|
170
|
+
const updated = !!fromVersion && fromVersion !== toVersion;
|
|
171
|
+
return {
|
|
172
|
+
updated,
|
|
173
|
+
...versions,
|
|
174
|
+
detail: updated
|
|
175
|
+
? `Updated Codex from ${fromVersion} to ${toVersion}`
|
|
176
|
+
: `Codex ${toVersion} is already up to date`,
|
|
177
|
+
};
|
|
178
|
+
},
|
|
179
|
+
};
|
|
180
|
+
}
|
|
181
|
+
//# sourceMappingURL=index.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/workers/codex/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,166 @@
|
|
|
1
|
+
const WINDOWS = ["primary", "secondary"];
|
|
2
|
+
/** `codex:primary` for the account-wide limit; other metered limits keep their own id. */
|
|
3
|
+
export function bucketName(limitId, window) {
|
|
4
|
+
return !limitId || limitId === "codex" ? `codex:${window}` : `codex:${limitId}:${window}`;
|
|
5
|
+
}
|
|
6
|
+
function isoFromUnixSeconds(seconds) {
|
|
7
|
+
return typeof seconds === "number" && Number.isFinite(seconds)
|
|
8
|
+
? new Date(seconds * 1000).toISOString()
|
|
9
|
+
: undefined;
|
|
10
|
+
}
|
|
11
|
+
function errorInfoName(info) {
|
|
12
|
+
if (typeof info === "string")
|
|
13
|
+
return info;
|
|
14
|
+
if (info && typeof info === "object")
|
|
15
|
+
return Object.keys(info)[0];
|
|
16
|
+
return undefined;
|
|
17
|
+
}
|
|
18
|
+
function httpStatus(info) {
|
|
19
|
+
if (!info || typeof info !== "object")
|
|
20
|
+
return undefined;
|
|
21
|
+
const inner = Object.values(info)[0];
|
|
22
|
+
return typeof inner?.httpStatusCode === "number" ? inner.httpStatusCode : undefined;
|
|
23
|
+
}
|
|
24
|
+
function isSpendLimit(snapshot) {
|
|
25
|
+
return (snapshot.spendControlReached === true ||
|
|
26
|
+
(snapshot.rateLimitReachedType ?? "").includes("credits_depleted"));
|
|
27
|
+
}
|
|
28
|
+
/**
|
|
29
|
+
* Picks the window that blocks work: an exhausted one (the latest reset if several, since all must
|
|
30
|
+
* reset), otherwise the fullest one. Without any snapshot, falls back to `codex:primary`.
|
|
31
|
+
*/
|
|
32
|
+
export function blockingWindow(snapshots) {
|
|
33
|
+
const blocksMore = (a, b) => {
|
|
34
|
+
const aFull = a.usedPercent >= 100;
|
|
35
|
+
if (aFull !== b.usedPercent >= 100)
|
|
36
|
+
return aFull;
|
|
37
|
+
return aFull ? (a.resetsAt ?? 0) > (b.resetsAt ?? 0) : a.usedPercent > b.usedPercent;
|
|
38
|
+
};
|
|
39
|
+
let best;
|
|
40
|
+
for (const snapshot of snapshots) {
|
|
41
|
+
for (const name of WINDOWS) {
|
|
42
|
+
const window = snapshot[name];
|
|
43
|
+
if (window && (!best || blocksMore(window, best.window)))
|
|
44
|
+
best = { snapshot, name, window };
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
if (!best)
|
|
48
|
+
return { bucket: "codex:primary", kind: "usage_limit" };
|
|
49
|
+
const resetsAt = isoFromUnixSeconds(best.window.resetsAt);
|
|
50
|
+
return {
|
|
51
|
+
bucket: bucketName(best.snapshot.limitId, best.name),
|
|
52
|
+
kind: isSpendLimit(best.snapshot) ? "spend_limit" : "usage_limit",
|
|
53
|
+
...(resetsAt ? { resetsAt } : {}),
|
|
54
|
+
};
|
|
55
|
+
}
|
|
56
|
+
const NOT_RETRYABLE = new Set([
|
|
57
|
+
"contextWindowExceeded",
|
|
58
|
+
"sessionBudgetExceeded",
|
|
59
|
+
"modelNotFound",
|
|
60
|
+
"badRequest",
|
|
61
|
+
"cyberPolicy",
|
|
62
|
+
"misalignmentPolicyViolation",
|
|
63
|
+
"inferenceHookDenied",
|
|
64
|
+
"tooManyDenials",
|
|
65
|
+
"sandboxError",
|
|
66
|
+
"threadRollbackFailed",
|
|
67
|
+
]);
|
|
68
|
+
/**
|
|
69
|
+
* Classifies a failed turn. Plan exhaustion, request-rate limits and authentication problems are
|
|
70
|
+
* kept apart, because Preston waits for the first two and asks the user about the third.
|
|
71
|
+
*/
|
|
72
|
+
export function classifyTurnError(error, snapshots) {
|
|
73
|
+
const message = error?.message || "Codex turn failed";
|
|
74
|
+
const detail = error?.additionalDetails ? `${message} (${error.additionalDetails})` : message;
|
|
75
|
+
const info = error?.codexErrorInfo;
|
|
76
|
+
const name = errorInfoName(info);
|
|
77
|
+
const status = httpStatus(info);
|
|
78
|
+
if (name === "unauthorized" || status === 401) {
|
|
79
|
+
return {
|
|
80
|
+
type: "auth_error",
|
|
81
|
+
detail: `Codex is not signed in or its login expired: ${detail}`,
|
|
82
|
+
};
|
|
83
|
+
}
|
|
84
|
+
if (name === "usageLimitExceeded") {
|
|
85
|
+
return { type: "quota_blocked", ...blockingWindow(snapshots), detail };
|
|
86
|
+
}
|
|
87
|
+
if (name === "rateLimitExceeded" || status === 429) {
|
|
88
|
+
return { type: "quota_blocked", bucket: "codex:rate_limit", kind: "rate_limit", detail };
|
|
89
|
+
}
|
|
90
|
+
return { type: "failed", error: detail, retryable: !(name && NOT_RETRYABLE.has(name)) };
|
|
91
|
+
}
|
|
92
|
+
/**
|
|
93
|
+
* Maps `account/rateLimits/read` to one reading per metered window. A window is unavailable when
|
|
94
|
+
* it is full, the backend says the limit is reached, or ordinary usage is not allowed.
|
|
95
|
+
*/
|
|
96
|
+
export function quotaReadings(response, checkedAt) {
|
|
97
|
+
if (!response)
|
|
98
|
+
return [];
|
|
99
|
+
const byId = Object.values(response.rateLimitsByLimitId ?? {}).filter((s) => !!s);
|
|
100
|
+
const snapshots = byId.length > 0 ? byId : response.rateLimits ? [response.rateLimits] : [];
|
|
101
|
+
const readings = [];
|
|
102
|
+
for (const snapshot of snapshots) {
|
|
103
|
+
const limitReached = !!snapshot.rateLimitReachedType || snapshot.spendControlReached === true;
|
|
104
|
+
for (const name of WINDOWS) {
|
|
105
|
+
const window = snapshot[name];
|
|
106
|
+
if (!window)
|
|
107
|
+
continue;
|
|
108
|
+
const resetsAt = isoFromUnixSeconds(window.resetsAt);
|
|
109
|
+
const exhausted = window.usedPercent >= 100 || response.ordinaryUsageAllowed === false || limitReached;
|
|
110
|
+
readings.push({
|
|
111
|
+
bucket: bucketName(snapshot.limitId, name),
|
|
112
|
+
available: !exhausted,
|
|
113
|
+
usedPercent: window.usedPercent,
|
|
114
|
+
...(resetsAt ? { resetsAt } : {}),
|
|
115
|
+
checkedAt,
|
|
116
|
+
});
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
return readings;
|
|
120
|
+
}
|
|
121
|
+
export function toModelInfo(model) {
|
|
122
|
+
const efforts = model.supportedReasoningEfforts?.map((e) => e.reasoningEffort);
|
|
123
|
+
return {
|
|
124
|
+
id: model.model || model.id,
|
|
125
|
+
...(model.displayName ? { displayName: model.displayName } : {}),
|
|
126
|
+
...(efforts?.length ? { efforts } : {}),
|
|
127
|
+
isDefault: model.isDefault === true,
|
|
128
|
+
};
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* Answers a server→client approval request. Preston starts Codex so it should not ask (full
|
|
132
|
+
* access never asks, tools-only has nothing to ask for); this keeps an unexpected ask from
|
|
133
|
+
* hanging the turn. Returns undefined for methods that are not approvals.
|
|
134
|
+
*/
|
|
135
|
+
export function answerApproval(method, raw, allow, reason) {
|
|
136
|
+
const params = (raw ?? {});
|
|
137
|
+
switch (method) {
|
|
138
|
+
case "item/commandExecution/requestApproval":
|
|
139
|
+
case "item/fileChange/requestApproval":
|
|
140
|
+
return { result: { decision: allow ? "accept" : "decline" }, carriesReason: false };
|
|
141
|
+
case "item/permissions/requestApproval": {
|
|
142
|
+
const requested = (params.permissions ?? {});
|
|
143
|
+
return {
|
|
144
|
+
result: {
|
|
145
|
+
permissions: allow
|
|
146
|
+
? {
|
|
147
|
+
...(requested.network ? { network: requested.network } : {}),
|
|
148
|
+
...(requested.fileSystem ? { fileSystem: requested.fileSystem } : {}),
|
|
149
|
+
}
|
|
150
|
+
: {},
|
|
151
|
+
scope: "turn",
|
|
152
|
+
},
|
|
153
|
+
carriesReason: false,
|
|
154
|
+
};
|
|
155
|
+
}
|
|
156
|
+
case "execCommandApproval":
|
|
157
|
+
case "applyPatchApproval":
|
|
158
|
+
return {
|
|
159
|
+
result: { decision: allow ? "approved" : { denied: { rejection: reason } } },
|
|
160
|
+
carriesReason: true,
|
|
161
|
+
};
|
|
162
|
+
default:
|
|
163
|
+
return undefined;
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
//# sourceMappingURL=mapping.js.map
|