im-agent 0.2.0 → 0.2.1

package/README.md

@@ -48,7 +48,7 @@ im-agent service install
 | `im-agent service install \| uninstall \| restart \| status` | 开机自启 |
 | `im-agent doctor` | 体检 |
 
-聊天里的命令（飞书和 Web 通用；Web 输入框打 `/` 会弹出命令补全，飞书里打 `/` 会弹出机器人的指令面板（im-agent 自动注册，约 5～8 分钟生效；只发一个 `/` 也会回一张可点击的命令卡片），顺序和显示项在 设置 → 命令 里调整）：`/new` `/fork` `/sessions [all]` `/resume <id>` `/model [名称]` `/effort <程度>` `/agent [名称]`（或者直接发 `/claude`、`/codex`）`/stop` `/cd <目录>` `/pwd` `/status` `/approve <id> allow-once|allow-always|deny` `/help`
+聊天里的命令（飞书和 Web 通用；Web 输入框打 `/` 会弹出命令补全，飞书里打 `/` 会弹出机器人的指令面板（im-agent 自动注册，约 5～8 分钟生效；只发一个 `/` 也会回一张可点击的命令卡片），顺序和显示项在 设置 → 命令 里调整）：`/new` `/fork` `/sessions [all]` `/resume <id>` `/model [名称]` `/effort <程度>` `/agent [名称]`（或者直接发 `/claude`、`/codex`）`/stop` `/cd <目录>` `/pwd` `/status` `/approve <id> allow-once|allow-always|allow-session|deny` `/help`
 
 ## 安全
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "im-agent",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "type": "module",
   "description": "把飞书（以及以后的 Telegram 等）和 Web 页面桥接到本机 Claude Code / Codex：聊天驱动、卡片审批、会话与模型切换",
   "keywords": [

package/src/agents/claude/session.ts

@@ -27,6 +27,7 @@ import {
   alwaysLabelOf,
   describeToolCall,
   isPreApproved,
+  isRememberable,
   isRememberableSignature,
   parseQuestions,
   rememberAlways,
@@ -134,6 +135,11 @@ export class ClaudeSession implements AgentSession {
    */
   private turnBusy = false;
   private pending: UserInput[] = [];
+  /**
+   * 用户点过「本会话全部允许」。只在内存里：这个对象一换（/new、切目录、切 agent、
+   * 恢复历史、进程重启），就重新逐条询问。
+   */
+  private allowAll = false;
 
   constructor(
     private readonly opts: SessionOptions,
@@ -265,6 +271,10 @@ export class ClaudeSession implements AgentSession {
       if (answered) return answered;
     }
 
+    // 提问、批准计划这类不是「安全确认」，而是要用户真的做决定，全部允许也照样问
+    const sessionable = isRememberable(toolName);
+    if (sessionable && this.allowAll) return { behavior: "allow", updatedInput: input };
+
     const signature = signatureOf(toolName, input);
     if (isPreApproved(toolName, signature)) return { behavior: "allow", updatedInput: input };
 
@@ -273,9 +283,14 @@ export class ClaudeSession implements AgentSession {
       title: `需要授权：${toolName}`,
       detail: describeToolCall(toolName, input),
       ...(isRememberableSignature(toolName, signature) ? { alwaysLabel: alwaysLabelOf(toolName, signature) } : {}),
+      ...(sessionable ? { allowSession: true } : {}),
     });
     if (outcome.settlement === "allow-always" && isRememberableSignature(toolName, signature)) rememberAlways(signature);
-    if (outcome.settlement === "allow-once" || outcome.settlement === "allow-always") {
+    if (outcome.settlement === "allow-session") {
+      if (!this.allowAll) this.events.onStep("warning", "🔓 本会话内后续操作不再询问（/new 或切换会话后恢复逐条确认）");
+      this.allowAll = true;
+    }
+    if (outcome.settlement === "allow-once" || outcome.settlement === "allow-always" || outcome.settlement === "allow-session") {
       return { behavior: "allow", updatedInput: input };
     }
     const why =

package/src/agents/codex/session.ts

@@ -10,6 +10,8 @@ import type {
   AgentEvents,
   AgentSession,
   InteractionHost,
+  InteractionOutcome,
+  InteractionSpec,
   QuestionSpec,
   RuntimeInfo,
   SessionOptions,
@@ -113,7 +115,7 @@ function describePermissions(params: PermissionsApprovalParams): string {
 }
 
 function allowed(s: Settlement): boolean {
-  return s === "allow-once" || s === "allow-always";
+  return s === "allow-once" || s === "allow-always" || s === "allow-session";
 }
 
 type ParsedQuestion = QuestionSpec & { secret: boolean };
@@ -176,6 +178,8 @@ export class CodexSession implements AgentSession {
   private opening: Promise<string> | null = null;
   private detached = false;
   private runtime: RuntimeInfo = {};
+  /** 用户点过「本会话全部允许」。只在内存里，会话对象一换就重新逐条询问。 */
+  private allowAll = false;
   private replyText = "";
   private lastTokens: number | undefined;
   /** 分叉已经真正完成（拿到并接管了新 thread）。失败了不算，重试还要接着分叉 */
@@ -473,6 +477,16 @@ export class CodexSession implements AgentSession {
 
   // ---------- 反向请求：审批与提问 ----------
 
+  /** 审批都走这里：带上「本会话全部允许」按钮，点了就记住。 */
+  private async ask(spec: Extract<InteractionSpec, { kind: "approval" }>): Promise<InteractionOutcome> {
+    const outcome = await this.host({ ...spec, allowSession: true });
+    if (outcome.settlement === "allow-session") {
+      if (!this.allowAll) this.events.onStep("warning", "🔓 本会话内后续操作不再询问（/new 或切换会话后恢复逐条确认）");
+      this.allowAll = true;
+    }
+    return outcome;
+  }
+
   /**
    * 每一条都**必须**返回点什么 —— 漏回一次，Codex 那一轮就永远挂在等审批上。
    * 未知方法也要按它自己的协议结构明确拒绝。
@@ -481,8 +495,9 @@ export class CodexSession implements AgentSession {
     switch (method) {
       case "item/commandExecution/requestApproval": {
         const req = params as CommandExecutionApprovalParams;
+        if (this.allowAll) return { decision: "acceptForSession" };
         const amendment = req.proposedExecpolicyAmendment ?? null;
-        const outcome = await this.host({
+        const outcome = await this.ask({
           kind: "approval",
           title: req.kind === "writeStdin" ? "需要授权：向运行中的命令输入" : "需要授权：执行命令",
           detail: describeCommand(req),
@@ -491,6 +506,7 @@ export class CodexSession implements AgentSession {
         });
         const s = outcome.settlement;
         if (s === "allow-once") return { decision: "accept" };
+        if (s === "allow-session") return { decision: "acceptForSession" };
         if (s === "allow-always") {
           return {
             decision: amendment
@@ -504,7 +520,8 @@ export class CodexSession implements AgentSession {
 
       case "item/fileChange/requestApproval": {
         const req = params as FileChangeApprovalParams;
-        const outcome = await this.host({
+        if (this.allowAll) return { decision: "acceptForSession" };
+        const outcome = await this.ask({
           kind: "approval",
           title: "需要授权：改动文件",
           detail: describeFileChange(req),
@@ -512,14 +529,15 @@ export class CodexSession implements AgentSession {
         });
         const s = outcome.settlement;
         if (s === "allow-once") return { decision: "accept" };
-        if (s === "allow-always") return { decision: "acceptForSession" };
+        if (s === "allow-always" || s === "allow-session") return { decision: "acceptForSession" };
         if (s === "cancelled") return { decision: "cancel" };
         return { decision: "decline" };
       }
 
       case "item/permissions/requestApproval": {
         const req = params as PermissionsApprovalParams;
-        const outcome = await this.host({
+        if (this.allowAll) return { permissions: req.permissions ?? {}, scope: "session" };
+        const outcome = await this.ask({
           kind: "approval",
           title: "需要授权：额外权限",
           detail: describePermissions(req),
@@ -528,7 +546,7 @@ export class CodexSession implements AgentSession {
         if (!allowed(outcome.settlement)) return { permissions: {}, scope: "turn" };
         return {
           permissions: req.permissions ?? {},
-          scope: outcome.settlement === "allow-always" ? "session" : "turn",
+          scope: outcome.settlement === "allow-once" ? "turn" : "session",
         };
       }
 

package/src/channels/feishu/cards.ts

@@ -62,6 +62,7 @@ export function approvalCard(interaction: Interaction, ctx: CardCtx) {
   const buttons = [
     button("允许一次", { a: "approval", r: id, d: "allow-once" }, ctx, "primary"),
     ...(spec.alwaysLabel ? [button(spec.alwaysLabel, { a: "approval", r: id, d: "allow-always" }, ctx)] : []),
+    ...(spec.allowSession ? [button("本会话全部允许", { a: "approval", r: id, d: "allow-session" }, ctx)] : []),
     button("拒绝", { a: "approval", r: id, d: "deny" }, ctx, "danger"),
   ];
   return card(
@@ -127,7 +128,7 @@ export function settledCard(interaction: Interaction) {
   const settlement = settled?.settlement ?? "cancelled";
   const by = settled?.by ?? "";
   if (interaction.spec.kind === "approval") {
-    const ok = settlement === "allow-once" || settlement === "allow-always";
+    const ok = settlement === "allow-once" || settlement === "allow-always" || settlement === "allow-session";
     const label =
       settlement === "allow-always"
         ? `已允许（${interaction.spec.alwaysLabel ?? "后续同类自动放行"}）`

package/src/channels/feishu/envelope.ts

@@ -86,7 +86,7 @@ const idx = (v: unknown): v is number => typeof v === "number" && Number.isInteg
 function validAction(v: Record<string, unknown>): boolean {
   switch (v.a) {
     case "approval":
-      return str(v.r) && (v.d === "allow-once" || v.d === "allow-always" || v.d === "deny");
+      return str(v.r) && (v.d === "allow-once" || v.d === "allow-always" || v.d === "allow-session" || v.d === "deny");
     case "ask":
       return str(v.r) && idx(v.q) && idx(v.o) && (v.v === 0 || v.v === 1);
     case "ask-submit":

package/src/core/command-catalog.ts

@@ -23,7 +23,7 @@ export const BUILTIN_COMMANDS: BuiltinSpec[] = [
   { name: "cd", args: "<相对目录>", description: "切换工作目录（限 workspace 内）" },
   { name: "pwd", description: "显示当前工作目录" },
   { name: "autoedit", args: "[on|off]", description: "本对话自动允许改工作目录内的文件（Bash 仍询问）" },
-  { name: "approve", args: "<请求ID> allow-once|allow-always|deny", description: "审批兜底（卡片失效时用）" },
+  { name: "approve", args: "<请求ID> allow-once|allow-always|allow-session|deny", description: "审批兜底（卡片失效时用）" },
   { name: "help", description: "显示帮助" },
 ];
 

package/src/core/commands.ts

@@ -24,7 +24,7 @@ export type ParsedCommand =
   | { kind: "approve"; requestId: string; decision: ApprovalDecision }
   | { kind: "chat"; text: string };
 
-const DECISIONS: ApprovalDecision[] = ["allow-once", "allow-always", "deny"];
+const DECISIONS: ApprovalDecision[] = ["allow-once", "allow-always", "allow-session", "deny"];
 
 export function parseCommand(raw: string): ParsedCommand {
   const text = raw.trim();

package/src/core/hub.ts

@@ -950,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}`);
       }

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/types.ts

@@ -20,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";
@@ -44,6 +48,8 @@ export type InteractionSpec =
       detail: string;
       /** 「总是允许」按钮的文字；不给就没有这个按钮 */
       alwaysLabel?: string;
+      /** 给了就显示「本会话全部允许」按钮。只有 agent 能真正兑现时才给 */
+      allowSession?: boolean;
     }
   | { kind: "question"; title: string; questions: QuestionSpec[] };
 

package/web/app.js

@@ -957,6 +957,7 @@ async function ixOp(id, op, extra = {}) {
 const SETTLE_LABEL = {
   "allow-once": "已允许（本次）",
   "allow-always": "已允许（总是）",
+  "allow-session": "已允许（本会话全部放行）",
   deny: "已拒绝",
   timeout: "已超时，按拒绝处理",
   cancelled: "已取消",
@@ -984,6 +985,9 @@ function renderInteraction(item) {
             spec.alwaysLabel
               ? h("button", { class: "btn", onclick: () => ixOp(ix.id, "decide", { decision: "allow-always" }) }, spec.alwaysLabel)
               : null,
+            spec.allowSession
+              ? h("button", { class: "btn", onclick: () => ixOp(ix.id, "decide", { decision: "allow-session" }) }, "本会话全部允许")
+              : null,
             h("button", { class: "btn danger", onclick: () => ixOp(ix.id, "decide", { decision: "deny" }) }, "拒绝"),
           ),
     );
@@ -1734,7 +1738,7 @@ function modelPicker(agent, model, effort, defaultLabel) {
   const asText = (reason) => {
     const m = h("input", { value: getModel(), placeholder: `留空${defaultLabel}` });
     const e = h("input", { value: getEffort(), placeholder: "low / medium / high …，留空默认" });
-    modelSlot.replaceChildren(m, reason ? h("small", {}, reason) : null);
+    fill(modelSlot, m, reason ? h("small", {}, reason) : null);
     effortSlot.replaceChildren(e);
     getModel = () => m.value.trim();
     getEffort = () => e.value.trim();
@@ -1761,7 +1765,9 @@ function modelPicker(agent, model, effort, defaultLabel) {
       const picked = modelSel.value ? models.find((m) => m.id === modelSel.value) : fallback;
       const efforts = picked?.efforts ?? [];
       const keep = effortSel.value || effort;
-      effortSel.replaceChildren(
+      // 子项里有数组：replaceChildren 不展开数组，会把它变成文本节点（select 里直接被忽略）
+      fill(
+        effortSel,
         option("", "默认", keep),
         withCurrent(efforts, keep).map((v) => option(v, `${v}（当前值，该模型可能不支持）`, keep)),
         efforts.map((v) => option(v, v, keep)),