@ycodium-ai/agent-claude 0.2.3094 → 0.2.3102

package/dist/index.js

@@ -21581,132 +21581,6 @@ var claudeStructuredErrorType = (value) => {
   return typeof type4 === "string" ? type4 : void 0;
 };
 
-// src/usage.ts
-function maxClaudeContextWindowFromModelUsage(modelUsage) {
-  if (!modelUsage) return void 0;
-  let maxContextWindow;
-  for (const value of Object.values(modelUsage)) {
-    const contextWindow = value.contextWindow;
-    maxContextWindow = Math.max(maxContextWindow ?? 0, contextWindow);
-  }
-  return maxContextWindow;
-}
-function finiteNonNegativeInteger(value) {
-  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.round(value) : void 0;
-}
-function finitePositiveInteger(value) {
-  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.round(value) : void 0;
-}
-function claudeUsageInputTokens(usage) {
-  return (finiteNonNegativeInteger(usage.input_tokens) ?? 0) + (finiteNonNegativeInteger(usage.cache_creation_input_tokens) ?? 0) + (finiteNonNegativeInteger(usage.cache_read_input_tokens) ?? 0);
-}
-function claudeUsageOutputTokens(usage) {
-  return finiteNonNegativeInteger(usage.output_tokens) ?? 0;
-}
-function lastClaudeUsageIteration(value) {
-  const iterations = Array.isArray(value.iterations) ? value.iterations : [];
-  return iterations.findLast(
-    (iteration) => iteration !== null && typeof iteration === "object" && !Array.isArray(iteration)
-  );
-}
-function claudeTotalProcessedTokens(value) {
-  if (!value || typeof value !== "object" || Array.isArray(value)) {
-    return void 0;
-  }
-  const usage = value;
-  const explicitTotal = finiteNonNegativeInteger(usage.total_tokens);
-  if (explicitTotal !== void 0 && explicitTotal > 0) {
-    return explicitTotal;
-  }
-  const total = claudeUsageInputTokens(usage) + claudeUsageOutputTokens(usage);
-  return total > 0 ? total : void 0;
-}
-var CLAUDE_COMPACTION_SUMMARY_MAX_CHARS = 8e3;
-function mergeClaudeCompactionSnapshot(snapshot, metadata) {
-  const preTokens = finiteNonNegativeInteger(metadata?.pre_tokens);
-  const postTokens = finiteNonNegativeInteger(metadata?.post_tokens);
-  const durationMs = finiteNonNegativeInteger(metadata?.duration_ms);
-  return {
-    ...snapshot,
-    ...metadata?.trigger === "manual" ? { trigger: "manual" } : metadata?.trigger === "auto" ? { trigger: "automatic" } : {},
-    ...preTokens !== void 0 ? { preTokens } : {},
-    ...postTokens !== void 0 ? { postTokens } : {},
-    ...durationMs !== void 0 ? { durationMs } : {}
-  };
-}
-function withClaudeCompactionSummary(snapshot, summary) {
-  const trimmed = summary.trim();
-  if (trimmed.length === 0) {
-    return snapshot;
-  }
-  const truncated = trimmed.length > CLAUDE_COMPACTION_SUMMARY_MAX_CHARS;
-  return {
-    ...snapshot,
-    summary: truncated ? trimmed.slice(0, CLAUDE_COMPACTION_SUMMARY_MAX_CHARS) : trimmed,
-    ...truncated ? { summaryTruncated: true } : {}
-  };
-}
-function makeClaudeTokenUsageSnapshot(input) {
-  const activeTokens = finiteNonNegativeInteger(input.activeTokens);
-  if (activeTokens === void 0 || activeTokens <= 0) {
-    return void 0;
-  }
-  const maxTokens = finitePositiveInteger(input.contextWindow);
-  const usedTokens = maxTokens !== void 0 ? Math.min(activeTokens, maxTokens) : activeTokens;
-  const lastUsedTokens = finiteNonNegativeInteger(input.lastUsedTokens) ?? (maxTokens !== void 0 ? Math.min(activeTokens, maxTokens) : activeTokens);
-  const totalProcessedTokens = finiteNonNegativeInteger(input.totalProcessedTokens);
-  const inputTokens = finiteNonNegativeInteger(input.inputTokens);
-  const outputTokens = finiteNonNegativeInteger(input.outputTokens);
-  return {
-    usedTokens,
-    lastUsedTokens,
-    ...totalProcessedTokens !== void 0 && totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
-    ...inputTokens !== void 0 && inputTokens > 0 ? { inputTokens } : {},
-    ...outputTokens !== void 0 && outputTokens > 0 ? { outputTokens } : {},
-    ...maxTokens !== void 0 ? { maxTokens } : {},
-    ...input.compactsAutomatically !== void 0 ? { compactsAutomatically: input.compactsAutomatically } : {},
-    ...input.autoCompactThreshold !== void 0 ? { autoCompactThreshold: input.autoCompactThreshold } : {}
-  };
-}
-function normalizeClaudeActiveTokenUsage(value, contextWindow, totalProcessedTokens) {
-  if (!value || typeof value !== "object") {
-    return void 0;
-  }
-  const usage = value;
-  const activeUsage = lastClaudeUsageIteration(usage) ?? usage;
-  const inputTokens = claudeUsageInputTokens(activeUsage);
-  const outputTokens = claudeUsageOutputTokens(activeUsage);
-  const activeTokens = claudeTotalProcessedTokens(activeUsage) ?? inputTokens + outputTokens;
-  if (activeTokens <= 0) {
-    return void 0;
-  }
-  return makeClaudeTokenUsageSnapshot({
-    activeTokens,
-    inputTokens,
-    outputTokens,
-    ...contextWindow !== void 0 ? { contextWindow } : {},
-    ...totalProcessedTokens !== void 0 ? { totalProcessedTokens } : {}
-  });
-}
-function compactBoundaryTokenUsageSnapshot(message, contextWindow, totalProcessedTokens) {
-  const metadata = message.compact_metadata;
-  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
-    return void 0;
-  }
-  const compactMetadata = metadata;
-  const postTokens = finiteNonNegativeInteger(compactMetadata.post_tokens);
-  if (postTokens === void 0 || postTokens <= 0) {
-    return void 0;
-  }
-  const preTokens = finiteNonNegativeInteger(compactMetadata.pre_tokens);
-  return makeClaudeTokenUsageSnapshot({
-    activeTokens: postTokens,
-    ...preTokens !== void 0 ? { lastUsedTokens: preTokens } : {},
-    ...contextWindow !== void 0 ? { contextWindow } : {},
-    ...totalProcessedTokens !== void 0 ? { totalProcessedTokens } : {}
-  });
-}
-
 // src/taskProgress.ts
 function claudeTaskRosterKind(input) {
   if (input.taskType === "local_workflow") return "workflow";
@@ -21946,36 +21820,6 @@ function workflowAgentStatus(entry) {
       return entry.startedAt === void 0 ? "pending" : "running";
   }
 }
