neoctl 0.1.5 → 0.1.7
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 +378 -357
- package/dist/agents/local-agent-task.js +2 -1
- package/dist/agents/local-agent-task.js.map +1 -1
- package/dist/agents/smoke-agents.js +21 -4
- package/dist/agents/smoke-agents.js.map +1 -1
- package/dist/core/query-engine.d.ts +20 -1
- package/dist/core/query-engine.js +86 -12
- package/dist/core/query-engine.js.map +1 -1
- package/dist/core/query.d.ts +2 -1
- package/dist/core/query.js +36 -1
- package/dist/core/query.js.map +1 -1
- package/dist/core/smoke-core-loop.js +53 -6
- package/dist/core/smoke-core-loop.js.map +1 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +2 -1
- package/dist/index.js.map +1 -1
- package/dist/model/communication-logger.d.ts +2 -1
- package/dist/model/communication-logger.js +3 -0
- package/dist/model/communication-logger.js.map +1 -1
- package/dist/model/config.d.ts +10 -4
- package/dist/model/config.js +61 -12
- package/dist/model/config.js.map +1 -1
- package/dist/model/deepseek-adapter.d.ts +29 -0
- package/dist/model/deepseek-adapter.js +108 -0
- package/dist/model/deepseek-adapter.js.map +1 -0
- package/dist/model/env.js +35 -19
- package/dist/model/env.js.map +1 -1
- package/dist/model/kimi-adapter.d.ts +29 -0
- package/dist/model/kimi-adapter.js +108 -0
- package/dist/model/kimi-adapter.js.map +1 -0
- package/dist/model/model-metadata.json +726 -677
- package/dist/model/openai-adapter.d.ts +1 -1
- package/dist/model/openai-chat-mapper.d.ts +4 -1
- package/dist/model/openai-chat-mapper.js +30 -8
- package/dist/model/openai-chat-mapper.js.map +1 -1
- package/dist/model/openai-mappers.d.ts +5 -2
- package/dist/model/openai-mappers.js +17 -4
- package/dist/model/openai-mappers.js.map +1 -1
- package/dist/model/openai-responses-mapper.d.ts +1 -1
- package/dist/model/openai-responses-mapper.js +2 -1
- package/dist/model/openai-responses-mapper.js.map +1 -1
- package/dist/model/provider-factory.js +32 -0
- package/dist/model/provider-factory.js.map +1 -1
- package/dist/model/smoke-deepseek-mapper.d.ts +1 -0
- package/dist/model/smoke-deepseek-mapper.js +65 -0
- package/dist/model/smoke-deepseek-mapper.js.map +1 -0
- package/dist/model/smoke-openai.js +1 -1
- package/dist/model/smoke-openai.js.map +1 -1
- package/dist/model/smoke-responses-mapper.js +6 -6
- package/dist/model/smoke-responses-mapper.js.map +1 -1
- package/dist/open-directory.d.ts +1 -0
- package/dist/open-directory.js +26 -0
- package/dist/open-directory.js.map +1 -0
- package/dist/paths.d.ts +7 -0
- package/dist/paths.js +12 -0
- package/dist/paths.js.map +1 -0
- package/dist/repl/commands.d.ts +7 -0
- package/dist/repl/commands.js +9 -0
- package/dist/repl/commands.js.map +1 -1
- package/dist/repl/index.js +700 -60
- package/dist/repl/index.js.map +1 -1
- package/dist/repl/render.js +0 -2
- package/dist/repl/render.js.map +1 -1
- package/dist/repl/status-line.d.ts +0 -1
- package/dist/repl/status-line.js +27 -34
- package/dist/repl/status-line.js.map +1 -1
- package/dist/session/session-export.d.ts +33 -0
- package/dist/session/session-export.js +351 -0
- package/dist/session/session-export.js.map +1 -0
- package/dist/session/session-store.js +2 -2
- package/dist/session/session-store.js.map +1 -1
- package/dist/session/smoke-session.js +22 -1
- package/dist/session/smoke-session.js.map +1 -1
- package/dist/skills/smoke-skills.js +1 -1
- package/dist/tips.d.ts +10 -0
- package/dist/tips.js +168 -0
- package/dist/tips.js.map +1 -0
- package/dist/tools/builtins/search-providers.d.ts +15 -1
- package/dist/tools/builtins/search-providers.js +195 -1
- package/dist/tools/builtins/search-providers.js.map +1 -1
- package/dist/tools/builtins/search-tool.js +2 -2
- package/dist/tools/builtins/search-tool.js.map +1 -1
- package/dist/tools/smoke-tool-system.js +43 -9
- package/dist/tools/smoke-tool-system.js.map +1 -1
- package/dist/web/html.d.ts +1 -0
- package/dist/web/html.js +697 -0
- package/dist/web/html.js.map +1 -0
- package/dist/web/index.d.ts +2 -0
- package/dist/web/index.js +1465 -0
- package/dist/web/index.js.map +1 -0
- package/package.json +53 -49
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { mkdirSync, writeFileSync } from "node:fs";
|
|
2
2
|
import { resolve } from "node:path";
|
|
3
|
+
import { getNeoctlHome } from "../paths.js";
|
|
3
4
|
export function createLocalAgentTask(input) {
|
|
4
5
|
const now = new Date().toISOString();
|
|
5
6
|
return {
|
|
@@ -58,6 +59,6 @@ export function renderLocalAgentTaskOutput(task) {
|
|
|
58
59
|
].filter((line) => line !== undefined).join("\n");
|
|
59
60
|
}
|
|
60
61
|
function defaultTaskOutputFile(taskId) {
|
|
61
|
-
return resolve(
|
|
62
|
+
return resolve(getNeoctlHome(), "agent-tasks", `${taskId}.txt`);
|
|
62
63
|
}
|
|
63
64
|
//# sourceMappingURL=local-agent-task.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"local-agent-task.js","sourceRoot":"","sources":["../../src/agents/local-agent-task.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"local-agent-task.js","sourceRoot":"","sources":["../../src/agents/local-agent-task.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,11 +7,27 @@ import { QueryEngine } from "../core/query-engine.js";
|
|
|
7
7
|
import { ToolRegistry } from "../tools/registry.js";
|
|
8
8
|
import { runToolUse } from "../tools/run-tool-use.js";
|
|
9
9
|
import { createTextMessage } from "../types/messages.js";
|
|
10
|
-
import { echoTool } from "../tools/builtins/echo-tool.js";
|
|
11
10
|
import { createAgentTool } from "./agent-tool.js";
|
|
12
11
|
import { StaticAgentCatalog, GENERAL_PURPOSE_AGENT } from "./agent-definition.js";
|
|
13
12
|
import { createTaskTools } from "../tasks/task-tools.js";
|
|
14
13
|
import { TaskStore } from "../tasks/task-store.js";
|
|
14
|
+
const smokePassthroughTool = {
|
|
15
|
+
name: "smoke_passthrough",
|
|
16
|
+
description: "Smoke test passthrough tool.",
|
|
17
|
+
inputSchema: {
|
|
18
|
+
type: "object",
|
|
19
|
+
properties: { text: { type: "string" } },
|
|
20
|
+
required: ["text"],
|
|
21
|
+
additionalProperties: false,
|
|
22
|
+
},
|
|
23
|
+
metadata: { readOnly: true, concurrent: true, visible: true },
|
|
24
|
+
validate(input) {
|
|
25
|
+
return input;
|
|
26
|
+
},
|
|
27
|
+
async call(input) {
|
|
28
|
+
return { ok: true, output: input.text };
|
|
29
|
+
},
|
|
30
|
+
};
|
|
15
31
|
class ParentAndSubagentGateway {
|
|
16
32
|
parentCalls = 0;
|
|
17
33
|
subagentCalls = 0;
|
|
@@ -54,7 +70,7 @@ async function main() {
|
|
|
54
70
|
const sessionRoot = await fs.mkdtemp(path.join(os.tmpdir(), "agent-title-smoke-"));
|
|
55
71
|
const taskStore = new TaskStore();
|
|
56
72
|
const tools = new ToolRegistry();
|
|
57
|
-
tools.register(
|
|
73
|
+
tools.register(smokePassthroughTool);
|
|
58
74
|
for (const tool of createTaskTools(taskStore))
|
|
59
75
|
tools.register(tool);
|
|
60
76
|
tools.register(createAgentTool({
|
|
@@ -78,8 +94,9 @@ async function main() {
|
|
|
78
94
|
const listed = await engine.listSessions(1);
|
|
79
95
|
return listed[0]?.title === "Refined Delegate Smoke Title" ? listed : undefined;
|
|
80
96
|
});
|
|
97
|
+
const afterRefinementTitleCalls = gateway.subagentCalls;
|
|
81
98
|
const syncOk = afterInitialTitleCalls === 2 &&
|
|
82
|
-
|
|
99
|
+
afterRefinementTitleCalls === afterInitialTitleCalls + 1 &&
|
|
83
100
|
events.includes("tool.started") &&
|
|
84
101
|
events.includes("tool.finished") &&
|
|
85
102
|
events.includes("terminal:completed") &&
|
|
@@ -120,7 +137,7 @@ async function main() {
|
|
|
120
137
|
const outputFileOk = Boolean(task?.outputFile && existsSync(task.outputFile));
|
|
121
138
|
const asyncOk = Boolean(taskId && task?.status === "completed" && outputText.includes("retrieval_status") && sendOk && listOk && outputFileOk);
|
|
122
139
|
const ok = syncOk && asyncOk;
|
|
123
|
-
console.log(JSON.stringify({ ok, syncOk, asyncOk, outputFileOk, sessionTitle: listedSessions[0]?.title, events, parentCalls: gateway.parentCalls, subagentCalls: gateway.subagentCalls, taskId, taskStatus: task?.status, outputFile: task?.outputFile }, null, 2));
|
|
140
|
+
console.log(JSON.stringify({ ok, syncOk, asyncOk, outputFileOk, sessionTitle: listedSessions[0]?.title, events, parentCalls: gateway.parentCalls, subagentCalls: gateway.subagentCalls, afterInitialTitleCalls, afterRefinementTitleCalls, taskId, taskStatus: task?.status, outputFile: task?.outputFile }, null, 2));
|
|
124
141
|
if (!ok)
|
|
125
142
|
process.exitCode = 1;
|
|
126
143
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-agents.js","sourceRoot":"","sources":["../../src/agents/smoke-agents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"smoke-agents.js","sourceRoot":"","sources":["../../src/agents/smoke-agents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,EAAE,MAAM,SAAS,CAAC;AACzB,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AAEvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AAEtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAEnD,MAAM,oBAAoB,GAA2B;IACnD,IAAI,EAAE,mBAAmB;IACzB,WAAW,EAAE,8BAA8B;IAC3C,WAAW,EAAE;QACX,IAAI,EAAE,QAAQ;QACd,UAAU,EAAE,EAAE,IAAI,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE;QACxC,QAAQ,EAAE,CAAC,MAAM,CAAC;QAClB,oBAAoB,EAAE,KAAK;KAC5B;IACD,QAAQ,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE;IAC7D,QAAQ,CAAC,KAAK;QACZ,OAAO,KAAyB,CAAC;IACnC,CAAC;IACD,KAAK,CAAC,IAAI,CAAC,KAAK;QACd,OAAO,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,CAAC;IAC1C,CAAC;CACF,CAAC;AAEF,MAAM,wBAAwB;IAC5B,WAAW,GAAG,CAAC,CAAC;IAChB,aAAa,GAAG,CAAC,CAAC;IAElB,KAAK,CAAC,CAAC,MAAM,CAAC,OAAqB;QACjC,IAAI,OAAO,CAAC,WAAW,KAAK,UAAU,EAAE,CAAC;YACvC,IAAI,CAAC,aAAa,IAAI,CAAC,CAAC;YACxB,MAAM,UAAU,GAAG,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM;iBAC/C,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC;iBACxC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC;iBAC1B,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;YACpB,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,iBAAiB,CAAC;gBAClF,CAAC,CAAC,8BAA8B;gBAChC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC;oBAChE,CAAC,CAAC,2BAA2B;oBAC7B,CAAC,CAAC,kBAAkB,UAAU,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC;YAClD,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,iBAAiB,CAAC,WAAW,EAAE,OAAO,CAAC,EAAE,CAAC;YACtF,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,OAAO,IAAI,CAAC,aAAa,EAAE,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;YACvG,OAAO;QACT,CAAC;QAED,IAAI,CAAC,WAAW,IAAI,CAAC,CAAC;QACtB,MAAM,aAAa,GAAG,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC,CAAC;QACvH,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,MAAM;gBACJ,IAAI,EAAE,UAAU;gBAChB,OAAO,EAAE;oBACP,EAAE,EAAE,iBAAiB;oBACrB,IAAI,EAAE,OAAO;oBACb,KAAK,EAAE,EAAE,MAAM,EAAE,uBAAuB,EAAE,WAAW,EAAE,oBAAoB,EAAE;iBAC9E;aACF,CAAC;YACF,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;YACvF,OAAO;QACT,CAAC;QAED,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,OAAO,EAAE,iBAAiB,CAAC,WAAW,EAAE,aAAa,CAAC,EAAE,CAAC;QAC5F,MAAM,EAAE,IAAI,EAAE,oBAAoB,EAAE,UAAU,EAAE,UAAU,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;IACxF,CAAC;CACF;AAED,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,IAAI,wBAAwB,EAAE,CAAC;IAC/C,MAAM,WAAW,GAAG,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,EAAE,oBAAoB,CAAC,CAAC,CAAC;IACnF,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,IAAI,YAAY,EAAE,CAAC;IACjC,KAAK,CAAC,QAAQ,CAAC,oBAAoB,CAAC,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,eAAe,CAAC,SAAS,CAAC;QAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpE,KAAK,CAAC,QAAQ,CAAC,eAAe,CAAC;QAC7B,YAAY,EAAE,OAAO;QACrB,KAAK;QACL,SAAS;QACT,YAAY,EAAE,IAAI,kBAAkB,CAAC,CAAC,qBAAqB,CAAC,CAAC;KAC9D,CAAC,CAAC,CAAC;IAEJ,OAAO,CAAC,GAAG,CAAC,4BAA4B,GAAG,GAAG,CAAC;IAC/C,MAAM,MAAM,GAAG,IAAI,WAAW,CAAC,EAAE,YAAY,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,CAAC,CAAC;IACjH,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxF,CAAC;IACD,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,2BAA2B,CAAC,CAAC;IACpG,MAAM,sBAAsB,GAAG,OAAO,CAAC,aAAa,CAAC;IAErD,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,CAAC,YAAY,CAAC,eAAe,CAAC,EAAE,CAAC;QAC/D,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxF,CAAC;IAED,MAAM,cAAc,GAAG,MAAM,OAAO,CAAC,KAAK,IAAI,EAAE;QAC9C,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC;QAC5C,OAAO,MAAM,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,8BAA8B,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC;IAClF,CAAC,CAAC,CAAC;IACH,MAAM,yBAAyB,GAAG,OAAO,CAAC,aAAa,CAAC;IACxD,MAAM,MAAM,GACV,sBAAsB,KAAK,CAAC;QAC5B,yBAAyB,KAAK,sBAAsB,GAAG,CAAC;QACxD,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC;QAC/B,MAAM,CAAC,QAAQ,CAAC,eAAe,CAAC;QAChC,MAAM,CAAC,QAAQ,CAAC,oBAAoB,CAAC;QACrC,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,KAAK,8BAA8B,CAAC;IAE9D,MAAM,OAAO,GAAmB;QAC9B,OAAO,EAAE,MAAM;QACf,KAAK;QACL,QAAQ,EAAE,IAAI,gBAAgB,CAAC,MAAM,CAAC;QACtC,QAAQ,EAAE,CAAC,iBAAiB,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;QACvD,IAAI,EAAE,GAAG,EAAE,CAAC,SAAS;KACtB,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC;QAC9B,EAAE,EAAE,kBAAkB;QACtB,IAAI,EAAE,OAAO;QACb,KAAK,EAAE,EAAE,MAAM,EAAE,kBAAkB,EAAE,WAAW,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE;KAC9G,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,CAAC,CAAC;IACjG,MAAM,MAAM,GAAG,CAAC,YAAY,EAAE,IAAI,KAAK,aAAa,IAAI,OAAO,YAAY,CAAC,MAAM,KAAK,QAAQ,IAAI,YAAY,CAAC,MAAM,CAAC;QACrH,CAAC,CAAE,YAAY,CAAC,MAA+B,CAAC,OAAO;QACvD,CAAC,CAAC,SAAS,CAAC;IAEd,IAAI,MAAM;QAAE,MAAM,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC,CAAC;IAE1E,MAAM,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,MAAM,UAAU,CAAC;QACvC,EAAE,EAAE,kBAAkB;QACtB,IAAI,EAAE,YAAY;QAClB,KAAK,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE;KACzC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjB,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC;QAC5B,EAAE,EAAE,WAAW;QACf,IAAI,EAAE,aAAa;QACnB,KAAK,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,WAAW,EAAE;KAC/C,EAAE,OAAO,CAAC,CAAC;IACZ,MAAM,IAAI,GAAG,MAAM,UAAU,CAAC,EAAE,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,CAAC;IAEzF,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;IACxD,MAAM,UAAU,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC;IACjF,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC;IAC9G,MAAM,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,aAAa,IAAI,KAAK,CAAC,EAAE,CAAC,IAAI,KAAK,CAAC;IAC9G,MAAM,YAAY,GAAG,OAAO,CAAC,IAAI,EAAE,UAAU,IAAI,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC;IAC9E,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,IAAI,IAAI,EAAE,MAAM,KAAK,WAAW,IAAI,UAAU,CAAC,QAAQ,CAAC,kBAAkB,CAAC,IAAI,MAAM,IAAI,MAAM,IAAI,YAAY,CAAC,CAAC;IAE/I,MAAM,EAAE,GAAG,MAAM,IAAI,OAAO,CAAC;IAC7B,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,cAAc,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,WAAW,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,EAAE,OAAO,CAAC,aAAa,EAAE,sBAAsB,EAAE,yBAAyB,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IACvT,IAAI,CAAC,EAAE;QAAE,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AAChC,CAAC;AAED,KAAK,UAAU,OAAO,CAAI,IAAkC,EAAE,SAAS,GAAG,IAAI;IAC5E,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IAC7B,IAAI,KAAK,GAAG,MAAM,IAAI,EAAE,CAAC;IACzB,OAAO,KAAK,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,SAAS,GAAG,SAAS,EAAE,CAAC;QACjE,MAAM,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QACxD,KAAK,GAAG,MAAM,IAAI,EAAE,CAAC;IACvB,CAAC;IACD,IAAI,KAAK,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAC5E,OAAO,KAAK,CAAC;AACf,CAAC;AAED,IAAI,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;IACrB,OAAO,CAAC,KAAK,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;IACrF,OAAO,CAAC,QAAQ,GAAG,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC"}
|
|
@@ -8,11 +8,12 @@ import type { AgentEvent, ContextMetrics } from "../types/events.js";
|
|
|
8
8
|
import type { Message, MessageBlock } from "../types/messages.js";
|
|
9
9
|
import type { TerminalReason } from "./state.js";
|
|
10
10
|
import { type SessionStoreSnapshot, type SessionSummary } from "../session/session-store.js";
|
|
11
|
+
import type { SessionPromptExportSnapshot } from "../session/session-export.js";
|
|
11
12
|
export interface QueryEngineOptions {
|
|
12
13
|
agentId?: string;
|
|
13
14
|
model?: string;
|
|
14
15
|
fallbackModel?: string;
|
|
15
|
-
reasoning?: ReasoningConfig;
|
|
16
|
+
reasoning?: ReasoningConfig | null;
|
|
16
17
|
queryOrigin?: string;
|
|
17
18
|
maxOutputTokensOverride?: number;
|
|
18
19
|
maxTurns?: number;
|
|
@@ -27,6 +28,11 @@ export interface QueryEngineOptions {
|
|
|
27
28
|
agents?: readonly string[];
|
|
28
29
|
skills?: readonly string[];
|
|
29
30
|
plugins?: readonly string[];
|
|
31
|
+
exportToolCalls?: (calls: Array<{
|
|
32
|
+
id: string;
|
|
33
|
+
name: string;
|
|
34
|
+
input: unknown;
|
|
35
|
+
}>) => void;
|
|
30
36
|
session?: {
|
|
31
37
|
enabled?: boolean;
|
|
32
38
|
sessionId?: string;
|
|
@@ -44,6 +50,8 @@ export declare class QueryEngine {
|
|
|
44
50
|
private sessionStore?;
|
|
45
51
|
private currentModel?;
|
|
46
52
|
private currentReasoning?;
|
|
53
|
+
private currentFallbackModel?;
|
|
54
|
+
private currentModelGateway;
|
|
47
55
|
private sessionInitialized;
|
|
48
56
|
private userTurns;
|
|
49
57
|
private titleSchedulerVersion;
|
|
@@ -61,6 +69,14 @@ export declare class QueryEngine {
|
|
|
61
69
|
displayText?: string;
|
|
62
70
|
}): AsyncGenerator<AgentEvent>;
|
|
63
71
|
setModel(model: string | undefined, reasoning?: ReasoningConfig | null, updateReasoning?: boolean): void;
|
|
72
|
+
canAcceptImageInput(): boolean;
|
|
73
|
+
private assertUserMessageCapabilities;
|
|
74
|
+
setModelProvider(settings: {
|
|
75
|
+
modelGateway: ModelGateway;
|
|
76
|
+
model?: string;
|
|
77
|
+
fallbackModel?: string;
|
|
78
|
+
reasoning?: ReasoningConfig | null;
|
|
79
|
+
}): void;
|
|
64
80
|
getModelSettings(): {
|
|
65
81
|
model?: string;
|
|
66
82
|
fallbackModel?: string;
|
|
@@ -85,7 +101,10 @@ export declare class QueryEngine {
|
|
|
85
101
|
getHistoryMessages(): Message[];
|
|
86
102
|
private applyCompactionResult;
|
|
87
103
|
contextMetrics(): Promise<ContextMetrics>;
|
|
104
|
+
promptExportSnapshot(): Promise<SessionPromptExportSnapshot>;
|
|
105
|
+
private buildPromptExportSnapshot;
|
|
88
106
|
get toolResultMemory(): import("../index.js").ToolResultMemory | undefined;
|
|
107
|
+
private recordSyntheticToolCalls;
|
|
89
108
|
private openSession;
|
|
90
109
|
private scheduleSessionTitleCheck;
|
|
91
110
|
private runSessionTitleCheck;
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { InMemoryAppState } from "../app/app-state.js";
|
|
2
2
|
import { DefaultContextManager } from "../context/context-manager.js";
|
|
3
3
|
import { ModelDrivenCompactor } from "../context/compaction.js";
|
|
4
|
+
import { supportsImageInput } from "../model/context-window.js";
|
|
4
5
|
import { ToolRegistry } from "../tools/registry.js";
|
|
5
6
|
import { createSystemInitMessage, createTextMessage } from "../types/messages.js";
|
|
6
7
|
import { buildContextMetrics } from "./context-metrics.js";
|
|
@@ -19,6 +20,8 @@ export class QueryEngine {
|
|
|
19
20
|
sessionStore;
|
|
20
21
|
currentModel;
|
|
21
22
|
currentReasoning;
|
|
23
|
+
currentFallbackModel;
|
|
24
|
+
currentModelGateway;
|
|
22
25
|
sessionInitialized = false;
|
|
23
26
|
userTurns = 0;
|
|
24
27
|
titleSchedulerVersion = 0;
|
|
@@ -28,7 +31,9 @@ export class QueryEngine {
|
|
|
28
31
|
this.options = options;
|
|
29
32
|
this.agentId = options.agentId ?? "main";
|
|
30
33
|
this.currentModel = options.model;
|
|
34
|
+
this.currentFallbackModel = options.fallbackModel;
|
|
31
35
|
this.currentReasoning = cloneReasoningConfig(options.reasoning);
|
|
36
|
+
this.currentModelGateway = options.modelGateway;
|
|
32
37
|
}
|
|
33
38
|
onSessionTitleChange(listener) {
|
|
34
39
|
this.sessionTitleListeners.add(listener);
|
|
@@ -83,6 +88,7 @@ export class QueryEngine {
|
|
|
83
88
|
const userMessage = options.blocks
|
|
84
89
|
? { ...createTextMessage("user", options.displayText ?? text), blocks: options.blocks }
|
|
85
90
|
: createTextMessage("user", text);
|
|
91
|
+
this.assertUserMessageCapabilities(userMessage);
|
|
86
92
|
this.userTurns += 1;
|
|
87
93
|
this.history.push(userMessage);
|
|
88
94
|
this.sessionStore?.recordMessage(userMessage);
|
|
@@ -96,6 +102,11 @@ export class QueryEngine {
|
|
|
96
102
|
skills: [...(this.options.skills ?? [])],
|
|
97
103
|
plugins: [...(this.options.plugins ?? [])],
|
|
98
104
|
});
|
|
105
|
+
initMessage.metadata = {
|
|
106
|
+
...initMessage.metadata,
|
|
107
|
+
fallbackModel: this.currentFallbackModel,
|
|
108
|
+
reasoning: cloneReasoningConfig(this.currentReasoning),
|
|
109
|
+
};
|
|
99
110
|
yield {
|
|
100
111
|
type: "message",
|
|
101
112
|
message: initMessage,
|
|
@@ -104,7 +115,7 @@ export class QueryEngine {
|
|
|
104
115
|
const queryOptions = {
|
|
105
116
|
agentId: this.agentId,
|
|
106
117
|
model: this.currentModel,
|
|
107
|
-
fallbackModel: this.
|
|
118
|
+
fallbackModel: this.currentFallbackModel,
|
|
108
119
|
reasoning: cloneReasoningConfig(this.currentReasoning),
|
|
109
120
|
queryOrigin: this.options.queryOrigin ?? "repl",
|
|
110
121
|
maxOutputTokensOverride: this.options.maxOutputTokensOverride,
|
|
@@ -113,9 +124,11 @@ export class QueryEngine {
|
|
|
113
124
|
};
|
|
114
125
|
const stream = query(this.history, {
|
|
115
126
|
...this.options,
|
|
127
|
+
modelGateway: this.currentModelGateway,
|
|
116
128
|
taskNotificationSource: this.options.taskNotificationSource,
|
|
117
129
|
toolResultMemory: this.sessionStore?.toolResultMemory,
|
|
118
130
|
recordContentReplacements: (records) => this.sessionStore?.recordContentReplacements(records),
|
|
131
|
+
exportToolCalls: (calls) => this.recordSyntheticToolCalls(calls),
|
|
119
132
|
}, queryOptions);
|
|
120
133
|
for await (const event of stream) {
|
|
121
134
|
if (event.type === "message") {
|
|
@@ -132,10 +145,26 @@ export class QueryEngine {
|
|
|
132
145
|
if (updateReasoning)
|
|
133
146
|
this.currentReasoning = reasoning === null ? null : cloneReasoningConfig(reasoning);
|
|
134
147
|
}
|
|
148
|
+
canAcceptImageInput() {
|
|
149
|
+
return supportsImageInput(this.currentModel) !== false;
|
|
150
|
+
}
|
|
151
|
+
assertUserMessageCapabilities(message) {
|
|
152
|
+
if (this.canAcceptImageInput())
|
|
153
|
+
return;
|
|
154
|
+
if (!message.blocks.some((block) => block.type === "image"))
|
|
155
|
+
return;
|
|
156
|
+
throw new Error(`Model ${this.currentModel ?? "(default)"} does not support image input; image attachments were not added to the conversation.`);
|
|
157
|
+
}
|
|
158
|
+
setModelProvider(settings) {
|
|
159
|
+
this.currentModelGateway = settings.modelGateway;
|
|
160
|
+
this.currentModel = settings.model?.trim() || undefined;
|
|
161
|
+
this.currentFallbackModel = settings.fallbackModel?.trim() || undefined;
|
|
162
|
+
this.currentReasoning = settings.reasoning === null ? null : cloneReasoningConfig(settings.reasoning);
|
|
163
|
+
}
|
|
135
164
|
getModelSettings() {
|
|
136
165
|
return {
|
|
137
166
|
model: this.currentModel,
|
|
138
|
-
fallbackModel: this.
|
|
167
|
+
fallbackModel: this.currentFallbackModel,
|
|
139
168
|
reasoning: cloneReasoningConfig(this.currentReasoning),
|
|
140
169
|
};
|
|
141
170
|
}
|
|
@@ -151,7 +180,7 @@ export class QueryEngine {
|
|
|
151
180
|
await this.initialize();
|
|
152
181
|
if (options.abortSignal?.aborted)
|
|
153
182
|
return { messages: this.getHistoryMessages(), changed: false, reason: "none" };
|
|
154
|
-
const compactor = this.options.compactor ?? new ModelDrivenCompactor(this.
|
|
183
|
+
const compactor = this.options.compactor ?? new ModelDrivenCompactor(this.currentModelGateway);
|
|
155
184
|
const result = await (compactor.manualCompact?.(this.history, this.options.contextBudget) ?? compactor.compact(this.history, this.options.contextBudget));
|
|
156
185
|
this.applyCompactionResult(result);
|
|
157
186
|
return result;
|
|
@@ -160,7 +189,7 @@ export class QueryEngine {
|
|
|
160
189
|
await this.initialize();
|
|
161
190
|
if (options.abortSignal?.aborted)
|
|
162
191
|
return { messages: this.getHistoryMessages(), changed: false, reason: "none" };
|
|
163
|
-
const compactor = this.options.compactor ?? new ModelDrivenCompactor(this.
|
|
192
|
+
const compactor = this.options.compactor ?? new ModelDrivenCompactor(this.currentModelGateway);
|
|
164
193
|
const result = await (compactor.pureCompact?.(this.history, this.options.contextBudget) ?? { messages: this.getHistoryMessages(), changed: false, reason: "none" });
|
|
165
194
|
this.applyCompactionResult(result);
|
|
166
195
|
return result;
|
|
@@ -170,7 +199,7 @@ export class QueryEngine {
|
|
|
170
199
|
agentId: this.agentId,
|
|
171
200
|
messages: this.history.length,
|
|
172
201
|
model: this.currentModel,
|
|
173
|
-
fallbackModel: this.
|
|
202
|
+
fallbackModel: this.currentFallbackModel,
|
|
174
203
|
reasoning: cloneReasoningConfig(this.currentReasoning),
|
|
175
204
|
lastTerminalReason: this.lastTerminalReason,
|
|
176
205
|
session: this.sessionStore?.snapshot(),
|
|
@@ -192,6 +221,19 @@ export class QueryEngine {
|
|
|
192
221
|
async contextMetrics() {
|
|
193
222
|
await this.initialize();
|
|
194
223
|
const messages = this.getHistoryMessages();
|
|
224
|
+
const promptSnapshot = await this.buildPromptExportSnapshot(messages);
|
|
225
|
+
return buildContextMetrics({
|
|
226
|
+
model: this.currentModel,
|
|
227
|
+
messages: prependUserContext(messages, promptSnapshot.userContext ?? {}),
|
|
228
|
+
systemPrompt: promptSnapshot.systemPrompt ?? "",
|
|
229
|
+
tools: Array.isArray(promptSnapshot.toolDefinitions) ? promptSnapshot.toolDefinitions : [],
|
|
230
|
+
});
|
|
231
|
+
}
|
|
232
|
+
async promptExportSnapshot() {
|
|
233
|
+
await this.initialize();
|
|
234
|
+
return this.buildPromptExportSnapshot(this.getHistoryMessages());
|
|
235
|
+
}
|
|
236
|
+
async buildPromptExportSnapshot(messages) {
|
|
195
237
|
const toolContext = {
|
|
196
238
|
agentId: this.agentId,
|
|
197
239
|
tools: this.options.tools,
|
|
@@ -202,23 +244,55 @@ export class QueryEngine {
|
|
|
202
244
|
emit: () => undefined,
|
|
203
245
|
};
|
|
204
246
|
const contextManager = this.options.contextManager ?? new DefaultContextManager();
|
|
247
|
+
const initialToolDefinitions = this.options.tools.definitions(toolContext);
|
|
205
248
|
const context = await contextManager.build({
|
|
206
249
|
agentId: this.agentId,
|
|
207
250
|
messages,
|
|
208
|
-
enabledTools:
|
|
251
|
+
enabledTools: initialToolDefinitions.map((tool) => tool.name),
|
|
209
252
|
toolUseContext: toolContext,
|
|
210
253
|
});
|
|
211
254
|
const toolDefinitions = this.options.tools.definitions(toolContext);
|
|
212
|
-
|
|
255
|
+
const messagesWithUserContext = prependUserContext([], context.userContext);
|
|
256
|
+
const userContextPrompt = messagesWithUserContext[0]?.blocks
|
|
257
|
+
.filter((block) => block.type === "text")
|
|
258
|
+
.map((block) => block.text)
|
|
259
|
+
.join("\n");
|
|
260
|
+
return {
|
|
213
261
|
model: this.currentModel,
|
|
214
|
-
|
|
262
|
+
fallbackModel: this.currentFallbackModel,
|
|
263
|
+
reasoning: cloneReasoningConfig(this.currentReasoning),
|
|
215
264
|
systemPrompt: appendSystemContext(context.systemPrompt, context.systemContext),
|
|
216
|
-
|
|
217
|
-
|
|
265
|
+
baseSystemPrompt: context.systemPrompt,
|
|
266
|
+
promptSections: context.promptSections,
|
|
267
|
+
userContext: context.userContext,
|
|
268
|
+
systemContext: context.systemContext,
|
|
269
|
+
userContextPrompt,
|
|
270
|
+
toolDefinitions,
|
|
271
|
+
commands: [...(this.options.commands ?? [])],
|
|
272
|
+
agents: [...(this.options.agents ?? [])],
|
|
273
|
+
skills: [...(this.options.skills ?? [])],
|
|
274
|
+
plugins: [...(this.options.plugins ?? [])],
|
|
275
|
+
};
|
|
218
276
|
}
|
|
219
277
|
get toolResultMemory() {
|
|
220
278
|
return this.sessionStore?.toolResultMemory;
|
|
221
279
|
}
|
|
280
|
+
recordSyntheticToolCalls(calls) {
|
|
281
|
+
const missing = calls.filter((call) => !this.history.some((message) => message.blocks.some((block) => block.type === "tool_use" && block.id === call.id)));
|
|
282
|
+
if (!missing.length)
|
|
283
|
+
return;
|
|
284
|
+
const message = {
|
|
285
|
+
id: `tool-use-${Date.now().toString(36)}-${Math.random().toString(36).slice(2, 8)}`,
|
|
286
|
+
role: "assistant",
|
|
287
|
+
createdAt: new Date().toISOString(),
|
|
288
|
+
blocks: missing.map((call) => ({ type: "tool_use", id: call.id, name: call.name, input: call.input })),
|
|
289
|
+
isMeta: true,
|
|
290
|
+
metadata: { syntheticToolUse: true },
|
|
291
|
+
};
|
|
292
|
+
this.history.push(message);
|
|
293
|
+
this.sessionStore?.recordMessage(message);
|
|
294
|
+
this.options.exportToolCalls?.(missing);
|
|
295
|
+
}
|
|
222
296
|
async openSession(options) {
|
|
223
297
|
if (this.options.session?.enabled === false || !this.options.session)
|
|
224
298
|
return;
|
|
@@ -266,9 +340,9 @@ export class QueryEngine {
|
|
|
266
340
|
this.titleAgentRun = { version, controller };
|
|
267
341
|
const title = await generateSessionTitle({
|
|
268
342
|
agentId: `${this.agentId}-session-title`,
|
|
269
|
-
modelGateway: this.
|
|
343
|
+
modelGateway: this.currentModelGateway,
|
|
270
344
|
model: this.currentModel,
|
|
271
|
-
fallbackModel: this.
|
|
345
|
+
fallbackModel: this.currentFallbackModel,
|
|
272
346
|
kind,
|
|
273
347
|
previousTitle: state.title,
|
|
274
348
|
messages: this.history,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-engine.js","sourceRoot":"","sources":["../../src/core/query-engine.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-engine.js","sourceRoot":"","sources":["../../src/core/query-engine.ts"],"names":[],"mappings":"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"}
|
package/dist/core/query.d.ts
CHANGED
|
@@ -4,7 +4,7 @@ import type { ModelGateway, ReasoningConfig } from "../model/model-gateway.js";
|
|
|
4
4
|
import type { ToolRegistry } from "../tools/registry.js";
|
|
5
5
|
import type { CanUseTool, ToolUseContext } from "../tools/tool.js";
|
|
6
6
|
import type { AgentEvent } from "../types/events.js";
|
|
7
|
-
import { type Message } from "../types/messages.js";
|
|
7
|
+
import { type Message, type ToolUseRequest } from "../types/messages.js";
|
|
8
8
|
import { type TerminalReason } from "./state.js";
|
|
9
9
|
export interface QueryOptions {
|
|
10
10
|
agentId: string;
|
|
@@ -33,6 +33,7 @@ export interface QueryDependencies {
|
|
|
33
33
|
toolResultMemory?: ToolUseContext["toolResultMemory"];
|
|
34
34
|
recordContentReplacements?: ToolUseContext["recordContentReplacements"];
|
|
35
35
|
taskNotificationSource?: TaskNotificationSource;
|
|
36
|
+
exportToolCalls?: (calls: ToolUseRequest[]) => void;
|
|
36
37
|
}
|
|
37
38
|
export interface TaskNotificationSource {
|
|
38
39
|
collectUnnotifiedCompletions(): {
|
package/dist/core/query.js
CHANGED
|
@@ -2,6 +2,7 @@ import { InMemoryAppState } from "../app/app-state.js";
|
|
|
2
2
|
import { ModelDrivenCompactor } from "../context/compaction.js";
|
|
3
3
|
import { DefaultContextManager } from "../context/context-manager.js";
|
|
4
4
|
import { ModelAPIError } from "../model/errors.js";
|
|
5
|
+
import { supportsImageInput } from "../model/context-window.js";
|
|
5
6
|
import { runTools } from "../tools/tool-orchestration.js";
|
|
6
7
|
import { createTextMessage, createThinkingMessage } from "../types/messages.js";
|
|
7
8
|
import { appendSystemContext, applyToolResultBudget, ensureToolResultPairing, getMessagesAfterCompactBoundary, prependUserContext, } from "./message-pipeline.js";
|
|
@@ -157,6 +158,7 @@ async function* callModelForTurn(state, context, messagesForQuery, dependencies,
|
|
|
157
158
|
let previousResponseId = state.previousResponseId;
|
|
158
159
|
let incompleteReason;
|
|
159
160
|
let activeModel = state.currentModel ?? options.model;
|
|
161
|
+
const modelMessages = adaptMessagesForModelCapabilities(messagesForQuery, activeModel);
|
|
160
162
|
yield { type: "state", phase: "compacting", detail: "messages prepared for model" };
|
|
161
163
|
yield { type: "context.metrics", metrics: telemetry.metrics };
|
|
162
164
|
yield { type: "state", phase: "calling_model", detail: activeModel ? `model stream opened (${activeModel})` : "model stream opened" };
|
|
@@ -164,7 +166,7 @@ async function* callModelForTurn(state, context, messagesForQuery, dependencies,
|
|
|
164
166
|
for await (const event of dependencies.modelGateway.stream({
|
|
165
167
|
model: activeModel,
|
|
166
168
|
fallbackModel: state.fallbackModel ?? options.fallbackModel,
|
|
167
|
-
messages:
|
|
169
|
+
messages: modelMessages,
|
|
168
170
|
systemPrompt: telemetry.systemPrompt,
|
|
169
171
|
tools: telemetry.toolDefinitions,
|
|
170
172
|
stream: true,
|
|
@@ -224,9 +226,42 @@ async function* callModelForTurn(state, context, messagesForQuery, dependencies,
|
|
|
224
226
|
}
|
|
225
227
|
if (options.abortSignal?.aborted)
|
|
226
228
|
return { terminal: "aborted_streaming" };
|
|
229
|
+
if (toolUses.length)
|
|
230
|
+
dependencies.exportToolCalls?.(toolUses);
|
|
227
231
|
appendSyntheticToolUseMessage(assistantMessages, toolUses);
|
|
228
232
|
return { output: { assistantMessages, toolUses, previousResponseId, incompleteReason } };
|
|
229
233
|
}
|
|
234
|
+
function adaptMessagesForModelCapabilities(messages, model) {
|
|
235
|
+
if (supportsImageInput(model) !== false)
|
|
236
|
+
return messages;
|
|
237
|
+
let changed = false;
|
|
238
|
+
const adapted = messages.map((message) => {
|
|
239
|
+
let messageChanged = false;
|
|
240
|
+
const blocks = message.blocks.map((block) => {
|
|
241
|
+
if (block.type !== "image")
|
|
242
|
+
return block;
|
|
243
|
+
changed = true;
|
|
244
|
+
messageChanged = true;
|
|
245
|
+
return {
|
|
246
|
+
type: "text",
|
|
247
|
+
text: formatUnsupportedImagePlaceholder(block),
|
|
248
|
+
};
|
|
249
|
+
});
|
|
250
|
+
return messageChanged
|
|
251
|
+
? {
|
|
252
|
+
...message,
|
|
253
|
+
blocks,
|
|
254
|
+
metadata: { ...message.metadata, imageInputDowngraded: true },
|
|
255
|
+
}
|
|
256
|
+
: message;
|
|
257
|
+
});
|
|
258
|
+
return changed ? adapted : messages;
|
|
259
|
+
}
|
|
260
|
+
function formatUnsupportedImagePlaceholder(block) {
|
|
261
|
+
const label = block.label?.trim();
|
|
262
|
+
const suffix = `[image ${block.mimeType} omitted: current model does not support image input]`;
|
|
263
|
+
return label ? `${label} ${suffix}` : suffix;
|
|
264
|
+
}
|
|
230
265
|
async function* handleModelEvent(event, assistantMessages, toolUses, outputFilter, thinkingParts) {
|
|
231
266
|
if (event.type === "assistant_delta") {
|
|
232
267
|
const text = outputFilter.push(event.text);
|