npm - agentquad - Versions diffs - 0.4.4 → 0.4.5 - Mend

agentquad 0.4.4 → 0.4.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

package/dist-web/assets/{index-CEiuiF0m.css → index-8A0oLLcX.css} +1 -1
package/dist-web/assets/{index-DuZ_lMdf.js → index-By--XlP3.js} +240 -236
package/dist-web/index.html +2 -2
package/package.json +1 -1
package/src/config.js +26 -20
package/src/pty.js +80 -5
package/src/routes/ai-terminal.js +58 -0
package/src/server.js +3 -12
package/src/transcript.js +17 -4

package/dist-web/index.html CHANGED Viewed

@@ -5,8 +5,8 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <link rel="icon" type="image/png" href="/favicon.png" />
     <title>AgentQuad</title>
-    <script type="module" crossorigin src="/assets/index-DuZ_lMdf.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-CEiuiF0m.css">
+    <script type="module" crossorigin src="/assets/index-By--XlP3.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-8A0oLLcX.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "agentquad",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "AgentQuad — local four-quadrant AI task scheduler with embedded Claude Code / Codex terminals",
   "license": "MIT",
   "author": "LIUZHENHUA521",

package/src/config.js CHANGED Viewed

@@ -217,12 +217,6 @@ function runtimeBinOverride(name) {
 	return process.env[`${name.toUpperCase()}_BIN`] || null;
 }
