@junctionpanel/server 0.1.97 → 0.1.98

package/dist/server/server/agent/providers/claude-agent.js

@@ -216,8 +216,14 @@ const REWIND_COMMAND = {
     description: "Rewind tracked files to a previous user message",
     argumentHint: "[user_message_uuid]",
 };
-const INTERRUPT_TOOL_USE_PLACEHOLDER = "[Request interrupted by user for tool use]";
+const INTERRUPT_PLACEHOLDERS = new Set([
+    "[Request interrupted by user]",
+    "[Request interrupted by user for tool use]",
+]);
 const UUID_PATTERN = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-8][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i;
+function isInterruptPlaceholderText(text) {
+    return INTERRUPT_PLACEHOLDERS.has(text.trim());
+}
 function resolveClaudeBinary() {
     const claudePath = resolveCommandPathWithFallback("claude", {
         env: process.env,
@@ -387,10 +393,30 @@ function coerceToolResultContentToString(content) {
     }
     return deterministicStringify(content);
 }
+const CLAUDE_LOCAL_COMMAND_ENVELOPE_PATTERN = /^<local-command-(stdout|stderr)>\s*([\s\S]*?)\s*<\/local-command-\1>$/i;
+const CLAUDE_MODEL_SWITCH_ACK_PATTERN = /^set model to\b/i;
+function unwrapClaudeLocalCommandEnvelope(content) {
+    const match = CLAUDE_LOCAL_COMMAND_ENVELOPE_PATTERN.exec(content.trim());
+    if (!match) {
+        return null;
+    }
+    const innerText = match[2]?.trim() ?? "";
+    return innerText.length > 0 ? innerText : null;
+}
+function isHiddenClaudeLocalCommandText(content) {
+    const innerText = unwrapClaudeLocalCommandEnvelope(content);
+    if (!innerText) {
+        return false;
+    }
+    return CLAUDE_MODEL_SWITCH_ACK_PATTERN.test(innerText);
+}
 export function extractUserMessageText(content) {
     if (typeof content === "string") {
         const normalized = content.trim();
-        return normalized.length > 0 ? normalized : null;
+        if (normalized.length === 0 || isHiddenClaudeLocalCommandText(normalized)) {
+            return null;
+        }
+        return normalized;
     }
     if (!Array.isArray(content)) {
         return null;
@@ -414,7 +440,10 @@ export function extractUserMessageText(content) {
         return null;
     }
     const combined = parts.join("\n\n").trim();
-    return combined.length > 0 ? combined : null;
+    if (combined.length === 0 || isHiddenClaudeLocalCommandText(combined)) {
+        return null;
+    }
+    return combined;
 }
 const MAX_SUB_AGENT_LOG_ENTRIES = 200;
 const MAX_SUB_AGENT_SUMMARY_CHARS = 160;
@@ -597,14 +626,12 @@ function resolveClaudePermissionDecision(input) {
         return "prompt";
     }
     if (input.kind === "plan") {
-        return input.lastNonPlanMode === "bypassPermissions"
-            ? "allow_plan_transition"
-            : "prompt";
+        return "prompt";
     }
     if (input.kind !== "tool") {
         return "prompt";
     }
-    const effectiveMode = input.currentMode === "plan" ? input.lastNonPlanMode : input.currentMode;
+    const effectiveMode = input.currentMode;
     if (effectiveMode === "bypassPermissions") {
         return "allow_silent";
     }
@@ -909,8 +936,7 @@ class TimelineAssembler {
     emitNewContent(state) {
         const items = [];
         const nextAssistantText = state.assistantText.slice(state.emittedAssistantLength);
-        if (nextAssistantText.length > 0 &&
-            nextAssistantText !== INTERRUPT_TOOL_USE_PLACEHOLDER) {
+        if (nextAssistantText.length > 0 && !isInterruptPlaceholderText(nextAssistantText)) {
             state.emittedAssistantLength = state.assistantText.length;
             items.push({ type: "assistant_message", text: nextAssistantText });
         }
@@ -1226,26 +1252,6 @@ class ClaudeAgentSession {
                     updatedInput: input,
                 };
             }
-            if (decision === "allow_plan_transition") {
-                this.currentMode = "bypassPermissions";
-                this.cachedRuntimeInfo = null;
-                this.pushToolCall(mapClaudeCompletedToolCall({
-                    name: "plan_approval",
-                    callId: options.toolUseID ?? requestId,
-                    input,
-                    output: { approved: true, automatic: true },
-                }));
-                this.pushEvent({
-                    type: "permission_resolved",
-                    provider: "claude",
-                    requestId,
-                    resolution: { behavior: "allow" },
-                });
-                return {
-                    behavior: "allow",
-                    updatedInput: input,
-                };
-            }
             const metadata = {};
             if (options.toolUseID) {
                 metadata.toolUseId = options.toolUseID;
@@ -2026,8 +2032,7 @@ class ClaudeAgentSession {
             cwd: this.config.cwd,
             includePartialMessages: true,
             permissionMode: this.currentMode,
-            ...(this.currentMode === "bypassPermissions" ||
-                this.lastNonPlanMode === "bypassPermissions"
+            ...(this.currentMode === "bypassPermissions"
                 ? { allowDangerouslySkipPermissions: true }
                 : {}),
             agents: this.defaults?.agents,
@@ -2472,7 +2477,16 @@ class ClaudeAgentSession {
                 }
                 const activeRuns = this.runTracker.listActiveRuns();
                 if (activeRuns.length > 0) {
+                    const treatDoneAsInterrupted = this.pendingInterruptPromise !== null;
                     for (const run of activeRuns) {
+                        if (treatDoneAsInterrupted) {
+                            this.cancelRun(run, {
+                                type: "turn_canceled",
+                                provider: "claude",
+                                reason: "Interrupted",
+                            });
+                            continue;
+                        }
                         this.failRun(run, "Claude stream ended before terminal result");
                     }
                 }
@@ -2964,12 +2978,15 @@ class ClaudeAgentSession {
                     break;
                 }
                 if (typeof content === "string" && content.length > 0) {
-                    // String content from user messages (e.g., local command output)
+                    const normalizedText = extractUserMessageText(content);
+                    if (!normalizedText) {
+                        break;
+                    }
                     events.push({
                         type: "timeline",
                         item: {
                             type: "user_message",
-                            text: content,
+                            text: normalizedText,
                             ...(messageId ? { messageId } : {}),
                         },
                         provider: "claude",
@@ -3263,7 +3280,7 @@ class ClaudeAgentSession {
         const suppressAssistant = options?.suppressAssistantText ?? false;
         const suppressReasoning = options?.suppressReasoning ?? false;
         if (typeof content === "string") {
-            if (!content || content === INTERRUPT_TOOL_USE_PLACEHOLDER) {
+            if (!content || isInterruptPlaceholderText(content)) {
                 return [];
             }
             if (suppressAssistant) {
@@ -3276,7 +3293,7 @@ class ClaudeAgentSession {
             switch (block.type) {
                 case "text":
                 case "text_delta":
-                    if (block.text && block.text !== INTERRUPT_TOOL_USE_PLACEHOLDER) {
+                    if (block.text && !isInterruptPlaceholderText(block.text)) {
                         if (!suppressAssistant) {
                             items.push({ type: "assistant_message", text: block.text });
                         }
@@ -3718,6 +3735,74 @@ function normalizeHistoryBlocks(content) {
     }
     return null;
 }
+function formatProposedPlanBlock(planText) {
+    return `<proposed_plan>\n${planText}\n</proposed_plan>`;
+}
+function extractToolResultToolName(block) {
+    return (readTrimmedString(block.tool_name) ??
+        readTrimmedString(block.name) ??
+        null);
+}
+function isPlanApprovalToolResult(block) {
+    const toolName = extractToolResultToolName(block)?.toLowerCase() ?? "";
+    return toolName === "exitplanmode" || toolName === "plan_approval";
+}
+function extractApprovedPlanFromText(text) {
+    const match = text.match(/## Approved Plan(?: \(edited by user\))?:\s*([\s\S]*)$/i);
+    const planText = match?.[1]?.trim();
+    return planText && planText.length > 0 ? planText : null;
+}
+function extractApprovedPlanFromPayload(value) {
+    if (!isMetadata(value)) {
+        return null;
+    }
+    return readTrimmedString(value.plan) ?? null;
+}
+function extractApprovedPlanFromHistoryBlock(block) {
+    const type = readTrimmedString(block.type)?.toLowerCase() ?? "";
+    if (!type.includes("tool_result")) {
+        return null;
+    }
+    if (!isPlanApprovalToolResult(block)) {
+        return null;
+    }
+    const planFromPayload = extractApprovedPlanFromPayload(block.toolUseResult) ??
+        extractApprovedPlanFromPayload(block.tool_use_result);
+    if (planFromPayload) {
+        return planFromPayload;
+    }
+    const contentText = coerceToolResultContentToString(block.content).trim();
+    if (contentText.length === 0) {
+        return null;
+    }
+    return extractApprovedPlanFromText(contentText);
+}
+function extractApprovedPlanFromHistoryEntry(entry) {
+    if (entry?.type !== "user") {
+        return null;
+    }
+    const content = entry?.message?.content;
+    const normalizedBlocks = normalizeHistoryBlocks(content);
+    if (!normalizedBlocks) {
+        return null;
+    }
+    for (const block of normalizedBlocks) {
+        const planText = extractApprovedPlanFromHistoryBlock(block);
+        if (planText) {
+            return planText;
+        }
+    }
+    return null;
+}
+const APPROVED_PLAN_RESOLUTION_MARKER = "Plan approved. Execute it now.";
+function buildApprovedPlanTimelineItem(planText) {
+    // Append a resolved marker so replayed approved plans stay extractable as cards
+    // without being mistaken for an unresolved timeline-only plan review.
+    return {
+        type: "assistant_message",
+        text: `${formatProposedPlanBlock(planText)}\n\n${APPROVED_PLAN_RESOLUTION_MARKER}`,
+    };
+}
 export function convertClaudeHistoryEntry(entry, mapBlocks) {
     if (entry.type === "system" && entry.subtype === "compact_boundary") {
         const compactMetadata = readCompactionMetadata(entry);
@@ -3762,6 +3847,7 @@ export function convertClaudeHistoryEntry(entry, mapBlocks) {
             return [taskNotificationItem];
         }
     }
+    const approvedPlan = extractApprovedPlanFromHistoryEntry(entry);
     const timeline = [];
     if (entry.type === "user") {
         const text = extractUserMessageText(content);
@@ -3777,7 +3863,17 @@ export function convertClaudeHistoryEntry(entry, mapBlocks) {
         const mapped = mapBlocks(normalizedBlocks);
         if (entry.type === "user") {
             const toolItems = mapped.filter((item) => item.type === "tool_call");
-            return timeline.length ? [...timeline, ...toolItems] : toolItems;
+            const nextTimeline = timeline.length
+                ? [
+                    ...timeline,
+                    ...(approvedPlan ? [buildApprovedPlanTimelineItem(approvedPlan)] : []),
+                    ...toolItems,
+                ]
+                : [
+                    ...(approvedPlan ? [buildApprovedPlanTimelineItem(approvedPlan)] : []),
+                    ...toolItems,
+                ];
+            return nextTimeline;
         }
         return mapped;
     }
@@ -3962,22 +4058,26 @@ async function parseClaudeSessionDescriptor(filePath, mtime) {
         timeline,
     };
 }
-function extractClaudeUserText(message) {
+export function extractClaudeUserText(message) {
     if (!message) {
         return null;
     }
     if (typeof message.content === "string") {
-        return message.content.trim();
+        const normalized = message.content.trim();
+        if (normalized.length === 0 || isHiddenClaudeLocalCommandText(normalized)) {
+            return null;
+        }
+        return normalized;
     }
     if (typeof message.text === "string") {
-        return message.text.trim();
+        const normalized = message.text.trim();
+        if (normalized.length === 0 || isHiddenClaudeLocalCommandText(normalized)) {
+            return null;
+        }
+        return normalized;
     }
     if (Array.isArray(message.content)) {
-        for (const block of message.content) {
-            if (block && typeof block.text === "string") {
-                return block.text.trim();
-            }
-        }
+        return extractUserMessageText(message.content);
     }
     return null;
 }