@typescript-agent-harness/agent 0.21.0 → 0.22.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/dist/context.d.ts +13 -0
- package/dist/context.d.ts.map +1 -0
- package/dist/context.js +67 -0
- package/dist/context.js.map +1 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/loop.d.ts +4 -1
- package/dist/loop.d.ts.map +1 -1
- package/dist/loop.js +16 -2
- package/dist/loop.js.map +1 -1
- package/dist/plugin.d.ts +3 -0
- package/dist/plugin.d.ts.map +1 -1
- package/dist/plugin.js +52 -1
- package/dist/plugin.js.map +1 -1
- package/dist/session.d.ts.map +1 -1
- package/dist/session.js +16 -0
- package/dist/session.js.map +1 -1
- package/dist/types.d.ts +4 -0
- package/dist/types.d.ts.map +1 -1
- package/package.json +5 -5
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import type { ChatMessage } from "@typescript-agent-harness/llm";
|
|
2
|
+
export type ContextProjection = {
|
|
3
|
+
messages: ChatMessage[];
|
|
4
|
+
droppedTurns: number;
|
|
5
|
+
elidedToolResults: number;
|
|
6
|
+
chars: number;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Pure projection of session history into what the model sees under a char budget.
|
|
10
|
+
* Never drops the latest turn and never splits a turn, so tool calls stay paired with results.
|
|
11
|
+
*/
|
|
12
|
+
export declare function projectContext(messages: ChatMessage[], budgetChars: number): ContextProjection;
|
|
13
|
+
//# sourceMappingURL=context.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context.d.ts","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,WAAW,EAAE,CAAC;IACxB,YAAY,EAAE,MAAM,CAAC;IACrB,iBAAiB,EAAE,MAAM,CAAC;IAC1B,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAoBF;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,QAAQ,EAAE,WAAW,EAAE,EACvB,WAAW,EAAE,MAAM,GAClB,iBAAiB,CAgDnB"}
|
package/dist/context.js
ADDED
|
@@ -0,0 +1,67 @@
|
|
|
1
|
+
const ELIDED = "[tool output omitted to fit the context window";
|
|
2
|
+
function size(m) {
|
|
3
|
+
let n = m.content?.length ?? 0;
|
|
4
|
+
if (m.role === "assistant" && m.toolCalls)
|
|
5
|
+
n += JSON.stringify(m.toolCalls).length;
|
|
6
|
+
return n;
|
|
7
|
+
}
|
|
8
|
+
function total(messages) {
|
|
9
|
+
return messages.reduce((n, m) => n + size(m), 0);
|
|
10
|
+
}
|
|
11
|
+
function elide(m) {
|
|
12
|
+
return { ...m, content: `${ELIDED}: ${m.content.length} chars]` };
|
|
13
|
+
}
|
|
14
|
+
/**
|
|
15
|
+
* Pure projection of session history into what the model sees under a char budget.
|
|
16
|
+
* Never drops the latest turn and never splits a turn, so tool calls stay paired with results.
|
|
17
|
+
*/
|
|
18
|
+
export function projectContext(messages, budgetChars) {
|
|
19
|
+
let start = 0;
|
|
20
|
+
while (messages[start]?.role === "system")
|
|
21
|
+
start += 1;
|
|
22
|
+
const head = messages.slice(0, start);
|
|
23
|
+
const turns = [];
|
|
24
|
+
for (const m of messages.slice(start)) {
|
|
25
|
+
if (m.role === "user" || turns.length === 0)
|
|
26
|
+
turns.push([m]);
|
|
27
|
+
else
|
|
28
|
+
turns[turns.length - 1].push(m);
|
|
29
|
+
}
|
|
30
|
+
let droppedTurns = 0;
|
|
31
|
+
let elidedToolResults = 0;
|
|
32
|
+
const fits = () => total(head) + turns.reduce((n, t) => n + total(t), 0) <= budgetChars;
|
|
33
|
+
const elideIn = (turn, end) => {
|
|
34
|
+
for (let j = 0; j < end && !fits(); j += 1) {
|
|
35
|
+
const m = turn[j];
|
|
36
|
+
if (m.role === "tool" && !m.content.startsWith(ELIDED)) {
|
|
37
|
+
turn[j] = elide(m);
|
|
38
|
+
elidedToolResults += 1;
|
|
39
|
+
}
|
|
40
|
+
}
|
|
41
|
+
};
|
|
42
|
+
for (let i = 0; i < turns.length - 1 && !fits(); i += 1) {
|
|
43
|
+
elideIn(turns[i], turns[i].length);
|
|
44
|
+
}
|
|
45
|
+
while (turns.length > 1 && !fits()) {
|
|
46
|
+
turns.shift();
|
|
47
|
+
droppedTurns += 1;
|
|
48
|
+
}
|
|
49
|
+
const current = turns[turns.length - 1];
|
|
50
|
+
if (current && !fits()) {
|
|
51
|
+
let lastAssistant = current.length - 1;
|
|
52
|
+
while (lastAssistant >= 0 && current[lastAssistant].role !== "assistant")
|
|
53
|
+
lastAssistant -= 1;
|
|
54
|
+
elideIn(current, lastAssistant);
|
|
55
|
+
}
|
|
56
|
+
if (droppedTurns > 0) {
|
|
57
|
+
const note = `[${droppedTurns} earlier conversation turn(s) omitted to fit the context window.]`;
|
|
58
|
+
const first = head[0];
|
|
59
|
+
if (first?.role === "system")
|
|
60
|
+
head[0] = { role: "system", content: `${first.content}\n\n${note}` };
|
|
61
|
+
else
|
|
62
|
+
head.unshift({ role: "system", content: note });
|
|
63
|
+
}
|
|
64
|
+
const out = [...head, ...turns.flat()];
|
|
65
|
+
return { messages: out, droppedTurns, elidedToolResults, chars: total(out) };
|
|
66
|
+
}
|
|
67
|
+
//# sourceMappingURL=context.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"context.js","sourceRoot":"","sources":["../src/context.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export { agentPlugin, SESSION, type AgentPluginOptions } from "./plugin.js";
|
|
2
2
|
export { subagentTool } from "./subagent-tool.js";
|
|
3
3
|
export { createDefaultLoop } from "./loop.js";
|
|
4
|
+
export { projectContext, type ContextProjection } from "./context.js";
|
|
4
5
|
export { MemorySession } from "./session.js";
|
|
5
6
|
export type { AgentLoop, AgentLoopEvent, AgentStep, RunResult, Session, SessionEvent, SessionService, SessionState, SessionSummary, } from "./types.js";
|
|
6
7
|
//# sourceMappingURL=index.d.ts.map
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,YAAY,EACV,SAAS,EACT,cAAc,EACd,SAAS,EACT,SAAS,EACT,OAAO,EACP,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,cAAc,GACf,MAAM,YAAY,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,KAAK,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,YAAY,EACV,SAAS,EACT,cAAc,EACd,SAAS,EACT,SAAS,EACT,OAAO,EACP,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,cAAc,GACf,MAAM,YAAY,CAAC"}
|
package/dist/index.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export { agentPlugin, SESSION } from "./plugin.js";
|
|
2
2
|
export { subagentTool } from "./subagent-tool.js";
|
|
3
3
|
export { createDefaultLoop } from "./loop.js";
|
|
4
|
+
export { projectContext } from "./context.js";
|
|
4
5
|
export { MemorySession } from "./session.js";
|
|
5
6
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAA2B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAA2B,MAAM,aAAa,CAAC;AAC5E,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,cAAc,EAA0B,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC"}
|
package/dist/loop.d.ts
CHANGED
|
@@ -1,10 +1,13 @@
|
|
|
1
1
|
import type { Context } from "@typescript-agent-harness/core";
|
|
2
|
-
import type { LLMService } from "@typescript-agent-harness/llm";
|
|
2
|
+
import type { ChatMessage, LLMService, ToolCall } from "@typescript-agent-harness/llm";
|
|
3
3
|
import type { ToolService } from "@typescript-agent-harness/tools";
|
|
4
4
|
import type { AgentLoop } from "./types.js";
|
|
5
|
+
export declare function pendingToolCalls(messages: ChatMessage[]): ToolCall[];
|
|
5
6
|
export declare function createDefaultLoop(deps: {
|
|
6
7
|
llm: LLMService;
|
|
7
8
|
tools: ToolService;
|
|
8
9
|
ctx: Pick<Context, "get" | "tryGet" | "emit">;
|
|
10
|
+
/** Char budget for messages sent to the LLM; full history is still kept. Unset = send everything. */
|
|
11
|
+
contextChars?: number;
|
|
9
12
|
}): AgentLoop;
|
|
10
13
|
//# sourceMappingURL=loop.d.ts.map
|
package/dist/loop.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../src/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"loop.d.ts","sourceRoot":"","sources":["../src/loop.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAe,UAAU,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACpG,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAEnE,OAAO,KAAK,EACV,SAAS,EAGV,MAAM,YAAY,CAAC;AAEpB,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,WAAW,EAAE,GAAG,QAAQ,EAAE,CAcpE;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE;IACtC,GAAG,EAAE,UAAU,CAAC;IAChB,KAAK,EAAE,WAAW,CAAC;IACnB,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC,CAAC;IAC9C,qGAAqG;IACrG,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,GAAG,SAAS,CAmIZ"}
|
package/dist/loop.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
|
|
1
|
+
import { projectContext } from "./context.js";
|
|
2
|
+
export function pendingToolCalls(messages) {
|
|
2
3
|
for (let i = messages.length - 1; i >= 0; i -= 1) {
|
|
3
4
|
const msg = messages[i];
|
|
4
5
|
if (msg?.role === "assistant" && msg.toolCalls?.length) {
|
|
@@ -50,8 +51,21 @@ export function createDefaultLoop(deps) {
|
|
|
50
51
|
while (steps < session.maxSteps) {
|
|
51
52
|
steps += 1;
|
|
52
53
|
session.signal.throwIfAborted();
|
|
54
|
+
let messages = [...session.messages];
|
|
55
|
+
if (deps.contextChars !== undefined) {
|
|
56
|
+
const projected = projectContext(messages, deps.contextChars);
|
|
57
|
+
messages = projected.messages;
|
|
58
|
+
if (projected.droppedTurns > 0 || projected.elidedToolResults > 0) {
|
|
59
|
+
await deps.ctx.emit("agent.context.trimmed", {
|
|
60
|
+
sessionId: session.id,
|
|
61
|
+
droppedTurns: projected.droppedTurns,
|
|
62
|
+
elidedToolResults: projected.elidedToolResults,
|
|
63
|
+
chars: projected.chars,
|
|
64
|
+
});
|
|
65
|
+
}
|
|
66
|
+
}
|
|
53
67
|
const request = {
|
|
54
|
-
messages
|
|
68
|
+
messages,
|
|
55
69
|
tools: deps.tools.listSchemas(),
|
|
56
70
|
};
|
|
57
71
|
const llmStepId = `step_llm_${steps}`;
|
package/dist/loop.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../src/loop.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"loop.js","sourceRoot":"","sources":["../src/loop.ts"],"names":[],"mappings":"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"}
|
package/dist/plugin.d.ts
CHANGED
|
@@ -2,8 +2,11 @@ import { type Plugin } from "@typescript-agent-harness/core";
|
|
|
2
2
|
import type { SessionService } from "./types.js";
|
|
3
3
|
export declare const SESSION: import("@typescript-agent-harness/core").ServiceKey<SessionService>;
|
|
4
4
|
export type AgentPluginOptions = {
|
|
5
|
+
/** Also replaces the stored system prompt when a persisted session is reopened. */
|
|
5
6
|
systemPrompt?: string;
|
|
6
7
|
maxSteps?: number;
|
|
8
|
+
/** Char budget per LLM request (old tool outputs, then old turns are trimmed). Unset = no limit. */
|
|
9
|
+
contextChars?: number;
|
|
7
10
|
};
|
|
8
11
|
export declare function agentPlugin(options?: AgentPluginOptions): Plugin;
|
|
9
12
|
//# sourceMappingURL=plugin.d.ts.map
|
package/dist/plugin.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAM/E,OAAO,KAAK,EAIV,cAAc,EAGf,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,OAAO,qEAA8C,CAAC;AAEnE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,KAAK,MAAM,EAAE,MAAM,gCAAgC,CAAC;AAM/E,OAAO,KAAK,EAIV,cAAc,EAGf,MAAM,YAAY,CAAC;AAEpB,eAAO,MAAM,OAAO,qEAA8C,CAAC;AAEnE,MAAM,MAAM,kBAAkB,GAAG;IAC/B,mFAAmF;IACnF,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,oGAAoG;IACpG,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AA4BF,wBAAgB,WAAW,CAAC,OAAO,GAAE,kBAAuB,GAAG,MAAM,CAsHpE"}
|
package/dist/plugin.js
CHANGED
|
@@ -5,6 +5,20 @@ import { TOOLS } from "@typescript-agent-harness/tools";
|
|
|
5
5
|
import { createDefaultLoop } from "./loop.js";
|
|
6
6
|
import { MemorySession } from "./session.js";
|
|
7
7
|
export const SESSION = createServiceKey("session");
|
|
8
|
+
/** History up to (not including) the user message that starts turn `turns + 1`. */
|
|
9
|
+
function firstTurns(messages, turns) {
|
|
10
|
+
if (turns === undefined)
|
|
11
|
+
return messages;
|
|
12
|
+
let seen = 0;
|
|
13
|
+
for (let i = 0; i < messages.length; i += 1) {
|
|
14
|
+
if (messages[i].role === "user") {
|
|
15
|
+
seen += 1;
|
|
16
|
+
if (seen > turns)
|
|
17
|
+
return messages.slice(0, i);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
return messages;
|
|
21
|
+
}
|
|
8
22
|
function asState(value) {
|
|
9
23
|
if (value === "idle" ||
|
|
10
24
|
value === "running" ||
|
|
@@ -25,7 +39,12 @@ export function agentPlugin(options = {}) {
|
|
|
25
39
|
const llm = ctx.get(LLM);
|
|
26
40
|
const tools = ctx.get(TOOLS);
|
|
27
41
|
const storage = ctx.tryGet(STORAGE);
|
|
28
|
-
const loop = createDefaultLoop({
|
|
42
|
+
const loop = createDefaultLoop({
|
|
43
|
+
llm,
|
|
44
|
+
tools,
|
|
45
|
+
ctx,
|
|
46
|
+
...(options.contextChars !== undefined ? { contextChars: options.contextChars } : {}),
|
|
47
|
+
});
|
|
29
48
|
const sessions = new Map();
|
|
30
49
|
async function hydrate(id) {
|
|
31
50
|
const hit = sessions.get(id);
|
|
@@ -42,6 +61,7 @@ export function agentPlugin(options = {}) {
|
|
|
42
61
|
loop,
|
|
43
62
|
bus: ctx,
|
|
44
63
|
maxSteps: row.maxSteps,
|
|
64
|
+
systemPrompt,
|
|
45
65
|
storage,
|
|
46
66
|
restored: {
|
|
47
67
|
state: asState(row.status),
|
|
@@ -76,6 +96,37 @@ export function agentPlugin(options = {}) {
|
|
|
76
96
|
async get(sessionId) {
|
|
77
97
|
return hydrate(sessionId);
|
|
78
98
|
},
|
|
99
|
+
async fork(sessionId, forkOptions = {}) {
|
|
100
|
+
const source = await hydrate(sessionId);
|
|
101
|
+
if (!source)
|
|
102
|
+
throw new Error(`session not found: ${sessionId}`);
|
|
103
|
+
const { turns } = forkOptions;
|
|
104
|
+
if (turns !== undefined && (!Number.isInteger(turns) || turns < 0)) {
|
|
105
|
+
throw new Error(`fork turns must be a non-negative integer, got ${turns}`);
|
|
106
|
+
}
|
|
107
|
+
const session = new MemorySession({
|
|
108
|
+
loop,
|
|
109
|
+
bus: ctx,
|
|
110
|
+
maxSteps,
|
|
111
|
+
systemPrompt,
|
|
112
|
+
...(storage ? { storage } : {}),
|
|
113
|
+
restored: {
|
|
114
|
+
state: "idle",
|
|
115
|
+
messages: structuredClone(firstTurns(source.messages, turns)),
|
|
116
|
+
steps: [],
|
|
117
|
+
events: [],
|
|
118
|
+
createdAt: Date.now(),
|
|
119
|
+
},
|
|
120
|
+
});
|
|
121
|
+
sessions.set(session.id, session);
|
|
122
|
+
await session.persist();
|
|
123
|
+
await ctx.emit("session.forked", {
|
|
124
|
+
sessionId: session.id,
|
|
125
|
+
parentId: sessionId,
|
|
126
|
+
turns: session.messages.filter((m) => m.role === "user").length,
|
|
127
|
+
});
|
|
128
|
+
return session;
|
|
129
|
+
},
|
|
79
130
|
async list() {
|
|
80
131
|
if (storage) {
|
|
81
132
|
const rows = await storage.listSessions();
|
package/dist/plugin.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAe,MAAM,gCAAgC,CAAC;AAC/E,OAAO,EAAE,GAAG,EAAoB,MAAM,+BAA+B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,mCAAmC,CAAC;AAC5D,OAAO,EAAE,KAAK,EAAE,MAAM,iCAAiC,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAU7C,MAAM,CAAC,MAAM,OAAO,GAAG,gBAAgB,CAAiB,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"plugin.js","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"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"}
|
package/dist/session.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAC;AAC9D,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAExE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,KAAK,EACV,SAAS,EACT,SAAS,EACT,OAAO,EACP,YAAY,EAEZ,YAAY,EACb,MAAM,YAAY,CAAC;AAQpB,MAAM,MAAM,WAAW,GAAG;IACxB,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,IAAI,EAAE,SAAS,CAAC;IAChB,GAAG,EAAE,IAAI,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC3B,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,OAAO,CAAC,EAAE,cAAc,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,EAAE;QACT,KAAK,EAAE,YAAY,CAAC;QACpB,QAAQ,EAAE,WAAW,EAAE,CAAC;QACxB,KAAK,EAAE,SAAS,EAAE,CAAC;QACnB,MAAM,EAAE,YAAY,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,CAAC;KACnB,CAAC;CACH,CAAC;AAEF,qBAAa,aAAc,YAAW,OAAO;IAC3C,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,OAAO,CAAC,MAAM,CAAwB;IACtC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAqB;IAC/C,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAmB;IAC1C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAsB;IAC9C,OAAO,CAAC,KAAK,CAAyB;IACtC,OAAO,CAAC,UAAU,CAAwB;IAC1C,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,iBAAiB,CAAqB;IAC9C,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAY;IACjC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAwB;IAC5C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAA6B;gBAEzC,IAAI,EAAE,WAAW;IAoC7B,IAAI,KAAK,IAAI,YAAY,CAExB;IAED,IAAI,QAAQ,IAAI,WAAW,EAAE,CAE5B;IAED,IAAI,KAAK,IAAI,SAAS,EAAE,CAEvB;IAED,IAAI,MAAM,IAAI,YAAY,EAAE,CAE3B;IAEK,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC;IAmBtC,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC;IAW5B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC;IAI7B,OAAO,CAAC,MAAM;IAyBd,OAAO,CAAC,MAAM;IAWd,OAAO,CAAC,cAAc;IAMhB,OAAO,CAAC,UAAU,UAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;YA2ClC,KAAK;CA2DpB"}
|
package/dist/session.js
CHANGED
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { pendingToolCalls } from "./loop.js";
|
|
1
2
|
let seq = 0;
|
|
2
3
|
function nextId(prefix) {
|
|
3
4
|
seq += 1;
|
|
@@ -28,6 +29,13 @@ export class MemorySession {
|
|
|
28
29
|
this._state =
|
|
29
30
|
init.restored.state === "running" ? "failed" : init.restored.state;
|
|
30
31
|
this._messages.push(...init.restored.messages);
|
|
32
|
+
if (init.systemPrompt) {
|
|
33
|
+
const system = { role: "system", content: init.systemPrompt };
|
|
34
|
+
if (this._messages[0]?.role === "system")
|
|
35
|
+
this._messages[0] = system;
|
|
36
|
+
else
|
|
37
|
+
this._messages.unshift(system);
|
|
38
|
+
}
|
|
31
39
|
this._steps.push(...init.restored.steps.filter((s) => s.status !== "pending"));
|
|
32
40
|
this._events.push(...init.restored.events);
|
|
33
41
|
for (const e of this._events)
|
|
@@ -63,6 +71,14 @@ export class MemorySession {
|
|
|
63
71
|
throw new Error(`session ${this.id} is already running`);
|
|
64
72
|
}
|
|
65
73
|
this.abort = new AbortController();
|
|
74
|
+
// Providers reject a request whose assistant tool_calls lack results (e.g. after cancel/crash mid-tool).
|
|
75
|
+
for (const call of pendingToolCalls(this._messages)) {
|
|
76
|
+
this._messages.push({
|
|
77
|
+
role: "tool",
|
|
78
|
+
toolCallId: call.id,
|
|
79
|
+
content: JSON.stringify({ error: "not run: the previous turn was interrupted" }),
|
|
80
|
+
});
|
|
81
|
+
}
|
|
66
82
|
this._messages.push({ role: "user", content: input });
|
|
67
83
|
this.record("user.message", { content: input });
|
|
68
84
|
await this.persist();
|
package/dist/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"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"}
|
package/dist/types.d.ts
CHANGED
|
@@ -46,6 +46,10 @@ export type SessionService = {
|
|
|
46
46
|
create(): Promise<Session>;
|
|
47
47
|
get(sessionId: string): Promise<Session | undefined>;
|
|
48
48
|
list(): Promise<SessionSummary[]>;
|
|
49
|
+
/** New session with a copy of the source history; `turns` keeps only the first N user turns. Source is untouched. */
|
|
50
|
+
fork(sessionId: string, options?: {
|
|
51
|
+
turns?: number;
|
|
52
|
+
}): Promise<Session>;
|
|
49
53
|
};
|
|
50
54
|
export type AgentLoopEvent = {
|
|
51
55
|
type: "llm.delta";
|
package/dist/types.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,+BAA+B,CAAC;AAEjE,MAAM,MAAM,YAAY,GACpB,MAAM,GACN,SAAS,GACT,WAAW,GACX,QAAQ,GACR,WAAW,CAAC;AAEhB,MAAM,MAAM,SAAS,GACjB;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,UAAU,CAAC;IACpB,QAAQ,CAAC,EAAE,WAAW,CAAC;IACvB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;CAC5C,GACD;IACE,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,SAAS,GAAG,WAAW,GAAG,QAAQ,CAAC;CAC5C,CAAC;AAEN,MAAM,MAAM,YAAY,GAAG;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;CACnB,CAAC;AAEF,MAAM,MAAM,SAAS,GAAG;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,WAAW,CAAC,cAAc,CAAC,GAAG,WAAW,CAAC;IACxD,KAAK,EAAE,SAAS,EAAE,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,YAAY,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC;IAC7B,QAAQ,CAAC,QAAQ,EAAE,WAAW,EAAE,CAAC;IACjC,QAAQ,CAAC,KAAK,EAAE,SAAS,EAAE,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,YAAY,EAAE,CAAC;IAEhC,GAAG,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAAC;IACvC,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAAC;IAC7B,MAAM,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACzB;AAED,MAAM,MAAM,cAAc,GAAG;IAC3B,MAAM,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3B,GAAG,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAAC;IACrD,IAAI,IAAI,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typescript-agent-harness/agent",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.22.0",
|
|
4
4
|
"description": "Session, DefaultLoop, and agent orchestration",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -15,10 +15,10 @@
|
|
|
15
15
|
"dist"
|
|
16
16
|
],
|
|
17
17
|
"dependencies": {
|
|
18
|
-
"@typescript-agent-harness/
|
|
19
|
-
"@typescript-agent-harness/
|
|
20
|
-
"@typescript-agent-harness/
|
|
21
|
-
"@typescript-agent-harness/
|
|
18
|
+
"@typescript-agent-harness/llm": "0.22.0",
|
|
19
|
+
"@typescript-agent-harness/storage": "0.22.0",
|
|
20
|
+
"@typescript-agent-harness/core": "0.22.0",
|
|
21
|
+
"@typescript-agent-harness/tools": "0.22.0"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
24
|
"@types/node": "^22.18.0",
|