@ycodium-ai/agent-claude 0.2.3265 → 0.2.3306

package/dist/index.js

@@ -22955,19 +22955,21 @@ function claudeSdkPermission(rules, mode) {
 }
 
 // src/adapter/permissionMode.ts
+var permissionControlError = (method, cause) => new Error(`${method} failed: ${toMessage(cause, String(cause))}`, { cause });
 var sameRules = (a, b3) => a.join("\n") === b3.join("\n");
 var permissionAllowInSync = (context) => sameRules(
   claudeSdkPermission(context.permissionRules, context.currentPermissionMode ?? "default").allow,
   context.currentPermissionAllow
 );
-async function applyClaudePermissionMode(context, mode, failAs) {
+async function applyClaudePermissionMode(context, mode, control) {
   const sdk = claudeSdkPermission(context.permissionRules, mode);
   try {
     await context.query.setPermissionMode(sdk.mode);
   } catch (cause) {
-    throw toRequestError(failAs.threadId, failAs.method, cause);
+    throw permissionControlError(control.method, cause);
   }
   context.currentPermissionMode = mode;
+  control.onModeApplied?.();
   const allow = sdk.allow;
   if (sameRules(allow, context.currentPermissionAllow)) return;
   try {
@@ -22975,7 +22977,7 @@ async function applyClaudePermissionMode(context, mode, failAs) {
       permissions: allow.length > 0 ? { allow: [...allow] } : null
     });
   } catch (cause) {
-    throw toRequestError(failAs.threadId, "session/applyFlagSettings", cause);
+    throw permissionControlError("session/applyFlagSettings", cause);
   }
   context.currentPermissionAllow = allow;
 }
@@ -23037,16 +23039,22 @@ var makeSendTurn = (deps) => {
       );
       context.currentEffort = getEffectiveClaudeAgentEffort(turnEffort ?? null) ?? void 0;
     }