-function normalizeClaudeTaskProgressTokenUsage(value, memory) {
-  const totalTokens = claudeTotalProcessedTokens(value);
-  if (totalTokens === void 0 || totalTokens <= 0) {
-    return void 0;
-  }
-  const lastUsedTokens = memory.lastKnownTokenUsage?.usedTokens;
-  const activeTokens = lastUsedTokens !== void 0 ? Math.max(totalTokens, lastUsedTokens) : totalTokens;
-  if (lastUsedTokens !== void 0 && activeTokens === lastUsedTokens) {
-    return void 0;
-  }
-  const usage = value;
-  const snapshot = makeClaudeTokenUsageSnapshot({
-    activeTokens,
-    ...memory.lastKnownContextWindow !== void 0 ? { contextWindow: memory.lastKnownContextWindow } : {},
-    totalProcessedTokens: Math.max(
-      totalTokens,
-      memory.lastKnownTotalProcessedTokens ?? totalTokens
-    )
-  });
-  if (!snapshot) {
-    return void 0;
-  }
-  const toolUses = finiteNonNegativeInteger(usage.tool_uses);
-  const durationMs = finiteNonNegativeInteger(usage.duration_ms);
-  return {
-    ...snapshot,
-    ...toolUses !== void 0 ? { toolUses } : {},
-    ...durationMs !== void 0 ? { durationMs } : {}
-  };
-}
 
 // src/adapter/emitters.ts
 var makeEmitters = (emitter) => {
@@ -23060,6 +22904,132 @@ var makeSendTurn = (deps) => {
   return { sendTurn };
 };
 
+// src/usage.ts
+function maxClaudeContextWindowFromModelUsage(modelUsage) {
+  if (!modelUsage) return void 0;
+  let maxContextWindow;
+  for (const value of Object.values(modelUsage)) {
+    const contextWindow = value.contextWindow;
+    maxContextWindow = Math.max(maxContextWindow ?? 0, contextWindow);
+  }
+  return maxContextWindow;
+}
+function finiteNonNegativeInteger(value) {
+  return typeof value === "number" && Number.isFinite(value) && value >= 0 ? Math.round(value) : void 0;
+}
+function finitePositiveInteger(value) {
+  return typeof value === "number" && Number.isFinite(value) && value > 0 ? Math.round(value) : void 0;
+}
+function claudeUsageInputTokens(usage) {
+  return (finiteNonNegativeInteger(usage.input_tokens) ?? 0) + (finiteNonNegativeInteger(usage.cache_creation_input_tokens) ?? 0) + (finiteNonNegativeInteger(usage.cache_read_input_tokens) ?? 0);
+}
+function claudeUsageOutputTokens(usage) {
+  return finiteNonNegativeInteger(usage.output_tokens) ?? 0;
+}
+function lastClaudeUsageIteration(value) {
+  const iterations = Array.isArray(value.iterations) ? value.iterations : [];
+  return iterations.findLast(
+    (iteration) => iteration !== null && typeof iteration === "object" && !Array.isArray(iteration)
+  );
+}
+function claudeTotalProcessedTokens(value) {
+  if (!value || typeof value !== "object" || Array.isArray(value)) {
+    return void 0;
+  }
+  const usage = value;
+  const explicitTotal = finiteNonNegativeInteger(usage.total_tokens);
+  if (explicitTotal !== void 0 && explicitTotal > 0) {
+    return explicitTotal;
+  }
+  const total = claudeUsageInputTokens(usage) + claudeUsageOutputTokens(usage);
+  return total > 0 ? total : void 0;
+}
+var CLAUDE_COMPACTION_SUMMARY_MAX_CHARS = 8e3;
+function mergeClaudeCompactionSnapshot(snapshot, metadata) {
+  const preTokens = finiteNonNegativeInteger(metadata?.pre_tokens);
+  const postTokens = finiteNonNegativeInteger(metadata?.post_tokens);
+  const durationMs = finiteNonNegativeInteger(metadata?.duration_ms);
+  return {
+    ...snapshot,
+    ...metadata?.trigger === "manual" ? { trigger: "manual" } : metadata?.trigger === "auto" ? { trigger: "automatic" } : {},
+    ...preTokens !== void 0 ? { preTokens } : {},
+    ...postTokens !== void 0 ? { postTokens } : {},
+    ...durationMs !== void 0 ? { durationMs } : {}
+  };
+}
+function withClaudeCompactionSummary(snapshot, summary) {
+  const trimmed = summary.trim();
+  if (trimmed.length === 0) {
+    return snapshot;
+  }
+  const truncated = trimmed.length > CLAUDE_COMPACTION_SUMMARY_MAX_CHARS;
+  return {
+    ...snapshot,
+    summary: truncated ? trimmed.slice(0, CLAUDE_COMPACTION_SUMMARY_MAX_CHARS) : trimmed,
+    ...truncated ? { summaryTruncated: true } : {}
+  };
+}
+function makeClaudeTokenUsageSnapshot(input) {
+  const activeTokens = finiteNonNegativeInteger(input.activeTokens);
+  if (activeTokens === void 0 || activeTokens <= 0) {
+    return void 0;
+  }
+  const maxTokens = finitePositiveInteger(input.contextWindow);
+  const usedTokens = maxTokens !== void 0 ? Math.min(activeTokens, maxTokens) : activeTokens;
+  const lastUsedTokens = finiteNonNegativeInteger(input.lastUsedTokens) ?? (maxTokens !== void 0 ? Math.min(activeTokens, maxTokens) : activeTokens);
+  const totalProcessedTokens = finiteNonNegativeInteger(input.totalProcessedTokens);
+  const inputTokens = finiteNonNegativeInteger(input.inputTokens);
+  const outputTokens = finiteNonNegativeInteger(input.outputTokens);
+  return {
+    usedTokens,
+    lastUsedTokens,
+    ...totalProcessedTokens !== void 0 && totalProcessedTokens > usedTokens ? { totalProcessedTokens } : {},
+    ...inputTokens !== void 0 && inputTokens > 0 ? { inputTokens } : {},
+    ...outputTokens !== void 0 && outputTokens > 0 ? { outputTokens } : {},
+    ...maxTokens !== void 0 ? { maxTokens } : {},
+    ...input.compactsAutomatically !== void 0 ? { compactsAutomatically: input.compactsAutomatically } : {},
+    ...input.autoCompactThreshold !== void 0 ? { autoCompactThreshold: input.autoCompactThreshold } : {}
+  };
+}
+function normalizeClaudeActiveTokenUsage(value, contextWindow, totalProcessedTokens) {
+  if (!value || typeof value !== "object") {
+    return void 0;
+  }
+  const usage = value;
+  const activeUsage = lastClaudeUsageIteration(usage) ?? usage;
+  const inputTokens = claudeUsageInputTokens(activeUsage);
+  const outputTokens = claudeUsageOutputTokens(activeUsage);
+  const activeTokens = claudeTotalProcessedTokens(activeUsage) ?? inputTokens + outputTokens;
+  if (activeTokens <= 0) {
+    return void 0;
+  }
+  return makeClaudeTokenUsageSnapshot({
+    activeTokens,
+    inputTokens,
+    outputTokens,
+    ...contextWindow !== void 0 ? { contextWindow } : {},
+    ...totalProcessedTokens !== void 0 ? { totalProcessedTokens } : {}
+  });
+}
+function compactBoundaryTokenUsageSnapshot(message, contextWindow, totalProcessedTokens) {
+  const metadata = message.compact_metadata;
+  if (!metadata || typeof metadata !== "object" || Array.isArray(metadata)) {
+    return void 0;
+  }
+  const compactMetadata = metadata;
+  const postTokens = finiteNonNegativeInteger(compactMetadata.post_tokens);
+  if (postTokens === void 0 || postTokens <= 0) {
+    return void 0;
+  }
+  const preTokens = finiteNonNegativeInteger(compactMetadata.pre_tokens);
+  return makeClaudeTokenUsageSnapshot({
+    activeTokens: postTokens,
+    ...preTokens !== void 0 ? { lastUsedTokens: preTokens } : {},
+    ...contextWindow !== void 0 ? { contextWindow } : {},
+    ...totalProcessedTokens !== void 0 ? { totalProcessedTokens } : {}
+  });
+}
+
 // src/adapter/sessionCallbacks.ts
 var makeSessionCallbacks = (deps) => {
   const { emitter, ensureSyntheticTurn, emitProposedPlanCompleted } = deps;
@@ -24834,18 +24804,6 @@ var makeSystemMessageHandler = (deps) => {
         return;
       }
       case "task_progress": {
-        await emitThreadTokenUsage(
-          context,
-          normalizeClaudeTaskProgressTokenUsage(message.usage, {
-            ...context.lastKnownTokenUsage === void 0 ? {} : { lastKnownTokenUsage: context.lastKnownTokenUsage },
-            ...context.lastKnownContextWindow === void 0 ? {} : { lastKnownContextWindow: context.lastKnownContextWindow },
-            ...context.lastKnownTotalProcessedTokens === void 0 ? {} : { lastKnownTotalProcessedTokens: context.lastKnownTotalProcessedTokens }
-          }),
-          {
-            rawMethod: "claude/system/task_progress",
-            rawPayload: message
-          }
-        );
         const linkage = taskLinkageFor(context.taskAgents, message.task_id);
         const typedUsage = normalizeTaskUsage(message.usage);
         const workflowPhases = parseWorkflowProgress(
@@ -24893,18 +24851,6 @@ var makeSystemMessageHandler = (deps) => {
       }
       case "task_notification": {
         context.liveTaskIds.delete(message.task_id);
-        await emitThreadTokenUsage(
-          context,
-          normalizeClaudeTaskProgressTokenUsage(message.usage, {
-            ...context.lastKnownTokenUsage === void 0 ? {} : { lastKnownTokenUsage: context.lastKnownTokenUsage },
-            ...context.lastKnownContextWindow === void 0 ? {} : { lastKnownContextWindow: context.lastKnownContextWindow },
-            ...context.lastKnownTotalProcessedTokens === void 0 ? {} : { lastKnownTotalProcessedTokens: context.lastKnownTotalProcessedTokens }
-          }),
-          {
-            rawMethod: "claude/system/task_notification",
-            rawPayload: message
-          }
-        );
         const typedUsage = normalizeTaskUsage(message.usage);
         offerRuntimeEvent(context, {
           ...base,
@@ -25175,9 +25121,7 @@ var makeTurnLifecycle = (deps) => {
     }
     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);
-    const resultTotalOnly = resultUsageRecord !== void 0 && !resultHasActiveUsage && claudeTotalProcessedTokens(resultUsageRecord) !== void 0;
-    const resultIterationSnapshot = resultUsageRecord ? normalizeClaudeActiveTokenUsage(
+    const resultIterationSnapshot = hasResultUsageIteration ? normalizeClaudeActiveTokenUsage(
       resultUsageRecord,
       maxTokens,
       accumulatedTotalProcessedTokens ?? context.lastKnownTotalProcessedTokens
@@ -25189,13 +25133,7 @@ var makeTurnLifecycle = (deps) => {
     );
     const lastGoodUsage = context.lastKnownTokenUsage;
     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 ? {
-        totalProcessedTokens: accumulatedTotalProcessedTokens
-      } : {}
-    } : resultIterationSnapshot) ?? (lastGoodUsage ? {
+    (context.turnState?.compactedSinceLatestAssistantUsage ? void 0 : resultIterationSnapshot) ?? (lastGoodUsage ? {
       ...lastGoodUsage,
       ...typeof maxTokens === "number" && Number.isFinite(maxTokens) && maxTokens > 0 ? { maxTokens } : {},
       ...typeof accumulatedTotalProcessedTokens === "number" && Number.isFinite(accumulatedTotalProcessedTokens) && accumulatedTotalProcessedTokens > lastGoodUsage.usedTokens ? {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.3094",
+  "version": "0.2.3102",
   "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.3094",
-    "ycodium-composer-tokens": "0.0.0",
+    "@ycodium-ai/plugin-api": "0.2.3102",
+    "ycodium-executor-testing": "0.0.0",
     "ycodium-jsonl-stream": "0.0.0",
-    "ycodium-executor-testing": "0.0.0"
+    "ycodium-composer-tokens": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",