@ycodium-ai/agent-claude 0.2.2488 → 0.2.2510

package/dist/index.js

@@ -21119,6 +21119,28 @@ var CLAUDE_SETTING_SOURCES = [
   "local"
 ];
 
+// src/readOnlyDirectories.ts
+var GLOB_METACHARACTERS = /[*?[\]{}]/;
+function toClaudeAbsolutePath(directory) {
+  const trimmed = directory.trim();
+  if (GLOB_METACHARACTERS.test(trimmed)) return void 0;
+  const drive = /^([A-Za-z]):[\\/]+(.*)$/.exec(trimmed);
+  if (drive) {
+    const rest = (drive[2] ?? "").split("\\").join("/").replace(/\/+$/, "");
+    return rest === "" ? void 0 : `//${(drive[1] ?? "").toLowerCase()}/${rest}`;
+  }
+  if (/^\/[^/]/.test(trimmed)) return `/${trimmed.replace(/\/+$/, "")}`;
+  return void 0;
+}
+function claudeReadAllowRules(directories) {
+  const rules = [];
+  for (const directory of directories ?? []) {
+    const path = toClaudeAbsolutePath(directory);
+    if (path !== void 0) rules.push(`Read(${path}/**)`);
+  }
+  return rules;
+}
+
 // src/sessions.ts
 import * as NodeFS3 from "node:fs";
 import * as NodeOS6 from "node:os";
@@ -21537,16 +21559,6 @@ function normalizeClaudeActiveTokenUsage(value, contextWindow, totalProcessedTok
     ...totalProcessedTokens !== void 0 ? { totalProcessedTokens } : {}
   });
 }
-function normalizeClaudeContextUsageApiSnapshot(value, totalProcessedTokens) {
-  const autoCompactThreshold = finitePositiveInteger(value.autoCompactThreshold);
-  return makeClaudeTokenUsageSnapshot({
-    activeTokens: value.totalTokens,
-    contextWindow: value.maxTokens,
-    ...totalProcessedTokens !== void 0 ? { totalProcessedTokens } : {},
-    compactsAutomatically: value.isAutoCompactEnabled,
-    ...autoCompactThreshold !== void 0 ? { autoCompactThreshold } : {}
-  });
-}
 function compactBoundaryTokenUsageSnapshot(message, contextWindow, totalProcessedTokens) {
   const metadata = message.compact_metadata;
   if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
@@ -22648,9 +22660,6 @@ function nativeProviderRefs(_context, options) {
 }
 async function buildUserMessageFromTurn(input) {
   const sdkContent = [];
-  if (input.text.length > 0) {
-    sdkContent.push({ type: "text", text: input.text });
-  }
   for (const attachment of input.attachments ?? []) {
     if (!attachment || typeof attachment !== "object" || Array.isArray(attachment)) continue;
     const rec = attachment;
@@ -22669,6 +22678,9 @@ async function buildUserMessageFromTurn(input) {
     const bytes = await input.attachmentsApi.read(id2);
     sdkContent.push(buildClaudeImageContentBlock({ mimeType, bytes }));
   }
+  if (input.text.length > 0) {
+    sdkContent.push({ type: "text", text: input.text });
+  }
   return buildUserMessage({ sdkContent });
 }
 async function persistProducedImage(input) {
@@ -22782,10 +22794,7 @@ function createClaudeAdapter(recipe, host, options) {
     }
     return {
       threadId,
-      turns: context.turns.map((turn) => ({
-        id: turn.id,
-        items: [...turn.items]
-      }))
+      turns: context.turns.map((turn) => ({ id: turn.id, items: [] }))
     };
   };
   const updateResumeCursor = async (context) => {
@@ -23039,27 +23048,6 @@ function createClaudeAdapter(recipe, host, options) {
       } : {}
     });
   };
