genaicode 2.29.0 → 2.31.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/README.md +2 -1
- package/dist/agents/artifacts.d.ts +70 -0
- package/dist/agents/artifacts.js +310 -0
- package/dist/agents/artifacts.js.map +1 -0
- package/dist/agents/cli-agent.js +2 -2
- package/dist/agents/cli-agent.js.map +1 -1
- package/dist/agents/drivers/mcp-isolation.js +5 -2
- package/dist/agents/drivers/mcp-isolation.js.map +1 -1
- package/dist/agents/failover.d.ts +17 -0
- package/dist/agents/failover.js +153 -0
- package/dist/agents/failover.js.map +1 -0
- package/dist/agents/handoff.d.ts +12 -0
- package/dist/agents/handoff.js +133 -0
- package/dist/agents/handoff.js.map +1 -0
- package/dist/agents/live-agent.js +2 -2
- package/dist/agents/live-agent.js.map +1 -1
- package/dist/agents/mcp-tools.d.ts +25 -0
- package/dist/agents/mcp-tools.js +64 -0
- package/dist/agents/mcp-tools.js.map +1 -0
- package/dist/agents/prepare.d.ts +12 -1
- package/dist/agents/prepare.js +15 -2
- package/dist/agents/prepare.js.map +1 -1
- package/dist/agents/runtime.d.ts +4 -2
- package/dist/agents/runtime.js +35 -10
- package/dist/agents/runtime.js.map +1 -1
- package/dist/agents/session.d.ts +68 -4
- package/dist/agents/session.js +196 -43
- package/dist/agents/session.js.map +1 -1
- package/dist/agents/types.d.ts +42 -0
- package/dist/agents/usage.d.ts +5 -0
- package/dist/agents/usage.js +26 -0
- package/dist/agents/usage.js.map +1 -0
- package/dist/agents.d.ts +4 -1
- package/dist/agents.js +2 -0
- package/dist/agents.js.map +1 -1
- package/dist/app-agent/app-agent.d.ts +21 -0
- package/dist/app-agent/app-agent.js +52 -0
- package/dist/app-agent/app-agent.js.map +1 -1
- package/dist/app-agent/http.d.ts +1 -0
- package/dist/app-agent/http.js +15 -0
- package/dist/app-agent/http.js.map +1 -1
- package/dist/app-agent/mcp.d.ts +2 -25
- package/dist/app-agent/mcp.js +1 -63
- package/dist/app-agent/mcp.js.map +1 -1
- package/dist/app-agent/state.d.ts +2 -0
- package/dist/app-agent/state.js.map +1 -1
- package/dist/cli/args.d.ts +6 -0
- package/dist/cli/args.js +15 -0
- package/dist/cli/args.js.map +1 -1
- package/dist/cli/main.d.ts +5 -1
- package/dist/cli/main.js +27 -2
- package/dist/cli/main.js.map +1 -1
- package/dist/cli/render.js +4 -0
- package/dist/cli/render.js.map +1 -1
- package/dist/react/agent-chat.css +59 -0
- package/dist/react/agent-chat.d.ts +9 -1
- package/dist/react/agent-chat.js +33 -5
- package/dist/react/agent-chat.js.map +1 -1
- package/dist/react/app-agent-chat.d.ts +6 -1
- package/dist/react/app-agent-chat.js +3 -2
- package/dist/react/app-agent-chat.js.map +1 -1
- package/dist/react/format.d.ts +1 -0
- package/dist/react/format.js +7 -0
- package/dist/react/format.js.map +1 -1
- package/dist/ui/index.js +99 -79
- package/dist/ui/web-client.js +71 -12
- package/dist/ui.d.ts +2 -0
- package/dist/ui.js.map +1 -1
- package/docs/agents.md +97 -2
- package/docs/app-agent.md +9 -0
- package/docs/cli.md +14 -2
- package/docs/react.md +13 -12
- package/package.json +2 -1
package/dist/agents/runtime.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { existsSync, statSync } from 'node:fs';
|
|
2
2
|
import { approximateSize, EventQueue } from './event-queue.js';
|
|
3
|
+
import { tokenCount } from './usage.js';
|
|
3
4
|
const STDERR_TAIL_BYTES = 4 * 1024;
|
|
4
5
|
/** Collects events for iteration and folds them into the pieces of an `AgentResult`. */
|
|
5
6
|
export class RunRecorder {
|
|
@@ -17,6 +18,7 @@ export class RunRecorder {
|
|
|
17
18
|
warned = new Set();
|
|
18
19
|
overBudget;
|
|
19
20
|
quotaReported = false;
|
|
21
|
+
quotaResetsAt;
|
|
20
22
|
constructor(name, command) {
|
|
21
23
|
this.name = name;
|
|
22
24
|
this.command = command;
|
|
@@ -38,8 +40,11 @@ export class RunRecorder {
|
|
|
38
40
|
if (event.costUsd !== undefined)
|
|
39
41
|
this.costUsd = event.costUsd;
|
|
40
42
|
}
|
|
41
|
-
if (event.type === 'rate-limit' && event.limit.status === 'exceeded')
|
|
43
|
+
if (event.type === 'rate-limit' && event.limit.status === 'exceeded') {
|
|
42
44
|
this.quotaReported = true;
|
|
45
|
+
if (event.limit.resetsAt !== undefined)
|
|
46
|
+
this.quotaResetsAt = Math.max(this.quotaResetsAt ?? 0, event.limit.resetsAt);
|
|
47
|
+
}
|
|
43
48
|
if (event.type === 'error')
|
|
44
49
|
this.lastError = event.message;
|
|
45
50
|
if (event.type === 'stderr')
|
|
@@ -83,6 +88,12 @@ export class RunRecorder {
|
|
|
83
88
|
// Stopped for its budget: a failure, not a user stop, even if the agent finished meanwhile.
|
|
84
89
|
const status = this.overBudget ? 'failed' : statusOf(exit, outcome);
|
|
85
90
|
const error = status === 'completed' ? undefined : (this.overBudget ?? this.errorOf(status, exit, outcome));
|
|
91
|
+
// A quota failure reported only in the outcome or on stderr.
|
|
92
|
+
if (error && !this.quotaReported && QUOTA_ERROR.test(error)) {
|
|
93
|
+
this.quotaReported = true;
|
|
94
|
+
this.events.push({ type: 'rate-limit', limit: { window: 'quota', status: 'exceeded' } });
|
|
95
|
+
}
|
|
96
|
+
const failure = status === 'failed' ? this.failureOf(exit, outcome, error) : undefined;
|
|
86
97
|
const result = {
|
|
87
98
|
status,
|
|
88
99
|
ok: status === 'completed',
|
|
@@ -93,16 +104,31 @@ export class RunRecorder {
|
|
|
93
104
|
...(this.usage ? { usage: this.usage } : {}),
|
|
94
105
|
...(this.costUsd !== undefined ? { costUsd: this.costUsd } : {}),
|
|
95
106
|
...(error ? { error } : {}),
|
|
107
|
+
...(failure ? { failure } : {}),
|
|
96
108
|
};
|
|
97
|
-
// A quota failure reported only in the outcome or on stderr.
|
|
98
|
-
if (error && !this.quotaReported && QUOTA_ERROR.test(error)) {
|
|
99
|
-
this.quotaReported = true;
|
|
100
|
-
this.events.push({ type: 'rate-limit', limit: { window: 'quota', status: 'exceeded' } });
|
|
101
|
-
}
|
|
102
109
|
this.events.push({ type: 'done', result });
|
|
103
110
|
this.events.close();
|
|
104
111
|
return result;
|
|
105
112
|
}
|
|
113
|
+
/** The agent's own failure, as opposed to a task that went wrong. */
|
|
114
|
+
failureOf(exit, outcome, error) {
|
|
115
|
+
if (this.overBudget)
|
|
116
|
+
return { kind: 'budget' };
|
|
117
|
+
if (this.quotaReported)
|
|
118
|
+
return { kind: 'quota', ...(this.quotaResetsAt !== undefined ? { resetsAt: this.quotaResetsAt } : {}) };
|
|
119
|
+
if (error && AUTH_ERROR.test(error))
|
|
120
|
+
return { kind: 'auth' };
|
|
121
|
+
if (exit.reason === 'spawn-error') {
|
|
122
|
+
const code = exit.error?.code;
|
|
123
|
+
return code === 'ENOENT' || code === 'EACCES' ? { kind: 'unavailable' } : undefined;
|
|
124
|
+
}
|
|
125
|
+
if (exit.reason === 'overflow' || exit.signal)
|
|
126
|
+
return { kind: 'crash' };
|
|
127
|
+
// Ended without a result of its own: the CLI died, not the task.
|
|
128
|
+
if (outcome === undefined && !this.lastError && (exit.reason === 'closed' || exit.exitCode !== 0))
|
|
129
|
+
return { kind: 'crash' };
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
106
132
|
errorOf(status, exit, outcome) {
|
|
107
133
|
if (status === 'aborted')
|
|
108
134
|
return `${this.name} was stopped.`;
|
|
@@ -120,12 +146,11 @@ export class RunRecorder {
|
|
|
120
146
|
return this.stderrTail.trim() || `${this.name} exited with code ${exit.exitCode ?? 'unknown'}.`;
|
|
121
147
|
}
|
|
122
148
|
}
|
|
149
|
+
export { addUsage, tokenCount } from './usage.js';
|
|
123
150
|
/** Errors that say a plan, account or API quota ran out. */
|
|
124
151
|
const QUOTA_ERROR = /\b(429|rate[ _-]?limit(ed|s)?|quota|usage limit|resource[ _]exhausted|too many requests|hit your limit)\b/i;
|
|
125
|
-
/**
|
|
126
|
-
|
|
127
|
-
return usage.totalTokens ?? (usage.inputTokens ?? 0) + (usage.outputTokens ?? 0);
|
|
128
|
-
}
|
|
152
|
+
/** Errors that say the CLI is not signed in or its credentials were refused. */
|
|
153
|
+
const AUTH_ERROR = /\b(not (logged|signed) in|(log|sign)[ -]?in (is )?required|please (log|sign)[ -]?in|unauthori[sz]ed|401|invalid (api[ _-]?key|x-api-key|credentials)|authentication (failed|required|error)|credentials? (expired|invalid))\b/i;
|
|
129
154
|
/** `usedPercent` as a status, for vendors that report only the number. */
|
|
130
155
|
export function limitStatus(usedPercent) {
|
|
131
156
|
if (usedPercent === undefined)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/agents/runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC/C,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"runtime.js","sourceRoot":"","sources":["../../src/agents/runtime.ts"],"names":[],"mappings":"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"}
|
package/dist/agents/session.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { TokenUsage } from '../core/types.js';
|
|
2
|
-
import
|
|
2
|
+
import { type ArtifactStore } from './artifacts.js';
|
|
3
|
+
import type { AgentBudget, AgentFailure, AgentResult, AgentTask, ApprovalDecision, ApprovalRequest, Artifact, CodingAgent, McpServer, RateLimit } from './types.js';
|
|
3
4
|
/** One item of a turn's transcript, built from the run's `AgentEvent`s. */
|
|
4
5
|
export type SessionEntry = {
|
|
5
6
|
kind: 'text';
|
|
@@ -17,6 +18,11 @@ export type SessionEntry = {
|
|
|
17
18
|
kind: 'files';
|
|
18
19
|
paths: string[];
|
|
19
20
|
}
|
|
21
|
+
/** The agent published something to look at; the content is in the session's `ArtifactStore`. */
|
|
22
|
+
| {
|
|
23
|
+
kind: 'artifact';
|
|
24
|
+
artifact: Artifact;
|
|
25
|
+
}
|
|
20
26
|
/** `automatic`: decided by the task's `permissions.approval`, without asking. */
|
|
21
27
|
| {
|
|
22
28
|
kind: 'approval';
|
|
@@ -29,6 +35,13 @@ export type SessionEntry = {
|
|
|
29
35
|
} | {
|
|
30
36
|
kind: 'error';
|
|
31
37
|
message: string;
|
|
38
|
+
}
|
|
39
|
+
/** The turn failed with `failure`, so the session moved to `to` and runs the prompt again there. */
|
|
40
|
+
| {
|
|
41
|
+
kind: 'failover';
|
|
42
|
+
from: string;
|
|
43
|
+
to: string;
|
|
44
|
+
failure: AgentFailure;
|
|
32
45
|
};
|
|
33
46
|
/** One prompt sent to the agent and everything it did about it. */
|
|
34
47
|
export interface SessionTurn {
|
|
@@ -42,6 +55,12 @@ export interface SessionTurn {
|
|
|
42
55
|
/** The turn's latest usage report. Agents report running totals, not increments. */
|
|
43
56
|
usage?: TokenUsage;
|
|
44
57
|
costUsd?: number;
|
|
58
|
+
/** Earlier turns this turn's agent was told about after `setAgent()`. */
|
|
59
|
+
handoff?: {
|
|
60
|
+
turns: number;
|
|
61
|
+
agents: string[];
|
|
62
|
+
file?: string;
|
|
63
|
+
};
|
|
45
64
|
}
|
|
46
65
|
export interface SessionState {
|
|
47
66
|
agent: string;
|
|
@@ -64,6 +83,8 @@ export interface SessionState {
|
|
|
64
83
|
budget?: AgentBudget;
|
|
65
84
|
/** The current agent's latest report per plan or account limit (`rate-limit` events). Cleared by `setAgent()`. */
|
|
66
85
|
rateLimits?: RateLimit[];
|
|
86
|
+
/** Agents a failed turn moves to, in order (`AgentSessionOptions.fallback`). Absent: no failover. */
|
|
87
|
+
fallback?: string[];
|
|
67
88
|
/** Whether `send()` during a turn reaches the running agent instead of the queue. */
|
|
68
89
|
canSteer: boolean;
|
|
69
90
|
}
|
|
@@ -91,6 +112,41 @@ export interface AgentSessionOptions {
|
|
|
91
112
|
* what is left as its `task.budget`; once a cap is used up, new turns fail without starting.
|
|
92
113
|
*/
|
|
93
114
|
budget?: AgentBudget;
|
|
115
|
+
/**
|
|
116
|
+
* Opt-in failover. When a turn fails because its agent is out (quota, sign-in, missing CLI,
|
|
117
|
+
* crash; see `shouldFailOver`), the session switches to the first agent here it has not tried
|
|
118
|
+
* for this prompt and runs the prompt again. The new agent stays for later turns. A stop, a
|
|
119
|
+
* spent budget and other failures never fail over. Without it, nothing changes.
|
|
120
|
+
*/
|
|
121
|
+
fallback?: readonly CodingAgent[];
|
|
122
|
+
/**
|
|
123
|
+
* What the fallback agent gets when it takes over a turn, instead of the turn's prompt. The new
|
|
124
|
+
* agent starts its own session, so this can brief it again: `prompt` is the failed turn's text as
|
|
125
|
+
* given to `send()`, `earlier` the finished turns before it. Its result is not passed through
|
|
126
|
+
* `transformPrompt`.
|
|
127
|
+
*/
|
|
128
|
+
failoverPrompt?(prompt: string, earlier: readonly SessionTurn[]): string;
|
|
129
|
+
/**
|
|
130
|
+
* What an agent hears, after `setAgent()` or a failover, about the turns it did not run.
|
|
131
|
+
* Default on: a recap goes before its next prompt, and the full transcript (tool calls,
|
|
132
|
+
* output, changed files) is written to `dir` (relative to cwd, default `.genaicode/handoff`)
|
|
133
|
+
* for it to read on demand. Switching back to an agent resumes its own session and tells it
|
|
134
|
+
* only what it missed. `false`: every switch starts the agent fresh, with no context.
|
|
135
|
+
*/
|
|
136
|
+
handoff?: boolean | {
|
|
137
|
+
dir?: string;
|
|
138
|
+
};
|
|
139
|
+
/**
|
|
140
|
+
* Let the agent publish artifacts (pages, images, documents) for the user to look at: the
|
|
141
|
+
* result of `startArtifactChannel()`, or a store plus the MCP server your app mounts its
|
|
142
|
+
* `tool()` on. Agents that take MCP servers get `mcpServer` on every turn, and each publish
|
|
143
|
+
* adds an `artifact` entry to the turn that made it. Serving the content is the host's job
|
|
144
|
+
* (`store.read()` with `artifactResponse()`).
|
|
145
|
+
*/
|
|
146
|
+
artifacts?: {
|
|
147
|
+
store: ArtifactStore;
|
|
148
|
+
mcpServer?: McpServer;
|
|
149
|
+
};
|
|
94
150
|
/** Longest tool output kept per call, in characters. Default 4,000. */
|
|
95
151
|
maxToolOutput?: number;
|
|
96
152
|
/** Most turns kept in state. Older turns are dropped. Default 200. */
|
|
@@ -122,12 +178,20 @@ export interface AgentSession {
|
|
|
122
178
|
stop(): void;
|
|
123
179
|
/** Answer a pending approval request. Returns false when no such request is pending. */
|
|
124
180
|
approve(id: string, decision: ApprovalDecision): boolean;
|
|
125
|
-
/**
|
|
126
|
-
|
|
181
|
+
/**
|
|
182
|
+
* Switch agents. The next turn resumes the agent's own earlier session when it had one, and
|
|
183
|
+
* hands over the turns it missed (see `AgentSessionOptions.handoff`). `{ handoff: false }`
|
|
184
|
+
* starts it fresh with no context. A running turn finishes with the agent that started it.
|
|
185
|
+
*/
|
|
186
|
+
setAgent(agent: CodingAgent, options?: {
|
|
187
|
+
handoff?: boolean;
|
|
188
|
+
}): void;
|
|
127
189
|
setModel(model: string | undefined): void;
|
|
190
|
+
/** Change the failover agents (`AgentSessionOptions.fallback`). Empty or undefined turns failover off. */
|
|
191
|
+
setFallback(agents: readonly CodingAgent[] | undefined): void;
|
|
128
192
|
/** Change the session budget. It applies from the next turn. */
|
|
129
193
|
setBudget(budget: AgentBudget | undefined): void;
|
|
130
|
-
/** Forget the agent
|
|
194
|
+
/** Forget the agent sessions so the next turn starts fresh, without a handoff. Keeps the transcript. */
|
|
131
195
|
reset(): void;
|
|
132
196
|
/** Resolves when no turn is running and nothing is queued. */
|
|
133
197
|
idle(): Promise<void>;
|
package/dist/agents/session.js
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { shouldFailOver } from './failover.js';
|
|
2
|
+
import { HANDOFF_DIR, handoffPreamble, writeHandoff } from './handoff.js';
|
|
3
|
+
import { addUsage, tokenCount } from './runtime.js';
|
|
4
|
+
import { PUBLISH_ARTIFACT_TOOL } from './artifacts.js';
|
|
2
5
|
export function createAgentSession(options) {
|
|
3
6
|
const maxToolOutput = options.maxToolOutput ?? 4_000;
|
|
4
7
|
const maxTurns = options.maxTurns ?? 200;
|
|
@@ -17,8 +20,18 @@ export function createAgentSession(options) {
|
|
|
17
20
|
approvals: [],
|
|
18
21
|
usage: {},
|
|
19
22
|
...(options.budget ? { budget: options.budget } : {}),
|
|
23
|
+
...(options.fallback?.length ? { fallback: options.fallback.map((candidate) => candidate.name) } : {}),
|
|
20
24
|
canSteer: false,
|
|
21
25
|
};
|
|
26
|
+
let fallback = options.fallback ?? [];
|
|
27
|
+
// Agents that failed the current prompt; reset when a prompt starts on its own.
|
|
28
|
+
let tried = new Set();
|
|
29
|
+
// Said to the next agent ahead of a prompt it takes over mid-way.
|
|
30
|
+
let takeover;
|
|
31
|
+
// `failoverPrompt`'s text for the turn that takes over.
|
|
32
|
+
let retryPrompt;
|
|
33
|
+
// What the user steered into the failed turn: the next agent hears it after the prompt.
|
|
34
|
+
let steeredBefore;
|
|
22
35
|
const listeners = new Set();
|
|
23
36
|
const waiting = new Map();
|
|
24
37
|
const idleWaiters = [];
|
|
@@ -28,8 +41,18 @@ export function createAgentSession(options) {
|
|
|
28
41
|
let closed = false;
|
|
29
42
|
// `options.resume` applies to the first turn as given, so an agent that cannot resume refuses it.
|
|
30
43
|
let explicitResume = options.resume;
|
|
31
|
-
// `reset()
|
|
44
|
+
// `reset()`, or a fresh switch to the running agent, during a turn: forget the session that
|
|
45
|
+
// turn reports when it ends.
|
|
32
46
|
let forgetAfterTurn = false;
|
|
47
|
+
let runningAgent;
|
|
48
|
+
const handoffOn = options.handoff !== false;
|
|
49
|
+
const handoffDir = (typeof options.handoff === 'object' && options.handoff.dir) || HANDOFF_DIR;
|
|
50
|
+
// Per agent: its own session and the last turn that session knows about.
|
|
51
|
+
const known = new Map(options.resume ? [[options.agent, { sessionId: options.resume, upTo: 0 }]] : []);
|
|
52
|
+
// Turns after this id are news to the current agent; undefined: it knows everything.
|
|
53
|
+
let missedAfter;
|
|
54
|
+
// `reset()` drops the turns up to here from every later handoff.
|
|
55
|
+
let resetAt = 0;
|
|
33
56
|
// After a user stop, `state.notes` wait for the user's next prompt instead of starting a turn.
|
|
34
57
|
let holdNotes = false;
|
|
35
58
|
// A note's turn that a stop cuts short puts the note back: the agent may not have heard it.
|
|
@@ -60,10 +83,10 @@ export function createAgentSession(options) {
|
|
|
60
83
|
};
|
|
61
84
|
const addEntry = (id, entry) => updateTurn(id, (turn) => ({ ...turn, entries: [...closeStreaming(turn.entries), entry] }));
|
|
62
85
|
const clip = (text) => text === undefined || text.length <= maxToolOutput ? text : `${text.slice(0, maxToolOutput)}\n… (truncated)`;
|
|
63
|
-
const onEvent = (turnId, event) => {
|
|
86
|
+
const onEvent = (turnId, event, own) => {
|
|
64
87
|
switch (event.type) {
|
|
65
88
|
case 'session':
|
|
66
|
-
if (!forgetAfterTurn)
|
|
89
|
+
if (!forgetAfterTurn && own())
|
|
67
90
|
set({ sessionId: event.sessionId });
|
|
68
91
|
return;
|
|
69
92
|
case 'text-delta':
|
|
@@ -146,12 +169,19 @@ export function createAgentSession(options) {
|
|
|
146
169
|
addEntry(turnId, { kind: 'error', message: event.message });
|
|
147
170
|
return;
|
|
148
171
|
case 'budget-warning':
|
|
172
|
+
case 'failover':
|
|
149
173
|
case 'stderr':
|
|
150
174
|
case 'raw':
|
|
151
175
|
case 'done':
|
|
152
176
|
return;
|
|
153
177
|
}
|
|
154
178
|
};
|
|
179
|
+
// A publish lands in the turn that is running; one that arrives late, in the last turn.
|
|
180
|
+
const stopArtifacts = options.artifacts?.store.subscribe((artifact) => {
|
|
181
|
+
const turn = state.turns.at(-1);
|
|
182
|
+
if (!closed && turn)
|
|
183
|
+
addEntry(turn.id, { kind: 'artifact', artifact });
|
|
184
|
+
});
|
|
155
185
|
const addApproval = (turnId, request) => {
|
|
156
186
|
const turn = state.turns.find((candidate) => candidate.id === turnId);
|
|
157
187
|
const known = turn?.entries.some((entry) => entry.kind === 'approval' && entry.request.id === request.id && !entry.decision);
|
|
@@ -162,6 +192,9 @@ export function createAgentSession(options) {
|
|
|
162
192
|
addApproval(turnId, request);
|
|
163
193
|
if (signal?.aborted)
|
|
164
194
|
return Promise.resolve('deny');
|
|
195
|
+
// Publishing changes nothing on disk, and the store has its own checks: no question for it.
|
|
196
|
+
if (isPublishRequest(request, options.artifacts?.mcpServer))
|
|
197
|
+
return Promise.resolve('approve');
|
|
165
198
|
const automatic = options.autoApprove?.(request);
|
|
166
199
|
if (automatic)
|
|
167
200
|
return Promise.resolve(automatic);
|
|
@@ -196,12 +229,104 @@ export function createAgentSession(options) {
|
|
|
196
229
|
for (const resolve of idleWaiters.splice(0))
|
|
197
230
|
resolve();
|
|
198
231
|
};
|
|
199
|
-
const
|
|
232
|
+
const switchAgent = (next, carry = handoffOn) => {
|
|
233
|
+
agent = next;
|
|
234
|
+
explicitResume = undefined;
|
|
235
|
+
if (!carry && runningAgent === next)
|
|
236
|
+
forgetAfterTurn = true;
|
|
237
|
+
const before = carry ? known.get(next) : undefined;
|
|
238
|
+
const sessionId = before?.sessionId && next.capabilities.resume ? before.sessionId : undefined;
|
|
239
|
+
// Without its own session the agent missed the whole conversation.
|
|
240
|
+
missedAfter = carry ? Math.max(resetAt, sessionId ? before.upTo : 0) : undefined;
|
|
241
|
+
if (!carry)
|
|
242
|
+
known.delete(next);
|
|
243
|
+
// Limits belong to the agent that reported them.
|
|
244
|
+
set({ agent: next.name, sessionId, rateLimits: [] });
|
|
245
|
+
};
|
|
246
|
+
/** After a turn: switch agents and return true when the failure is one another agent can get past. */
|
|
247
|
+
const failOver = (turnId, result) => {
|
|
248
|
+
const failed = state.turns.find((turn) => turn.id === turnId);
|
|
249
|
+
if (closed || !failed || failed.agent !== agent.name || !shouldFailOver(result))
|
|
250
|
+
return false;
|
|
251
|
+
tried.add(agent.name);
|
|
252
|
+
const next = fallback.find((candidate) => candidate.name !== agent.name && !tried.has(candidate.name));
|
|
253
|
+
if (!next)
|
|
254
|
+
return false;
|
|
255
|
+
addEntry(turnId, { kind: 'failover', from: agent.name, to: next.name, failure: result.failure });
|
|
256
|
+
const changed = [...new Set(failed.entries.flatMap((entry) => (entry.kind === 'files' ? entry.paths : [])))];
|
|
257
|
+
takeover = changed.length
|
|
258
|
+
? `${agent.name} stopped part-way through this request (${result.failure.kind}). ` +
|
|
259
|
+
`It already changed: ${changed.join(', ')}. Check those files and continue from there.\n\n`
|
|
260
|
+
: undefined;
|
|
261
|
+
const steered = failed.entries.flatMap((entry) => (entry.kind === 'input' ? [entry.text] : []));
|
|
262
|
+
steeredBefore = steered.length
|
|
263
|
+
? `\n\nWhile ${agent.name} worked on it, the user added:\n${steered.map((text) => `- ${text}`).join('\n')}`
|
|
264
|
+
: undefined;
|
|
265
|
+
retryPrompt = undefined;
|
|
266
|
+
if (options.failoverPrompt) {
|
|
267
|
+
const earlier = state.turns.filter((turn) => turn.id < turnId && turn.result && turn.entries.at(-1)?.kind !== 'failover');
|
|
268
|
+
try {
|
|
269
|
+
retryPrompt = options.failoverPrompt(failed.prompt, earlier);
|
|
270
|
+
}
|
|
271
|
+
catch {
|
|
272
|
+
// The turn's own prompt, as without the hook.
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
switchAgent(next);
|
|
276
|
+
// The failed turn is over: the next agent's session is one to keep.
|
|
277
|
+
forgetAfterTurn = false;
|
|
278
|
+
// Another vendor's model name means nothing to the next agent; its default applies.
|
|
279
|
+
if (state.model !== undefined)
|
|
280
|
+
set({ model: undefined });
|
|
281
|
+
if (state.effort !== undefined && !next.capabilities.effort?.includes(state.effort))
|
|
282
|
+
set({ effort: undefined });
|
|
283
|
+
return true;
|
|
284
|
+
};
|
|
285
|
+
const startTurn = (prompt, retry = false) => {
|
|
200
286
|
holdNotes = false;
|
|
287
|
+
if (!retry) {
|
|
288
|
+
tried = new Set();
|
|
289
|
+
takeover = undefined;
|
|
290
|
+
}
|
|
291
|
+
const prefix = takeover ?? '';
|
|
292
|
+
const rewritten = retry ? retryPrompt : undefined;
|
|
293
|
+
const suffix = (retry && steeredBefore) || '';
|
|
294
|
+
takeover = undefined;
|
|
295
|
+
retryPrompt = undefined;
|
|
296
|
+
steeredBefore = undefined;
|
|
201
297
|
const turnId = nextTurnId++;
|
|
202
298
|
noteTurn = nextIsNote ? { id: turnId, text: prompt } : undefined;
|
|
203
299
|
nextIsNote = false;
|
|
204
|
-
const
|
|
300
|
+
const turnAgent = agent;
|
|
301
|
+
runningAgent = turnAgent;
|
|
302
|
+
const own = () => agent === turnAgent;
|
|
303
|
+
let preamble = '';
|
|
304
|
+
let handoff;
|
|
305
|
+
if (missedAfter !== undefined && rewritten === undefined) {
|
|
306
|
+
const from = missedAfter;
|
|
307
|
+
// The attempt being retried is this prompt itself (and the takeover note), not history.
|
|
308
|
+
const retried = retry ? state.turns.at(-1)?.id : undefined;
|
|
309
|
+
const missed = state.turns.filter((past) => past.id > from && past.id !== retried);
|
|
310
|
+
if (missed.length) {
|
|
311
|
+
let file;
|
|
312
|
+
try {
|
|
313
|
+
file = writeHandoff(state.cwd, handoffDir, agent.name, missed);
|
|
314
|
+
}
|
|
315
|
+
catch {
|
|
316
|
+
// An unwritable cwd still gets the recap.
|
|
317
|
+
}
|
|
318
|
+
preamble = handoffPreamble(missed, file);
|
|
319
|
+
handoff = { turns: missed.length, agents: [...new Set(missed.map((past) => past.agent))], file };
|
|
320
|
+
}
|
|
321
|
+
}
|
|
322
|
+
const turn = {
|
|
323
|
+
id: turnId,
|
|
324
|
+
agent: agent.name,
|
|
325
|
+
prompt,
|
|
326
|
+
entries: [],
|
|
327
|
+
startedAt: Date.now(),
|
|
328
|
+
...(handoff ? { handoff } : {}),
|
|
329
|
+
};
|
|
205
330
|
const resume = explicitResume !== undefined
|
|
206
331
|
? explicitResume
|
|
207
332
|
: state.sessionId && agent.capabilities.resume
|
|
@@ -221,10 +346,12 @@ export function createAgentSession(options) {
|
|
|
221
346
|
if (left?.spent)
|
|
222
347
|
throw new Error(left.spent);
|
|
223
348
|
const budget = tighterBudget(left?.budget, options.task?.budget);
|
|
224
|
-
|
|
349
|
+
const artifactServer = turnAgent.capabilities.mcp ? options.artifacts?.mcpServer : undefined;
|
|
350
|
+
current = turnAgent.run({
|
|
225
351
|
...options.task,
|
|
352
|
+
...(artifactServer ? { mcpServers: [...(options.task?.mcpServers ?? []), artifactServer] } : {}),
|
|
226
353
|
...(budget ? { budget } : {}),
|
|
227
|
-
prompt: toAgent(prompt),
|
|
354
|
+
prompt: preamble + prefix + (rewritten ?? toAgent(prompt)) + suffix,
|
|
228
355
|
cwd: state.cwd,
|
|
229
356
|
model: state.model,
|
|
230
357
|
effort: state.effort,
|
|
@@ -238,18 +365,23 @@ export function createAgentSession(options) {
|
|
|
238
365
|
current = failedRun(error instanceof Error ? error.message : String(error));
|
|
239
366
|
}
|
|
240
367
|
run = current;
|
|
241
|
-
if (current.steer &&
|
|
368
|
+
if (current.steer && turnAgent.capabilities.steer)
|
|
242
369
|
set({ canSteer: true });
|
|
370
|
+
let turnSession;
|
|
243
371
|
void (async () => {
|
|
244
372
|
try {
|
|
245
|
-
for await (const event of current)
|
|
246
|
-
|
|
373
|
+
for await (const event of current) {
|
|
374
|
+
if (event.type === 'session')
|
|
375
|
+
turnSession = event.sessionId;
|
|
376
|
+
onEvent(turnId, event, own);
|
|
377
|
+
}
|
|
247
378
|
}
|
|
248
379
|
catch (error) {
|
|
249
380
|
addEntry(turnId, { kind: 'error', message: error instanceof Error ? error.message : String(error) });
|
|
250
381
|
}
|
|
251
382
|
const result = await current.result;
|
|
252
|
-
|
|
383
|
+
const noteTurnWas = noteTurn?.id === turnId;
|
|
384
|
+
if (noteTurnWas)
|
|
253
385
|
noteTurn = undefined;
|
|
254
386
|
denyPending();
|
|
255
387
|
run = undefined;
|
|
@@ -269,12 +401,31 @@ export function createAgentSession(options) {
|
|
|
269
401
|
// A quota known only from an error is over once a turn gets through again.
|
|
270
402
|
if (result.ok && state.rateLimits?.some((limit) => limit.window === 'quota'))
|
|
271
403
|
set({ rateLimits: state.rateLimits.filter((limit) => limit.window !== 'quota') });
|
|
404
|
+
runningAgent = undefined;
|
|
405
|
+
// A resumed turn that names no new session continued the one it resumed.
|
|
406
|
+
const sessionId = result.sessionId ?? turnSession ?? (result.ok ? resume : undefined);
|
|
272
407
|
if (forgetAfterTurn) {
|
|
273
408
|
forgetAfterTurn = false;
|
|
274
|
-
|
|
409
|
+
if (own())
|
|
410
|
+
set({ sessionId: undefined });
|
|
411
|
+
}
|
|
412
|
+
else {
|
|
413
|
+
// The agent heard everything up to this turn, through its session or this turn's handoff.
|
|
414
|
+
if (sessionId || result.ok)
|
|
415
|
+
known.set(turnAgent, { sessionId, upTo: turnId });
|
|
416
|
+
if (own()) {
|
|
417
|
+
if (sessionId || result.ok)
|
|
418
|
+
missedAfter = undefined;
|
|
419
|
+
if (sessionId)
|
|
420
|
+
set({ sessionId });
|
|
421
|
+
}
|
|
422
|
+
}
|
|
423
|
+
if (failOver(turnId, result)) {
|
|
424
|
+
// The same prompt again, on the next agent; a note stays a note.
|
|
425
|
+
if (finished && noteTurnWas)
|
|
426
|
+
nextIsNote = true;
|
|
427
|
+
return startTurn(finished.prompt, true);
|
|
275
428
|
}
|
|
276
|
-
else if (result.sessionId)
|
|
277
|
-
set({ sessionId: result.sessionId });
|
|
278
429
|
const next = closed ? undefined : takeNext();
|
|
279
430
|
if (next !== undefined) {
|
|
280
431
|
startTurn(next);
|
|
@@ -372,15 +523,25 @@ export function createAgentSession(options) {
|
|
|
372
523
|
resolve(decision);
|
|
373
524
|
return true;
|
|
374
525
|
},
|
|
375
|
-
setAgent(next) {
|
|
376
|
-
|
|
526
|
+
setAgent(next, switchOptions) {
|
|
527
|
+
const carry = handoffOn && switchOptions?.handoff !== false;
|
|
528
|
+
if (next === agent) {
|
|
529
|
+
// Switching to the current agent fresh is a reset of its session.
|
|
530
|
+
if (!carry) {
|
|
531
|
+
explicitResume = undefined;
|
|
532
|
+
known.delete(next);
|
|
533
|
+
missedAfter = undefined;
|
|
534
|
+
if (runningAgent === next)
|
|
535
|
+
forgetAfterTurn = true;
|
|
536
|
+
set({ sessionId: undefined });
|
|
537
|
+
}
|
|
377
538
|
return;
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
set({
|
|
539
|
+
}
|
|
540
|
+
switchAgent(next, carry);
|
|
541
|
+
},
|
|
542
|
+
setFallback(agents) {
|
|
543
|
+
fallback = agents ?? [];
|
|
544
|
+
set({ fallback: fallback.length ? fallback.map((candidate) => candidate.name) : undefined });
|
|
384
545
|
},
|
|
385
546
|
setModel(model) {
|
|
386
547
|
set({ model });
|
|
@@ -390,6 +551,9 @@ export function createAgentSession(options) {
|
|
|
390
551
|
},
|
|
391
552
|
reset() {
|
|
392
553
|
explicitResume = undefined;
|
|
554
|
+
known.clear();
|
|
555
|
+
missedAfter = undefined;
|
|
556
|
+
resetAt = state.turns.at(-1)?.id ?? 0;
|
|
393
557
|
if (state.status === 'running')
|
|
394
558
|
forgetAfterTurn = true;
|
|
395
559
|
set({ sessionId: undefined });
|
|
@@ -401,6 +565,7 @@ export function createAgentSession(options) {
|
|
|
401
565
|
},
|
|
402
566
|
close() {
|
|
403
567
|
closed = true;
|
|
568
|
+
stopArtifacts?.();
|
|
404
569
|
if (state.notes?.length)
|
|
405
570
|
set({ notes: [] });
|
|
406
571
|
this.stop();
|
|
@@ -408,6 +573,14 @@ export function createAgentSession(options) {
|
|
|
408
573
|
},
|
|
409
574
|
};
|
|
410
575
|
}
|
|
576
|
+
/** Claude's permission prompt for the session's own `publish_artifact` tool. */
|
|
577
|
+
function isPublishRequest(request, server) {
|
|
578
|
+
const detail = request.detail;
|
|
579
|
+
return (!!server &&
|
|
580
|
+
typeof detail === 'object' &&
|
|
581
|
+
detail !== null &&
|
|
582
|
+
detail.tool_name === `mcp__${server.name}__${PUBLISH_ARTIFACT_TOOL}`);
|
|
583
|
+
}
|
|
411
584
|
/** A run that failed before it started. */
|
|
412
585
|
/** What a session budget leaves for the next turn, or why nothing is left. */
|
|
413
586
|
function remainingBudget(budget, usage, costUsd) {
|
|
@@ -468,24 +641,4 @@ function findOpenTool(entries, id, name) {
|
|
|
468
641
|
}
|
|
469
642
|
return -1;
|
|
470
643
|
}
|
|
471
|
-
function addUsage(total, usage) {
|
|
472
|
-
const sum = (a, b) => (a === undefined && b === undefined ? undefined : (a ?? 0) + (b ?? 0));
|
|
473
|
-
const next = {};
|
|
474
|
-
const inputTokens = sum(total.inputTokens, usage.inputTokens);
|
|
475
|
-
const outputTokens = sum(total.outputTokens, usage.outputTokens);
|
|
476
|
-
const cachedInputTokens = sum(total.cachedInputTokens, usage.cachedInputTokens);
|
|
477
|
-
// A turn without `totalTokens` counts input + output, so mixed agents add up right.
|
|
478
|
-
const totalTokens = total.totalTokens === undefined && usage.totalTokens === undefined
|
|
479
|
-
? undefined
|
|
480
|
-
: tokenCount(total) + tokenCount(usage);
|
|
481
|
-
if (inputTokens !== undefined)
|
|
482
|
-
next.inputTokens = inputTokens;
|
|
483
|
-
if (outputTokens !== undefined)
|
|
484
|
-
next.outputTokens = outputTokens;
|
|
485
|
-
if (cachedInputTokens !== undefined)
|
|
486
|
-
next.cachedInputTokens = cachedInputTokens;
|
|
487
|
-
if (totalTokens !== undefined)
|
|
488
|
-
next.totalTokens = totalTokens;
|
|
489
|
-
return next;
|
|
490
|
-
}
|
|
491
644
|
//# sourceMappingURL=session.js.map
|