im-agent 0.1.1 → 0.2.1

package/src/core/hub.ts

@@ -34,6 +34,7 @@ import type {
   StepKind,
   UserInput,
 } from "./types.js";
+import { buildCatalog, type AgentCommand, type CommandEntry, type CommandPrefs } from "./command-catalog.js";
 import { helpText, type ParsedCommand } from "./commands.js";
 
 // ---------- 事件 ----------
@@ -95,6 +96,8 @@ export type CommandReply =
       effortSupported: boolean;
     }
   | { type: "agents"; agents: { id: string; label: string }[]; current: string }
+  /** 只发了「/」：可用命令（已按用户配置排序、去掉隐藏的） */
+  | { type: "commands"; agent: string; commands: CommandEntry[] }
   | { type: "none" };
 
 export type ConversationInfo = {
@@ -368,6 +371,7 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
         ...(effort ? { effort } : {}),
         ...(resumeId ? { resumeId } : {}),
         ...(fork ? { fork: true } : {}),
+        ...(conv.autoEdit ? { autoEdit: true } : {}),
       },
       {
         onTurnStart: () => alive() && this.emitEvent(key, { type: "turn_start" }),
@@ -756,6 +760,28 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
     return `思考程度已切换为 ${effort}。`;
   }
 
+  /** /autoedit：on 不给就是切换。只影响正在跑的会话和以后新建的，不追溯已经弹出的授权。 */
+  private async setAutoEditNow(key: string, on: boolean | undefined): Promise<string> {
+    const conv = getConversation(key)!;
+    const next = on ?? !conv.autoEdit;
+    const live = this.live.get(key);
+    if (live?.session.setAutoEdit) await withTimeout(live.session.setAutoEdit(next), "切换自动改文件");
+    updateConversation(key, { autoEdit: next });
+    this.emitEvent(key, { type: "meta" });
+    const driver = this.requireDriver(conv.agent);
+    const note =
+      conv.agent === "codex"
+        ? `\n\n注意：${driver.label} 改文件由沙箱控制（设置 → Agent → 沙箱），这个开关只对 Claude 生效。`
+        : "";
+    return next
+      ? `已开启：这条对话里 Claude 修改工作目录（${conv.cwd}）内的文件不再询问；目录外的文件、Bash 命令照常询问。发 /autoedit off 关闭。${note}`
+      : `已关闭：改文件恢复逐次询问。${note}`;
+  }
+
+  setAutoEdit(key: string, on?: boolean): Promise<string> {
+    return this.serial(key, () => this.setAutoEditNow(key, on));
+  }
+
   /** 切 agent：各 agent 的会话各自保留，切回来接着聊。 */
   private async setAgentNow(key: string, agent: string, allowed: string[], op: SwitchOp): Promise<string> {
     const conv = getConversation(key)!;
@@ -809,6 +835,7 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
       `目录：${conv.cwd}`,
       `模型：${runtime.model ?? "默认"}`,
       ...(runtime.effort ? [`思考程度：${runtime.effort}`] : []),
+      ...(conv.autoEdit ? ["自动允许改文件：开（/autoedit off 关闭）"] : []),
       ...(extra.length > 0 ? ["", ...extra] : []),
     ].join("\n");
   }
@@ -879,8 +906,15 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
     switch (cmd.kind) {
       case "help":
         return text(helpText(ctx.allowedAgents));
+      case "commands": {
+        const conv = getConversation(key)!;
+        const all = await this.commandCatalog(conv.agent, { cwd: conv.cwd, allowedAgents: ctx.allowedAgents });
+        return { type: "commands", agent: conv.agent, commands: all.filter((c) => !c.hidden) };
+      }
       case "pwd":
         return text(getConversation(key)!.cwd);
+      case "autoedit":
+        return text(await this.setAutoEdit(key, cmd.on));
       case "status":
         return text(await this.status(key));
       case "cd":
@@ -916,6 +950,9 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
         return text(await this.stop(key));
       case "approve": {
         const settled = interactions.decide(cmd.requestId, cmd.decision as ApprovalDecision, ctx.by);
+        if (!settled && interactions.isPending(cmd.requestId)) {
+          return text(`请求 ${cmd.requestId} 不支持 ${cmd.decision}。`);
+        }
         if (!settled) return text(`请求 ${cmd.requestId} 不存在或已处理。`);
         return text(`${SETTLEMENT_LABEL[cmd.decision]}：${cmd.requestId}`);
       }
@@ -924,6 +961,27 @@ class Hub extends EventEmitter<{ event: [EventEnvelope] }> {
     }
   }
 