-  const queryCurrentContextUsage = async (context, totalProcessedTokens) => {
-    if (!context.query.getContextUsage) {
-      return void 0;
-    }
-    let usage;
-    try {
-      usage = await Promise.race([
-        context.query.getContextUsage(),
-        new Promise((resolve2) => {
-          setTimeout(() => resolve2(void 0), 1e3);
-        })
-      ]);
-    } catch {
-      usage = void 0;
-    }
-    if (!usage) {
-      return void 0;
-    }
-    context.lastKnownContextWindow = usage.maxTokens;
-    return normalizeClaudeContextUsageApiSnapshot(usage, totalProcessedTokens);
-  };
   const emitProposedPlanCompleted = async (context, input) => {
     const turnState = context.turnState;
     const planMarkdown = input.planMarkdown.trim();
@@ -23132,10 +23120,11 @@ function createClaudeAdapter(recipe, host, options) {
       turnId,
       startedAt,
       synthetic: true,
-      items: [],
       assistantTextBlocks: /* @__PURE__ */ new Map(),
       assistantTextBlockOrder: [],
       capturedProposedPlanKeys: /* @__PURE__ */ new Set(),
+      latestAssistantUsage: void 0,
+      compactedSinceLatestAssistantUsage: false,
       retrying: false,
       nextSyntheticAssistantBlockIndex: -1
     };
@@ -23175,10 +23164,6 @@ function createClaudeAdapter(recipe, host, options) {
     if (accumulatedTotalProcessedTokens !== void 0) {
       context.lastKnownTotalProcessedTokens = accumulatedTotalProcessedTokens;
     }
-    const contextUsageSnapshot = await queryCurrentContextUsage(
-      context,
-      accumulatedTotalProcessedTokens ?? context.lastKnownTotalProcessedTokens
-    );
     const resultUsageRecord = result?.usage && typeof result.usage === "object" && !Array.isArray(result.usage) ? result.usage : void 0;
     const hasResultUsageIteration = resultUsageRecord !== void 0 && lastClaudeUsageIteration(resultUsageRecord) !== void 0;
     const resultHasActiveUsage = resultUsageRecord !== void 0 && (hasResultUsageIteration || claudeUsageInputTokens(resultUsageRecord) + claudeUsageOutputTokens(resultUsageRecord) > 0);
@@ -23188,8 +23173,14 @@ function createClaudeAdapter(recipe, host, options) {
       maxTokens,
       accumulatedTotalProcessedTokens ?? context.lastKnownTotalProcessedTokens
     ) : void 0;
+    const latestAssistantSnapshot = normalizeClaudeActiveTokenUsage(
+      context.turnState?.latestAssistantUsage,
+      maxTokens,
+      accumulatedTotalProcessedTokens ?? context.lastKnownTotalProcessedTokens
+    );
     const lastGoodUsage = context.lastKnownTokenUsage;
-    const usageSnapshot = contextUsageSnapshot ?? (resultTotalOnly && lastGoodUsage ? {
+    const usageSnapshot = latestAssistantSnapshot ?? // 压缩之后还没有新的 assistant 用量时，result 里的累计数反映的是压缩前的上下文，不能用。
+    (context.turnState?.compactedSinceLatestAssistantUsage ? void 0 : resultTotalOnly && lastGoodUsage ? {
       ...lastGoodUsage,
       ...typeof maxTokens === "number" && Number.isFinite(maxTokens) && maxTokens > 0 ? { maxTokens } : {},
       ...typeof accumulatedTotalProcessedTokens === "number" && Number.isFinite(accumulatedTotalProcessedTokens) && accumulatedTotalProcessedTokens > lastGoodUsage.usedTokens ? {
@@ -23256,10 +23247,7 @@ function createClaudeAdapter(recipe, host, options) {
         rawPayload: result ?? { status }
       });
     }
-    context.turns.push({
-      id: turnState.turnId,
-      items: [...turnState.items]
-    });
+    context.turns.push({ id: turnState.turnId });
     await emitThreadTokenUsage(context, usageSnapshot, {
       rawMethod: "claude/result",
       rawPayload: result ?? { status }
@@ -23557,9 +23545,6 @@ function createClaudeAdapter(recipe, host, options) {
     if (message.type !== "user") {
       return;
     }
-    if (context.turnState) {
-      context.turnState.items.push(message.message);
-    }
     for (const toolResult of toolResultBlocksFromUserMessage(message)) {
       const toolEntry = Array.from(context.inFlightTools.entries()).find(
         ([, tool2]) => tool2.itemId === toolResult.toolUseId
@@ -23778,7 +23763,14 @@ function createClaudeAdapter(recipe, host, options) {
       }
     }
     if (context.turnState) {
-      context.turnState.items.push(message.message);
+      if (normalizeClaudeActiveTokenUsage(
+        message.message.usage,
+        context.lastKnownContextWindow,
+        context.lastKnownTotalProcessedTokens
+      )) {
+        context.turnState.latestAssistantUsage = message.message.usage;
+        context.turnState.compactedSinceLatestAssistantUsage = false;
+      }
       await backfillAssistantTextBlocksFromSnapshot(context, message);
     }
     context.lastAssistantUuid = message.uuid;
@@ -23924,6 +23916,10 @@ function createClaudeAdapter(recipe, host, options) {
         return;
       }
       case "compact_boundary": {
+        if (context.turnState) {
+          context.turnState.latestAssistantUsage = void 0;
+          context.turnState.compactedSinceLatestAssistantUsage = true;
+        }
         await emitThreadTokenUsage(
           context,
           compactBoundaryTokenUsageSnapshot(
@@ -24189,13 +24185,19 @@ function createClaudeAdapter(recipe, host, options) {
         return;
       // 目前无 Ycodium 表面的内部协议/UX 细节 — 主动消费
       // deliberately so they don't masquerade as unknown-subtype warnings.
-      case "model_refusal_fallback":
       case "local_command_output":
       case "plugin_install":
       case "commands_changed":
       case "memory_recall":
       case "elicitation_complete":
         return;
+      case "model_refusal_fallback":
+        await emitRuntimeWarning(
+          context,
+          message.content.length > 0 ? message.content : `Claude switched from ${message.original_model} to ${message.fallback_model} after a safety refusal.`,
+          message
+        );
+        return;
       case "permission_denied":
         offerRuntimeEvent(context, {
           ...base,
@@ -24902,6 +24904,10 @@ function createClaudeAdapter(recipe, host, options) {
     const additionalDirectories = input.cwd ? [input.cwd] : [];
     const mcpServers = toClaudeMcpServers(input.mcpServers);
     const querySettings = { ...settings };
+    const readAllowRules = claudeReadAllowRules(input.readOnlyDirectories);
+    if (readAllowRules.length > 0) {
+      querySettings.permissions = { allow: [...readAllowRules] };
+    }
     const stderrTail = createOutputTail(CLAUDE_STDERR_TAIL_CHARS);
     const queryOptions = {
       ...input.cwd ? { cwd: input.cwd } : {},
@@ -25141,10 +25147,11 @@ function createClaudeAdapter(recipe, host, options) {
       const turnState = {
         turnId,
         startedAt: nowIso(),
-        items: [],
         assistantTextBlocks: /* @__PURE__ */ new Map(),
         assistantTextBlockOrder: [],
         capturedProposedPlanKeys: /* @__PURE__ */ new Set(),
+        latestAssistantUsage: void 0,
+        compactedSinceLatestAssistantUsage: false,
         retrying: false,
         nextSyntheticAssistantBlockIndex: -1
       };

package/package.json

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