jinzd-ai-cli 0.4.228 → 0.4.230

package/dist/electron-server.js

@@ -38,7 +38,7 @@ import {
   VERSION,
   buildUserIdentityPrompt,
   runTestsTool
-} from "./chunk-LDWTVCE5.js";
+} from "./chunk-7I4GGVIS.js";
 import {
   hasSemanticIndex,
   semanticSearch
@@ -3275,84 +3275,44 @@ var DeepSeekProvider = class extends OpenAICompatibleProvider {
   }
 };
 
-// src/providers/zhipu.ts
-var ZhipuProvider = class extends OpenAICompatibleProvider {
-  defaultBaseUrl = "https://open.bigmodel.cn/api/paas/v4";
-  // GLM-5 / GLM-5.1 等深度思考模型生成长内容需要较长时间，默认 5 分钟
-  defaultTimeout = 3e5;
-  info = {
-    id: "zhipu",
-    displayName: "Zhipu (GLM)",
-    // 默认选 GLM-4.6：中文写作口碑最稳 + 200K 上下文 + 价格只有 5.1 的 ~1/2。
-    // 需要 Agent 长跑 / 代码工程时再手动 /model glm-5.1。
-    defaultModel: "glm-4.6",
-    apiKeyEnvVar: "AICLI_API_KEY_ZHIPU",
-    requiresApiKey: true,
-    baseUrl: this.defaultBaseUrl,
-    models: [
-      // ── GLM-5.2 系列（2026-06 最新旗舰，主打代码工程） ──
-      // 744B MoE / 40B active，与 5.1 同底座，后训练强化超长上下文代码任务。
-      // 思考模式 High/Max 由请求参数控制，不另列 model id。
-      // 上下文：标准 `glm-5.2` 在 paas/v4 上原生即 1M（open.bigmodel.cn/pricing 定价页
-      //   实测口径 1M，¥8/¥28）。曾被移除的 `glm-5.2[1m]` 是 *带后缀的 model code*——那个
-      //   code 只在 GLM Coding Plan 的 Anthropic 兼容端点存在，paas/v4 不认会报「模型不存在」；
-      //   1M 能力本身在标准 code 上就有，无需后缀。
-      {
-        id: "glm-5.2",
-        displayName: "GLM-5.2 (2026-06 Flagship, 1M, Coding)",
-        contextWindow: 1048576,
-        supportsStreaming: true,
-        supportsThinking: true
-      },
-      // 视觉编程旗舰：原生多模态（图片 / 短视频 / 文本同上下文）。API model code = `glm-5v-turbo`
-      //   （Z.ai 官方文档代码示例确认）。REPL 用 `@./pic.png` 引用本地图即可走 vision 请求；
-      //   getVisionModelHint 已识别 `5v` 不拦截。
-      {
-        id: "glm-5v-turbo",
-        displayName: "GLM-5V-Turbo (Multimodal Vision + Coding)",
-        contextWindow: 202752,
-        supportsStreaming: true
-      },
-      // ── GLM-5.1 系列（2026-04 旗舰，主打长程 Agent + 代码工程） ──
-      {
-        id: "glm-5.1",
-        displayName: "GLM-5.1 (2026 Flagship, 200K, Agent+Code)",
-        contextWindow: 204800,
-        supportsStreaming: true,
-        supportsThinking: true
-      },
-      {
-        id: "glm-5.1-reasoning",
-        displayName: "GLM-5.1 Reasoning (Deep Thinking)",
-        contextWindow: 204800,
-        supportsStreaming: true,
-        supportsThinking: true
-      },
-      {
-        id: "glm-5.1-air",
-        displayName: "GLM-5.1 Air (Lightweight 5.1)",
-        contextWindow: 204800,
-        supportsStreaming: true,
-        supportsThinking: true
-      },
-      // ── GLM-5 系列（2026-02） ──
-      {
-        id: "glm-5",
-        displayName: "GLM-5 (Flagship, Deep Thinking)",
-        contextWindow: 131072,
-        supportsStreaming: true,
-        supportsThinking: true
-      },
-      // ── GLM-4.6 系列（2025-09，中文写作口碑最佳） ──
-      {
-        id: "glm-4.6",
-        displayName: "GLM-4.6 (200K, \u4E2D\u6587\u5199\u4F5C\u63A8\u8350)",
-        contextWindow: 204800,
-        supportsStreaming: true
-      }
-    ]
+// src/providers/static-config.ts
+function createStaticProviderClass(config) {
+  return class extends OpenAICompatibleProvider {
+    defaultBaseUrl = config.baseUrl;
+    defaultTimeout = config.defaultTimeout ?? 12e4;
+    enableStreamingToolCalls = config.enableStreamingToolCalls ?? true;
+    reliableContentOnlyTee = config.reliableContentOnlyTee ?? true;
+    info = {
+      id: config.id,
+      displayName: config.displayName,
+      defaultModel: config.defaultModel,
+      apiKeyEnvVar: config.apiKeyEnvVar,
+      requiresApiKey: config.requiresApiKey ?? true,
+      baseUrl: config.baseUrl,
+      models: config.models
+    };
   };
+}
+
+// src/providers/zhipu.ts
+var ZHIPU_CONFIG = {
+  id: "zhipu",
+  displayName: "Zhipu (GLM)",
+  defaultModel: "glm-4.6",
+  apiKeyEnvVar: "AICLI_API_KEY_ZHIPU",
+  baseUrl: "https://open.bigmodel.cn/api/paas/v4",
+  defaultTimeout: 3e5,
+  models: [
+    { id: "glm-5.2", displayName: "GLM-5.2 (2026-06 Flagship, 1M, Coding)", contextWindow: 1048576, supportsStreaming: true, supportsThinking: true },
+    { id: "glm-5v-turbo", displayName: "GLM-5V-Turbo (Multimodal Vision + Coding)", contextWindow: 202752, supportsStreaming: true },
+    { id: "glm-5.1", displayName: "GLM-5.1 (2026 Flagship, 200K, Agent+Code)", contextWindow: 204800, supportsStreaming: true, supportsThinking: true },
+    { id: "glm-5.1-reasoning", displayName: "GLM-5.1 Reasoning (Deep Thinking)", contextWindow: 204800, supportsStreaming: true, supportsThinking: true },
+    { id: "glm-5.1-air", displayName: "GLM-5.1 Air (Lightweight 5.1)", contextWindow: 204800, supportsStreaming: true, supportsThinking: true },
+    { id: "glm-5", displayName: "GLM-5 (Flagship, Deep Thinking)", contextWindow: 131072, supportsStreaming: true, supportsThinking: true },
+    { id: "glm-4.6", displayName: "GLM-4.6 (200K, \u4E2D\u6587\u5199\u4F5C\u63A8\u8350)", contextWindow: 204800, supportsStreaming: true }
+  ]
 };
+var ZhipuProvider = createStaticProviderClass(ZHIPU_CONFIG);
 
 // src/providers/kimi.ts
 var KIMI_XML_REMINDER = `
@@ -3519,242 +3479,81 @@ var KimiProvider = class _KimiProvider extends OpenAICompatibleProvider {
 };
 
 // src/providers/minimax.ts
-var MiniMaxProvider = class extends OpenAICompatibleProvider {
-  defaultBaseUrl = "https://api.minimaxi.com/v1";
-  info = {
-    id: "minimax",
-    displayName: "MiniMax (\u6D77\u87BA)",
-    defaultModel: "MiniMax-M3",
-    apiKeyEnvVar: "AICLI_API_KEY_MINIMAX",
-    requiresApiKey: true,
-    baseUrl: this.defaultBaseUrl,
-    models: [
-      {
-        id: "MiniMax-M3",
-        displayName: "MiniMax M3\uFF08\u65D7\u8230\uFF0C1M \u4E0A\u4E0B\u6587\uFF09",
-        contextWindow: 1e6,
-        supportsStreaming: true
-      },
-      {
-        id: "MiniMax-M2.7",
-        displayName: "MiniMax M2.7",
-        contextWindow: 1e6,
-        supportsStreaming: true
-      },
-      {
-        id: "MiniMax-M2.7-highspeed",
-        displayName: "MiniMax M2.7 Highspeed",
-        contextWindow: 1e6,
-        supportsStreaming: true
-      },
-      {
-        id: "MiniMax-M2.5",
-        displayName: "MiniMax M2.5",
-        contextWindow: 1e6,
-        supportsStreaming: true
-      },
-      {
-        id: "MiniMax-M2.5-highspeed",
-        displayName: "MiniMax M2.5 Highspeed",
-        contextWindow: 1e6,
-        supportsStreaming: true
-      }
-    ]
-  };
+var MINIMAX_CONFIG = {
+  id: "minimax",
+  displayName: "MiniMax (\u6D77\u87BA)",
+  defaultModel: "MiniMax-M3",
+  apiKeyEnvVar: "AICLI_API_KEY_MINIMAX",
+  baseUrl: "https://api.minimaxi.com/v1",
+  models: [
+    { id: "MiniMax-M3", displayName: "MiniMax M3\uFF08\u65D7\u8230\uFF0C1M \u4E0A\u4E0B\u6587\uFF09", contextWindow: 1e6, supportsStreaming: true },
+    { id: "MiniMax-M2.7", displayName: "MiniMax M2.7", contextWindow: 1e6, supportsStreaming: true },
+    { id: "MiniMax-M2.7-highspeed", displayName: "MiniMax M2.7 Highspeed", contextWindow: 1e6, supportsStreaming: true },
+    { id: "MiniMax-M2.5", displayName: "MiniMax M2.5", contextWindow: 1e6, supportsStreaming: true },
+    { id: "MiniMax-M2.5-highspeed", displayName: "MiniMax M2.5 Highspeed", contextWindow: 1e6, supportsStreaming: true }
+  ]
 };
+var MiniMaxProvider = createStaticProviderClass(MINIMAX_CONFIG);
 
 // src/providers/qwen.ts
-var QwenProvider = class extends OpenAICompatibleProvider {
-  defaultBaseUrl = "https://dashscope.aliyuncs.com/compatible-mode/v1";
-  info = {
-    id: "qwen",
-    displayName: "Qwen (Alibaba Cloud)",
-    defaultModel: "qwen-plus",
-    apiKeyEnvVar: "AICLI_API_KEY_QWEN",
-    requiresApiKey: true,
-    baseUrl: this.defaultBaseUrl,
-    models: [
-      {
-        id: "qwen-plus",
-        displayName: "Qwen Plus",
-        contextWindow: 131072,
-        supportsStreaming: true
-      },
-      {
-        id: "qwen-max",
-        displayName: "Qwen Max",
-        contextWindow: 131072,
-        supportsStreaming: true
-      },
-      {
-        id: "qwen-turbo",
-        displayName: "Qwen Turbo",
-        contextWindow: 131072,
-        supportsStreaming: true
-      },
-      {
-        id: "qwen-coder-plus",
-        displayName: "Qwen Coder Plus",
-        contextWindow: 131072,
-        supportsStreaming: true
-      }
-    ]
-  };
+var QWEN_CONFIG = {
+  id: "qwen",
+  displayName: "Qwen (Alibaba Cloud)",
+  defaultModel: "qwen-plus",
+  apiKeyEnvVar: "AICLI_API_KEY_QWEN",
+  baseUrl: "https://dashscope.aliyuncs.com/compatible-mode/v1",
+  models: [
+    { id: "qwen-plus", displayName: "Qwen Plus", contextWindow: 131072, supportsStreaming: true },
+    { id: "qwen-max", displayName: "Qwen Max", contextWindow: 131072, supportsStreaming: true },
+    { id: "qwen-turbo", displayName: "Qwen Turbo", contextWindow: 131072, supportsStreaming: true },
+    { id: "qwen-coder-plus", displayName: "Qwen Coder Plus", contextWindow: 131072, supportsStreaming: true }
+  ]
 };
+var QwenProvider = createStaticProviderClass(QWEN_CONFIG);
 
 // src/providers/openai.ts
-var OpenAIProvider = class extends OpenAICompatibleProvider {
-  defaultBaseUrl = "https://api.openai.com/v1";
-  info = {
-    id: "openai",
-    displayName: "OpenAI",
-    defaultModel: "gpt-5.4",
-    apiKeyEnvVar: "AICLI_API_KEY_OPENAI",
-    requiresApiKey: true,
-    baseUrl: this.defaultBaseUrl,
-    models: [
-      // GPT-5.4 系列（最新旗舰，1.05M 上下文）
-      {
-        id: "gpt-5.4",
-        displayName: "GPT-5.4",
-        contextWindow: 105e4,
-        supportsStreaming: true
-      },
-      {
-        id: "gpt-5.4-pro",
-        displayName: "GPT-5.4 Pro",
-        contextWindow: 105e4,
-        supportsStreaming: true
-      },
-      // GPT-5 系列（400K 上下文）
-      {
-        id: "gpt-5",
-        displayName: "GPT-5",
-        contextWindow: 4e5,
-        supportsStreaming: true
-      },
-      {
-        id: "gpt-5-mini",
-        displayName: "GPT-5 Mini",
-        contextWindow: 4e5,
-        supportsStreaming: true
-      },
-      {
-        id: "gpt-5-nano",
-        displayName: "GPT-5 Nano",
-        contextWindow: 4e5,
-        supportsStreaming: true
-      },
-      // GPT-4.1 系列（1M 上下文）
-      {
-        id: "gpt-4.1",
-        displayName: "GPT-4.1",
-        contextWindow: 1048576,
-        supportsStreaming: true
-      },
-      {
-        id: "gpt-4.1-mini",
-        displayName: "GPT-4.1 Mini",
-        contextWindow: 1048576,
-        supportsStreaming: true
-      },
-      {
-        id: "gpt-4.1-nano",
-        displayName: "GPT-4.1 Nano",
-        contextWindow: 1048576,
-        supportsStreaming: true
-      },
-      // 推理模型（200K 上下文）
-      {
-        id: "o3",
-        displayName: "o3",
-        contextWindow: 2e5,
-        supportsStreaming: true
-      },
-      {
-        id: "o4-mini",
-        displayName: "o4 Mini",
-        contextWindow: 2e5,
-        supportsStreaming: true
-      }
-    ]
-  };
+var OPENAI_CONFIG = {
+  id: "openai",
+  displayName: "OpenAI",
+  defaultModel: "gpt-5.4",
+  apiKeyEnvVar: "AICLI_API_KEY_OPENAI",
+  baseUrl: "https://api.openai.com/v1",
+  models: [
+    { id: "gpt-5.4", displayName: "GPT-5.4", contextWindow: 105e4, supportsStreaming: true },
+    { id: "gpt-5.4-pro", displayName: "GPT-5.4 Pro", contextWindow: 105e4, supportsStreaming: true },
+    { id: "gpt-5", displayName: "GPT-5", contextWindow: 4e5, supportsStreaming: true },
+    { id: "gpt-5-mini", displayName: "GPT-5 Mini", contextWindow: 4e5, supportsStreaming: true },
+    { id: "gpt-5-nano", displayName: "GPT-5 Nano", contextWindow: 4e5, supportsStreaming: true },
+    { id: "gpt-4.1", displayName: "GPT-4.1", contextWindow: 1048576, supportsStreaming: true },
+    { id: "gpt-4.1-mini", displayName: "GPT-4.1 Mini", contextWindow: 1048576, supportsStreaming: true },
+    { id: "gpt-4.1-nano", displayName: "GPT-4.1 Nano", contextWindow: 1048576, supportsStreaming: true },
+    { id: "o3", displayName: "o3", contextWindow: 2e5, supportsStreaming: true },
+    { id: "o4-mini", displayName: "o4 Mini", contextWindow: 2e5, supportsStreaming: true }
+  ]
 };
+var OpenAIProvider = createStaticProviderClass(OPENAI_CONFIG);
 
 // src/providers/openrouter.ts
-var OpenRouterProvider = class extends OpenAICompatibleProvider {
-  defaultBaseUrl = "https://openrouter.ai/api/v1";
-  info = {
-    id: "openrouter",
-    displayName: "OpenRouter",
-    defaultModel: "anthropic/claude-sonnet-4",
-    apiKeyEnvVar: "AICLI_API_KEY_OPENROUTER",
-    requiresApiKey: true,
-    baseUrl: this.defaultBaseUrl,
-    models: [
-      {
-        id: "anthropic/claude-opus-4",
-        displayName: "Claude Opus 4",
-        contextWindow: 2e5,
-        supportsStreaming: true
-      },
-      {
-        id: "anthropic/claude-sonnet-4",
-        displayName: "Claude Sonnet 4",
-        contextWindow: 2e5,
-        supportsStreaming: true
-      },
-      {
-        id: "anthropic/claude-haiku-4",
-        displayName: "Claude Haiku 4",
-        contextWindow: 2e5,
-        supportsStreaming: true
-      },
-      {
-        id: "openai/gpt-5.4",
-        displayName: "GPT-5.4",
-        contextWindow: 105e4,
-        supportsStreaming: true
-      },
-      {
-        id: "google/gemini-2.5-pro",
-        displayName: "Gemini 2.5 Pro",
-        contextWindow: 1048576,
-        supportsStreaming: true
-      },
-      {
-        id: "google/gemini-2.5-flash",
-        displayName: "Gemini 2.5 Flash",
-        contextWindow: 1048576,
-        supportsStreaming: true
-      },
-      {
-        id: "meta-llama/llama-4-maverick",
-        displayName: "Llama 4 Maverick",
-        contextWindow: 1048576,
-        supportsStreaming: true
-      },
-      {
-        id: "meta-llama/llama-4-scout",
-        displayName: "Llama 4 Scout",
-        contextWindow: 512e3,
-        supportsStreaming: true
-      },
-      {
-        id: "qwen/qwen3-coder",
-        displayName: "Qwen3 Coder",
-        contextWindow: 262144,
-        supportsStreaming: true
-      },
-      {
-        id: "mistralai/mistral-large",
-        displayName: "Mistral Large",
-        contextWindow: 131072,
-        supportsStreaming: true
-      }
-    ]
-  };
+var OPENROUTER_CONFIG = {
+  id: "openrouter",
+  displayName: "OpenRouter",
+  defaultModel: "anthropic/claude-sonnet-4",
+  apiKeyEnvVar: "AICLI_API_KEY_OPENROUTER",
+  baseUrl: "https://openrouter.ai/api/v1",
+  models: [
+    { id: "anthropic/claude-opus-4", displayName: "Claude Opus 4", contextWindow: 2e5, supportsStreaming: true },
+    { id: "anthropic/claude-sonnet-4", displayName: "Claude Sonnet 4", contextWindow: 2e5, supportsStreaming: true },
+    { id: "anthropic/claude-haiku-4", displayName: "Claude Haiku 4", contextWindow: 2e5, supportsStreaming: true },
+    { id: "openai/gpt-5.4", displayName: "GPT-5.4", contextWindow: 105e4, supportsStreaming: true },
+    { id: "google/gemini-2.5-pro", displayName: "Gemini 2.5 Pro", contextWindow: 1048576, supportsStreaming: true },
+    { id: "google/gemini-2.5-flash", displayName: "Gemini 2.5 Flash", contextWindow: 1048576, supportsStreaming: true },
+    { id: "meta-llama/llama-4-maverick", displayName: "Llama 4 Maverick", contextWindow: 1048576, supportsStreaming: true },
+    { id: "meta-llama/llama-4-scout", displayName: "Llama 4 Scout", contextWindow: 512e3, supportsStreaming: true },
+    { id: "qwen/qwen3-coder", displayName: "Qwen3 Coder", contextWindow: 262144, supportsStreaming: true },
+    { id: "mistralai/mistral-large", displayName: "Mistral Large", contextWindow: 131072, supportsStreaming: true }
+  ]
 };
+var OpenRouterProvider = createStaticProviderClass(OPENROUTER_CONFIG);
 
 // src/providers/ollama.ts
 var OllamaProvider = class extends OpenAICompatibleProvider {
@@ -4152,6 +3951,8 @@ var Session = class _Session {
    * 持久化在 toJSON / fromJSON 中，重启后不会重复请求。
    */
   titleAiGenerated;
+  /** P1-PERF-03: 脏标记 — 任何修改操作设为 true，save() 后归零；避免大 session 无变更时的全量序列化写盘 */
+  dirty = false;
   tokenUsage = {
     inputTokens: 0,
     outputTokens: 0,
@@ -4194,10 +3995,12 @@ var Session = class _Session {
     this.provider = provider;
     this.model = model;
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
   }
   addMessage(message) {
     this.messages.push(message);
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     if (!this.title && message.role === "user") {
       this.title = getContentText(message.content).slice(0, 50).replace(/\n/g, " ");
     }
@@ -4207,6 +4010,7 @@ var Session = class _Session {
     this.tokenUsage.outputTokens += usage.outputTokens;
     this.tokenUsage.cacheCreationTokens += usage.cacheCreationTokens ?? 0;
     this.tokenUsage.cacheReadTokens += usage.cacheReadTokens ?? 0;
+    this.dirty = true;
   }
   clear() {
     this.messages = [];
@@ -4219,6 +4023,7 @@ var Session = class _Session {
       cacheReadTokens: 0
     };
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
   }
   /**
    * 上下文压缩：用摘要消息替换旧消息，保留最近 keepLast 条。
@@ -4244,6 +4049,7 @@ var Session = class _Session {
     const removedCount = cutIndex;
     this.messages = [summaryMsg, ackMsg, ...preserved];
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return removedCount;
   }
   /** 在当前消息位置创建检查点 */
@@ -4254,6 +4060,7 @@ var Session = class _Session {
       messageIndex: this.messages.length,
       timestamp: /* @__PURE__ */ new Date()
     });
+    this.dirty = true;
   }
   /** 恢复到指定检查点：截断消息到检查点位置，移除后续检查点 */
   restoreCheckpoint(name) {
@@ -4262,6 +4069,7 @@ var Session = class _Session {
     this.messages = this.messages.slice(0, cp.messageIndex);
     this.checkpoints = this.checkpoints.filter((c) => c.messageIndex <= cp.messageIndex);
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return true;
   }
   listCheckpoints() {
@@ -4329,6 +4137,7 @@ var Session = class _Session {
     this.messages = _Session.cloneMessages(this.messages.slice(0, fromIndex));
     this.activeBranchId = id;
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return id;
   }
   /**
@@ -4346,6 +4155,7 @@ var Session = class _Session {
     this.messages = target;
     this.activeBranchId = id;
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return true;
   }
   /**
@@ -4370,6 +4180,7 @@ var Session = class _Session {
     this.branches.splice(idx, 1);
     this._inactiveBranchMessages.delete(id);
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return true;
   }
   /** Rename a branch (affects only display title). */
@@ -4378,6 +4189,7 @@ var Session = class _Session {
     if (!b) return false;
     b.title = newTitle;
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return true;
   }
   /**
@@ -4460,6 +4272,7 @@ var Session = class _Session {
     };
     this.messages.push(copy);
     this.updated = /* @__PURE__ */ new Date();
+    this.dirty = true;
     return copy;
   }
   getMeta() {
@@ -4552,6 +4365,7 @@ var Session = class _Session {
     });
     forked.checkpoints = original.checkpoints.filter((c) => c.messageIndex <= clampedCount).map((c) => ({ ...c, timestamp: new Date(c.timestamp.getTime()) }));
     forked.updated = /* @__PURE__ */ new Date();
+    forked.dirty = true;
     return forked;
   }
   /**
@@ -4631,6 +4445,7 @@ var Session = class _Session {
         }
       }
     }
+    session.dirty = false;
     return session;
   }
 };
@@ -4694,8 +4509,10 @@ var SessionManager = class {
   clearCurrent() {
     this._current = null;
   }
-  async save() {
+  /** P1-PERF-03: `force` 跳过脏检查（用于进程退出、fork 等必须落盘场景） */
+  async save(force = false) {
     if (!this._current) return;
+    if (!force && !this._current.dirty) return;
     mkdirSync3(this.historyDir, { recursive: true });
     const filePath = join3(this.historyDir, `${this._current.id}.json`);
     const raw = this._current.toJSON();
@@ -4703,6 +4520,7 @@ var SessionManager = class {
     const { value: payload, hits } = redactJson(raw, opts);
     this.lastRedactionHits = hits.length;
     atomicWriteFileSync(filePath, JSON.stringify(payload, null, 2));
+    this._current.dirty = false;
   }
   loadSession(id) {
     const filePath = join3(this.historyDir, `${id}.json`);
@@ -4843,10 +4661,10 @@ var SessionManager = class {
     if (!this._current) {
       throw new Error("No active session to fork");
     }
-    await this.save();
+    await this.save(true);
     const forked = Session.fork(this._current, uuidv4(), messageCount, title);
     this._current = forked;
-    await this.save();
+    await this.save(true);
     return forked;
   }
   /**
@@ -5382,14 +5200,19 @@ Important rules:
         );
       }
       if (status !== 0 || timedOut) {
-        throw {
-          status,
-          signal: null,
-          code: timedOut ? "ETIMEDOUT" : void 0,
-          stdout: Buffer.from(stdout, "utf-8"),
-          stderr: Buffer.from(stderr, "utf-8"),
-          message: timedOut ? "ETIMEDOUT" : `exit ${status}`
-        };
+        const poolStdout = (stdout ?? "").trim();
+        const poolStderr = (stderr ?? "").trim();
+        const combined = [poolStdout, poolStderr].filter(Boolean).join("\n");
+        const hint = buildErrorHint(command, combined);
+        throw new ToolError(
+          "bash",
+          `Exit code ${status}:
+${combined || `exit ${status}`}
+
+` + (hint ? `${hint}
+
+` : "") + `[Command failed. Report this error to the user. Do not retry with variant commands.]`
+        );
       }
       pushBashUndoEntries(beforeSnapshot, parsedTargetsBefore, effectiveCwd);
       updateCwdFromCommand(command, effectiveCwd);
@@ -7313,7 +7136,7 @@ var ToolExecutor = class {
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
         return { callId: call.id, content, isError: false };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
         this.printToolResult(call.name, message, true, false);
         runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -7358,7 +7181,7 @@ var ToolExecutor = class {
           runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
           return { callId: call.id, content, isError: false };
         } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
+          const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
           this.printToolResult(call.name, message, true, false);
           runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
           runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -7379,7 +7202,7 @@ var ToolExecutor = class {
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
         return { callId: call.id, content, isError: false };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
         this.printToolResult(call.name, message, true, false);
         runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -7419,7 +7242,7 @@ var ToolExecutor = class {
       runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
       return { callId: call.id, content, isError: false };
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
+      const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
       this.printToolResult(call.name, message, true, false);
       runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
       runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -7505,7 +7328,7 @@ var ToolExecutor = class {
           this.printToolResult(call.name, rawContent, false, wasTruncated);
           results[i] = { callId: call.id, content, isError: false };
         } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
+          const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
           this.printToolResult(call.name, message, true, false);
           results[i] = { callId: call.id, content: message, isError: true };
         }
@@ -9867,7 +9690,6 @@ function saveMemoryEntries(configDir, entries) {
   mkdirSync8(configDir, { recursive: true });
   const jsonl = entries.map((entry) => JSON.stringify(entry)).join("\n");
   atomicWriteFileSync(memoryStorePath(configDir), jsonl ? jsonl + "\n" : "");
-  syncLegacyMarkdown(configDir, entries);
 }
 function isMemoryExpired(entry, at = /* @__PURE__ */ new Date()) {
   return Boolean(entry.expiresAt && Date.parse(entry.expiresAt) <= at.getTime());
@@ -9938,25 +9760,6 @@ function findUnique(entries, idPrefix) {
   if (matches.length > 1) throw new Error(`memory id is ambiguous: ${idPrefix}`);
   return matches[0];
 }
-function syncLegacyMarkdown(configDir, entries = loadMemoryEntries(configDir)) {
-  mkdirSync8(dirname6(memoryMarkdownPath(configDir)), { recursive: true });
-  const active = entries.filter((entry) => entry.approved && !isMemoryExpired(entry));
-  const markdown = active.map((entry) => {
-    const date = entry.createdAt.replace("T", " ").slice(0, 19);
-    const source = [
-      `id:${entry.id.slice(0, 8)}`,
-      `scope:${entry.scope}`,
-      entry.sourceSession ? `session:${entry.sourceSession.slice(0, 8)}` : "",
-      entry.sourceProject ? `project:${entry.sourceProject}` : "",
-      `sensitivity:${entry.sensitivity}`
-    ].filter(Boolean).join(" \xB7 ");
-    return `## ${date}
-<!-- ${source} -->
-${entry.content}
-`;
-  }).join("\n");
-  atomicWriteFileSync(memoryMarkdownPath(configDir), markdown);
-}
 function formatMemoryForPrompt(configDir, cwd = process.cwd()) {
   const entries = listMemoryEntries(configDir, { cwd }).filter((entry) => entry.approved && !isMemoryExpired(entry));
   if (entries.length === 0) return null;
@@ -13360,7 +13163,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
         return { callId: call.id, content, isError: false };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
         this.sendToolCallResult(call, message, true);
         runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -13399,7 +13202,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
           runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
           return { callId: call.id, content, isError: false };
         } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
+          const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
           this.sendToolCallResult(call, message, true);
           runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
           runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -13416,7 +13219,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
         return { callId: call.id, content, isError: false };
       } catch (err) {
-        const message = err instanceof Error ? err.message : String(err);
+        const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
         this.sendToolCallResult(call, message, true);
         runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
         runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -13440,7 +13243,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
       runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "ok" }, { configDir: this.hookConfigDir });
       return { callId: call.id, content, isError: false };
     } catch (err) {
-      const message = err instanceof Error ? err.message : String(err);
+      const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
       this.sendToolCallResult(call, message, true);
       runHook(this.hookConfig?.postToolExecution, { tool: call.name, status: "error" });
       runLifecycleHooks(this.hookConfig, "PostToolUse", { tool: call.name, status: "error", error: message }, { configDir: this.hookConfigDir });
@@ -13503,7 +13306,7 @@ var ToolExecutorWeb = class _ToolExecutorWeb {
           this.sendToolCallResult(call, rawContent, false);
           results[i] = { callId: call.id, content, isError: false };
         } catch (err) {
-          const message = err instanceof Error ? err.message : String(err);
+          const message = err instanceof Error ? err.message : err && typeof err === "object" && "message" in err ? String(err.message) : String(err);
           this.sendToolCallResult(call, message, true);
           results[i] = { callId: call.id, content: message, isError: true };
         }
@@ -15822,37 +15625,32 @@ async function handleRewind(args, ctx) {
 async function handleTools(_args, ctx) {
   ctx.sendToolsList();
 }
-async function handlePlugins(_args, ctx) {
-  const configDir = ctx.config.getConfigDir();
-  const pluginsDir = join24(configDir, PLUGINS_DIR_NAME);
-  const pluginTools = ctx.toolRegistry.listPluginTools();
-  const pluginPackages = listInstalledPlugins(configDir);
-  const lines = [`\u{1F50C} **Plugins:**`, `Dir: ${pluginsDir}`, ""];
-  if (pluginTools.length === 0 && pluginPackages.length === 0) {
-    lines.push("No plugins loaded.");
-    lines.push("Use /plugin install <path>, /plugin trust <name>, then /plugin enable <name>.");
-  } else {
-    if (pluginPackages.length > 0) {
-      lines.push(`Package plugins (${pluginPackages.length}):`);
-      for (const p of pluginPackages) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
-      lines.push("");
-    }
-    if (pluginTools.length > 0) {
-      lines.push(`Legacy JS plugin tools (${pluginTools.length}):`);
-      for (const t of pluginTools) lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
-    }
-  }
-  ctx.send({ type: "info", message: lines.join("\n") });
-}
 async function handlePlugin(args, ctx) {
   const configDir = ctx.config.getConfigDir();
   const sub = args[0] ?? "list";
   try {
     if (sub === "list") {
       const plugins = listInstalledPlugins(configDir);
-      const lines = [`\u{1F50C} **Package Plugins**`, `Dir: ${pluginRoot(configDir)}`, ""];
-      if (plugins.length === 0) lines.push("No package plugins installed.");
-      for (const p of plugins) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
+      const pluginTools = ctx.toolRegistry.listPluginTools();
+      const lines = ["\u{1F50C} **Plugins**", ""];
+      if (plugins.length === 0 && pluginTools.length === 0) {
+        lines.push("No plugins loaded.");
+        lines.push(`Dir: ${pluginRoot(configDir)}`);
+        lines.push("Use /plugin install <path>, /plugin trust <name>, then /plugin enable <name>.");
+      } else {
+        if (plugins.length > 0) {
+          lines.push(`**Package plugins** (${plugins.length}):`);
+          lines.push(`Dir: ${pluginRoot(configDir)}`);
+          for (const p of plugins) lines.push(`  \u2022 ${p.name}@${p.manifest.version} \u2014 ${p.enabled ? "enabled" : "disabled"} / ${p.trusted ? "trusted" : "untrusted"}`);
+          lines.push("");
+        }
+        if (pluginTools.length > 0) {
+          const legacyDir = join24(configDir, PLUGINS_DIR_NAME);
+          lines.push(`**Legacy JS tools** (${pluginTools.length}):`);
+          lines.push(`Dir: ${legacyDir}`);
+          for (const t of pluginTools) lines.push(`  \u2022 ${t.definition.name} \u2014 ${t.definition.description}`);
+        }
+      }
       ctx.send({ type: "info", message: lines.join("\n") });
       return;
     }
@@ -16068,7 +15866,7 @@ async function handleSecurityReview(args, ctx) {
 async function handleTest(args, ctx) {
   ctx.send({ type: "info", message: "\u{1F9EA} Running tests..." });
   try {
-    const { executeTests } = await import("./run-tests-7SGHDDHL.js");
+    const { executeTests } = await import("./run-tests-M45ZJPR6.js");
     const argStr = args.join(" ").trim();
     let testArgs = {};
     if (argStr) {
@@ -16548,8 +16346,7 @@ async function handleHelp(_args, ctx) {
       "  /scaffold <desc>     \u2014 Generate project scaffolding with AI",
       "  /add-dir [path|remove] \u2014 Add/remove directory from AI context",
       "  /mcp [reconnect]     \u2014 Show/manage MCP servers",
-      "  /plugins             \u2014 Show loaded plugins",
-      "  /plugin <cmd>        \u2014 Manage package plugins",
+      "  /plugin <cmd>        \u2014 Manage plugins (list/install/enable/disable/inspect/trust)",
       "  /commands            \u2014 List custom commands",
       "  /doctor              \u2014 Health check (API keys, config, MCP)",
       "  /bug                 \u2014 Generate bug report template",
@@ -16666,7 +16463,6 @@ var webCommandHandlers = {
   fork: handleFork,
   rewind: handleRewind,
   tools: handleTools,
-  plugins: handlePlugins,
   plugin: handlePlugin,
   mcp: handleMcp,
   skill: handleSkill,