-    if (input.interactionMode === "plan") {
-      await applyClaudePermissionMode(context, "plan", {
-        threadId: input.threadId,
-        method: "turn/setPermissionMode"
-      });
-    } else if (input.interactionMode === "default") {
-      await applyClaudePermissionMode(context, context.basePermissionMode ?? "default", {
-        threadId: input.threadId,
-        method: "turn/setPermissionMode"
-      });
+    try {
+      if (input.interactionMode === "plan") {
+        await applyClaudePermissionMode(context, "plan", {
+          method: "turn/setPermissionMode"
+        });
+      } else if (input.interactionMode === "default") {
+        await applyClaudePermissionMode(context, context.basePermissionMode ?? "default", {
+          method: "turn/setPermissionMode"
+        });
+      }
+    } catch (cause) {
+      const rejected = Object.assign(
+        cause instanceof Error ? cause : new Error(String(cause)),
+        { code: "provider-rejected" }
+      );
+      throw rejected;
     }
     const turnCapsForPrompt = claudeModelCapabilities(
       modelSelection?.model,
@@ -23155,6 +23163,16 @@ function claudeTotalProcessedTokens(value) {
   return total > 0 ? total : void 0;
 }
 var CLAUDE_COMPACTION_SUMMARY_MAX_CHARS = 8e3;
+function beginClaudeCompaction(context, randomUUIDv4) {
+  if (!context.compactionInProgress) {
+    context.compaction = {
+      compactionId: randomUUIDv4(),
+      trigger: context.pendingManualCompaction ? "manual" : "automatic"
+    };
+    context.compactionInProgress = true;
+    context.pendingManualCompaction = false;
+  }
+}
 function mergeClaudeCompactionSnapshot(snapshot, metadata) {
   const preTokens = finiteNonNegativeInteger(metadata?.pre_tokens);
   const postTokens = finiteNonNegativeInteger(metadata?.post_tokens);
@@ -23241,11 +23259,50 @@ function compactBoundaryTokenUsageSnapshot(message, contextWindow, totalProcesse
 }
 
 // src/adapter/sessionCallbacks.ts
+var CONTEXT_AFTER_COMPACTION_TIMEOUT_MS = 5e3;
 var makeSessionCallbacks = (deps) => {
   const { emitter, ensureSyntheticTurn, emitProposedPlanCompleted } = deps;
   const { randomUUIDv4, makeEventStamp, eventHeader, offerRuntimeEvent } = emitter;
   const forSession = (session) => {
     const { waitSessionContext, pendingApprovals, pendingUserInputs } = session;
+    let sessionContext;
+    const handlePreCompact = async () => {
+      const context = await waitSessionContext();
+      if (context) {
+        sessionContext = context;
+        beginClaudeCompaction(context, randomUUIDv4);
+      }
+      return {};
+    };
+    const handleSessionStart = async (hookInput) => {
+      if (hookInput.source !== "compact" || session.contextAfterCompaction === void 0) return {};
+      sessionContext ??= await waitSessionContext();
+      const compactionId = sessionContext?.compaction?.compactionId;
+      if (compactionId === void 0) return {};
+      const signal = AbortSignal.timeout(CONTEXT_AFTER_COMPACTION_TIMEOUT_MS);
+      const aborted = Promise.withResolvers();
+      const onAbort = () => aborted.reject(signal.reason);
+      signal.addEventListener("abort", onAbort, { once: true });
+      try {
+        signal.throwIfAborted();
+        const context = await Promise.race([
+          aborted.promise,
+          session.contextAfterCompaction({ compactionId, signal })
+        ]);
+        signal.throwIfAborted();
+        return typeof context === "string" && context.length > 0 ? {
+          hookSpecificOutput: {
+            hookEventName: "SessionStart",
+            additionalContext: context
+          }
+        } : {};
+      } catch {
+        session.log.warn("claude.compaction.contextUnavailable");
+        return {};
+      } finally {
+        signal.removeEventListener("abort", onAbort);
+      }
+    };
     const handleAskUserQuestion = async (context, toolInput, callbackOptions) => {
       const requestId = randomUUIDv4();
       const rawQuestions = Array.isArray(toolInput.questions) ? toolInput.questions : [];
@@ -23514,7 +23571,7 @@ var makeSessionCallbacks = (deps) => {
       });
     };
     const onUserDialog = (request, callbackOptions) => handleResumeDialog(request, callbackOptions);
-    return { canUseTool, onUserDialog, handlePostCompact };
+    return { canUseTool, onUserDialog, handlePostCompact, handlePreCompact, handleSessionStart };
   };
   return { forSession };
 };
@@ -23591,18 +23648,22 @@ var makeSessionControls = (deps) => {
       return;
     }
     const permissionMode = claudePermissionModeFor(runtimeMode);
-    context.basePermissionMode = permissionMode;
-    context.session = {
-      ...context.session,
-      runtimeMode,
-      nativeModeId: permissionMode,
-      updatedAt: nowIso()
+    const commitMode = () => {
+      context.basePermissionMode = permissionMode;
+      context.session = {
+        ...context.session,
+        runtimeMode,
+        nativeModeId: permissionMode,
+        updatedAt: nowIso()
+      };
     };
     if (context.currentPermissionMode !== "plan") {
       await applyClaudePermissionMode(context, permissionMode, {
-        threadId,
-        method: "session/setPermissionMode"
+        method: "session/setPermissionMode",
+        onModeApplied: commitMode
       });
+    } else {
+      commitMode();
     }
     if (permissionMode !== "bypassPermissions") {
       return;
@@ -23616,17 +23677,21 @@ var makeSessionControls = (deps) => {
     const context = requireSession(threadId);
     if (!isClaudeNativeModeId(nativeModeId)) return;
     if (context.currentPermissionMode === nativeModeId && permissionAllowInSync(context)) return;
-    context.basePermissionMode = nativeModeId;
-    context.session = {
-      ...context.session,
-      nativeModeId,
-      updatedAt: nowIso()
+    const commitMode = () => {
+      context.basePermissionMode = nativeModeId;
+      context.session = {
+        ...context.session,
+        nativeModeId,
+        updatedAt: nowIso()
+      };
     };
     if (context.currentPermissionMode !== "plan" || nativeModeId === "plan") {
       await applyClaudePermissionMode(context, nativeModeId, {
-        threadId,
-        method: "session/setPermissionMode"
+        method: "session/setPermissionMode",
+        onModeApplied: commitMode
       });
+    } else {
+      commitMode();
     }
     if (nativeModeId !== "bypassPermissions") {
       return;
@@ -24174,21 +24239,26 @@ var makeStartSession = (deps) => {
     const liveTaskIds = /* @__PURE__ */ new Set();
     const contextDeferred = Promise.withResolvers();
     const waitSessionContext = async () => {
+      let timer;
       try {
         return await Promise.race([
           contextDeferred.promise,
-          new Promise(
-            (resolve4) => setTimeout(() => resolve4(void 0), CLAUDE_SESSION_CONTEXT_WAIT_MS)
-          )
+          new Promise((resolve4) => {
+            timer = setTimeout(() => resolve4(void 0), CLAUDE_SESSION_CONTEXT_WAIT_MS);
+          })
         ]);
       } catch {
         return void 0;
+      } finally {
+        if (timer !== void 0) clearTimeout(timer);
       }
     };
-    const { canUseTool, onUserDialog, handlePostCompact } = sessionCallbacks.forSession({
+    const { canUseTool, onUserDialog, handlePostCompact, handlePreCompact, handleSessionStart } = sessionCallbacks.forSession({
       waitSessionContext,
       pendingApprovals,
-      pendingUserInputs
+      pendingUserInputs,
+      contextAfterCompaction: input.contextAfterCompaction,
+      log
     });
     const additionalDirectories = input.cwd ? [input.cwd] : [];
     const mcpServers = toClaudeMcpServers(input.mcpServers);
@@ -24230,7 +24300,8 @@ var makeStartSession = (deps) => {
         effort: effectiveEffort
       } : {},
       permissionMode: sdkPermission.mode,
-      ...permissionMode === "bypassPermissions" ? { allowDangerouslySkipPermissions: true } : {},
+      // SDK 要在启动时允许未来切入 Bypass；当前权限仍由 permissionMode 决定。
+      allowDangerouslySkipPermissions: true,
       ...Object.keys(querySettings).length > 0 ? { settings: querySettings } : {},
       ...existingResumeSessionId ? { resume: existingResumeSessionId } : {},
       ...newSessionId ? { sessionId: newSessionId } : {},
@@ -24238,6 +24309,16 @@ var makeStartSession = (deps) => {
       canUseTool,
       onUserDialog,
       hooks: {
+        ...input.contextAfterCompaction === void 0 ? {} : {
+          PreCompact: [{ hooks: [async () => handlePreCompact()] }],
+          SessionStart: [
+            {
+              hooks: [
+                async (hookInput) => hookInput.hook_event_name === "SessionStart" ? handleSessionStart(hookInput) : {}
+              ]
+            }
+          ]
+        },
         PostCompact: [
           {
             hooks: [
@@ -24902,7 +24983,8 @@ var makeSystemMessageHandler = (deps) => {
           ...base,
           type: "session.state.changed",
           payload: {
-            state: compacting ? "compacting" : "running",
+            // 空闲时切权限也会收到 status:null；它不能凭空启动一轮、堵住下一条排队消息。
+            state: compacting ? "compacting" : context.turnState ? "running" : "ready",
             reason: `status:${message.status ?? "active"}`,
             detail: message
           }
@@ -24911,14 +24993,7 @@ var makeSystemMessageHandler = (deps) => {
           context.compactionInProgress = false;
           return;
         }
-        if (!context.compactionInProgress) {
-          context.compaction = {
-            compactionId: randomUUIDv4(),
-            trigger: context.pendingManualCompaction ? "manual" : "automatic"
-          };
-          context.compactionInProgress = true;
-          context.pendingManualCompaction = false;
-        }
+        beginClaudeCompaction(context, randomUUIDv4);
         offerRuntimeEvent(context, {
           ...base,
           ...eventHeader(context, await makeEventStamp()),
@@ -28388,7 +28463,7 @@ var executors = [
 ];
 var index_default = definePlugin({
   id: "agent-claude",
-  apiVersion: 31,
+  apiVersion: 34,
   executors,
   activate(ctx) {
     capturedAttachments = ctx.attachments;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ycodium-ai/agent-claude",
-  "version": "0.2.3265",
+  "version": "0.2.3306",
   "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.3265",
+    "@ycodium-ai/plugin-api": "0.2.3306",
     "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-executor-testing": "0.0.0"
   },
   "ycodium": {
     "plugin": "./dist/index.js",