@co0ontty/wand 1.21.7 → 1.21.9

package/dist/config.js

@@ -188,7 +188,7 @@ export function applyStoragePreferences(config, storage) {
             config.defaultModel = v.trim();
     }
     if (storage.hasPreference(preferenceStorageKey("structuredRunner"))) {
-        const v = storage.getPreference(preferenceStorageKey("structuredRunner"), defaults.structuredRunner ?? "sdk");
+        const v = storage.getPreference(preferenceStorageKey("structuredRunner"), defaults.structuredRunner ?? "cli");
         if (v === "cli" || v === "sdk")
             config.structuredRunner = v;
     }

package/dist/server.js

@@ -724,7 +724,7 @@ export async function startServer(config, configPath) {
             defaultMode: config.defaultMode,
             defaultCwd: config.defaultCwd,
             commandPresets: config.commandPresets,
-            structuredRunner: config.structuredRunner ?? "sdk",
+            structuredRunner: config.structuredRunner ?? "cli",
             structuredRunners: [
                 { label: "Claude Structured", runner: "claude-cli-print" },
                 { label: "Codex Structured", runner: "codex-cli-exec" },

package/dist/structured-session-manager.js

@@ -1,5 +1,7 @@
 import { randomUUID } from "node:crypto";
 import { spawn } from "node:child_process";
+import { createRequire } from "node:module";
+import { existsSync } from "node:fs";
 import { prepareSessionWorktree } from "./git-worktree.js";
 import { truncateMessagesForTransport } from "./message-truncator.js";
 function defaultStructuredRunner(provider) {
@@ -24,6 +26,47 @@ const ARCHIVE_AFTER_MS = 1000 * 60 * 60 * 24;
 function isRunningAsRoot() {
     return process.getuid?.() === 0 || process.geteuid?.() === 0;
 }
+/**
+ * 检测当前系统是否使用 musl libc（Alpine Linux 等）。
+ * Node.js 进程报告中 glibcVersionRuntime 仅在 glibc 系统存在；musl 系统为 undefined。
+ */
+function isMuslSystem() {
+    try {
+        const header = process.report?.getReport()?.header;
+        return !header?.glibcVersionRuntime;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * 解析 claude-agent-sdk 应使用的 native binary 路径。
+ * SDK 默认在 Linux 上优先选 musl 包，但 glibc 系统（Debian/Ubuntu 等）跑不动 musl binary，
+ * 会抛 "Claude Code native binary not found" 错误。这里手动按 libc 类型选正确的包，
+ * 找不到时回退到系统 PATH 上的 `claude`。
+ */
+function resolveSdkClaudeBinary() {
+    if (process.platform !== "linux")
+        return undefined;
+    const musl = isMuslSystem();
+    const arch = process.arch;
+    const require = createRequire(import.meta.url);
+    // 按当前 libc 类型决定优先顺序
+    const candidates = musl
+        ? [`@anthropic-ai/claude-agent-sdk-linux-${arch}-musl/claude`, `@anthropic-ai/claude-agent-sdk-linux-${arch}/claude`]
+        : [`@anthropic-ai/claude-agent-sdk-linux-${arch}/claude`, `@anthropic-ai/claude-agent-sdk-linux-${arch}-musl/claude`];
+    for (const pkg of candidates) {
+        try {
+            const resolved = require.resolve(pkg);
+            if (existsSync(resolved))
+                return resolved;
+        }
+        catch {
+            // 包不存在，继续
+        }
+    }
+    return undefined;
+}
 /**
  * 找出最后一条 assistant turn 中尚未配对 tool_result 的 AskUserQuestion tool_use。
  * 用来识别"刚被 SIGTERM 中断、正在等用户提交答案"的状态。
@@ -1491,6 +1534,7 @@ export class StructuredSessionManager {
                 ? "请使用中文回复。所有解释、注释和对话文本都使用中文。"
                 : `Please respond in ${language}. Use ${language} for all your explanations, comments, and conversational text.`);
         }
+        const sdkClaudeBinary = resolveSdkClaudeBinary();
         const sdkOptions = {
             cwd: session.cwd,
             abortController,
@@ -1500,6 +1544,7 @@ export class StructuredSessionManager {
             ...(isManaged ? { disallowedTools: ["AskUserQuestion"] } : {}),
             includePartialMessages: true,
             ...(systemPromptParts.length > 0 ? { appendSystemPrompt: systemPromptParts.join("\n\n") } : {}),
+            ...(sdkClaudeBinary ? { pathToClaudeCodeExecutable: sdkClaudeBinary } : {}),
         };
         if (session.claudeSessionId)
             sdkOptions.resume = session.claudeSessionId;

package/dist/web-ui/content/scripts.js

@@ -7537,7 +7537,7 @@
             if (langEl) langEl.value = cfg.language || "";
 
             var srEl = document.getElementById("cfg-structured-runner");
-            if (srEl) srEl.value = cfg.structuredRunner || "sdk";
+            if (srEl) srEl.value = cfg.structuredRunner || "cli";
 
             // Default model
             state.configDefaultModel = cfg.defaultModel || "";
@@ -7597,7 +7597,7 @@
           shell: (document.getElementById("cfg-shell") || {}).value,
           language: (document.getElementById("cfg-language") || {}).value || "",
           defaultModel: (document.getElementById("cfg-default-model") || {}).value || "",
-          structuredRunner: (document.getElementById("cfg-structured-runner") || {}).value || "sdk",
+          structuredRunner: (document.getElementById("cfg-structured-runner") || {}).value || "cli",
         };
 
         var previousDefaultModel = (state.config && state.config.defaultModel) || "";
@@ -15597,7 +15597,7 @@
       // ── Native Live Progress Sync ──
 
       var _progressSyncTimers = {};
-      var _PROGRESS_SYNC_DEBOUNCE_MS = 300;
+      var _PROGRESS_SYNC_DEBOUNCE_MS = 100;
 
       // Strip markdown formatting and clamp to a single short line so the
       // native Live Activity / lock-screen card stays readable. 100 chars
@@ -15647,6 +15647,7 @@
         var todos = null;
         var latestUserText = "";
         var latestAssistantText = "";
+        var recentUserTexts = [];
         var messages = session.messages || [];
         for (var i = messages.length - 1; i >= 0; i--) {
           var msg = messages[i];
@@ -15662,7 +15663,7 @@
             }
           }
 
-          if (!latestUserText && msg.role === "user") {
+          if (msg.role === "user") {
             // Skip queued / synthetic placeholder turns — they don't represent
             // user-visible "I just asked this" prompts.
             var isPlaceholder = msg.content.some(function(b) { return b && b.__queued; });
@@ -15670,7 +15671,9 @@
               for (var ui = 0; ui < msg.content.length; ui++) {
                 var ublock = msg.content[ui];
                 if (ublock && ublock.type === "text" && ublock.text && ublock.text.trim()) {
-                  latestUserText = _compactNotificationText(ublock.text);
+                  var utext = _compactNotificationText(ublock.text);
+                  if (!latestUserText) latestUserText = utext;
+                  if (recentUserTexts.length < 4) recentUserTexts.push(utext);
                   break;
                 }
               }
@@ -15688,8 +15691,9 @@
             }
           }
 
-          if (todos && latestUserText && latestAssistantText) break;
+          if (todos && recentUserTexts.length >= 4 && latestAssistantText) break;
         }
+        recentUserTexts.reverse();
 
         // Get current task
         var currentTask = "";
@@ -15703,7 +15707,8 @@
           currentTask: currentTask,
           latestUserText: latestUserText,
           latestAssistantText: latestAssistantText,
-          todos: todos || []
+          todos: todos || [],
+          recentUserTexts: recentUserTexts
         };
 
         try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@co0ontty/wand",
-  "version": "1.21.7",
+  "version": "1.21.9",
   "description": "A web terminal for local CLI tools like Claude.",
   "type": "module",
   "bin": {