+  /**
+   * 某个 agent 的完整命令表（含隐藏项，带 hidden 标记），已按配置排序。
+   * 原生命令读不到、或者超时，就只给 im-agent 自己的 —— 列表少几项，总比「/」没反应强。
+   * 未启用的 agent 不去问：问一次就可能拉起它的进程。
+   */
+  async commandCatalog(
+    agent: string,
+    opts: { cwd?: string; allowedAgents: string[] },
+  ): Promise<CommandEntry[]> {
+    const driver = this.enabledAgents().find((d) => d.id === agent);
+    let native: AgentCommand[] = [];
+    if (driver?.commands) {
+      native = await withTimeout(driver.commands(opts.cwd), "读取命令列表").catch((err) => {
+        console.error(`[${agent}] 读取命令列表失败:`, err instanceof Error ? err.message : err);
+        return [];
+      });
+    }
+    const prefs = (config().commands as Record<string, CommandPrefs | undefined>)[agent];
+    return buildCatalog({ allowedAgents: opts.allowedAgents, native, prefs });
+  }
+
   async shutdown(): Promise<void> {
     for (const key of [...this.live.keys()]) await this.drop(key, "服务正在重启");
     for (const driver of this.drivers.values()) await driver.stop().catch(() => {});

package/src/core/interactions.ts

@@ -89,7 +89,18 @@ class InteractionCenter extends EventEmitter<InteractionEvents> {
   decide(id: string, decision: Settlement, by: string): Interaction | undefined {
     const entry = this.pending.get(id);
     if (!entry || entry.spec.kind !== "approval") return undefined;
-    return this.settle(id, decision, by);
+    // 卡上没有这个按钮（比如批准计划）就不认：不能靠手打 /approve 绕过去
+    if (decision === "allow-session" && !entry.spec.allowSession) return undefined;
+    const settled = this.settle(id, decision, by);
+    if (decision === "allow-session") {
+      // 并行的工具调用会同时挂着好几张卡：同一个会话进程里能一并放行的，一起放掉
+      for (const other of [...this.pending.values()]) {
+        if (other.convKey !== entry.convKey || other.owner !== entry.owner) continue;
+        if (other.spec.kind !== "approval" || !other.spec.allowSession) continue;
+        this.settle(other.id, "allow-session", `${by}（随「本会话全部允许」）`);
+      }
+    }
+    return settled;
   }
 
   /** 把某个选项设成选中 / 未选中。全单选且都答完时自动收束。 */
@@ -251,6 +262,7 @@ export function answerTextOf(entry: Interaction): Record<string, string> {
 export const SETTLEMENT_LABEL: Record<Settlement, string> = {
   "allow-once": "已允许（本次）",
   "allow-always": "已允许",
+  "allow-session": "已允许（本会话全部放行）",
   deny: "已拒绝",
   timeout: "已超时，按拒绝处理",
   cancelled: "已取消",

package/src/core/store.ts

@@ -38,6 +38,8 @@ export type Conversation = {
   createdAt: number;
   /** Web 列表里隐藏（Web 上删除的会话只是隐藏，agent 侧的历史还在） */
   hidden?: boolean;
+  /** /autoedit：这条对话里 agent 在工作目录内改文件不再询问（跨 /new 保留，属于对话不属于某个会话） */
+  autoEdit?: boolean;
 };
 
 type StoreShape = Record<string, Conversation>;

package/src/core/types.ts

@@ -1,5 +1,6 @@
 // 核心类型：渠道（飞书 / Web / 以后的 Telegram）与 agent（Claude / Codex / 以后的 ACP）
 // 之间只通过这里的类型说话。渠道不认识 Claude，agent 不认识飞书。
+import type { AgentCommand } from "./command-catalog.js";
 
 // ---------- 用户输入 ----------
 
@@ -19,7 +20,11 @@ export type UserInput = { text: string; attachments: SavedAttachment[] };
 
 // ---------- 交互（审批 / 提问） ----------
 
-export type ApprovalDecision = "allow-once" | "allow-always" | "deny";
+/**
+ * allow-session：本会话内后续的审批全部自动放行（不落盘）。会话重建
+ * （/new、切目录、切 agent、恢复历史、进程重启）后失效。
+ */
+export type ApprovalDecision = "allow-once" | "allow-always" | "allow-session" | "deny";
 
 /** 一个卡点的收束方式。timeout / cancelled 和 deny 一样都是「没放行」，但显示不同。 */
 export type Settlement = ApprovalDecision | "timeout" | "cancelled" | "answered" | "skipped";
@@ -43,6 +48,8 @@ export type InteractionSpec =
       detail: string;
       /** 「总是允许」按钮的文字；不给就没有这个按钮 */
       alwaysLabel?: string;
+      /** 给了就显示「本会话全部允许」按钮。只有 agent 能真正兑现时才给 */
+      allowSession?: boolean;
     }
   | { kind: "question"; title: string; questions: QuestionSpec[] };
 
@@ -118,6 +125,8 @@ export type SessionOptions = {
   fork?: boolean;
   /** 附件所在目录，agent 需要能直接读 */
   uploadsDir: string;
+  /** 工作目录内改文件不再询问（/autoedit）。Bash 等照常询问 */
+  autoEdit?: boolean;
 };
 
 export interface AgentSession {
@@ -127,6 +136,8 @@ export interface AgentSession {
   setModel(model?: string, effort?: string): Promise<void>;
   describeRuntime(): Promise<RuntimeInfo>;
   dispose(): Promise<void>;
+  /** 运行中切换「自动允许改文件」；不支持的 agent 不实现 */
+  setAutoEdit?(on: boolean): Promise<void>;
 }
 
 export type Diagnosis = {
@@ -151,6 +162,10 @@ export interface AgentDriver {
   readHistory(id: string, cwd: string): Promise<HistoryMessage[]>;
   /** 有的 agent（Claude）要借一个活着的会话才能问到模型列表 */
   listModels(session: AgentSession): Promise<ModelInfo[]>;
+  /** 不依赖会话的模型列表，设置页的下拉框用 */
+  catalog(): Promise<ModelInfo[]>;
+  /** agent 自己的斜杠命令（skills 之类），没有就不实现。cwd 影响项目级命令 */
+  commands?(cwd?: string): Promise<AgentCommand[]>;
   /** 不建会话也能知道的默认模型 / 思考程度 */
   defaults(): Promise<RuntimeInfo>;
   /** /status 里额外的几行（比如 Codex 的额度） */