@ai-zen/air 0.2.1 → 0.2.3

package/src/__tests__/{session.test.ts → chat.test.ts}

@@ -1,5 +1,5 @@
 import { describe, it, expect, vi, beforeEach } from "vitest";
-import type { SessionCtx } from "../session/shared.js";
+import type { ChatCtx } from "../chat/shared.js";
 
 // Mock all external dependencies
 vi.mock("inquirer", () => ({ default: { prompt: vi.fn() } }));
@@ -16,7 +16,7 @@ vi.mock("../agent-factory.js", () => ({
     send: vi.fn(),
   })),
 }));
-vi.mock("../session/print.js", () => ({
+vi.mock("../chat/print.js", () => ({
   sendAndPrint: vi.fn(),
 }));
 
@@ -24,18 +24,18 @@ const mockPrompt = vi.mocked((await import("inquirer")).default.prompt);
 const { saveMessages, saveSnapshot, listSnapshots, loadSnapshot } = await import("../config.js");
 const { buildAgent } = await import("../agent-factory.js");
 
-function makeCtx(msgs: any[] = []): SessionCtx {
+function makeCtx(msgs: any[] = []): ChatCtx {
   return { agent: { messages: msgs, events: { on: vi.fn(), off: vi.fn() }, send: vi.fn() } as any };
 }
 
-// ==================== shared.ts ====================
+// ==================== cmdNew ====================
 
-describe("saveAndNew", () => {
+describe("cmdNew", () => {
   it("写入 system prompt 并构建 agent", async () => {
-    const { saveAndNew } = await import("../session/shared.js");
+    const { cmdNew } = await import("../chat/commands/new.js");
     const ctx = makeCtx();
 
-    await saveAndNew(ctx);
+    await cmdNew(ctx);
 
     expect(saveMessages).toHaveBeenCalledWith(
       expect.arrayContaining([expect.objectContaining({ role: "system" })])
@@ -54,28 +54,28 @@ describe("dispatchCommand", () => {
 
   it('"/exit" 调用 cmdExit（process.exit）', async () => {
     // Can't easily test process.exit, just verify it doesn't throw
-    const { runConversation } = await import("../session/runtime.js");
+    const { runChat } = await import("../chat/runtime.js");
     // dispatchCommand is internal, tested via routing only
   });
 
   it('"/save" 调用 cmdSave', async () => {
-    const { cmdSave } = await import("../session/commands/save.js");
+    const { cmdSave } = await import("../chat/commands/save.js");
     const ctx = makeCtx([{ role: "system", content: "sys" }]);
     await cmdSave(ctx);
     expect(saveSnapshot).toHaveBeenCalledWith(ctx.agent.messages);
   });
 
   it('"/new" 调用 cmdNew 并打印提示', async () => {
-    const { cmdNew } = await import("../session/commands/new.js");
+    const { cmdNew } = await import("../chat/commands/new.js");
     const ctx = makeCtx();
     const spy = vi.spyOn(console, "log").mockImplementation(() => {});
     await cmdNew(ctx);
-    expect(spy).toHaveBeenCalledWith("\n🆕 重新开始\n");
+    expect(spy).toHaveBeenCalledWith("\n🆕 新会话\n");
     spy.mockRestore();
   });
 
   it('"/help" 打印帮助信息', async () => {
-    const { cmdHelp } = await import("../session/commands/help.js");
+    const { cmdHelp } = await import("../chat/commands/help.js");
     const spy = vi.spyOn(console, "log").mockImplementation(() => {});
     cmdHelp();
     expect(spy).toHaveBeenCalled();
@@ -91,7 +91,7 @@ describe("cmdBack", () => {
   });
 
   it("没有消息时提示无可撤回", async () => {
-    const { cmdBack } = await import("../session/commands/back.js");
+    const { cmdBack } = await import("../chat/commands/back.js");
     const ctx = makeCtx([{ role: "system", content: "sys" }]);
     const spy = vi.spyOn(console, "log").mockImplementation(() => {});
     await cmdBack(ctx);
@@ -100,7 +100,7 @@ describe("cmdBack", () => {
   });
 
   it("取消操作时不修改消息", async () => {
-    const { cmdBack } = await import("../session/commands/back.js");
+    const { cmdBack } = await import("../chat/commands/back.js");
     const msgs = [
       { role: "system", content: "sys" },
       { role: "user", content: "你好" },
@@ -120,7 +120,7 @@ describe("cmdLoad", () => {
   });
 
   it("没有快照时提示", async () => {
-    const { cmdLoad } = await import("../session/commands/load.js");
+    const { cmdLoad } = await import("../chat/commands/load.js");
     const ctx = makeCtx();
     vi.mocked(listSnapshots).mockReturnValueOnce([]);
     const spy = vi.spyOn(console, "log").mockImplementation(() => {});
@@ -138,7 +138,7 @@ describe("cmdEditor", () => {
   });
 
   it("取消编辑不报错", async () => {
-    const { cmdEditor } = await import("../session/commands/editor.js");
+    const { cmdEditor } = await import("../chat/commands/editor.js");
     const ctx = makeCtx();
     mockPrompt.mockResolvedValueOnce({ content: "" });
     await cmdEditor(ctx);

package/src/__tests__/e2e.test.ts

@@ -177,7 +177,7 @@ describe("E2E: 真实 API 对话", () => {
 
     // Interactive mode: /new then exit
     const result = await runCli([], "/new\n/exit\n", env);
-    expect(result.stdout).toContain("🆕 重新开始");
+    expect(result.stdout).toContain("🆕 新会话");
 
     // Verify context was reset
     msgs = JSON.parse(readFileSync(contextFile, "utf-8"));

package/src/{session → chat}/commands/back.ts

@@ -1,10 +1,10 @@
 import inquirer from "inquirer";
-import type { SessionCtx } from "../shared.js";
+import type { ChatCtx } from "../shared.js";
 import { sendAndPrint } from "../print.js";
 import { saveMessages } from "../../config.js";
 import { buildAgent } from "../../agent-factory.js";
 
-export async function cmdBack(ctx: SessionCtx): Promise<void> {
+export async function cmdBack(ctx: ChatCtx): Promise<void> {
   const targets: { index: number; role: string; label: string; preview: string }[] = [];
   for (let i = 0; i < ctx.agent.messages.length; i++) {
     const msg = ctx.agent.messages[i];

package/src/{session → chat}/commands/editor.ts

@@ -1,9 +1,9 @@
 import inquirer from "inquirer";
-import type { SessionCtx } from "../shared.js";
+import type { ChatCtx } from "../shared.js";
 import { sendAndPrint } from "../print.js";
 import { saveMessages } from "../../config.js";
 
-export async function cmdEditor(ctx: SessionCtx) {
+export async function cmdEditor(ctx: ChatCtx) {
   const { content } = await inquirer.prompt([
     { type: "editor", name: "content", message: "编辑消息:" },
   ]);

package/src/chat/commands/exit.ts

@@ -0,0 +1,6 @@
+import type { ChatCtx } from "../shared.js";
+
+export async function cmdExit(ctx: ChatCtx): Promise<void> {
+  console.log("\n👋 再见！");
+  process.exit(0);
+}

package/src/chat/commands/index.ts

@@ -0,0 +1,38 @@
+import type { ChatCtx } from "../shared.js";
+import { cmdExit } from "./exit.js";
+import { cmdHelp } from "./help.js";
+import { cmdSave } from "./save.js";
+import { cmdNew } from "./new.js";
+import { cmdLoad } from "./load.js";
+import { cmdEditor } from "./editor.js";
+import { cmdBack } from "./back.js";
+
+export async function dispatchCommand(ctx: ChatCtx, cmd: string): Promise<void> {
+  switch (cmd) {
+    case "/exit":
+    case "/quit":
+      cmdExit(ctx);
+      break;
+    case "/save":
+      await cmdSave(ctx);
+      break;
+    case "/new":
+      await cmdNew(ctx);
+      break;
+    case "/load":
+      await cmdLoad(ctx);
+      break;
+    case "/back":
+      await cmdBack(ctx);
+      break;
+    case "/editor":
+      await cmdEditor(ctx);
+      break;
+    case "/help":
+      cmdHelp();
+      break;
+    default:
+      console.log(`\n❌ 未知命令: ${cmd}\n`);
+      break;
+  }
+}

package/src/{session → chat}/commands/load.ts

@@ -1,11 +1,11 @@
 import { Message } from "@ai-zen/agents-core";
 import inquirer from "inquirer";
-import type { SessionCtx } from "../shared.js";
+import type { ChatCtx } from "../shared.js";
 import { SYSTEM_PROMPT } from "../shared.js";
 import { listSnapshots, loadSnapshot, saveMessages } from "../../config.js";
 import { buildAgent } from "../../agent-factory.js";
 
-export async function cmdLoad(ctx: SessionCtx): Promise<void> {
+export async function cmdLoad(ctx: ChatCtx): Promise<void> {
   const snapshots = listSnapshots();
   if (snapshots.length === 0) {
     console.log("\n📭 没有可用的快照\n");

package/src/chat/commands/new.ts

@@ -0,0 +1,12 @@
+import type { ChatCtx } from "../shared.js";
+import { Message } from "@ai-zen/agents-core";
+import { saveMessages } from "../../config.js";
+import { buildAgent } from "../../agent-factory.js";
+import { SYSTEM_PROMPT } from "../shared.js";
+
+export async function cmdNew(ctx: ChatCtx): Promise<void> {
+  const msgs = [Message.System(SYSTEM_PROMPT)];
+  saveMessages(msgs);
+  ctx.agent = await buildAgent(msgs);
+  console.log("\n🆕 新会话\n");
+}

package/src/{session → chat}/commands/save.ts

@@ -1,6 +1,6 @@
-import type { SessionCtx } from "../shared.js";
+import type { ChatCtx } from "../shared.js";
 import { saveSnapshot } from "../../config.js";
 
-export async function cmdSave(ctx: SessionCtx) {
+export async function cmdSave(ctx: ChatCtx) {
   console.log(`\n✅ 快照: ${saveSnapshot(ctx.agent.messages)}\n`);
 }

package/src/{session → chat}/message.ts

@@ -1,12 +1,12 @@
 import { Message } from "@ai-zen/agents-core";
-import type { SessionCtx } from "./shared.js";
+import type { ChatCtx } from "./shared.js";
 import { SYSTEM_PROMPT } from "./shared.js";
 import { sendAndPrint } from "./print.js";
 import { saveMessages, saveSnapshot } from "../config.js";
 import { buildAgent } from "../agent-factory.js";
 import { contextSize, shouldMigrate, generateMigrationDoc, MAX_CONTEXT_CHARS } from "../migration.js";
 
-export async function handleMessage(ctx: SessionCtx, text: string): Promise<void> {
+export async function handleMessage(ctx: ChatCtx, text: string): Promise<void> {
   try {
     await sendAndPrint(ctx.agent, text);
     saveMessages(ctx.agent.messages);

package/src/{session → chat}/runtime.ts

@@ -1,11 +1,29 @@
 import { Agent, Message } from "@ai-zen/agents-core";
+import inquirer from "inquirer";
 import { readConfig, readMessages, saveMessages, saveSnapshot } from "../config.js";
 import { buildAgent } from "../agent-factory.js";
 import { contextSize } from "../migration.js";
-import { SessionCtx, SYSTEM_PROMPT, saveAndNew, ask } from "./shared.js";
+import { ChatCtx, SYSTEM_PROMPT } from "./shared.js";
+import { dispatchCommand } from "./commands/index.js";
+import { handleMessage } from "./message.js";
 import { sendAndPrint } from "./print.js";
 
-export async function runConversation(initialMessage?: string): Promise<void> {
+async function chatLoop(ctx: ChatCtx) {
+  while (true) {
+    const { input } = await inquirer.prompt([
+      { type: "input", name: "input", message: "你:" },
+    ]);
+    const t = input.trim();
+    if (!t) continue;
+    if (t.startsWith("/")) {
+      await dispatchCommand(ctx, t.toLowerCase());
+      continue;
+    }
+    await handleMessage(ctx, t);
+  }
+}
+
+export async function runChat(initialMessage?: string): Promise<void> {
   const config = readConfig();
   if (!config.apiKey) {
     console.error("❌ 请先设置 API Key: air key <your-key>");
@@ -19,7 +37,7 @@ export async function runConversation(initialMessage?: string): Promise<void> {
     saveMessages(msgs);
   }
   const agent: Agent = await buildAgent(msgs);
-  const ctx: SessionCtx = { agent };
+  const ctx: ChatCtx = { agent };
 
   if (initialMessage) {
     const hasHistory = ctx.agent.messages.some(m => m.role === "user" || m.role === "assistant");
@@ -27,14 +45,14 @@ export async function runConversation(initialMessage?: string): Promise<void> {
       const snap = saveSnapshot(ctx.agent.messages);
       console.log(`💾 已存档旧对话: ${snap}\n`);
     }
-    await saveAndNew(ctx);
+    await dispatchCommand(ctx, "/new");
     console.log(`💬 你: ${initialMessage}`);
     try {
       await sendAndPrint(ctx.agent, initialMessage);
       saveMessages(ctx.agent.messages);
     } catch (err: any) { console.error(`\n❌ ${err.message}`); }
     console.log("\n💬 继续对话 (输入 /exit 退出)\n");
-    await ask(ctx);
+    await chatLoop(ctx);
     return;
   }
 
@@ -43,5 +61,5 @@ export async function runConversation(initialMessage?: string): Promise<void> {
     ? `\n💬 继续上次对话 (${msgCount} 条，/${contextSize(ctx.agent.messages)} 字符，输入 /new 重新开始)\n`
     : "\n💬 air — 极简 AI 助手 (输入 /help 查看命令)\n");
 
-  await ask(ctx);
+  await chatLoop(ctx);
 }

package/src/chat/shared.ts

@@ -0,0 +1,21 @@
+import { Agent } from "@ai-zen/agents-core";
+
+export interface ChatCtx {
+  agent: Agent;
+}
+
+export const SYSTEM_PROMPT = [
+  "你是一个AI助手，专门帮助用户回答问题和执行任务。请用中文回复。",
+  "",
+  "## 行为准则",
+  "1. 做任何改动之前，必须先跟用户商量，获得明确指示之后再行动。",
+  "2. 用户没有明确要求产出文件时，不得自行创建任何文件到项目中。讨论就停留在讨论层面。",
+  "3. 区分危险操作：删除文件、覆盖文件、安装卸载软件、修改系统配置、执行耗时任务等属于危险操作。执行前必须评估影响范围，并向用户说明风险，获得用户明确的书面的确认之后再执行。",
+  "4. 追责原则：你的每一步操作都应当基于用户的明确指令。如果出了问题，可以从用户说过的话追溯责任——是用户让你做的，用户承担责任。所以你不需要畏手畏脚，只要用户明确说了\u201c做\u201d，你就放心去做。",
+  "",
+  "## 记忆",
+  "你可以使用 shell 工具执行任何命令。如果你有需要长期记住的信息（用户偏好、项目约定、任务进度等），请写入以下位置：",
+  "- 全局记忆: ~/.ai-zen/air/temp/*.md",
+  "- 项目记忆: $(cwd)/.ai-zen/air/temp/*.md",
+  "下次启动时用 shell 读取即可。这是你唯一的记忆方式。",
+].join("\n");

package/src/cli.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import { readFileSync } from "node:fs";
 import { Command } from "commander";
-import { runConversation } from "./session/runtime.js";
+import { runChat } from "./chat/runtime.js";
 import { installHook, uninstallHook } from "./hook.js";
 import { readConfig, saveConfig } from "./config.js";
 
@@ -57,7 +57,7 @@ program
       console.error("   获取 Key: https://platform.deepseek.com/api_keys");
       process.exit(1);
     }
-    await runConversation(message?.join(" "));
+    await runChat(message?.join(" "));
   });
 
 program.parse(process.argv);

package/dist/agent-runtime.d.ts

@@ -1,2 +0,0 @@
-export declare function runConversation(initialMessage?: string): Promise<void>;
-//# sourceMappingURL=agent-runtime.d.ts.map

package/dist/agent-runtime.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"agent-runtime.d.ts","sourceRoot":"","sources":["../src/agent-runtime.ts"],"names":[],"mappings":"AA0RA,wBAAsB,eAAe,CAAC,cAAc,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAyC5E"}