@ycodium-ai/agent-claude 0.2.3254 → 0.2.3272

package/dist/index.js

@@ -19620,7 +19620,9 @@ import { mergeLaunchEnv as mergeLaunchEnv3 } from "@ycodium-ai/plugin-api/execut
 // src/claudeProbe.ts
 import {
   describeExecutorSpawnFailure,
-  ExecutorSpawnRefusedError
+  ExecutorSpawnAbortedError,
+  ExecutorSpawnRefusedError,
+  raceAbort
 } from "@ycodium-ai/plugin-api/executor";
 
 // src/claudeAccount.ts
@@ -20167,13 +20169,52 @@ function isClaudeUltracodeEffort(effort) {
 }
 function claudeCliModelId(input) {
   const requested = input.requestedModelId.trim();
-  if (requested.length > 0 && (input.catalog ?? []).length === 0) return requested;
+  if (requested.length === 0) return input.placeholder;
+  if ((input.catalog ?? []).length === 0) return requested;
   const known = [
     ...(input.catalog ?? []).map((model) => model.slug),
     ...input.declared ?? [],
     ...(input.customModels ?? []).map((model) => normalizeCustomModelSlug(model.slug))
   ];
-  return matchCatalogModel(input.requestedModelId, known) ?? input.placeholder;
+  const match = matchCatalogModel(input.requestedModelId, known);
+  if (match !== void 0) return match;
+  throw Object.assign(
+    new Error(
+      `Requested model "${requested}" is not in this agent's catalog; it is on "${input.placeholder}". This turn was not sent. Refresh the model list in this agent's settings and try again.`
+    ),
+    { failureCategory: "model-unavailable" }
+  );
+}
+var isModelUnavailable = (error) => typeof error === "object" && error !== null && error.failureCategory === "model-unavailable";
+async function resolveClaudeCliModelId(input) {
+  const read = () => claudeCliModelId({
+    requestedModelId: input.requestedModelId,
+    placeholder: input.placeholder,
+    catalog: input.catalog(),
+    ...input.declared === void 0 ? {} : { declared: input.declared },
+    ...input.customModels === void 0 ? {} : { customModels: input.customModels }
+  });
+  try {
+    return read();
+  } catch (error) {
+    if (!isModelUnavailable(error)) throw error;
+    let failure;
+    try {
+      await input.refreshCatalog();
+    } catch (cause) {
+      failure = cause;
+    }
+    if (failure !== void 0 || !input.refreshSucceeded()) {
+      const detail = failure instanceof Error && failure.message.trim().length > 0 ? failure.message : "the model list could not be read";
+      throw Object.assign(
+        new Error(
+          `Refreshing this agent's model list failed (${detail}), so this turn was not sent. Requested model "${input.requestedModelId.trim()}".`
+        ),
+        { failureCategory: "model-unavailable" }
+      );
+    }
+    return read();
+  }
 }
 function getEffectiveClaudeAgentEffort(effort) {
   const normalized = normalizeClaudeCliEffort(effort);
@@ -20378,17 +20419,20 @@ function createClaudeProbe(input) {
       };
     }
     if (signal?.aborted) {
-      throw new Error("aborted");
+      throw new ExecutorSpawnAbortedError();
     }
     let handle;
     try {
       handle = await host.process.spawn({
         program: recipe.binaryPath,
         args: ["--version"],
-        owner: { bindingId: host.bindingId }
+        owner: { bindingId: host.bindingId },
+        ...signal === void 0 ? {} : { signal }
       });
     } catch (error) {
-      if (error instanceof ExecutorSpawnRefusedError) throw error;
+      if (error instanceof ExecutorSpawnRefusedError || error instanceof ExecutorSpawnAbortedError) {
+        throw error;
+      }
       const failure = describeExecutorSpawnFailure(error);
       return {
         installed: false,
@@ -20398,21 +20442,30 @@ function createClaudeProbe(input) {
         detail: failure.detail
       };
     }
-    const [stdout, stderr, exitCode] = await Promise.all([
-      collectProcessText(handle.stdout),
-      collectProcessText(handle.stderr),
-      handle.exited
-    ]);
+    const [stdout, stderr, exitCode] = await raceAbort(
+      Promise.all([
+        collectProcessText(handle.stdout),
+        collectProcessText(handle.stderr),
+        handle.exited
+      ]),
+      signal
+    );
+    if (signal?.aborted) throw new ExecutorSpawnAbortedError();
     const version = parseGenericCliVersion(`${stdout}
 ${stderr}`);
     if (version !== null || exitCode === 0) {
-      await modelCatalog.refresh({ signal, force: version !== lastProbedVersion });
+      await modelCatalog.refresh({
+        signal,
+        force: version !== lastProbedVersion,
+        paired: true
+      });
       lastProbedVersion = version;
     }
     const models = claudeProbeModels({
       catalog: modelCatalog.current(),
       customModels: recipe.customModels
     });
+    const reportedModels = modelCatalog.lastRefreshOk() ? { models } : {};
     const auth = probeAuth();
     const skills = await discoverClaudeSkills(
       resolveClaudeConfigDirPath(recipe.homePath, { ...process.env, ...recipe.environment })
@@ -20433,7 +20486,7 @@ ${stderr}`);
         version,
         readiness: "error",
         auth,
-        models,
+        ...reportedModels,
         skills,
         detail: "Claude is signed out",
         // 退出登录了档位照样是那五档。不报就退回宿主四档，而那份映射少了 `plan`。
@@ -20446,7 +20499,7 @@ ${stderr}`);
       version,
       readiness: "ready",
       auth,
-      models,
+      ...reportedModels,
       skills,
       ...notice === void 0 ? {} : { notice },
       ...CLAUDE_NATIVE_MODE_REPORT
@@ -20454,6 +20507,46 @@ ${stderr}`);
   };
   return probe;
 }
+var CLAUDE_VERSION_TIMEOUT_MS = 15e3;
+async function readClaudeCliVersion(input) {
+  if (input.recipe.binaryPath.length === 0) return null;
+  let handle;
+  try {
+    handle = await input.host.process.spawn({
+      program: input.recipe.binaryPath,
+      args: ["--version"],
+      owner: { bindingId: input.host.bindingId }
+    });
+  } catch {
+    return null;
+  }
+  const collect = async (stream) => {
+    const chunks = [];
+    for await (const chunk of stream) chunks.push(Buffer.from(chunk));
+    return Buffer.concat(chunks).toString("utf8");
+  };
+  const collected = Promise.all([collect(handle.stdout), collect(handle.stderr), handle.exited]);
+  let timer;
+  const timeout = new Promise((resolve4) => {
+    timer = setTimeout(() => resolve4("timeout"), CLAUDE_VERSION_TIMEOUT_MS);
+    timer.unref?.();
+  });
+  try {
+    const settled = await Promise.race([collected, timeout]);
+    if (settled === "timeout") {
+      collected.catch(() => void 0);
+      return null;
+    }
+    const [stdout, stderr] = settled;
+    return parseGenericCliVersion(`${stdout}
+${stderr}`);
+  } catch {
+    return null;
+  } finally {
+    if (timer !== void 0) clearTimeout(timer);
+    await handle.kill("SIGTERM").catch(() => void 0);
+  }
+}
 
 // src/claudeExecutable.ts
 import * as NodeFS2 from "node:fs";
@@ -22346,11 +22439,22 @@ var makeClaudeModelCatalog = (deps) => {
   let modelCatalog;
   let modelCatalogRead;
   let modelCatalogFailedAt;
+  let catalogReadOk = false;
+  let successfulReadAt;
+  let skipPairedRefresh = false;
   const current = () => modelCatalog?.models ?? [];
   const refresh = (input) => {
-    const fresh = modelCatalog !== void 0 && deps.now() - modelCatalog.readAt < CLAUDE_SDK_MODELS_TTL_MS;
-    if (fresh && input?.force !== true) return Promise.resolve();
+    if (input?.paired === true && skipPairedRefresh) {
+      skipPairedRefresh = false;
+      return Promise.resolve();
+    }
+    const fresh = successfulReadAt !== void 0 && deps.now() - successfulReadAt < CLAUDE_SDK_MODELS_TTL_MS;
+    if (fresh && input?.force !== true) {
+      catalogReadOk = true;
+      return Promise.resolve();
+    }
     if (input?.force !== true && modelCatalogFailedAt !== void 0 && deps.now() - modelCatalogFailedAt < CLAUDE_SDK_MODELS_RETRY_MS) {
+      catalogReadOk = false;
       return Promise.resolve();
     }
     if (modelCatalogRead !== void 0) return modelCatalogRead;
@@ -22369,9 +22473,14 @@ var makeClaudeModelCatalog = (deps) => {
       });
       if (models === void 0) {
         modelCatalogFailedAt = deps.now();
+        catalogReadOk = false;
+        successfulReadAt = void 0;
       } else {
+        const readAt = deps.now();
         modelCatalogFailedAt = void 0;
-        modelCatalog = { models: claudeCatalogFromSdk(models), readAt: deps.now() };
+        catalogReadOk = true;
+        successfulReadAt = readAt;
+        modelCatalog = { models: claudeCatalogFromSdk(models), readAt };
       }
     })().finally(() => {
       modelCatalogRead = void 0;
@@ -22383,7 +22492,12 @@ var makeClaudeModelCatalog = (deps) => {
     current,
     refresh,
     /** 此刻正在进行的那次读取；没有就是 undefined。起会话等它读完，不为此另起一次。 */
-    pendingRead: () => modelCatalogRead
+    pendingRead: () => modelCatalogRead,
+    /** 最近一次读取拿到了清单。新鲜跳过也算；退避或读失败不算。 */
+    lastRefreshOk: () => catalogReadOk,
+    notePairedRefresh: () => {
+      skipPairedRefresh = true;
+    }
   };
 };
 
@@ -22830,20 +22944,14 @@ function claudeUsesOfficialChannel(env2) {
     return false;
   }
 }
-var ALLOWLIST_MODE_TOOLS = [
-  "Read",
-  "Glob",
-  "Grep",
-  "Edit",
-  "MultiEdit",
-  "Write",
-  "NotebookEdit",
-  "Bash"
-];
+var ALLOWLIST_MODE_TOOLS = ["Read", "Glob", "Grep", "Bash"];
 function claudeSdkPermission(rules, mode) {
   if (mode !== "auto") return { mode, allow: rules.read };
   if (rules.officialChannel) return { mode, allow: [...rules.read, ...rules.hostMcp] };
-  return { mode: "dontAsk", allow: [...rules.read, ...rules.hostMcp, ...ALLOWLIST_MODE_TOOLS] };
+  return {
+    mode: "dontAsk",
+    allow: [...rules.read, ...rules.hostMcp, ...ALLOWLIST_MODE_TOOLS, ...rules.workspaceWrite]
+  };
 }
 
 // src/adapter/permissionMode.ts
@@ -22879,6 +22987,8 @@ var makeSendTurn = (deps) => {
     recipe,
     boundInstanceId,
     currentModelCatalog,
+    refreshModelCatalogForSend,
+    modelCatalogRefreshSucceeded,
     declaredModels,
     requireSession,
     completeTurn,
@@ -22895,18 +23005,20 @@ var makeSendTurn = (deps) => {
       await completeTurn(context, "completed");
     }
     if (modelSelection?.model) {
+      const apiModelId = await resolveClaudeCliModelId({
+        requestedModelId: modelSelection.model,
+        placeholder: CLAUDE_CARD.defaultModel,
+        catalog: currentModelCatalog,
+        declared: declaredModels,
+        customModels: recipe.customModels,
+        refreshCatalog: refreshModelCatalogForSend,
+        refreshSucceeded: modelCatalogRefreshSucceeded
+      });
       const turnCaps = claudeModelCapabilities(
         modelSelection.model,
         currentModelCatalog(),
         recipe.customModels
       );
-      const apiModelId = claudeCliModelId({
-        requestedModelId: modelSelection.model,
-        placeholder: CLAUDE_CARD.defaultModel,
-        catalog: currentModelCatalog(),
-        declared: declaredModels,
-        customModels: recipe.customModels
-      });
       if (context.currentApiModelId !== apiModelId) {
         try {
           await context.query.setModel(apiModelId);
@@ -23907,14 +24019,20 @@ function toClaudeAbsolutePath(directory) {
   if (/^\/[^/]/.test(trimmed)) return `/${trimmed.replace(/\/+$/, "")}`;
   return void 0;
 }
-function claudeReadAllowRules(directories) {
+function claudeDirectoryRules(tools, directories) {
   const rules = [];
   for (const directory of directories ?? []) {
     const path = toClaudeAbsolutePath(directory);
-    if (path !== void 0) rules.push(`Read(${path}/**)`);
+    if (path !== void 0) for (const tool of tools) rules.push(`${tool}(${path}/**)`);
   }
   return rules;
 }
+function claudeReadAllowRules(directories) {
+  return claudeDirectoryRules(["Read"], directories);
+}
+function claudeWorkspaceWriteAllowRules(directories) {
+  return claudeDirectoryRules(["Edit", "MultiEdit", "Write", "NotebookEdit"], directories);
+}
 
 // src/adapter/startSession.ts
 function toClaudeMcpServers(entries) {
@@ -23967,19 +24085,21 @@ var makeStartSession = (deps) => {
     } = flags;
     const modelSelection = boundModelSelection(input.modelSelection, boundInstanceId);
     await modelCatalog.pendingRead();
+    const apiModelId = modelSelection?.model ? await resolveClaudeCliModelId({
+      requestedModelId: modelSelection.model,
+      placeholder: CLAUDE_CARD.defaultModel,
+      catalog: currentModelCatalog,
+      declared: declaredModels,
+      customModels: recipe.customModels,
+      refreshCatalog: () => modelCatalog.refresh({ force: true }),
+      refreshSucceeded: () => modelCatalog.lastRefreshOk()
+    }) : void 0;
     const caps = claudeModelCapabilities(
       modelSelection?.model,
       currentModelCatalog(),
       recipe.customModels
     );
     const descriptors = caps.optionDescriptors;
-    const apiModelId = modelSelection?.model ? claudeCliModelId({
-      requestedModelId: modelSelection.model,
-      placeholder: CLAUDE_CARD.defaultModel,
-      catalog: currentModelCatalog(),
-      declared: declaredModels,
-      customModels: recipe.customModels
-    }) : void 0;
     const rawEffort = getModelSelectionStringOptionValue(modelSelection, "effort");
     const effort = resolveClaudeEffort(caps, rawEffort) ?? null;
     const fastModeSupported = descriptors.some(
@@ -24076,6 +24196,7 @@ var makeStartSession = (deps) => {
     const permissionRules = {
       read: claudeReadAllowRules(input.readOnlyDirectories),
       hostMcp: claudeHostMcpAllowRules(input.mcpServers),
+      workspaceWrite: claudeWorkspaceWriteAllowRules(additionalDirectories),
       officialChannel: claudeUsesOfficialChannel(spawnEnvironment.processEnv)
     };
     const sdkPermission = claudeSdkPermission(permissionRules, permissionMode);
@@ -28097,6 +28218,8 @@ function createClaudeAdapter(recipe, host, options) {
     boundInstanceId,
     attachments: options?.attachments,
     currentModelCatalog,
+    refreshModelCatalogForSend: () => modelCatalog.refresh({ force: true }),
+    modelCatalogRefreshSucceeded: () => modelCatalog.lastRefreshOk(),
     declaredModels,
     requireSession,
     completeTurn,
@@ -28109,7 +28232,12 @@ function createClaudeAdapter(recipe, host, options) {
   };
   return {
     /** 型号目录：探测用它读并拿当前这份；会话内部自己走同一份。 */
-    modelCatalog: { refresh: modelCatalog.refresh, current: currentModelCatalog },
+    modelCatalog: {
+      refresh: modelCatalog.refresh,
+      current: currentModelCatalog,
+      lastRefreshOk: modelCatalog.lastRefreshOk,
+      notePairedRefresh: modelCatalog.notePairedRefresh
+    },
     /** 会话起进程用的那份环境；探测判工具搜索提示也看它。 */
     buildLaunchEnvironment,
     startSession,
@@ -28169,6 +28297,20 @@ function createClaudeInstance(config, host, attachments, overrides, usageCache)
   };
   return {
     probe,
+    readCliVersion: () => readClaudeCliVersion({ recipe, host }),
+    // `force: false` 立刻返回。每天那次探测自己按清单 TTL 决定要不要读；这里只服务「版本变了」和手动刷新。
+    refreshModelCatalog: async ({ force }) => {
+      if (!force) return;
+      try {
+        await adapter.modelCatalog.refresh({ force: true });
+      } catch (error) {
+        host.log.warn("claude model catalog refresh failed", {
+          detail: error instanceof Error ? error.message : String(error)
+        });
+      } finally {
+        adapter.modelCatalog.notePairedRefresh();
+      }
+    },
     startSession: adapter.startSession,
     sendTurn: adapter.sendTurn,
     interruptTurn: adapter.interruptTurn,
@@ -28246,7 +28388,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-claude",
-  apiVersion: 30,
+  apiVersion: 32,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.3254",
+  "version": "0.2.3272",
   "description": "Claude executor: Claude Code CLI via @anthropic-ai/claude-agent-sdk.",
   "keywords": [
     "ycodium",
@@ -24,10 +24,10 @@
     "@types/node": "24.12.4",
     "esbuild": "0.28.1",
     "vite-plus": "0.2.2",
-    "@ycodium-ai/plugin-api": "0.2.3254",
     "ycodium-composer-tokens": "0.0.0",
-    "ycodium-executor-testing": "0.0.0",
-    "ycodium-jsonl-stream": "0.0.0"
+    "ycodium-jsonl-stream": "0.0.0",
+    "@ycodium-ai/plugin-api": "0.2.3272",
+    "ycodium-executor-testing": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",