@ai-zen/cli 1.0.0-alpha.3 → 1.0.0-alpha.5

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.
Files changed (66) hide show
  1. package/CHANGELOG.md +31 -0
  2. package/README.md +2 -2
  3. package/README.zh.md +2 -2
  4. package/dist/index.js +5 -2
  5. package/dist/index.js.map +1 -1
  6. package/dist/tui/chat-session.d.ts +39 -46
  7. package/dist/tui/chat-session.d.ts.map +1 -1
  8. package/dist/tui/chat-session.js +71 -66
  9. package/dist/tui/chat-session.js.map +1 -1
  10. package/dist/tui/components.d.ts +5 -2
  11. package/dist/tui/components.d.ts.map +1 -1
  12. package/dist/tui/components.js +2 -2
  13. package/dist/tui/components.js.map +1 -1
  14. package/dist/tui/index.d.ts +1 -0
  15. package/dist/tui/index.d.ts.map +1 -1
  16. package/dist/tui/index.js +4 -4
  17. package/dist/tui/index.js.map +1 -1
  18. package/dist/tui/screens/chat-commands.d.ts +4 -2
  19. package/dist/tui/screens/chat-commands.d.ts.map +1 -1
  20. package/dist/tui/screens/chat-commands.js +5 -8
  21. package/dist/tui/screens/chat-commands.js.map +1 -1
  22. package/dist/tui/screens/chat.d.ts +0 -4
  23. package/dist/tui/screens/chat.d.ts.map +1 -1
  24. package/dist/tui/screens/chat.js +84 -63
  25. package/dist/tui/screens/chat.js.map +1 -1
  26. package/dist/tui/screens/frame-buffer.d.ts +47 -0
  27. package/dist/tui/screens/frame-buffer.d.ts.map +1 -0
  28. package/dist/tui/screens/frame-buffer.js +78 -0
  29. package/dist/tui/screens/frame-buffer.js.map +1 -0
  30. package/dist/tui/screens/index.d.ts +6 -6
  31. package/dist/tui/screens/index.d.ts.map +1 -1
  32. package/dist/tui/screens/index.js +5 -5
  33. package/dist/tui/screens/index.js.map +1 -1
  34. package/dist/tui/screens/layout.d.ts +5 -3
  35. package/dist/tui/screens/layout.d.ts.map +1 -1
  36. package/dist/tui/screens/layout.js +3 -8
  37. package/dist/tui/screens/layout.js.map +1 -1
  38. package/dist/tui/screens/lines.d.ts +2 -39
  39. package/dist/tui/screens/lines.d.ts.map +1 -1
  40. package/dist/tui/screens/lines.js +2 -65
  41. package/dist/tui/screens/lines.js.map +1 -1
  42. package/dist/tui/screens/messages-view.d.ts +10 -0
  43. package/dist/tui/screens/messages-view.d.ts.map +1 -0
  44. package/dist/tui/screens/messages-view.js +115 -0
  45. package/dist/tui/screens/messages-view.js.map +1 -0
  46. package/dist/tui/screens/notice.d.ts +32 -0
  47. package/dist/tui/screens/notice.d.ts.map +1 -0
  48. package/dist/tui/screens/notice.js +46 -0
  49. package/dist/tui/screens/notice.js.map +1 -0
  50. package/dist/tui/screens/render.d.ts +2 -4
  51. package/dist/tui/screens/render.d.ts.map +1 -1
  52. package/dist/tui/screens/render.js +2 -40
  53. package/dist/tui/screens/render.js.map +1 -1
  54. package/dist/tui/text.d.ts +5 -0
  55. package/dist/tui/text.d.ts.map +1 -1
  56. package/dist/tui/text.js +7 -0
  57. package/dist/tui/text.js.map +1 -1
  58. package/dist/usage.d.ts +20 -0
  59. package/dist/usage.d.ts.map +1 -0
  60. package/dist/usage.js +40 -0
  61. package/dist/usage.js.map +1 -0
  62. package/package.json +3 -3
  63. package/dist/tui/screens/state.d.ts +0 -30
  64. package/dist/tui/screens/state.d.ts.map +0 -1
  65. package/dist/tui/screens/state.js +0 -100
  66. package/dist/tui/screens/state.js.map +0 -1
