@ycodium-ai/agent-claude 0.2.3598 → 0.2.3608

package/dist/index.js

@@ -50,7 +50,9 @@ var CLAUDE_CARD = {
     // （同一会话两轮不同模型，中间一条 `setModel`）。宿主内置名片此前写 unsupported，
     // 与 adapter 自己声明给编排的 `"in-session"` 相反——那边是真的，名片是错的。
     sessionModelSwitch: "in-session",
-    sessionOptionSwitch: "unsupported",
+    // 暴露的选项只有推理档（含 ultracode、max）与快速模式，都经 `applyFlagSettings` 在会话里写
+    // （adapter/sessionOptions.ts），换选项不重开会话，挂在进程里的子 agent 与后台任务保住。
+    sessionOptionSwitch: "in-session",
     runtimeModeSwitch: "in-session",
     // SDK 的 `setPermissionMode` 会话中途就能改，所以这一位也是真的。
     nativeModeSwitch: true,
@@ -22017,6 +22019,13 @@ function resolveClaudeEffort(caps, raw) {
   if (!descriptor || descriptor.type !== "select") return void 0;
   return currentSelectValue(descriptor, raw);
 }
+function unsupportedClaudeEffort(caps, raw) {
+  const descriptor = caps.optionDescriptors.find((entry) => entry.id === "effort");
+  if (!raw || raw === RETIRED_CLAUDE_EFFORT || !descriptor || descriptor.type !== "select") {
+    return void 0;
+  }
+  return currentSelectValue(descriptor, raw) === raw ? void 0 : raw;
+}
 function normalizeClaudeCliEffort(effort) {
   if (!effort) {
     return void 0;
@@ -25046,10 +25055,77 @@ async function applyClaudePermissionMode(context, mode, control) {
   context.currentPermissionAllow = allow;
 }
 
+// src/adapter/sessionOptions.ts
+function resolveClaudeSessionOptions(input) {
+  const { modelSelection, recipe } = input;
+  const caps = claudeModelCapabilities(modelSelection?.model, input.catalog, recipe.customModels);
+  const descriptors = caps.optionDescriptors;
+  const rawEffort = getModelSelectionStringOptionValue(modelSelection, "effort");
+  const effort = resolveClaudeEffort(caps, rawEffort) ?? null;
+  const supports = (id2) => descriptors.some((descriptor) => descriptor.type === "boolean" && descriptor.id === id2);
+  const fastMode = getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true && supports("fastMode");
+  const thinking = supports("thinking") ? getModelSelectionBooleanOptionValue(modelSelection, "thinking") : void 0;
+  return {
+    effort: getEffectiveClaudeAgentEffort(effort) ?? void 0,
+    unsupportedEffort: unsupportedClaudeEffort(caps, rawEffort),
+    fastMode,
+    settings: buildClaudeSessionSettings({
+      thinking,
+      fastMode,
+      ultracode: isClaudeUltracodeEffort(effort),
+      autoCompactWindow: recipe.autoCompactWindow
+    })
+  };
+}
+var readEffectiveEffort = (settings) => {
+  if (typeof settings !== "object" || settings === null) return void 0;
+  const effective = settings.effective;
+  if (typeof effective !== "object" || effective === null) return void 0;
+  const level = effective.effortLevel;
+  return typeof level === "string" && level.length > 0 ? level : void 0;
+};
+async function applyClaudeSessionOptions(context, desired, methodPrefix, log) {
+  const threadId = context.session.threadId;
+  if (context.currentApiModelId !== desired.apiModelId) {
+    try {
+      await context.query.setModel(desired.apiModelId);
+    } catch (cause) {
+      throw toRequestError(threadId, `${methodPrefix}/setModel`, cause);
+    }
+    context.currentApiModelId = desired.apiModelId;
+  }
+  const effortChanged = context.currentEffort !== desired.effort;
+  const patch = {
+    ...diffClaudeSessionSettings(context.currentSettings, desired.settings),
+    // SDK 的 Settings 类型不含 `max`，CLI 会话内照收（见上）。
+    ...effortChanged ? {
+      effortLevel: desired.effort ?? null
+    } : {}
+  };
+  if (Object.keys(patch).length > 0) {
+    try {
+      await context.query.applyFlagSettings(patch);
+    } catch (cause) {
+      throw toRequestError(threadId, `${methodPrefix}/applyFlagSettings`, cause);
+    }
+    context.currentSettings = desired.settings;
+    context.currentEffort = desired.effort;
+  }
+  if (!effortChanged || desired.effort === void 0 || desired.effort === "max") return;
+  const requested = desired.effort;
+  void context.query.getSettings?.().then((readback) => {
+    const adopted = readEffectiveEffort(readback);
+    if (adopted !== void 0 && adopted !== requested) {
+      log.warn("claude.session.effort-readback-differs", { threadId, requested, adopted });
+    }
+  }).catch(() => void 0);
+}
+
 // src/adapter/sendTurn.ts
 var makeSendTurn = (deps) => {
   const {
     emitter,
+    log,
     recipe,
     boundInstanceId,
     currentModelCatalog,
@@ -25070,40 +25146,35 @@ var makeSendTurn = (deps) => {
     if (context.turnState && steeringTurnState === null) {
       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
-      );
-      if (context.currentApiModelId !== apiModelId) {
-        try {
-          await context.query.setModel(apiModelId);
-        } catch (cause) {
-          throw toRequestError(input.threadId, "turn/setModel", cause);
-        }
-        context.currentApiModelId = apiModelId;
-      }
-      context.session = {
-        ...context.session,
-        model: modelSelection.model
-      };
-      const turnEffort = resolveClaudeEffort(
-        turnCaps,
-        getModelSelectionStringOptionValue(modelSelection, "effort")
-      );
-      context.currentEffort = getEffectiveClaudeAgentEffort(turnEffort ?? null) ?? void 0;
-    }
+    const apiModelId = modelSelection?.model && steeringTurnState === null ? await resolveClaudeCliModelId({
+      requestedModelId: modelSelection.model,
+      placeholder: CLAUDE_CARD.defaultModel,
+      catalog: currentModelCatalog,
+      declared: declaredModels,
+      customModels: recipe.customModels,
+      refreshCatalog: refreshModelCatalogForSend,
+      refreshSucceeded: modelCatalogRefreshSucceeded
+    }) : void 0;
+    let unsupportedEffort;
     try {
+      if (modelSelection?.model && apiModelId !== void 0) {
+        const turnOptions = resolveClaudeSessionOptions({
+          modelSelection,
+          catalog: currentModelCatalog(),
+          recipe
+        });
+        await applyClaudeSessionOptions(
+          context,
+          { apiModelId, effort: turnOptions.effort, settings: turnOptions.settings },
+          "turn",
+          log
+        );
+        unsupportedEffort = turnOptions.unsupportedEffort;
+        context.session = {
+          ...context.session,
+          model: modelSelection.model
+        };
+      }
       if (input.interactionMode === "plan") {
         await applyClaudePermissionMode(context, "plan", {
           method: "turn/setPermissionMode"
@@ -25113,6 +25184,12 @@ var makeSendTurn = (deps) => {
           method: "turn/setPermissionMode"
         });
       }
+      if (steeringTurnState === null && context.turnState?.synthetic === true) {
+        await completeTurn(context, "completed");
+      }
+      if (requireSession(input.threadId) !== context) {
+        throw new Error(`Claude session replaced: ${input.threadId}`);
+      }
     } catch (cause) {
       const rejected = Object.assign(
         cause instanceof Error ? cause : new Error(String(cause)),
@@ -25167,6 +25244,12 @@ var makeSendTurn = (deps) => {
       context
     });
     for (const warning of turnText.warnings) await emitRuntimeWarning(context, warning);
+    if (unsupportedEffort !== void 0 && modelSelection?.model) {
+      await emitRuntimeWarning(
+        context,
+        `${modelSelection.model} does not support the "${unsupportedEffort}" reasoning level, so this turn uses the model's default level. Your saved choice is unchanged.`
+      );
+    }
     const message = await buildUserMessageFromTurn({
       text: turnText,
       attachments: input.attachments,
@@ -25960,7 +26043,7 @@ var makeSessionLifecycle = (deps) => {
       context.spawnEnvironment,
       desired.spawnEnvironment
     );
-    const reusable = !context.stopped && context.session.status !== "closed" && context.session.cwd === input.cwd && sameWorkingDirectories(context.additionalDirectories, desired.additionalDirectories) && context.session.runtimeMode === input.runtimeMode && context.basePermissionMode === desired.permissionMode && context.launchEffort === desired.effectiveEffort && context.sessionSkills?.pluginDir === input.skills?.pluginDir && (resumeTarget === void 0 || resumeTarget === context.resumeSessionId) && changedEnvironmentKeys.length === 0;
+    const reusable = !context.stopped && context.session.status !== "closed" && context.session.cwd === input.cwd && sameWorkingDirectories(context.additionalDirectories, desired.additionalDirectories) && context.session.runtimeMode === input.runtimeMode && context.basePermissionMode === desired.permissionMode && context.sessionSkills?.pluginDir === input.skills?.pluginDir && (resumeTarget === void 0 || resumeTarget === context.resumeSessionId) && changedEnvironmentKeys.length === 0;
     if (!reusable) {
       if (changedEnvironmentKeys.length > 0) {
         log.info("claude.session.environment-changed", {
@@ -25970,23 +26053,16 @@ var makeSessionLifecycle = (deps) => {
       }
       return void 0;
     }
-    if (context.currentApiModelId !== desired.apiModelId) {
-      try {
-        await context.query.setModel(desired.apiModelId);
-      } catch (cause) {
-        throw toRequestError(context.session.threadId, "session/setModel", cause);
-      }
-      context.currentApiModelId = desired.apiModelId;
-    }
-    const settingsPatch = diffClaudeSessionSettings(context.currentSettings, desired.settings);
-    if (settingsPatch) {
-      try {
-        await context.query.applyFlagSettings(settingsPatch);
-      } catch (cause) {
-        throw toRequestError(context.session.threadId, "session/applyFlagSettings", cause);
-      }
-      context.currentSettings = desired.settings;
-    }
+    await applyClaudeSessionOptions(
+      context,
+      {
+        apiModelId: desired.apiModelId,
+        effort: desired.effectiveEffort,
+        settings: desired.settings
+      },
+      "session",
+      log
+    );
     const updatedAt = nowIso();
     context.session = {
       ...context.session,
@@ -26138,24 +26214,15 @@ var makeStartSession = (deps) => {
       refreshCatalog: () => modelCatalog.refresh({ force: true }),
       refreshSucceeded: () => modelCatalog.lastRefreshOk()
     }) : void 0;
-    const caps = claudeModelCapabilities(
-      modelSelection?.model,
-      currentModelCatalog(),
-      recipe.customModels
-    );
-    const descriptors = caps.optionDescriptors;
-    const rawEffort = getModelSelectionStringOptionValue(modelSelection, "effort");
-    const effort = resolveClaudeEffort(caps, rawEffort) ?? null;
-    const fastModeSupported = descriptors.some(
-      (descriptor) => descriptor.type === "boolean" && descriptor.id === "fastMode"
-    );
-    const thinkingSupported = descriptors.some(
-      (descriptor) => descriptor.type === "boolean" && descriptor.id === "thinking"
-    );
-    const fastMode = getModelSelectionBooleanOptionValue(modelSelection, "fastMode") === true && fastModeSupported;
-    const thinking = thinkingSupported ? getModelSelectionBooleanOptionValue(modelSelection, "thinking") : void 0;
-    const ultracode = isClaudeUltracodeEffort(effort);
-    const effectiveEffort = getEffectiveClaudeAgentEffort(effort);
+    const {
+      effort: effectiveEffort,
+      fastMode,
+      settings
+    } = resolveClaudeSessionOptions({
+      modelSelection,
+      catalog: currentModelCatalog(),
+      recipe
+    });
     const permissionMode = claudePermissionModeFor(input.runtimeMode, input.nativeModeId);
     if (launchArgPermissionMode !== void 0) {
       log.warn("claude.launchArgs.permissionModeIgnored", {
@@ -26172,12 +26239,6 @@ var makeStartSession = (deps) => {
         reason: "permission mode follows the permission seat; --dangerously-skip-permissions was removed"
       });
     }
-    const settings = buildClaudeSessionSettings({
-      thinking,
-      fastMode,
-      ultracode,
-      autoCompactWindow: recipe.autoCompactWindow
-    });
     const workingDirectories = claudeWorkingDirectories(input.cwd, input.additionalDirectories);
     const additionalDirectories = workingDirectories.directories;
     const spawnEnvironment = {
@@ -26364,8 +26425,7 @@ var makeStartSession = (deps) => {
       currentApiModelId: apiModelId,
       // 上下文长度只信 SDK 结果里报的那个数，起步时不猜。
       lastKnownContextWindow: void 0,
-      currentEffort: effectiveEffort ?? void 0,
-      launchEffort: effectiveEffort ?? void 0,
+      currentEffort: effectiveEffort,
       sessionSkills: input.skills,
       spawnEnvironment,
       additionalDirectories,
@@ -29352,6 +29412,7 @@ function createClaudeAdapter(recipe, host, options) {
   });
   const { sendTurn } = makeSendTurn({
     emitter,
+    log: options?.log ?? host.log,
     recipe,
     boundInstanceId,
     attachments: options?.attachments,
@@ -29542,7 +29603,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-claude",
-  apiVersion: 48,
+  apiVersion: 49,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

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