-function isStaleLegacyBin(name, configuredCommand, configuredBin, detectedBin) {
-	if (!configuredCommand || !configuredBin) return false;
-	if (configuredBin === detectedBin) return false;
-	return basename(configuredBin) === name;
-}
 function getToolMetadata(name, tools = {}) {
 	const normalizedTool = normalizeToolConfig(name, tools?.[name], {
 		applyDefaultCommand: false,
@@ -232,12 +226,9 @@ function getToolMetadata(name, tools = {}) {
 	const configuredBin = normalizedTool.bin || null;
 	const effectiveCommand = configuredCommand || defaultToolCommand(name);
 	const detectedBin = detectBinary(effectiveCommand);
-	const staleLegacyBin = isStaleLegacyBin(
-		name,
-		configuredCommand,
-		configuredBin,
-		detectedBin,
-	);
+	// effectiveBin 与 PTY 实际启动顺序保持一致：env override > 用户字面 bin > PATH 探测兜底。
+	// 不再用 basename 启发式自动改写用户的字面值（option C：用户输入即真理）。
+	const effectiveBin = envBin || configuredBin || detectedBin;
 	const source = envBin
 		? "env"
 		: configuredBin
@@ -253,8 +244,7 @@ function getToolMetadata(name, tools = {}) {
 		configuredCommand: configuredCommand || null,
 		effectiveCommand,
 		configuredBin,
-		effectiveBin:
-			envBin || (staleLegacyBin ? detectedBin : configuredBin) || detectedBin,
+		effectiveBin,
 		args: normalizedTool.args,
 		source,
 		installHint: TOOL_INSTALL_HINTS[name] || null,
@@ -266,12 +256,16 @@ export function resolveToolsConfig(tools = {}) {
 	const out = {};
 	for (const name of SUPPORTED_TOOLS) {
 		const normalized = normalizeToolConfig(name, tools[name]);
-		const meta = getToolMetadata(name, { ...tools, [name]: normalized });
+		// 不再用 `command -v` 自动填充 bin —— 用户输入即真理。
+		// 仍保留 env override（<TOOL>_BIN，runtime 调试用），优先级高于配置文件，
+		// 但绝不写回 config.json。
+		// PTY 启动时 bin 为空会 fallback 到 command 名走 PATH 解析。
+		const envBin = runtimeBinOverride(name);
 		out[name] = {
 			...normalized,
-			command: meta.effectiveCommand,
-			bin: meta.effectiveBin,
-			args: meta.args,
+			command: normalized.command || defaultToolCommand(name),
+			bin: envBin || normalized.bin || "",
+			args: normalized.args,
 		};
 	}
 	return out;
@@ -281,10 +275,13 @@ export function inspectToolsConfig(tools = {}) {
 	const resolved = resolveToolsConfig(tools);
 	const out = {};
 	for (const name of SUPPORTED_TOOLS) {
+		const meta = getToolMetadata(name, tools);
 		out[name] = {
-			...getToolMetadata(name, tools),
+			...meta,
 			command: resolved[name].command,
-			bin: resolved[name].bin,
+			// 诊断行"当前有效路径"显示的是 envBin / configuredBin / detectedBin 三路兜底的值，
+			// 让用户能看到 PATH 探测会落到哪里；这里跟 resolved.bin（仅用户字面值）刻意分开。
+			bin: meta.effectiveBin,
 		};
 	}
 	return out;
@@ -313,6 +310,11 @@ function defaultConfig() {
 		host: "127.0.0.1",
 		defaultCwd: homedir(),
 		defaultPermissionMode: "default",
+		// 新建待办时是否默认勾选「创建后自动启动 AI 终端」。
+		// Drawer 上的开关仍可单次覆盖；这里只是默认值。
+		defaultAutoStartAi: false,
+		// 自动启动 / dispatch / 顶栏 ⌘K 等场景下使用的默认 AI 工具。
+		defaultAiTool: "claude",
 		tools: resolveToolsConfig(),
 		webhook: { ...DEFAULT_WEBHOOK_CONFIG },
 		openclaw: {
@@ -372,10 +374,14 @@ export function normalizeConfig(cfg = {}) {
 		};
 		finalTools[name] = normalizeToolConfig(name, mergedTools[name]);
 	}
+	const rawDefaultAiTool = typeof cfg.defaultAiTool === "string" ? cfg.defaultAiTool.trim() : "";
+	const defaultAiTool = SUPPORTED_TOOLS.includes(rawDefaultAiTool) ? rawDefaultAiTool : defaults.defaultAiTool;
 	return {
 		...defaults,
 		...cfgRest,
 		defaultPermissionMode: normalizePermissionMode(cfg.defaultPermissionMode, "default"),
+		defaultAutoStartAi: !!cfg.defaultAutoStartAi,
+		defaultAiTool,
 		tools: {
 			...mergedTools,
 			...finalTools,

package/src/pty.js CHANGED Viewed

@@ -64,6 +64,7 @@ const TUI_ALERT_COOLDOWN_MS = 30_000
 const CLAUDE_SESSION_RE = /claude\s+--resume\s+([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/
 const CODEX_SESSION_RE = /codex\s+resume\s+([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})/
 const CODEX_ROLLOUT_FILE_RE = /^rollout-.*-([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/
+const CLAUDE_JSONL_FILE_RE = /^([0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})\.jsonl$/
 const MAX_LOG_BYTES = 512 * 1024
 const CODEX_SESSIONS_DIR = join(homedir(), '.codex', 'sessions')
@@ -143,6 +144,44 @@ function detectCodexSessionFromFs(afterMs) {
   return newest
 }
+// Claude 把 JSONL 写到 ~/.claude/projects/<cwd-hash>/<uuid>.jsonl。我们在 spawn
+// 时通过 --session-id <presetClaudeId> 把 UUID 推下去，理想情况下 Claude 会用这个
+// UUID 写文件，session.nativeId 直接对得上。
+//
+// 但部分代理 / wrapper（mira / trae 之类）会再 spawn 一次 claude、丢掉 --session-id，
+// 或自家 fork 不识别这个 flag → Claude 用自己生成的 UUID 写 JSONL → session.nativeId
+// 与磁盘上不一致 → loadTranscript 找不到文件 → 兜底成 PTY raw → Conversation
+// 整段 banner 塌掉。
+//
+// 形态对齐 detectCodexSessionFromFs：扫所有 project 目录里 mtime > spawnTime 的
+// <uuid>.jsonl，挑最新一个的 UUID。命中后由 _setNativeId 去重 + 覆盖。
+function detectClaudeSessionFromFs(afterMs) {
+  if (!existsSync(CLAUDE_PROJECTS_DIR)) return null
+  let dirs
+  try { dirs = readdirSync(CLAUDE_PROJECTS_DIR, { withFileTypes: true }) } catch { return null }
+  let newest = null
+  let newestTime = 0
+  for (const dirent of dirs) {
+    if (!dirent.isDirectory()) continue
+    const projDir = join(CLAUDE_PROJECTS_DIR, dirent.name)
+    let files
+    try { files = readdirSync(projDir) } catch { continue }
+    for (const f of files) {
+      const m = f.match(CLAUDE_JSONL_FILE_RE)
+      if (!m) continue
+      try {
+        const st = statSync(join(projDir, f))
+        const t = st.birthtimeMs || st.ctimeMs
+        if (t > afterMs && t > newestTime) {
+          newest = m[1]
+          newestTime = t
+        }
+      } catch { /* ignore */ }
+    }
+  }
+  return newest
+}
 function tryReadCwdFromSessionMeta(filePath) {
   try {
     const head = readFileSync(filePath, 'utf8').split('\n').slice(0, 2)
@@ -449,9 +488,11 @@ export class PtyManager extends EventEmitter {
     // cursor-agent 没有 --session-id 预置，但有 `cursor-agent create-chat` 异步建会话拿 chatId。
     // 新会话先异步跑 create-chat，拿到 chatId 后在 startWithSize() 里用 --resume 进交互模式。
     // create-chat 失败就降级（无 nativeId，直接传 prompt）。
+    // bin 为空时 fallback 到 command 名，让 execFile / spawn 走 PATH 解析。
+    const spawnFile = (toolCfg.bin && String(toolCfg.bin).trim()) || toolCfg.command
     let cursorChatPromise = null
     if (tool === 'cursor' && !resumeNativeId) {
-      cursorChatPromise = createCursorChatAsync(toolCfg.bin)
+      cursorChatPromise = createCursorChatAsync(spawnFile)
     }
     const cursorResumeId = tool === 'cursor' ? resumeNativeId : null
@@ -533,6 +574,7 @@ export class PtyManager extends EventEmitter {
         effectiveCwd,
         toolCfg,
         tool,
+        spawnFile,
         resumeNativeId: resumeNativeId || null,
         _baseArgs: [...baseArgs],
         _permissionArgs: [...permissionArgs],
@@ -572,14 +614,14 @@ export class PtyManager extends EventEmitter {
     const spec = session.spawnSpec
     if (!spec) throw new Error(`session ${sessionId} has no spawnSpec (was it created?)`)
-    const { args, env, effectiveCwd, toolCfg, tool } = spec
+    const { args, env, effectiveCwd, toolCfg, tool, spawnFile } = spec
     const { resumeNativeId } = spec
-    console.log(`[pty] starting ${tool} bin=${toolCfg.bin} cwd=${effectiveCwd} args=${JSON.stringify(args)} cols=${cols} rows=${rows}`)
+    console.log(`[pty] starting ${tool} spawnFile=${spawnFile} (configured bin=${toolCfg.bin || '<empty>'}) cwd=${effectiveCwd} args=${JSON.stringify(args)} cols=${cols} rows=${rows}`)
     let proc
     try {
-      proc = this.ptyFactory(toolCfg.bin, args, {
+      proc = this.ptyFactory(spawnFile, args, {
         name: 'xterm-256color',
         cols,
         rows,
@@ -594,7 +636,7 @@ export class PtyManager extends EventEmitter {
         try { if (existsSync(session.mcpConfigPath)) unlinkSync(session.mcpConfigPath) } catch { /* ignore */ }
       }
       this.sessions.delete(sessionId)
-      error.message = `PTY spawn failed for ${tool} (bin=${toolCfg.bin}, cwd=${effectiveCwd}, args=${JSON.stringify(args)}): ${error.message}`
+      error.message = `PTY spawn failed for ${tool} (spawnFile=${spawnFile}, cwd=${effectiveCwd}, args=${JSON.stringify(args)}): ${error.message}`
       throw error
     }
     session.proc = proc
@@ -669,6 +711,39 @@ export class PtyManager extends EventEmitter {
       session.detectTimer.unref?.()
     }
+    // Claude 新会话：虽然 spawn 时已经传了 --session-id <presetClaudeId> 把 UUID
+    // 推下去（session.nativeId 也立刻设上），但代理/wrapper（mira / trae 等）会
+    // 在转发链路里丢掉 --session-id 或自家 fork claude → Claude 写 JSONL 时用自己
+    // 的 UUID → session.nativeId 对不上磁盘 → loadTranscript 兜底成 PTY raw。
+    //
+    // 这里加一道 FS 轮询治本：扫到 mtime > spawnTime 的真实 UUID，跟 session.nativeId
+    // 比一比；如果一致说明 preset 被 honor，停掉轮询即可；不一致则 _setNativeId 覆盖。
+    if (!resumeNativeId && tool === 'claude') {
+      const spawnTime = Date.now() - 1000
+      let detectAttempts = 0
+      const presetIdShort = session.nativeId?.slice(0, 8)
+      console.log(`[claude-detect] poll started session=${sessionId} preset=${presetIdShort} spawnTime=${spawnTime}`)
+      session.detectTimer = setInterval(() => {
+        detectAttempts++
+        const id = detectClaudeSessionFromFs(spawnTime)
+        if (id) {
+          if (id !== session.nativeId) {
+            console.log(`[claude-detect] poll attempt=${detectAttempts} OVERRIDE ${session.nativeId?.slice(0, 8)} → ${id.slice(0, 8)} (--session-id likely ignored by wrapper)`)
+            this._setNativeId(session, id)
+          } else {
+            console.log(`[claude-detect] poll attempt=${detectAttempts} preset honored, stop`)
+            clearInterval(session.detectTimer)
+            session.detectTimer = null
+          }
+        } else if (detectAttempts >= 30) {
+          console.warn(`[claude-detect] poll GAVE UP after 30 attempts (12s) for session=${sessionId} — no jsonl matching afterMs=${spawnTime} under ${CLAUDE_PROJECTS_DIR}`)
+          clearInterval(session.detectTimer)
+          session.detectTimer = null
+        }
+      }, 400)
+      session.detectTimer.unref?.()
+    }
     proc.onData((data) => {
       session.fullLog.push(data)
       session.logBytes += data.length

package/src/routes/ai-terminal.js CHANGED Viewed

@@ -1231,6 +1231,27 @@ export function createAiTerminal({ db, pty, logDir, defaultCwd, getDefaultCwd, o
     nativeSessionMap.clear()
   }
+  // recoverPendingTodosOnStartup 的 spawn 失败 catch 路径用：把 mergeTodoAiSessions
+  // 之前刚写进 DB 的 status='running' 那条改回 'failed'，其它 aiSessions 原样保留。
+  function markRecoveryFailed(todoId, sessionId) {
+    try {
+      const todoNow = db.getTodo(todoId)
+      if (!todoNow) return
+      const aiSessions = Array.isArray(todoNow.aiSessions) ? todoNow.aiSessions : []
+      let mutated = false
+      const next = aiSessions.map((s) => {
+        if (s?.sessionId === sessionId) {
+          mutated = true
+          return { ...s, status: 'failed', completedAt: Date.now() }
+        }
+        return s
+      })
+      if (mutated) db.updateTodo(todoId, { aiSessions: next })
+    } catch (e) {
+      console.warn('[ai-terminal] markRecoveryFailed failed:', e.message)
+    }
+  }
   function recoverPendingTodosOnStartup() {
     // 启动期一次性读 config：恢复一条没记 permissionMode 的老 session 时回退到全局默认。
     // 用户在设置里选了"完全托管"但 DB 里没存 → 这里把意图重新接上，否则 claude --resume
@@ -1329,6 +1350,10 @@ export function createAiTerminal({ db, pty, logDir, defaultCwd, getDefaultCwd, o
           todoSessionMap.delete(todo.id)
           const nativeKey = `${recoverable.tool}:${recoverable.nativeSessionId}`
           if (nativeSessionMap.get(nativeKey) === sessionId) nativeSessionMap.delete(nativeKey)
+          // recoverPendingTodosOnStartup 此前已 mergeTodoAiSessions 把该 session 写成
+          // status='running'；spawn 失败必须把那条改回 'failed'，否则前端读到 running
+          // 会渲染"运行中"且没有对应 PTY。与 markOrphanedSessionsAsFailed 互为冗余。
+          markRecoveryFailed(todo.id, sessionId)
           db.updateTodo(todo.id, { status: 'todo' })
         })
       } catch (e) {
@@ -1337,6 +1362,7 @@ export function createAiTerminal({ db, pty, logDir, defaultCwd, getDefaultCwd, o
         todoSessionMap.delete(todo.id)
         const nativeKey = `${recoverable.tool}:${recoverable.nativeSessionId}`
         if (nativeSessionMap.get(nativeKey) === sessionId) nativeSessionMap.delete(nativeKey)
+        markRecoveryFailed(todo.id, sessionId)
         db.updateTodo(todo.id, { status: 'todo' })
       }
     }
@@ -1372,8 +1398,40 @@ export function createAiTerminal({ db, pty, logDir, defaultCwd, getDefaultCwd, o
     }
   }
+  // 服务硬重启 / crash 时 PTY 进程没机会触发 onExit，DB 里 aiSession.status='running'
+  // (或 idle / pending_confirm) 会留作"僵尸"，前端读到后渲染成「运行中」却没有对应 PTY。
+  // 启动期一次性把所有"看起来还活着但无对应 live PTY"的 aiSession 改成 'failed'。
+  // 必须在 recoverPendingTodosOnStartup 之后调用：成功 recover 的 session 此时已在
+  // nativeSessionMap 里，扫描会跳过它们；只有真正的孤儿会被改写。
+  function markOrphanedSessionsAsFailed() {
+    const ALIVE_LOOKING = new Set(['running', 'idle', 'pending_confirm'])
+    let swept = 0
+    try {
+      for (const todo of db.listTodos()) {
+        const aiSessions = Array.isArray(todo.aiSessions) ? todo.aiSessions : []
+        let changed = false
+        const nextSessions = aiSessions.map((s) => {
+          if (!s || !ALIVE_LOOKING.has(s.status)) return s
+          const key = s.tool && s.nativeSessionId ? `${s.tool}:${s.nativeSessionId}` : null
+          if (key && nativeSessionMap.has(key)) return s
+          changed = true
+          return { ...s, status: 'failed', completedAt: Date.now() }
+        })
+        if (!changed) continue
+        db.updateTodo(todo.id, { aiSessions: nextSessions })
+        swept += 1
+      }
+      if (swept > 0) {
+        console.log(`[ai-terminal] orphan sweep: marked ${swept} sessions as failed`)
+      }
+    } catch (e) {
+      console.warn('[ai-terminal] markOrphanedSessionsAsFailed failed:', e.message)
+    }
+  }
   sweepStuckPendingConfirm()
   recoverPendingTodosOnStartup()
+  markOrphanedSessionsAsFailed()
   return {
     router,

package/src/server.js CHANGED Viewed

@@ -369,21 +369,12 @@ function buildNativeResumeCommand(tool, nativeSessionId, tools = {}) {
 }
 function mergeToolConfig(currentTool = {}, nextTool = {}) {
-	const merged = {
+	// 用户字段即真理：直接合并，不再因为 command 变了就悄悄清空 bin。
+	// PTY 启动时 bin 为空会 fallback 到 command 名走 PATH 解析。
+	return {
 		...currentTool,
 		...nextTool,
 	};
-	const commandChanged =
-		nextTool.command !== undefined &&
-		nextTool.command !== (currentTool.command || "");
-	const binUnchanged =
-		nextTool.bin !== undefined && nextTool.bin === (currentTool.bin || "");
-	if (commandChanged && binUnchanged) {
-		merged.bin = "";
-	}
-	return merged;
 }
 function splitEditorPath(rawPath = "") {

package/src/transcript.js CHANGED Viewed

@@ -91,10 +91,23 @@ function parseClaudeJsonl(filePath) {
 }
 function findClaudeFile(cwd, nativeSessionId) {
-  if (!cwd || !nativeSessionId) return null
-  const projDir = join(CLAUDE_PROJECTS_DIR, claudeProjectHash(cwd))
-  const file = join(projDir, `${nativeSessionId}.jsonl`)
-  return existsSync(file) ? file : null
+  if (!nativeSessionId) return null
+  // 优先按 cwd 哈希命中预期路径（多数场景的 fast path）
+  if (cwd) {
+    const file = join(CLAUDE_PROJECTS_DIR, claudeProjectHash(cwd), `${nativeSessionId}.jsonl`)
+    if (existsSync(file)) return file
+  }
+  // 兜底：cwd 哈希漂移（symlink / 特殊字符 / Claude 内部规范化差异）时，按 UUID
+  // 全局唯一性遍历所有 project 目录。命中是确定的，不会误伤。
+  if (!existsSync(CLAUDE_PROJECTS_DIR)) return null
+  let entries
+  try { entries = readdirSync(CLAUDE_PROJECTS_DIR, { withFileTypes: true }) } catch { return null }
+  for (const dirent of entries) {
+    if (!dirent.isDirectory()) continue
+    const file = join(CLAUDE_PROJECTS_DIR, dirent.name, `${nativeSessionId}.jsonl`)
+    if (existsSync(file)) return file
+  }
+  return null
 }
 function findCodexFile(nativeSessionId) {