@@ -0,0 +1,115 @@
1
+ // 渲染层 —— 直接以 SDK 的 `AgentNS.Message[]` 为唯一数据源产出 RLine(不经过任何自定义中间模型)
2
+ //
3
+ // 顺序即真相:遍历 messages 数组(跨消息天然有序);单条 assistant 内恒为
4
+ // `reasoning_content → tool_calls → content`。因此 **不需要** 自定义 Block / LiveAssistant,
5
+ // 也不需要把流式 delta 翻译成中间事件 —— 流式中 SDK 会实时更新「当前那条 message」,
6
+ // 直接读它即可。
7
+ import { AgentNS } from "@ai-zen/agents-core";
8
+ import { contentLines, indentLines, clipSpans, toolSpans, spanLine, innerWidth } from "./lines.js";
9
+ import { stripCwdNote } from "../text.js";
10
+ /** 从消息内容提取纯文本;非文本块(图片 / 文件)以占位文本表示 */
11
+ export function messageText(content) {
12
+ if (content == null)
13
+ return "";
14
+ if (typeof content === "string")
15
+ return content;
16
+ return content
17
+ .map((part) => {
18
+ if (part.type === "text")
19
+ return part.text;
20
+ if (part.type === "image_url")
21
+ return `[图片: ${part.image_url.url}]`;
22
+ if (part.type === "file") {
23
+ const file = part;
24
+ return `[文件: ${file.file_id ?? file.filename ?? "内联文件"}]`;
25
+ }
26
+ return "";
27
+ })
28
+ .join("");
29
+ }
30
+ /** 单条消息 → 预折行(不可渲染的消息返回空数组) */
31
+ export function messageToLines(message, columns) {
32
+ if (message.hidden || message.omit)
33
+ return [];
34
+ const key = `m${message.id}`;
35
+ const width = innerWidth(columns);
36
+ if (message.role === AgentNS.Role.User) {
37
+ const text = stripCwdNote(messageText(message.content));
38
+ if (!text.trim())
39
+ return [];
40
+ return [
41
+ { key: `${key}-gap`, kind: "gap", text: " " },
42
+ { key: `${key}-h`, kind: "user-header", text: "❯ 你" },
43
+ ...indentLines("user-text", key, text, width),
44
+ ];
45
+ }
46
+ if (message.role === AgentNS.Role.Assistant) {
47
+ const reasoning = (message.reasoning_content ?? "").trim();
48
+ const content = messageText(message.content).trim();
49
+ const tools = (message.tool_calls ?? []).filter((t) => t?.function?.name);
50
+ // 占位(流式尚未产出任何内容):不渲染,避免空标题
51
+ if (!reasoning && !content && tools.length === 0)
52
+ return [];
53
+ const lines = [
54
+ { key: `${key}-gap`, kind: "gap", text: " " },
55
+ { key: `${key}-h`, kind: "ai-header", text: "✦ AI" },
56
+ ];
57
+ if (reasoning) {
58
+ lines.push(...contentLines("reasoning", `${key}-r`, reasoning, width));
59
+ }
60
+ if (reasoning && tools.length > 0) {
61
+ // 思考与工具调用之间留一个空行,区分「过程」与「动作」
62
+ lines.push({ key: `${key}-tg`, kind: "gap", text: " " });
63
+ }
64
+ tools.forEach((tool, i) => {
65
+ const name = tool.function?.name ?? "";
66
+ const args = tool.function?.arguments ?? "";
67
+ lines.push(spanLine(`${key}-t${i}`, "tool", clipSpans(toolSpans(name, args), columns - 2)));
68
+ });
69
+ if (content) {
70
+ // 思考 / 工具与正文之间留一个空行,便于区分「过程」与「结论」
71
+ if (lines.length > 2)
72
+ lines.push({ key: `${key}-cgap`, kind: "gap", text: " " });
73
+ lines.push(...contentLines("content", `${key}-c`, content, width));
74
+ }
75
+ return lines;
76
+ }
77
+ // system / tool(工具结果)/ function:不进转录
78
+ return [];
79
+ }
80
+ /** 内容签名:流式中同一条消息会持续增长,用它判断是否需要重算 */
81
+ function signature(message) {
82
+ const reasoning = message.reasoning_content?.length ?? 0;
83
+ const content = typeof message.content === "string"
84
+ ? message.content.length
85
+ : Array.isArray(message.content)
86
+ ? message.content.length
87
+ : 0;
88
+ const tools = message.tool_calls?.reduce((sum, t) => sum + (t.function?.name?.length ?? 0) + (t.function?.arguments?.length ?? 0), 0) ?? 0;
89
+ return `${reasoning}:${content}:${tools}:${message.status ?? ""}`;
90
+ }
91
+ /**
92
+ * `messageToLines` 的缓存包装。
93
+ *
94
+ * 已完成消息的渲染结果按「消息对象 + 列宽 + 内容签名」缓存:流式期间每帧都要重排整个转录,
95
+ * 命中缓存后历史消息的折行 / 高亮全部免算。用签名(而非仅对象身份)兜住「流式中那条正在
96
+ * 增长的消息」——签名变了就重算,避免拿到陈旧结果。
97
+ */
98
+ const messageLineCache = new WeakMap();
99
+ export function cachedMessageToLines(message, columns) {
100
+ const sig = signature(message);
101
+ const hit = messageLineCache.get(message);
102
+ if (hit && hit.columns === columns && hit.sig === sig)
103
+ return hit.lines;
104
+ const lines = messageToLines(message, columns);
105
+ messageLineCache.set(message, { columns, sig, lines });
106
+ return lines;
107
+ }
108
+ /** 整段转录 → 预折行 */
109
+ export function transcriptLines(messages, columns) {
110
+ const out = [];
111
+ for (const message of messages)
112
+ out.push(...cachedMessageToLines(message, columns));
113
+ return out;
114
+ }
115
+ //# sourceMappingURL=messages-view.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"messages-view.js","sourceRoot":"","sources":["../../../src/tui/screens/messages-view.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,32 @@
1
+ /**
2
+ * 通知通道 —— 系统级提示(notice / error)的旁路,与对话转录严格分离。
3
+ *
4
+ * 为什么不能塞进 `agent.messages`:那份数组会被 `formatHistory()` **原样发给模型**,
5
+ * 把「配置已更新 / 已中止 / 保存失败」这类 UI 提示写进去,等于往上下文里灌噪声,
6
+ * 甚至带偏模型行为。所以 notice / error 走这条独立通道,由对话屏订阅后渲染到
7
+ * 输入框上方的独立栏位,**绝不进入 messages**。
8
+ *
9
+ * 纯逻辑、不依赖 React,可独立单测。
10
+ */
11
+ export interface Notice {
12
+ text: string;
13
+ tone: "info" | "error";
14
+ /** 递增序号:同一文本重复推送也能被 React 依赖感知为「新通知」 */
15
+ seq: number;
16
+ }
17
+ export type NoticeListener = (notice: Notice) => void;
18
+ /** 通知通道:`push` 广播,屏订阅。 */
19
+ export declare class NoticeChannel {
20
+ private seq;
21
+ private readonly listeners;
22
+ push(text: string, tone?: "info" | "error"): void;
23
+ subscribe(listener: NoticeListener): () => void;
24
+ }
25
+ /** 通知栏最多占用的行数(超出以 … 收尾),避免长输出把对话区挤没 */
26
+ export declare const MAX_NOTICE_LINES = 8;
27
+ /**
28
+ * 通知 → 栏位文本行(按显示宽度折行、封顶)。
29
+ * 首行带前缀(info `· ` / error `✖ `),其余行对齐缩进。
30
+ */
31
+ export declare function noticeLines(notice: Notice, columns: number): string[];
32
+ //# sourceMappingURL=notice.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"notice.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/notice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAIH,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,wCAAwC;IACxC,GAAG,EAAE,MAAM,CAAC;CACb;AAED,MAAM,MAAM,cAAc,GAAG,CAAC,MAAM,EAAE,MAAM,KAAK,IAAI,CAAC;AAEtD,0BAA0B;AAC1B,qBAAa,aAAa;IACxB,OAAO,CAAC,GAAG,CAAK;IAChB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA6B;IAEvD,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,GAAE,MAAM,GAAG,OAAgB,GAAG,IAAI;IAKzD,SAAS,CAAC,QAAQ,EAAE,cAAc,GAAG,MAAM,IAAI;CAMhD;AAED,uCAAuC;AACvC,eAAO,MAAM,gBAAgB,IAAI,CAAC;AAElC;;;GAGG;AACH,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,CAUrE"}
@@ -0,0 +1,46 @@
1
+ /**
2
+ * 通知通道 —— 系统级提示(notice / error)的旁路,与对话转录严格分离。
3
+ *
4
+ * 为什么不能塞进 `agent.messages`:那份数组会被 `formatHistory()` **原样发给模型**,
5
+ * 把「配置已更新 / 已中止 / 保存失败」这类 UI 提示写进去,等于往上下文里灌噪声,
6
+ * 甚至带偏模型行为。所以 notice / error 走这条独立通道,由对话屏订阅后渲染到
7
+ * 输入框上方的独立栏位,**绝不进入 messages**。
8
+ *
9
+ * 纯逻辑、不依赖 React,可独立单测。
10
+ */
11
+ import { wrapText } from "../text.js";
12
+ /** 通知通道:`push` 广播,屏订阅。 */
13
+ export class NoticeChannel {
14
+ seq = 0;
15
+ listeners = new Set();
16
+ push(text, tone = "info") {
17
+ const notice = { text, tone, seq: ++this.seq };
18
+ for (const listener of this.listeners)
19
+ listener(notice);
20
+ }
21
+ subscribe(listener) {
22
+ this.listeners.add(listener);
23
+ return () => {
24
+ this.listeners.delete(listener);
25
+ };
26
+ }
27
+ }
28
+ /** 通知栏最多占用的行数(超出以 … 收尾),避免长输出把对话区挤没 */
29
+ export const MAX_NOTICE_LINES = 8;
30
+ /**
31
+ * 通知 → 栏位文本行(按显示宽度折行、封顶)。
32
+ * 首行带前缀(info `· ` / error `✖ `),其余行对齐缩进。
33
+ */
34
+ export function noticeLines(notice, columns) {
35
+ if (!notice.text)
36
+ return [];
37
+ const width = Math.max(4, columns - 4);
38
+ const prefix = notice.tone === "error" ? "✖ " : "· ";
39
+ const wrapped = wrapText(notice.text, width);
40
+ const capped = wrapped.slice(0, MAX_NOTICE_LINES);
41
+ if (wrapped.length > MAX_NOTICE_LINES && capped.length > 0) {
42
+ capped[capped.length - 1] = `${capped[capped.length - 1]}…`;
43
+ }
44
+ return capped.map((line, i) => ` ${i === 0 ? prefix : " "}${line}`);
45
+ }
46
+ //# sourceMappingURL=notice.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"notice.js","sourceRoot":"","sources":["../../../src/tui/screens/notice.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAWtC,0BAA0B;AAC1B,MAAM,OAAO,aAAa;IAChB,GAAG,GAAG,CAAC,CAAC;IACC,SAAS,GAAG,IAAI,GAAG,EAAkB,CAAC;IAEvD,IAAI,CAAC,IAAY,EAAE,OAAyB,MAAM;QAChD,MAAM,MAAM,GAAW,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC;QACvD,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS;YAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;IAED,SAAS,CAAC,QAAwB;QAChC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC7B,OAAO,GAAG,EAAE;YACV,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC;IACJ,CAAC;CACF;AAED,uCAAuC;AACvC,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAElC;;;GAGG;AACH,MAAM,UAAU,WAAW,CAAC,MAAc,EAAE,OAAe;IACzD,IAAI,CAAC,MAAM,CAAC,IAAI;QAAE,OAAO,EAAE,CAAC;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,GAAG,CAAC,CAAC,CAAC;IACvC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IACrD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAC7C,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,gBAAgB,CAAC,CAAC;IAClD,IAAI,OAAO,CAAC,MAAM,GAAG,gBAAgB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC3D,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC;IAC9D,CAAC;IACD,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;AACxE,CAAC"}
@@ -1,9 +1,7 @@
1
- import { AgentNS } from "@ai-zen/agents-core";
2
- import { RLine, Block } from "./lines.js";
1
+ import { RLine } from "./lines.js";
3
2
  export declare function LineView({ line }: {
4
3
  line: RLine;
5
4
  }): import("react").JSX.Element;
