neoctl 0.1.12 → 0.1.14
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 +172 -10
- package/dist/context/prompts.js +4 -0
- package/dist/context/prompts.js.map +1 -1
- package/dist/core/query.js +23 -4
- package/dist/core/query.js.map +1 -1
- package/dist/core/smoke-core-loop.js +43 -1
- package/dist/core/smoke-core-loop.js.map +1 -1
- package/dist/index.d.ts +23 -0
- package/dist/index.js +23 -0
- package/dist/index.js.map +1 -1
- package/dist/repl/index.js +11 -0
- package/dist/repl/index.js.map +1 -1
- package/dist/session/simple-session-runtime.d.ts +74 -0
- package/dist/session/simple-session-runtime.js +171 -0
- package/dist/session/simple-session-runtime.js.map +1 -0
- package/dist/skills/skill-filesystem.d.ts +32 -0
- package/dist/skills/skill-filesystem.js +371 -0
- package/dist/skills/skill-filesystem.js.map +1 -0
- package/dist/skills/skill-management-tools.d.ts +36 -0
- package/dist/skills/skill-management-tools.js +188 -0
- package/dist/skills/skill-management-tools.js.map +1 -0
- package/dist/skills/skill-tool.d.ts +85 -5
- package/dist/skills/skill-tool.js +173 -14
- package/dist/skills/skill-tool.js.map +1 -1
- package/dist/skills/smoke-skills.js +53 -4
- package/dist/skills/smoke-skills.js.map +1 -1
- package/dist/tools/builtins/image-generation-tool.d.ts +51 -0
- package/dist/tools/builtins/image-generation-tool.js +298 -0
- package/dist/tools/builtins/image-generation-tool.js.map +1 -0
- package/dist/tools/registry.d.ts +1 -0
- package/dist/tools/registry.js +11 -0
- package/dist/tools/registry.js.map +1 -1
- package/dist/tools/run-tool-use.js +1 -1
- package/dist/tools/run-tool-use.js.map +1 -1
- package/dist/tools/tool.d.ts +9 -1
- package/dist/tools/tool.js.map +1 -1
- package/dist/ui/display-message.d.ts +101 -0
- package/dist/ui/display-message.js +113 -0
- package/dist/ui/display-message.js.map +1 -0
- package/dist/web/index.js +11 -0
- package/dist/web/index.js.map +1 -1
- package/package.json +19 -1
package/README.md
CHANGED
|
@@ -252,6 +252,7 @@ REPL 当前注册的内置工具:
|
|
|
252
252
|
| `edit` / `replace` | 基于唯一字符串替换修改文件,容忍 LF/CRLF 和直/弯引号差异 |
|
|
253
253
|
| `exec` / `shell` / `bash` / `powershell` | 执行命令,支持 cwd、超时、输出截断和后台模式 |
|
|
254
254
|
| `search` | 通过可插拔 provider 搜索 Web;OpenAI 模型提供者默认走 GPT web search,否则默认 Exa MCP;可显式切换 provider |
|
|
255
|
+
| `image2` / `draw_image` / `generate_image` | 仅在 `MODEL_PROVIDER=openai` 时注册;通过 OpenAI Images API 生成图片并返回可展示的 data URL;非 OpenAI provider 不暴露绘图工具,系统提示会要求模型说明当前不具备绘图能力 |
|
|
255
256
|
| `plan` | 输出和更新当前任务计划 |
|
|
256
257
|
| `agent` | 启动同步/后台/fork 子代理 |
|
|
257
258
|
| `TaskOutput` | 读取后台任务输出,可阻塞等待完成 |
|
|
@@ -267,6 +268,7 @@ REPL 当前注册的内置工具:
|
|
|
267
268
|
- `list` 默认跳过 `.git`、`node_modules`、`dist`、`build`、`coverage` 等重目录。
|
|
268
269
|
- `grep` 不依赖系统 PATH,会调用 `vendor/ripgrep` 中的平台二进制;支持 glob、大小写模式、fixed strings、隐藏文件、上下文行、结果数和列宽限制。
|
|
269
270
|
- `search` 默认优先使用显式 `SEARCH_PROVIDER` / `WEB_SEARCH_PROVIDER`;未显式配置且当前模型提供者为 OpenAI(`MODEL_PROVIDER=openai` 或存在 `OPENAI_API_KEY`)时走 OpenAI Responses API 的 GPT web search,否则走 `https://mcp.exa.ai/mcp` 的 `web_search_exa`。OpenAI 搜索可通过 `OPENAI_SEARCH_API_KEY`、`OPENAI_SEARCH_BASE_URL`、`OPENAI_SEARCH_MODEL`、`OPENAI_SEARCH_TOOL_TYPE`、`OPENAI_SEARCH_CONTEXT_SIZE` 配置;Exa 可通过 `EXA_MCP_URL`、`EXA_MCP_TOOL_NAME` 配置;两者超时可用 `SEARCH_TIMEOUT_MS` 配置。模型也可以在单次工具调用里通过 `provider` 字段切换后端,但工具提示会要求:除非用户明确要求特定 provider,或默认/当前搜索 provider 在重试后持续不可用,否则不要显式指定 `provider`,让系统默认选择生效。
|
|
271
|
+
- `image2` 按 OpenAI 图片生成官方接口实现,底层请求 `POST /v1/images/generations`(可理解为项目里的 image2 绘图接口),默认模型 `gpt-image-1`,可用 `OPENAI_IMAGE_API_KEY` / `OPENAI_API_KEY`、`OPENAI_IMAGE_BASE_URL` / `OPENAI_BASE_URL`、`OPENAI_IMAGE_MODEL`、`OPENAI_IMAGE_TIMEOUT_MS` 配置。只有 `MODEL_PROVIDER=openai` 时 REPL/Web 运行时会注册该工具;切换到 DeepSeek/Kimi 等其他 provider 后会移除该工具,并在系统提示中要求模型告知用户当前模型/供应者不具备绘图工具。
|
|
270
272
|
|
|
271
273
|
### 命令执行
|
|
272
274
|
|
|
@@ -350,18 +352,68 @@ REPL 当前注册的内置工具:
|
|
|
350
352
|
|
|
351
353
|
## Skill 模块
|
|
352
354
|
|
|
353
|
-
`src/skills` 提供可复用 prompt workflow
|
|
355
|
+
`src/skills` 提供可复用 prompt workflow 与插件化 catalog。设计参考:Claude Code 的 `SKILL.md` + frontmatter 目录形态、OpenAI Agents SDK 的 tools / agents-as-tools / guardrails 组合方式,以及 OpenClaw 的多目录、插件目录和 skill gating 思路。默认 REPL 运行时当前未注册 skill catalog,嵌入方可按需装配。
|
|
356
|
+
|
|
357
|
+
核心能力:
|
|
358
|
+
|
|
359
|
+
- `SkillDescriptor` 支持 `version`、`tags`、`inputSchema`、`outputSchema`、`permissions`、`examples`、`trustLevel`、`source` 等插件元数据。
|
|
360
|
+
- `InMemorySkillCatalog` 适合测试和静态注入。
|
|
361
|
+
- `FileSystemSkillCatalog` 支持 `.neo/skills/<skill-name>/SKILL.md` 风格目录,也可合并 workspace、user、plugin、remote mirror 等多个 root。
|
|
362
|
+
- `CompositeSkillCatalog` 可按优先级合并多个 catalog。
|
|
363
|
+
- `createSkillTool()` 会创建 `skill` 调用工具。
|
|
364
|
+
- inline skill 会向下一轮模型注入 meta user message,并可修改主循环模型/effort,同时记录 `activeSkill`。
|
|
365
|
+
- `createSkillAwareCanUseTool()` 可基于 active skill 的 `allowedTools` 做运行期工具 gating。
|
|
366
|
+
- fork skill 会返回 `fork_required`,需要调用方用 AgentTool / 子 agent 编排承接。
|
|
367
|
+
- `createSkillManagementTools()` 提供 `skill_list`、`skill_read`、`skill_validate`、`skill_create`、`skill_update`、`skill_delete`,方便父项目实现 agent 自动生成 skill。
|
|
368
|
+
|
|
369
|
+
`SKILL.md` 示例:
|
|
370
|
+
|
|
371
|
+
```md
|
|
372
|
+
---
|
|
373
|
+
name: review-code
|
|
374
|
+
description: Review code changes for correctness and risk.
|
|
375
|
+
version: 1.0.0
|
|
376
|
+
execution: inline
|
|
377
|
+
allowed-tools:
|
|
378
|
+
- read
|
|
379
|
+
- grep
|
|
380
|
+
tags:
|
|
381
|
+
- code-review
|
|
382
|
+
trust-level: workspace
|
|
383
|
+
---
|
|
384
|
+
|
|
385
|
+
Review the provided changes. Focus on correctness, security, tests, and migration risk.
|
|
386
|
+
Return concise findings with file references when available.
|
|
387
|
+
```
|
|
388
|
+
|
|
389
|
+
父项目装配示例:
|
|
390
|
+
|
|
391
|
+
```ts
|
|
392
|
+
import {
|
|
393
|
+
FileSystemSkillCatalog,
|
|
394
|
+
createSkillTool,
|
|
395
|
+
createSkillManagementTools,
|
|
396
|
+
createSkillAwareCanUseTool,
|
|
397
|
+
} from "neoctl";
|
|
398
|
+
|
|
399
|
+
const skills = new FileSystemSkillCatalog({
|
|
400
|
+
roots: [
|
|
401
|
+
{ root: ".neo/skills", kind: "workspace" },
|
|
402
|
+
{ root: ".neo/plugins/acme/skills", kind: "plugin", plugin: "acme", readonly: true },
|
|
403
|
+
],
|
|
404
|
+
});
|
|
405
|
+
|
|
406
|
+
tools.register(createSkillTool(skills));
|
|
407
|
+
for (const tool of createSkillManagementTools(skills, { requireApproval: true })) tools.register(tool);
|
|
354
408
|
|
|
355
|
-
|
|
356
|
-
|
|
357
|
-
- inline skill 会向下一轮模型注入 meta user message,并可修改主循环模型/effort。
|
|
358
|
-
- fork skill 会返回 `fork_required`,需要调用方用 AgentTool 承接。
|
|
409
|
+
const canUseTool = createSkillAwareCanUseTool(skills, parentCanUseTool);
|
|
410
|
+
```
|
|
359
411
|
|
|
360
|
-
|
|
412
|
+
建议:开放 `skill_create`/`skill_update` 给模型时保持 approval;对 remote/plugin skill 使用只读 root;生产环境使用 `createSkillAwareCanUseTool()` 或父级权限系统强制 `allowedTools`。
|
|
361
413
|
|
|
362
414
|
## 作为库使用
|
|
363
415
|
|
|
364
|
-
|
|
416
|
+
包入口会导出核心 agent 编排运行时、模型网关、上下文管理、任务/子代理、工具系统、session 与 safety 边界:
|
|
365
417
|
|
|
366
418
|
```ts
|
|
367
419
|
import {
|
|
@@ -371,14 +423,16 @@ import {
|
|
|
371
423
|
readFileTool,
|
|
372
424
|
listDirectoryTool,
|
|
373
425
|
grepTool,
|
|
374
|
-
|
|
426
|
+
execTool,
|
|
427
|
+
planTool,
|
|
375
428
|
} from "neoctl";
|
|
376
429
|
|
|
377
430
|
const tools = new ToolRegistry();
|
|
378
|
-
tools.register(echoTool);
|
|
379
431
|
tools.register(readFileTool);
|
|
380
432
|
tools.register(listDirectoryTool);
|
|
381
433
|
tools.register(grepTool);
|
|
434
|
+
tools.register(execTool);
|
|
435
|
+
tools.register(planTool);
|
|
382
436
|
|
|
383
437
|
const engine = new QueryEngine({
|
|
384
438
|
agentId: "main",
|
|
@@ -391,7 +445,115 @@ for await (const event of engine.sendUserText("Summarize this repository")) {
|
|
|
391
445
|
}
|
|
392
446
|
```
|
|
393
447
|
|
|
394
|
-
|
|
448
|
+
Vue 等前端项目如果通过 API 消费消息,可使用展示层投影工具把内部 `Message` 转为可直接渲染的 DTO。`image2` 生成结果会被写入 `image` block;`imageMode: "data-url"` 时图片块会提供可直接赋给 `<img :src>` 的 `thumbnail.src` / `original.src`:
|
|
449
|
+
|
|
450
|
+
```ts
|
|
451
|
+
import { extractDisplayImages, toDisplayAgentEvent, toDisplayMessages } from "neoctl";
|
|
452
|
+
|
|
453
|
+
const displayMessages = toDisplayMessages(engine.getHistoryMessages(), {
|
|
454
|
+
imageMode: "data-url",
|
|
455
|
+
includeThinking: false,
|
|
456
|
+
includeToolUse: false,
|
|
457
|
+
});
|
|
458
|
+
|
|
459
|
+
// 如果只想拿图片列表:
|
|
460
|
+
const images = extractDisplayImages(displayMessages);
|
|
461
|
+
// images[0]?.src 可直接返回给 Vue 的 <img :src>
|
|
462
|
+
```
|
|
463
|
+
|
|
464
|
+
```vue
|
|
465
|
+
<template v-for="message in displayMessages" :key="message.id">
|
|
466
|
+
<template v-for="(block, index) in message.blocks" :key="index">
|
|
467
|
+
<img
|
|
468
|
+
v-if="block.type === 'image' && block.thumbnail"
|
|
469
|
+
:src="block.thumbnail.src"
|
|
470
|
+
:alt="block.label || 'generated image'"
|
|
471
|
+
class="message-image-thumb"
|
|
472
|
+
/>
|
|
473
|
+
</template>
|
|
474
|
+
</template>
|
|
475
|
+
```
|
|
476
|
+
|
|
477
|
+
SSE/WebSocket 流式推送事件时,可以在后端把单个 `AgentEvent` 投影为 `DisplayAgentEvent`,这样 Vue 收到 `event.type === "message"` 时同样能直接渲染图片:
|
|
478
|
+
|
|
479
|
+
```ts
|
|
480
|
+
for await (const event of engine.sendUserText("画一张小猫")) {
|
|
481
|
+
sendSse(toDisplayAgentEvent(event, { imageMode: "data-url" }));
|
|
482
|
+
}
|
|
483
|
+
```
|
|
484
|
+
|
|
485
|
+
也可以用 `imageMode: "metadata-only"` 只返回图片标签、MIME 与大小信息,避免在列表接口中内联 base64。
|
|
486
|
+
|
|
487
|
+
### 简单多会话 / Vue 后端集成
|
|
488
|
+
|
|
489
|
+
如果 Vue 侧只需要“每个用户使用自己的会话”或“一个用户操作,其他用户旁观”,可以使用轻量的 `SimpleSessionRuntime`。它不会改变底层 `QueryEngine` / `SessionStore` 行为,只是在库侧封装:
|
|
490
|
+
|
|
491
|
+
- 每个 `sessionId` 一个活动 `QueryEngine`。
|
|
492
|
+
- 同一 session 默认只允许一个发送任务运行,避免并发写历史。
|
|
493
|
+
- 支持读取 Vue 展示 DTO。
|
|
494
|
+
- 支持 `abort()` 中断当前 session。
|
|
495
|
+
- 支持 `onEvent()` 监听事件,便于服务端广播给 SSE/WebSocket 客户端。
|
|
496
|
+
- 可通过 `sessionRootDir` 做简单用户隔离。
|
|
497
|
+
|
|
498
|
+
```ts
|
|
499
|
+
import { SimpleSessionRuntime, createModelGatewayFromEnv, ToolRegistry } from "neoctl";
|
|
500
|
+
|
|
501
|
+
const tools = new ToolRegistry();
|
|
502
|
+
|
|
503
|
+
const runtime = new SimpleSessionRuntime({
|
|
504
|
+
agentId: "main",
|
|
505
|
+
modelGateway: createModelGatewayFromEnv(),
|
|
506
|
+
tools,
|
|
507
|
+
// 简单多用户推荐:后端根据登录态为每个用户分配独立 session 目录。
|
|
508
|
+
sessionRootDir: `.agent/users/${userId}/sessions`,
|
|
509
|
+
});
|
|
510
|
+
|
|
511
|
+
runtime.onDisplayEvent((event, { sessionId }) => {
|
|
512
|
+
// 可在这里把已投影的 DisplayAgentEvent 广播给正在观看该 session 的 SSE/WebSocket 客户端。
|
|
513
|
+
// image2 图片会以 message.blocks[].type === "image" 且 block.thumbnail.src 可直接渲染的形式出现。
|
|
514
|
+
broadcast(sessionId, event);
|
|
515
|
+
}, { imageMode: "data-url", includeThinking: false, includeToolUse: false });
|
|
516
|
+
|
|
517
|
+
for await (const event of runtime.sendUserText(sessionId, "Summarize this repository")) {
|
|
518
|
+
console.log(event);
|
|
519
|
+
}
|
|
520
|
+
|
|
521
|
+
const displayMessages = await runtime.getDisplayMessages(sessionId, {
|
|
522
|
+
imageMode: "data-url", // Vue <img :src> 用这个;列表页可改为 metadata-only
|
|
523
|
+
includeThinking: false,
|
|
524
|
+
includeToolUse: false,
|
|
525
|
+
});
|
|
526
|
+
const images = await runtime.getDisplayImages(sessionId, { imageMode: "data-url" });
|
|
527
|
+
```
|
|
528
|
+
|
|
529
|
+
常用方法:
|
|
530
|
+
|
|
531
|
+
```ts
|
|
532
|
+
await runtime.newSession();
|
|
533
|
+
await runtime.resumeSession(sessionId);
|
|
534
|
+
await runtime.listSessions(20);
|
|
535
|
+
await runtime.getMessages(sessionId);
|
|
536
|
+
await runtime.getDisplayMessages(sessionId, { imageMode: "metadata-only" });
|
|
537
|
+
await runtime.getDisplayImages(sessionId, { imageMode: "data-url" });
|
|
538
|
+
runtime.isBusy(sessionId);
|
|
539
|
+
runtime.abort(sessionId);
|
|
540
|
+
runtime.release(sessionId);
|
|
541
|
+
```
|
|
542
|
+
|
|
543
|
+
如果同一 session 正在运行,再次发送默认会抛出 `session is busy`。需要新请求打断旧请求时,可以使用:
|
|
544
|
+
|
|
545
|
+
```ts
|
|
546
|
+
runtime.sendUserText(sessionId, text, { busyBehavior: "interrupt" });
|
|
547
|
+
```
|
|
548
|
+
|
|
549
|
+
除根入口外,发布包还通过 package `exports` 暴露 `dist` 下的编译后子路径,便于依赖方按需导入较底层模块:
|
|
550
|
+
|
|
551
|
+
```ts
|
|
552
|
+
import { HttpTransport } from "neoctl/model/http-transport";
|
|
553
|
+
import { createAgentTool } from "neoctl/agents/agent-tool";
|
|
554
|
+
```
|
|
555
|
+
|
|
556
|
+
如果直接从源码运行,请使用 `.ts` 源文件路径或 `tsx`;发布包会通过 `dist` 导出编译后的 `.js` 模块与 `.d.ts` 类型声明。
|
|
395
557
|
|
|
396
558
|
## 运行数据目录
|
|
397
559
|
|
package/dist/context/prompts.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export const SYSTEM_PROMPT_DYNAMIC_BOUNDARY = "__SYSTEM_PROMPT_DYNAMIC_BOUNDARY__";
|
|
2
2
|
export function buildDefaultSystemPromptSections(enabledTools = []) {
|
|
3
|
+
const hasImageGenerationTool = enabledTools.includes("image2") || enabledTools.includes("draw_image") || enabledTools.includes("generate_image");
|
|
3
4
|
return [
|
|
4
5
|
{
|
|
5
6
|
name: "Agent Scaffold",
|
|
@@ -28,6 +29,9 @@ export function buildDefaultSystemPromptSections(enabledTools = []) {
|
|
|
28
29
|
? `Available tools are provided separately. Stable tool prefix: ${enabledTools.join(", ")}.`
|
|
29
30
|
: "Available tools are provided separately by the runtime.",
|
|
30
31
|
"When using tools, you may briefly state the intent of the tool call; if a tool result contains valuable information, you may briefly report it.",
|
|
32
|
+
hasImageGenerationTool
|
|
33
|
+
? "When the user asks for drawing/image generation, use the image2 tool. It is backed by OpenAI's Images API."
|
|
34
|
+
: "This runtime has no drawing/image generation tool. If the user asks you to draw, create, render, or generate an image, say that the current model/provider does not have drawing capability instead of pretending to generate one.",
|
|
31
35
|
].join("\n"),
|
|
32
36
|
},
|
|
33
37
|
{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/context/prompts.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,8BAA8B,GAAG,oCAAoC,CAAC;AAkBnF,MAAM,UAAU,gCAAgC,CAAC,eAAkC,EAAE;IACnF,OAAO;QACL;YACE,IAAI,EAAE,gBAAgB;YACtB,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE;gBACP,kDAAkD;gBAClD,6EAA6E;gBAC7E,6FAA6F;aAC9F,CAAC,IAAI,CAAC,IAAI,CAAC;SACb;QACD;YACE,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE;gBACP,oCAAoC;gBACpC,mIAAmI;gBACnI,+EAA+E;gBAC/E,qJAAqJ;aACtJ,CAAC,IAAI,CAAC,IAAI,CAAC;SACb;QACD;YACE,IAAI,EAAE,aAAa;YACnB,WAAW,EAAE,IAAI;YACjB,OAAO,EAAE;gBACP,YAAY,CAAC,MAAM;oBACjB,CAAC,CAAC,gEAAgE,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG;oBAC5F,CAAC,CAAC,yDAAyD;gBAC7D,iJAAiJ;
|
|
1
|
+
{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../src/context/prompts.ts"],"names":[],"mappings":"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"}
|
package/dist/core/query.js
CHANGED
|
@@ -343,16 +343,18 @@ async function* executeToolsForTurn(toolUses, dependencies, options, context) {
|
|
|
343
343
|
yield { type: "tool.started", toolUse };
|
|
344
344
|
if (options.abortSignal?.aborted)
|
|
345
345
|
return { terminal: "aborted_tools", messages: [], context };
|
|
346
|
-
const result = await runTools(toolUses, context, { canUseTool: dependencies.canUseTool });
|
|
347
|
-
|
|
346
|
+
const result = await abortable(runTools(toolUses, context, { canUseTool: dependencies.canUseTool }), options.abortSignal);
|
|
347
|
+
if (!result.completed)
|
|
348
|
+
return { terminal: "aborted_tools", messages: [], context };
|
|
349
|
+
for (const message of result.value.messages) {
|
|
348
350
|
context.appState.appendMessage(message);
|
|
349
351
|
yield { type: "message", message };
|
|
350
352
|
}
|
|
351
353
|
for (const toolUse of toolUses) {
|
|
352
|
-
const resultMessage = result.messages.find((message) => message.blocks.some((block) => block.type === "tool_result" && block.toolUseId === toolUse.id));
|
|
354
|
+
const resultMessage = result.value.messages.find((message) => message.blocks.some((block) => block.type === "tool_result" && block.toolUseId === toolUse.id));
|
|
353
355
|
yield { type: "tool.finished", toolUse, ok: resultMessage ? toolResultOk(resultMessage) : false };
|
|
354
356
|
}
|
|
355
|
-
return { messages: result.messages, context: result.context };
|
|
357
|
+
return { messages: result.value.messages, context: result.value.context };
|
|
356
358
|
}
|
|
357
359
|
function maybeRecoverWithoutTools(state, incompleteReason, assistantMessages, previousResponseId, options) {
|
|
358
360
|
if (incompleteReason === "max_output_tokens" && state.maxOutputTokensRecoveryCount === 0) {
|
|
@@ -369,6 +371,23 @@ function maybeRecoverWithoutTools(state, incompleteReason, assistantMessages, pr
|
|
|
369
371
|
}
|
|
370
372
|
return undefined;
|
|
371
373
|
}
|
|
374
|
+
function abortable(promise, signal) {
|
|
375
|
+
if (!signal)
|
|
376
|
+
return promise.then((value) => ({ completed: true, value }));
|
|
377
|
+
if (signal.aborted)
|
|
378
|
+
return Promise.resolve({ completed: false });
|
|
379
|
+
return new Promise((resolve, reject) => {
|
|
380
|
+
const onAbort = () => resolve({ completed: false });
|
|
381
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
382
|
+
promise.then((value) => {
|
|
383
|
+
signal.removeEventListener("abort", onAbort);
|
|
384
|
+
resolve({ completed: true, value });
|
|
385
|
+
}, (error) => {
|
|
386
|
+
signal.removeEventListener("abort", onAbort);
|
|
387
|
+
reject(error);
|
|
388
|
+
});
|
|
389
|
+
});
|
|
390
|
+
}
|
|
372
391
|
function buildNextTurnState(state, input) {
|
|
373
392
|
const allMessages = [...state.messages, ...input.assistantMessages, ...input.toolResults];
|
|
374
393
|
return {
|
package/dist/core/query.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/core/query.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query.js","sourceRoot":"","sources":["../../src/core/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,6 +2,20 @@ import { QueryEngine } from "./query-engine.js";
|
|
|
2
2
|
import { ToolRegistry } from "../tools/registry.js";
|
|
3
3
|
import { createTextMessage } from "../types/messages.js";
|
|
4
4
|
import { stripLeakedReasoningText } from "./assistant-output-filter.js";
|
|
5
|
+
const neverSettlingToolStarted = { value: false };
|
|
6
|
+
const neverSettlingTool = {
|
|
7
|
+
name: "never_settling",
|
|
8
|
+
description: "Smoke test tool that never resolves until the caller aborts.",
|
|
9
|
+
inputSchema: { type: "object", additionalProperties: false },
|
|
10
|
+
metadata: { readOnly: true, concurrent: true, visible: true },
|
|
11
|
+
validate() {
|
|
12
|
+
return {};
|
|
13
|
+
},
|
|
14
|
+
async call() {
|
|
15
|
+
neverSettlingToolStarted.value = true;
|
|
16
|
+
return new Promise(() => undefined);
|
|
17
|
+
},
|
|
18
|
+
};
|
|
5
19
|
const smokePassthroughTool = {
|
|
6
20
|
name: "smoke_passthrough",
|
|
7
21
|
description: "Smoke test passthrough tool.",
|
|
@@ -34,6 +48,14 @@ class FakeToolCallingGateway {
|
|
|
34
48
|
yield { type: "response_completed", responseId: "resp_2", stopReason: "completed" };
|
|
35
49
|
}
|
|
36
50
|
}
|
|
51
|
+
class AbortDuringToolGateway {
|
|
52
|
+
requests = [];
|
|
53
|
+
async *stream(request) {
|
|
54
|
+
this.requests.push(request);
|
|
55
|
+
yield { type: "tool_use", toolUse: { id: "call_never_settling", name: "never_settling", input: {} } };
|
|
56
|
+
yield { type: "response_completed", responseId: "abort_tools_1", stopReason: "tool_calls" };
|
|
57
|
+
}
|
|
58
|
+
}
|
|
37
59
|
class CapturingGateway {
|
|
38
60
|
requests = [];
|
|
39
61
|
async *stream(request) {
|
|
@@ -53,6 +75,21 @@ async function main() {
|
|
|
53
75
|
}
|
|
54
76
|
const snapshot = engine.snapshot();
|
|
55
77
|
const sanitized = stripLeakedReasoningText("目录内容:\n- `package-lock.json`We need answer in Chinese likely. Final maybe mention.");
|
|
78
|
+
const abortTools = new ToolRegistry();
|
|
79
|
+
abortTools.register(neverSettlingTool);
|
|
80
|
+
const abortController = new AbortController();
|
|
81
|
+
const abortEngine = new QueryEngine({ modelGateway: new AbortDuringToolGateway(), tools: abortTools, maxTurns: 2 });
|
|
82
|
+
const abortEvents = [];
|
|
83
|
+
const abortStartedAt = Date.now();
|
|
84
|
+
const abortRun = (async () => {
|
|
85
|
+
for await (const event of abortEngine.sendUserText("run never", { abortSignal: abortController.signal })) {
|
|
86
|
+
abortEvents.push(event.type === "terminal" ? `${event.type}:${event.reason}` : event.type);
|
|
87
|
+
if (event.type === "tool.started")
|
|
88
|
+
setTimeout(() => abortController.abort("smoke abort during tool"), 5);
|
|
89
|
+
}
|
|
90
|
+
})();
|
|
91
|
+
await abortRun;
|
|
92
|
+
const abortElapsedMs = Date.now() - abortStartedAt;
|
|
56
93
|
const imageGateway = new CapturingGateway();
|
|
57
94
|
const imageEngine = new QueryEngine({ model: "gpt-5.4", modelGateway: imageGateway, tools: new ToolRegistry(), maxTurns: 1 });
|
|
58
95
|
const imageBlocks = [
|
|
@@ -72,13 +109,18 @@ async function main() {
|
|
|
72
109
|
const historyImageDowngraded = downgradeEvents.includes("terminal:completed") &&
|
|
73
110
|
!finalBlocks.some((block) => block.type === "image") &&
|
|
74
111
|
finalBlocks.some((block) => block.type === "text" && block.text.includes("[img#1]") && block.text.includes("does not support image input"));
|
|
112
|
+
const abortDuringToolsOk = neverSettlingToolStarted.value &&
|
|
113
|
+
abortEvents.includes("tool.started") &&
|
|
114
|
+
abortEvents.includes("terminal:aborted_tools") &&
|
|
115
|
+
abortElapsedMs < 1000;
|
|
75
116
|
const ok = events.includes("tool.started") &&
|
|
76
117
|
events.includes("tool.finished") &&
|
|
77
118
|
events.includes("terminal:completed") &&
|
|
78
119
|
sanitized === "目录内容:\n- `package-lock.json`" &&
|
|
79
120
|
snapshot.messages >= 3 &&
|
|
121
|
+
abortDuringToolsOk &&
|
|
80
122
|
historyImageDowngraded;
|
|
81
|
-
console.log(JSON.stringify({ ok, events, snapshot, sanitized, downgradeEvents, historyImageDowngraded }, null, 2));
|
|
123
|
+
console.log(JSON.stringify({ ok, events, snapshot, sanitized, abortEvents, abortElapsedMs, abortDuringToolsOk, downgradeEvents, historyImageDowngraded }, null, 2));
|
|
82
124
|
if (!ok)
|
|
83
125
|
process.exitCode = 1;
|
|
84
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smoke-core-loop.js","sourceRoot":"","sources":["../../src/core/smoke-core-loop.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"smoke-core-loop.js","sourceRoot":"","sources":["../../src/core/smoke-core-loop.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -3,15 +3,20 @@ export * from "./core/query.js";
|
|
|
3
3
|
export * from "./core/state.js";
|
|
4
4
|
export * from "./core/message-pipeline.js";
|
|
5
5
|
export * from "./core/run-agent.js";
|
|
6
|
+
export * from "./core/assistant-output-filter.js";
|
|
7
|
+
export * from "./core/context-metrics.js";
|
|
6
8
|
export * from "./context/prompts.js";
|
|
7
9
|
export * from "./context/context-manager.js";
|
|
8
10
|
export * from "./context/compaction.js";
|
|
9
11
|
export * from "./agents/agent-definition.js";
|
|
10
12
|
export * from "./agents/agent-tool.js";
|
|
11
13
|
export * from "./agents/local-agent-task.js";
|
|
14
|
+
export * from "./agents/team.js";
|
|
12
15
|
export * from "./tasks/task-store.js";
|
|
13
16
|
export * from "./tasks/task-tools.js";
|
|
14
17
|
export * from "./skills/skill-tool.js";
|
|
18
|
+
export * from "./skills/skill-filesystem.js";
|
|
19
|
+
export * from "./skills/skill-management-tools.js";
|
|
15
20
|
export * from "./model/model-gateway.js";
|
|
16
21
|
export * from "./model/config.js";
|
|
17
22
|
export * from "./model/communication-logger.js";
|
|
@@ -22,11 +27,20 @@ export * from "./model/openai-responses-adapter.js";
|
|
|
22
27
|
export * from "./model/deepseek-adapter.js";
|
|
23
28
|
export * from "./model/kimi-adapter.js";
|
|
24
29
|
export * from "./model/provider-adapter.js";
|
|
30
|
+
export * from "./model/credentials.js";
|
|
31
|
+
export * from "./model/http-transport.js";
|
|
32
|
+
export * from "./model/openai-chat-mapper.js";
|
|
33
|
+
export * from "./model/openai-mappers.js";
|
|
34
|
+
export * from "./model/openai-responses-mapper.js";
|
|
35
|
+
export * from "./model/retry-runner.js";
|
|
36
|
+
export * from "./model/sse-decoder.js";
|
|
25
37
|
export * from "./model/env.js";
|
|
26
38
|
export * from "./model/errors.js";
|
|
27
39
|
export * from "./tools/tool.js";
|
|
28
40
|
export * from "./session/session-store.js";
|
|
41
|
+
export * from "./session/session-export.js";
|
|
29
42
|
export * from "./session/tool-result-memory.js";
|
|
43
|
+
export * from "./session/simple-session-runtime.js";
|
|
30
44
|
export * from "./tools/registry.js";
|
|
31
45
|
export * from "./tools/run-tool-use.js";
|
|
32
46
|
export * from "./tools/tool-orchestration.js";
|
|
@@ -39,6 +53,15 @@ export * from "./tools/builtins/grep-tool.js";
|
|
|
39
53
|
export * from "./tools/builtins/search-tool.js";
|
|
40
54
|
export * from "./tools/builtins/search-providers.js";
|
|
41
55
|
export * from "./tools/builtins/plan-tool.js";
|
|
56
|
+
export * from "./tools/builtins/image-generation-tool.js";
|
|
42
57
|
export * from "./tools/builtins/ripgrep-binary.js";
|
|
43
58
|
export * from "./types/messages.js";
|
|
44
59
|
export * from "./types/events.js";
|
|
60
|
+
export * from "./ui/display-message.js";
|
|
61
|
+
export * from "./app/app-state.js";
|
|
62
|
+
export * from "./safety/audit.js";
|
|
63
|
+
export * from "./safety/permissions.js";
|
|
64
|
+
export * from "./safety/sandbox.js";
|
|
65
|
+
export * from "./open-directory.js";
|
|
66
|
+
export * from "./paths.js";
|
|
67
|
+
export * from "./tips.js";
|
package/dist/index.js
CHANGED
|
@@ -3,15 +3,20 @@ export * from "./core/query.js";
|
|
|
3
3
|
export * from "./core/state.js";
|
|
4
4
|
export * from "./core/message-pipeline.js";
|
|
5
5
|
export * from "./core/run-agent.js";
|
|
6
|
+
export * from "./core/assistant-output-filter.js";
|
|
7
|
+
export * from "./core/context-metrics.js";
|
|
6
8
|
export * from "./context/prompts.js";
|
|
7
9
|
export * from "./context/context-manager.js";
|
|
8
10
|
export * from "./context/compaction.js";
|
|
9
11
|
export * from "./agents/agent-definition.js";
|
|
10
12
|
export * from "./agents/agent-tool.js";
|
|
11
13
|
export * from "./agents/local-agent-task.js";
|
|
14
|
+
export * from "./agents/team.js";
|
|
12
15
|
export * from "./tasks/task-store.js";
|
|
13
16
|
export * from "./tasks/task-tools.js";
|
|
14
17
|
export * from "./skills/skill-tool.js";
|
|
18
|
+
export * from "./skills/skill-filesystem.js";
|
|
19
|
+
export * from "./skills/skill-management-tools.js";
|
|
15
20
|
export * from "./model/model-gateway.js";
|
|
16
21
|
export * from "./model/config.js";
|
|
17
22
|
export * from "./model/communication-logger.js";
|
|
@@ -22,11 +27,20 @@ export * from "./model/openai-responses-adapter.js";
|
|
|
22
27
|
export * from "./model/deepseek-adapter.js";
|
|
23
28
|
export * from "./model/kimi-adapter.js";
|
|
24
29
|
export * from "./model/provider-adapter.js";
|
|
30
|
+
export * from "./model/credentials.js";
|
|
31
|
+
export * from "./model/http-transport.js";
|
|
32
|
+
export * from "./model/openai-chat-mapper.js";
|
|
33
|
+
export * from "./model/openai-mappers.js";
|
|
34
|
+
export * from "./model/openai-responses-mapper.js";
|
|
35
|
+
export * from "./model/retry-runner.js";
|
|
36
|
+
export * from "./model/sse-decoder.js";
|
|
25
37
|
export * from "./model/env.js";
|
|
26
38
|
export * from "./model/errors.js";
|
|
27
39
|
export * from "./tools/tool.js";
|
|
28
40
|
export * from "./session/session-store.js";
|
|
41
|
+
export * from "./session/session-export.js";
|
|
29
42
|
export * from "./session/tool-result-memory.js";
|
|
43
|
+
export * from "./session/simple-session-runtime.js";
|
|
30
44
|
export * from "./tools/registry.js";
|
|
31
45
|
export * from "./tools/run-tool-use.js";
|
|
32
46
|
export * from "./tools/tool-orchestration.js";
|
|
@@ -39,7 +53,16 @@ export * from "./tools/builtins/grep-tool.js";
|
|
|
39
53
|
export * from "./tools/builtins/search-tool.js";
|
|
40
54
|
export * from "./tools/builtins/search-providers.js";
|
|
41
55
|
export * from "./tools/builtins/plan-tool.js";
|
|
56
|
+
export * from "./tools/builtins/image-generation-tool.js";
|
|
42
57
|
export * from "./tools/builtins/ripgrep-binary.js";
|
|
43
58
|
export * from "./types/messages.js";
|
|
44
59
|
export * from "./types/events.js";
|
|
60
|
+
export * from "./ui/display-message.js";
|
|
61
|
+
export * from "./app/app-state.js";
|
|
62
|
+
export * from "./safety/audit.js";
|
|
63
|
+
export * from "./safety/permissions.js";
|
|
64
|
+
export * from "./safety/sandbox.js";
|
|
65
|
+
export * from "./open-directory.js";
|
|
66
|
+
export * from "./paths.js";
|
|
67
|
+
export * from "./tips.js";
|
|
45
68
|
//# 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,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qCAAqC,CAAC;AACpD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,iBAAiB,CAAC;AAChC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,qBAAqB,CAAC;AACpC,cAAc,mCAAmC,CAAC;AAClD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,yBAAyB,CAAC;AACxC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,kBAAkB,CAAC;AACjC,cAAc,uBAAuB,CAAC;AACtC,cAAc,uBAAuB,CAAC;AACtC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,0BAA0B,CAAC;AACzC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iCAAiC,CAAC;AAChD,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,qCAAqC,CAAC;AACpD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,oCAAoC,CAAC;AACnD,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,iCAAiC,CAAC;AAChD,cAAc,qCAAqC,CAAC;AACpD,cAAc,qBAAqB,CAAC;AACpC,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,oCAAoC,CAAC;AACnD,cAAc,mBAAmB,CAAC;AAClC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC;AAChD,cAAc,sCAAsC,CAAC;AACrD,cAAc,+BAA+B,CAAC;AAC9C,cAAc,2CAA2C,CAAC;AAC1D,cAAc,oCAAoC,CAAC;AACnD,cAAc,qBAAqB,CAAC;AACpC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,oBAAoB,CAAC;AACnC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,qBAAqB,CAAC;AACpC,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC"}
|