6
- export declare function contentToText(content: AgentNS.MessageContent | undefined): string;
7
- export declare function messagesToBlocks(messages: AgentNS.Message[]): Block[];
5
+ /** 单行化文本(表格 / 列表项用):折叠空白并截断 */
8
6
  export declare function truncate(text: string, max: number): string;
9
7
  //# sourceMappingURL=render.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/render.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,OAAO,EAAE,KAAK,EAAY,KAAK,EAAiB,MAAM,YAAY,CAAC;AA6BnE,wBAAgB,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,+BAmCjD;AAID,wBAAgB,aAAa,CAAC,OAAO,EAAE,OAAO,CAAC,cAAc,GAAG,SAAS,GAAG,MAAM,CAYjF;AAED,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,KAAK,EAAE,CAmBrE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAG1D"}
1
+ {"version":3,"file":"render.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/render.tsx"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,EAAiB,MAAM,YAAY,CAAC;AA0BlD,wBAAgB,QAAQ,CAAC,EAAE,IAAI,EAAE,EAAE;IAAE,IAAI,EAAE,KAAK,CAAA;CAAE,+BAmCjD;AAED,+BAA+B;AAC/B,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAG1D"}
@@ -1,10 +1,7 @@
1
1
  import { jsx as _jsx } from "react/jsx-runtime";
2
- // 由 src/tui/screens.tsx 拆分而来 —— 行渲染与「消息 → 块」
2
+ // 行渲染(Ink 组件)—— RLine → <Text>
3
3
  import { Text } from "ink";
4
- import { AgentNS } from "@ai-zen/agents-core";
5
4
  import { theme } from "../theme.js";
6
- import { nextId } from "./state.js";
7
- // ==================== 行渲染 ====================
8
5
  /** 行 kind → 基础色(分段渲染时作默认色;`undefined` = 终端默认前景色) */
9
6
  function baseColor(kind) {
10
7
  switch (kind) {
@@ -56,42 +53,7 @@ export function LineView({ line }) {
56
53
  return _jsx(Text, { children: line.text });
57
54
  }
58
55
  }
59
- // ==================== 消息 → 块(撤回后重建视图)====================
60
- export function contentToText(content) {
61
- if (content == null)
62
- return "";
63
- if (typeof content === "string")
64
- return content;
65
- return content
66
- .map((part) => part.type === "text"
67
- ? part.text
68
- : part.type === "image_url"
69
- ? `[图片: ${part.image_url.url}]`
70
- : "")
71
- .join("");
72
- }
73
- export function messagesToBlocks(messages) {
74
- const blocks = [];
75
- for (const message of messages) {
76
- if (message.role === AgentNS.Role.User) {
77
- const text = contentToText(message.content);
78
- if (text.trim())
79
- blocks.push({ id: nextId(), kind: "user", text });
80
- }
81
- else if (message.role === AgentNS.Role.Assistant) {
82
- const content = contentToText(message.content);
83
- const reasoning = message.reasoning_content ?? "";
84
- const tools = (message.tool_calls ?? []).map((tc) => ({
85
- name: tc.function?.name ?? "",
86
- args: tc.function?.arguments ?? "",
87
- }));
88
- if (content.trim() || reasoning.trim() || tools.some((t) => t.name)) {
89
- blocks.push({ id: nextId(), kind: "assistant", reasoning, content, tools });
90
- }
91
- }
92
- }
93
- return blocks;
94
- }
56
+ /** 单行化文本(表格 / 列表项用):折叠空白并截断 */
95
57
  export function truncate(text, max) {
96
58
  const single = text.replace(/\s+/g, " ").trim();
97
59
  return single.length > max ? `${single.slice(0, max - 1)}…` : single;
@@ -1 +1 @@
1
- {"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/tui/screens/render.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"render.js","sourceRoot":"","sources":["../../../src/tui/screens/render.tsx"],"names":[],"mappings":"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"}
@@ -68,4 +68,9 @@ export declare function usableFrameRows(terminalRows: number): number;
68
68
  * 传入行数超过一帧时返回 0(由调用方负责限制内容行数)。
69
69
  */
70
70
  export declare function bottomPadding(terminalRows: number, contentLines: number): number;
71
+ /**
72
+ * 去掉 CwdTrackerPlugin 追加在用户消息末尾的工作目录提示。
73
+ * 该提示是喂给模型的上下文,不该显示给用户。
74
+ */
75
+ export declare function stripCwdNote(text: string): string;
71
76
  //# sourceMappingURL=text.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuBH,6BAA6B;AAC7B,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA8B9D;AAID,oBAAoB;AACpB,MAAM,WAAW,WAAW;IAC1B,sBAAsB;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,kBAAkB;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAgDpF;AAED,+CAA+C;AAC/C,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAMzD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAY3D;AAID;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhF"}
1
+ {"version":3,"file":"text.d.ts","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAuBH,6BAA6B;AAC7B,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQjD;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,EAAE,CA8B9D;AAID,oBAAoB;AACpB,MAAM,WAAW,WAAW;IAC1B,sBAAsB;IACtB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,kBAAkB;IAClB,SAAS,EAAE,MAAM,CAAC;IAClB,gCAAgC;IAChC,SAAS,EAAE,MAAM,CAAC;CACnB;AAED;;;GAGG;AACH,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,WAAW,CAgDpF;AAED,+CAA+C;AAC/C,eAAO,MAAM,kBAAkB,IAAI,CAAC;AAEpC;;;;;;;;;;;;GAYG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAMzD;AAED;;;;;GAKG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAY3D;AAID;;;;;;;GAOG;AACH,wBAAgB,eAAe,CAAC,YAAY,EAAE,MAAM,GAAG,MAAM,CAE5D;AAED;;;;;;;;;GASG;AACH,wBAAgB,aAAa,CAAC,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,MAAM,CAEhF;AAED;;;GAGG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAEjD"}
package/dist/tui/text.js CHANGED
@@ -188,4 +188,11 @@ export function usableFrameRows(terminalRows) {
188
188
  export function bottomPadding(terminalRows, contentLines) {
189
189
  return Math.max(0, usableFrameRows(terminalRows) - Math.max(0, contentLines));
190
190
  }
191
+ /**
192
+ * 去掉 CwdTrackerPlugin 追加在用户消息末尾的工作目录提示。
193
+ * 该提示是喂给模型的上下文,不该显示给用户。
194
+ */
195
+ export function stripCwdNote(text) {
196
+ return text.replace(/\n+(?:\[工作目录变更\]\n)?当前工作目录: [^\n]*$/, "");
197
+ }
191
198
  //# sourceMappingURL=text.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/tui/text.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,20 @@
1
+ /**
2
+ * Token 用量统计 — 纯函数
3
+ *
4
+ * 数据源为 core 为每条 assistant 消息钉上的 `usage`(`Agent.lastUsage` 的近亲,
5
+ * 由流式响应的最后一个 chunk 写入)。因每轮请求都会重发完整历史,
6
+ * 「各 assistant 消息 usage 之和」即计费口径的累计消耗。
7
+ *
8
+ * 本模块为纯数据与纯函数,不依赖 React / Ink,可直接单测。
9
+ */
10
+ import { AgentNS } from "@ai-zen/agents-core";
11
+ /** 零用量(复用为累加初值;调用方勿直接修改) */
12
+ export declare const ZERO_USAGE: AgentNS.Usage;
13
+ /** 累加两个 usage(逐字段相加,返回新对象) */
14
+ export declare function addUsage(a: AgentNS.Usage, b: AgentNS.Usage): AgentNS.Usage;
15
+ /**
16
+ * 求和一组消息中 assistant 消息的 usage。
17
+ * 非 assistant 消息、以及无 usage 的消息(如被中断的轮次)一律忽略。
18
+ */
19
+ export declare function sumMessagesUsage(messages: readonly AgentNS.Message[]): AgentNS.Usage;
20
+ //# sourceMappingURL=usage.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,4BAA4B;AAC5B,eAAO,MAAM,UAAU,EAAE,OAAO,CAAC,KAIhC,CAAC;AAEF,8BAA8B;AAC9B,wBAAgB,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,CAAC,EAAE,OAAO,CAAC,KAAK,GAAG,OAAO,CAAC,KAAK,CAM1E;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,QAAQ,EAAE,SAAS,OAAO,CAAC,OAAO,EAAE,GACnC,OAAO,CAAC,KAAK,CASf"}
package/dist/usage.js ADDED
@@ -0,0 +1,40 @@
1
+ /**
2
+ * Token 用量统计 — 纯函数
3
+ *
4
+ * 数据源为 core 为每条 assistant 消息钉上的 `usage`(`Agent.lastUsage` 的近亲,
5
+ * 由流式响应的最后一个 chunk 写入)。因每轮请求都会重发完整历史,
6
+ * 「各 assistant 消息 usage 之和」即计费口径的累计消耗。
7
+ *
8
+ * 本模块为纯数据与纯函数,不依赖 React / Ink,可直接单测。
9
+ */
10
+ import { AgentNS } from "@ai-zen/agents-core";
11
+ /** 零用量(复用为累加初值;调用方勿直接修改) */
12
+ export const ZERO_USAGE = {
13
+ prompt_tokens: 0,
14
+ completion_tokens: 0,
15
+ total_tokens: 0,
16
+ };
17
+ /** 累加两个 usage(逐字段相加,返回新对象) */
18
+ export function addUsage(a, b) {
19
+ return {
20
+ prompt_tokens: a.prompt_tokens + b.prompt_tokens,
21
+ completion_tokens: a.completion_tokens + b.completion_tokens,
22
+ total_tokens: a.total_tokens + b.total_tokens,
23
+ };
24
+ }
25
+ /**
26
+ * 求和一组消息中 assistant 消息的 usage。
27
+ * 非 assistant 消息、以及无 usage 的消息(如被中断的轮次)一律忽略。
28
+ */
29
+ export function sumMessagesUsage(messages) {
30
+ const acc = { ...ZERO_USAGE };
31
+ for (const message of messages) {
32
+ if (message.role !== AgentNS.Role.Assistant || !message.usage)
33
+ continue;
34
+ acc.prompt_tokens += message.usage.prompt_tokens ?? 0;
35
+ acc.completion_tokens += message.usage.completion_tokens ?? 0;
36
+ acc.total_tokens += message.usage.total_tokens ?? 0;
37
+ }
38
+ return acc;
39
+ }
40
+ //# sourceMappingURL=usage.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAE9C,4BAA4B;AAC5B,MAAM,CAAC,MAAM,UAAU,GAAkB;IACvC,aAAa,EAAE,CAAC;IAChB,iBAAiB,EAAE,CAAC;IACpB,YAAY,EAAE,CAAC;CAChB,CAAC;AAEF,8BAA8B;AAC9B,MAAM,UAAU,QAAQ,CAAC,CAAgB,EAAE,CAAgB;IACzD,OAAO;QACL,aAAa,EAAE,CAAC,CAAC,aAAa,GAAG,CAAC,CAAC,aAAa;QAChD,iBAAiB,EAAE,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,iBAAiB;QAC5D,YAAY,EAAE,CAAC,CAAC,YAAY,GAAG,CAAC,CAAC,YAAY;KAC9C,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAC9B,QAAoC;IAEpC,MAAM,GAAG,GAAG,EAAE,GAAG,UAAU,EAAE,CAAC;IAC9B,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;QAC/B,IAAI,OAAO,CAAC,IAAI,KAAK,OAAO,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,OAAO,CAAC,KAAK;YAAE,SAAS;QACxE,GAAG,CAAC,aAAa,IAAI,OAAO,CAAC,KAAK,CAAC,aAAa,IAAI,CAAC,CAAC;QACtD,GAAG,CAAC,iBAAiB,IAAI,OAAO,CAAC,KAAK,CAAC,iBAAiB,IAAI,CAAC,CAAC;QAC9D,GAAG,CAAC,YAAY,IAAI,OAAO,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,CAAC;IACtD,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@ai-zen/cli",
3
- "version": "1.0.0-alpha.3",
3
+ "version": "1.0.0-alpha.5",
4
4
  "description": "AI-ZEN CLI - dual-mode AI terminal: pure stdio pipelines and an interactive TUI",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
@@ -21,8 +21,8 @@
21
21
  "author": "LZQCN",
22
22
  "license": "MIT",
23
23
  "dependencies": {
24
- "@ai-zen/agents-core": "^4.3.2",
25
- "@ai-zen/agents-sdk": "1.0.0-alpha.6",
24
+ "@ai-zen/agents-core": "^4.4.0",
25
+ "@ai-zen/agents-sdk": "1.0.0-alpha.7",
26
26
  "@modelcontextprotocol/sdk": "^1.29.0",
27
27
  "dayjs": "^1.11.21",
28
28
  "highlight.js": "^11.12.0",
@@ -1,30 +0,0 @@
1
- import { ChatEvent } from "../chat-session.js";
2
- import { Block, LiveAssistant } from "./lines.js";
3
- /**
4
- * 视图历史保留上限(块数)。
5
- *
6
- * 长对话里 `blocks` 会随每轮追加而单调增长:迁移(`strategy: "prune"`)虽会裁剪
7
- * `agent.messages`,**却不会清理 `blocks`**,于是内存里累积的是「跨迁移的全程历史」
8
- * —— 这正是长对话 OOM 的主要来源。
9
- *
10
- * 这里给内存中的视图封顶:超出即从**最旧的块**开始丢弃。更早的内容仍完整保存在
11
- * `conversations/<id>.json`,可用 `/load` 找回。
12
- *
13
- * 注意:**不能**改在迁移时清空视图 —— 迁移发生在 `agent.send()` 内部(`onAfterSend`),
14
- * 此时正在流式的 `live` 尚未被 `done` 定稿,清空会把刚生成的回答一并抹掉。封顶只丢最旧、
15
- * 不碰 `live`,故安全。
16
- */
17
- export declare const MAX_TRANSCRIPT_BLOCKS = 200;
18
- /** 追加块并封顶(丢弃最旧),保证内存有界;`live` 不在其中,不受影响 */
19
- export declare function trimTranscript(blocks: Block[]): Block[];
20
- export interface ChatState {
21
- blocks: Block[];
22
- live: LiveAssistant | null;
23
- }
24
- export type ChatAction = ChatEvent | {
25
- type: "clear";
26
- };
27
- export declare let blockSeq: number;
28
- export declare const nextId: () => number;
29
- export declare function chatReducer(state: ChatState, action: ChatAction): ChatState;
30
- //# sourceMappingURL=state.d.ts.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"state.d.ts","sourceRoot":"","sources":["../../../src/tui/screens/state.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAIlD;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,qBAAqB,MAAM,CAAC;AAEzC,2CAA2C;AAC3C,wBAAgB,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,EAAE,CAIvD;AAMD,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,IAAI,EAAE,aAAa,GAAG,IAAI,CAAC;CAC5B;AAED,MAAM,MAAM,UAAU,GAAG,SAAS,GAAG;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEvD,eAAO,IAAI,QAAQ,QAAI,CAAC;AACxB,eAAO,MAAM,MAAM,cAAmB,CAAC;AAEvC,wBAAgB,WAAW,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,GAAG,SAAS,CAmE3E"}
@@ -1,100 +0,0 @@
1
- // ==================== 对话状态与归约器 ====================
2
- /**
3
- * 视图历史保留上限(块数)。
4
- *
5
- * 长对话里 `blocks` 会随每轮追加而单调增长:迁移(`strategy: "prune"`)虽会裁剪
6
- * `agent.messages`,**却不会清理 `blocks`**,于是内存里累积的是「跨迁移的全程历史」
7
- * —— 这正是长对话 OOM 的主要来源。
8
- *
9
- * 这里给内存中的视图封顶:超出即从**最旧的块**开始丢弃。更早的内容仍完整保存在
10
- * `conversations/<id>.json`,可用 `/load` 找回。
11
- *
12
- * 注意:**不能**改在迁移时清空视图 —— 迁移发生在 `agent.send()` 内部(`onAfterSend`),
13
- * 此时正在流式的 `live` 尚未被 `done` 定稿,清空会把刚生成的回答一并抹掉。封顶只丢最旧、
14
- * 不碰 `live`,故安全。
15
- */
16
- export const MAX_TRANSCRIPT_BLOCKS = 200;
17
- /** 追加块并封顶(丢弃最旧),保证内存有界;`live` 不在其中,不受影响 */
18
- export function trimTranscript(blocks) {
19
- return blocks.length > MAX_TRANSCRIPT_BLOCKS
20
- ? blocks.slice(blocks.length - MAX_TRANSCRIPT_BLOCKS)
21
- : blocks;
22
- }
23
- function appendBlocks(blocks, ...added) {
24
- return trimTranscript([...blocks, ...added]);
25
- }
26
- export let blockSeq = 0;
27
- export const nextId = () => ++blockSeq;
28
- export function chatReducer(state, action) {
29
- switch (action.type) {
30
- case "clear":
31
- return { blocks: [], live: null };
32
- case "user":
33
- return {
34
- blocks: appendBlocks(state.blocks, { id: nextId(), kind: "user", text: action.text }),
35
- live: { reasoning: "", content: "", tools: [], sub: null, roundBase: 0 },
36
- };
37
- case "assistant-start":
38
- // 每次 API 请求(含一轮内并行调用后的后续轮次)都会触发:把本轮工具调用的
39
- // 起始下标锚到当前已收集的工具数,使新一轮 index 从 0 起也落到新的一行。
40
- return {
41
- ...state,
42
- live: state.live
43
- ? { ...state.live, roundBase: state.live.tools.length }
44
- : { reasoning: "", content: "", tools: [], sub: null, roundBase: 0 },
45
- };
46
- case "reasoning":
47
- return state.live
48
- ? { ...state, live: { ...state.live, reasoning: state.live.reasoning + action.text } }
49
- : state;
50
- case "content":
51
- return state.live
52
- ? { ...state, live: { ...state.live, content: state.live.content + action.text } }
53
- : state;
54
- case "tool": {
55
- if (!state.live)
56
- return state;
57
- // 落到「本轮起始下标 + 本轮内 index」:同一轮内的分片按 index 归并(并行调用
58
- // 各占一行),跨轮的同 index 因 roundBase 不同而分段,不再相互拼接。
59
- const pos = (state.live.roundBase ?? 0) + Math.max(0, action.index ?? 0);
60
- const tools = [...state.live.tools];
61
- // 保持数组稠密(避免稀疏空位在渲染时被 for...of 迭代为 undefined)
62
- while (tools.length < pos)
63
- tools.push({ name: "", args: "" });
64
- const prev = tools[pos] ?? { name: "", args: "" };
65
- tools[pos] = {
66
- name: prev.name + (action.name ?? ""),
67
- args: prev.args + (action.args ?? ""),
68
- };
69
- return { ...state, live: { ...state.live, tools } };
70
- }
71
- case "subagent-start":
72
- return state.live ? { ...state, live: { ...state.live, sub: action.name } } : state;
73
- case "subagent-end":
74
- return state.live ? { ...state, live: { ...state.live, sub: null } } : state;
75
- case "notice":
76
- return {
77
- ...state,
78
- blocks: appendBlocks(state.blocks, { id: nextId(), kind: "notice", tone: "info", text: action.text }),
79
- };
80
- case "error":
81
- return {
82
- ...state,
83
- blocks: appendBlocks(state.blocks, { id: nextId(), kind: "notice", tone: "error", text: action.text }),
84
- };
85
- case "done": {
86
- if (!state.live)
87
- return state;
88
- const { reasoning, content, tools } = state.live;
89
- // 请求失败时 live 可能为空壳(无思考/内容/工具)——不产生空白的 AI 块
90
- const isEmpty = !reasoning.trim() && !content.trim() && !tools.some((t) => t.name);
91
- if (isEmpty)
92
- return { ...state, live: null };
93
- const finished = { id: nextId(), kind: "assistant", reasoning, content, tools };
94
- return { blocks: appendBlocks(state.blocks, finished), live: null };
95
- }
96
- default:
97
- return state;
98
- }
99
- }
100
- //# sourceMappingURL=state.js.map
@@ -1 +0,0 @@
1
- {"version":3,"file":"state.js","sourceRoot":"","sources":["../../../src/tui/screens/state.ts"],"names":[],"mappings":"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"}