deskbuddy 0.2.0-beta.4 → 0.2.0-beta.6

package/dist/cli.js

@@ -3873,9 +3873,17 @@ function tooLongToInject(text) {
 function prepare(text) {
   return " " + oneLine(text);
 }
+var TRUST_RE = /trust (the files in )?this folder|Yes, I trust this folder/i;
+var PLACEHOLDER_RE = /^Try ".*"$/;
+function isTerminalReport(s) {
+  if (!s) return true;
+  const rest = s.replace(/\x1b\[[IO]/g, "").replace(/\x1b\[\d+;\d+R/g, "").replace(/\x1b\[[?>][\d;]*\$?[a-zA-Z]/g, "").replace(/\x1b\][^\x07\x1b]*(?:\x07|\x1b\\)/g, "").replace(/\x1bP[^\x1b]*\x1b\\/g, "");
+  return rest === "";
+}
 var PERMISSION_RE = /Do you want to (proceed|make|create|run|allow)|[❯>]\s*1\. Yes/;
-function inspectLines(lines2) {
+function inspectLines(lines2, undimmed) {
   const text = lines2.join("\n");
+  const trust = TRUST_RE.test(text);
   const permission = PERMISSION_RE.test(text);
   const rules = [];
   lines2.forEach((l, i) => {
@@ -3885,9 +3893,13 @@ function inspectLines(lines2) {
   if (rules.length >= 2) {
     const a = rules[rules.length - 2];
     const b = rules[rules.length - 1];
-    input = lines2.slice(a + 1, b).join("\n").replace(/^\s*[❯>]\s?/, "").trimEnd();
+    const src = undimmed && undimmed.length === lines2.length ? undimmed : lines2;
+    input = src.slice(a + 1, b).map((l) => l.trimEnd()).join("\n").replace(/^\s*[❯>]\s?/, "").trimEnd();
   }
-  return { permission, input };
+  const v = { permission, input };
+  if (trust) v.trust = true;
+  if (input !== null && PLACEHOLDER_RE.test(input.trim())) v.placeholder = true;
+  return v;
 }
 function boxMatches(view, body) {
   if (view.input === null || view.permission) return false;
@@ -4590,6 +4602,8 @@ var PING_FRAME_SERVICE = "ping";
 var PONG_FRAME = JSON.stringify({ service: "pong", version: "1.0" });
 var CODEX_REMOTE_REFRESH_MS = 30 * 1e3;
 var CLAIM_WAIT_MS = 15 * 1e3;
+var FIRST_LINE_WAIT_MS = 10 * 60 * 1e3;
+var FIRST_LINE_CAP_MS = 18 * 60 * 1e3;
 var WINDOW_READY_MS = 30 * 1e3;
 var CODEX_WATCH_MS = 5 * 1e3;
 function defaultCodexAppServers() {
@@ -4973,6 +4987,7 @@ var Daemon = class {
       return;
     }
     this.#seen.save();
+    cmd.receivedAt = this.#deps.now();
     this.#route(cmd);
   }
   /**
@@ -5113,9 +5128,9 @@ var Daemon = class {
    * 返回时：窗口已收下首句 / 已按失败回报 / 降级的后台那次已跑完
    */
   async #openWindowFor(cmd, sid, cwd) {
-    const headless = (why) => {
+    const headless = (why, c = cmd) => {
       log(`\u6307\u4EE4 ${cmd.instructionId} ${why}\uFF0C\u6539\u540E\u53F0\u6267\u884C`);
-      return this.#headless(cmd, sid, cwd);
+      return this.#headless(c, sid, cwd);
     };
     let gui = false;
     try {
@@ -5130,6 +5145,7 @@ var Daemon = class {
     } catch (e) {
       return headless(`\u5199\u4EA4\u63A5\u5355\u5931\u8D25\uFF1A${e.message}`);
     }
+    const openedAt = this.#deps.now();
     try {
       await this.#deps.openWindow(runId);
     } catch (e) {
@@ -5145,7 +5161,9 @@ var Daemon = class {
     removeCommandFile(deskbuddyHome(), runId);
     if (launchPending(runId) && claimLaunch(runId)) return headless(`${Math.round(this.#deps.claimWaitMs / 1e3)} \u79D2\u5185\u7A97\u53E3\u6CA1\u8D77\u6765`);
     log(`\u6307\u4EE4 ${cmd.instructionId} \u7A97\u53E3\u5DF2\u8D77\u6765\uFF08${runId.slice(0, 8)}\uFF09\uFF0C\u7B49\u5B83\u5C31\u7EEA\u540E\u5199\u5165\u9996\u53E5`);
-    const req2 = { instructionId: cmd.instructionId, sessionId: "", text: cmd.text, expireAt: cmd.expireAt };
+    const firstLineExpire = Math.min(Math.max(cmd.expireAt, openedAt + FIRST_LINE_WAIT_MS), (cmd.receivedAt ?? openedAt) + FIRST_LINE_CAP_MS);
+    const wcmd = cmd.expireAt > 0 ? { ...cmd, expireAt: Math.max(cmd.expireAt, firstLineExpire) } : cmd;
+    const req2 = { instructionId: cmd.instructionId, sessionId: "", text: cmd.text, expireAt: wcmd.expireAt };
     const fb = { p: null, final: false };
     const readyDeadline = this.#deps.now() + this.#deps.windowReadyMs;
     while (this.#deps.now() < readyDeadline) {
@@ -5167,7 +5185,7 @@ var Daemon = class {
       if (r === "handled") {
         log(`\u6307\u4EE4 ${cmd.instructionId} \u9996\u53E5\u5DF2\u4EA4\u7ED9\u65B0\u7A97\u53E3 len=${cmd.text.length}`);
         if (sid) {
-          const left = cmd.expireAt > 0 ? Math.max(cmd.expireAt - this.#deps.now(), 0) : 10 * 60 * 1e3;
+          const left = wcmd.expireAt > 0 ? Math.max(wcmd.expireAt - this.#deps.now(), 0) : FIRST_LINE_WAIT_MS;
           const cap = this.#deps.now() + left + this.#deps.windowReadyMs;
           while (!fb.final && this.#deps.now() < cap) {
             let found = null;
@@ -6300,6 +6318,31 @@ function screenLines(term) {
   }
   return out;
 }
+function screenLinesUndimmed(term) {
+  const b = term.buffer.active;
+  const out = [];
+  for (let i = b.viewportY; i < b.viewportY + term.rows; i++) {
+    const l = b.getLine(i);
+    if (!l) {
+      out.push("");
+      continue;
+    }
+    if (typeof l.getCell !== "function") {
+      out.push(l.translateToString(true));
+      continue;
+    }
+    let s = "";
+    for (let x = 0; x < term.cols; x++) {
+      const c = l.getCell(x);
+      if (!c) break;
+      const w = c.getWidth();
+      if (w === 0) continue;
+      s += c.isDim() ? " ".repeat(w) : c.getChars() || " ";
+    }
+    out.push(s.trimEnd());
+  }
+  return out;
+}
 
 // src/commands/enable.ts
 function stdout(line) {
@@ -6676,6 +6719,8 @@ async function runSetup(opts = {}) {
   bound.remoteCwd = remoteCwd;
   saveConfig(bound);
   out(`  \u5DF2\u8BB0\u4E0B\uFF1A${remoteCwd}`);
+  out("  \u63D0\u793A\uFF1AClaude Code \u7B2C\u4E00\u6B21\u5728\u65B0\u76EE\u5F55\u91CC\u542F\u52A8\u4F1A\u95EE\u300C\u662F\u5426\u4FE1\u4EFB\u6B64\u6587\u4EF6\u5939\u300D\uFF0CDeskBuddy \u4E0D\u4F1A\u66FF\u4F60\u56DE\u7B54\u3002");
+  out("  \u5EFA\u8BAE\u5148\u5728\u8FD9\u4E2A\u76EE\u5F55\u91CC\u624B\u52A8\u8FD0\u884C\u4E00\u6B21 claude \u5E76\u9009\u62E9\u4FE1\u4EFB\uFF0C\u5426\u5219\u65B0\u5EFA\u4EFB\u52A1\u8981\u7B49\u4F60\u5728\u7535\u8111\u4E0A\u70B9\u4E86\u624D\u4F1A\u5F00\u59CB\u3002");
   out("");
   out("\u2705 \u6388\u6743\u6210\u529F\u3002\u63A5\u4E0B\u6765\u8FD0\u884C\uFF1Adeskbuddy enable claude_code,codex");
   return 0;
@@ -7079,6 +7124,13 @@ var Injector = class {
   #lastKey = 0;
   #busy = false;
   #closed = false;
+  #lastWhy = "";
+  /** 用户在这个窗口里按过键（终端报告不算） */
+  #userKeyed = false;
+  /** 本窗口已经写进过一条 */
+  #injectedOnce = false;
+  /** 出现过信任框：之后窗口关闭多半是用户选了 No / 不想在这个目录里跑，不能交回后台 */
+  #sawTrust = false;
   /** instructionId → 那一条（去重：daemon 等 ack 超时重送时，不能写进窗口两遍） */
   #seen = /* @__PURE__ */ new Map();
   constructor(deps) {
@@ -7088,8 +7140,11 @@ var Injector = class {
   noteOutput() {
     this.#lastOut = this.#d.now();
   }
-  noteKey() {
+  /** 终端输入（不传 = 按一次真按键算）。只有终端自己回的报告（焦点进出、光标位置等）不算按键 */
+  noteKey(input) {
+    if (input !== void 0 && isTerminalReport(input)) return;
     this.#lastKey = this.#d.now();
+    this.#userKeyed = true;
   }
   get pending() {
     return this.#queue.length;
@@ -7100,6 +7155,7 @@ var Injector = class {
     if (i >= 0) this.#queue.splice(i, 1);
     if (job.done) return;
     job.done = true;
+    this.#d.log?.(`\u7ED3\u5C40 ${job.instructionId} ${msg.status}${msg.reason ? "/" + msg.reason : ""}`);
     job.finalMsg = { instructionId: job.instructionId, ...msg };
     job.reply(job.finalMsg);
   }
@@ -7160,6 +7216,7 @@ var Injector = class {
       return;
     }
     this.#remember(job);
+    this.#d.log?.(`\u6536\u5230 ${job.instructionId} len=${job.text.length} head=${JSON.stringify(job.text.slice(0, 12))}`);
     job.phase = "queued";
     job.reply({ instructionId: job.instructionId, status: "ack" });
     this.#queue.push(job);
@@ -7176,10 +7233,15 @@ var Injector = class {
     const why = [];
     const v = this.#d.view();
     if (!v) return ["no-screen"];
+    const last = this.#d.lastEvent();
+    if (v.trust) {
+      why.push("trust-dialog");
+      this.#sawTrust = true;
+    }
     if (v.permission) why.push("permission");
+    const pristine = this.#d.startupIdle === true && !this.#userKeyed && !this.#injectedOnce && !last;
     if (v.input === null) why.push("no-input-box");
-    else if (v.input !== "") why.push("user-typing");
-    const last = this.#d.lastEvent();
+    else if (v.input !== "" && !v.placeholder && !pristine) why.push("user-typing");
     if (!last) {
       if (!this.#d.startupIdle) why.push("hook:none");
     } else if (!IDLE_EVENTS.has(last.ev)) why.push("hook:" + last.ev);
@@ -7215,9 +7277,16 @@ var Injector = class {
       this.#d.log?.(`\u7A7A\u95F2\u5224\u65AD\u51FA\u9519\uFF1A${e.message}`);
     }
     if (why.length > 0) {
+      const key = why.join(",");
+      if (key !== this.#lastWhy) {
+        this.#lastWhy = key;
+        const v = this.#d.view();
+        this.#d.log?.(`\u6392\u961F\u4E2D\uFF1A${key} input=${v?.input === null ? "null" : JSON.stringify((v?.input ?? "").slice(0, 12)) + "/" + (v?.input ?? "").length} last=${this.#d.lastEvent()?.ev ?? "none"}`);
+      }
       this.#markQueued(job);
       return;
     }
+    this.#lastWhy = "";
     this.#busy = true;
     try {
       await this.#inject(job);
@@ -7230,6 +7299,8 @@ var Injector = class {
   }
   async #inject(job) {
     const body = prepare(job.text);
+    this.#injectedOnce = true;
+    this.#d.log?.(`\u5199\u5165 ${job.instructionId} len=${body.length - 1}`);
     let enterAt = 0;
     this.#d.holdKeys(true);
     try {
@@ -7276,6 +7347,7 @@ var Injector = class {
     for (const job of [...this.#queue]) {
       if (job.phase === "entered") this.#final(job, { status: "started", mode: "window", reason: "" });
       else if (job.phase === "pasted") this.#final(job, { status: "failed", mode: "window", reason: "window_failed" });
+      else if (this.#sawTrust) this.#final(job, { status: "rejected", mode: "window", reason: "window_failed" });
       else this.#final(job, { status: "not_here" });
     }
   }
@@ -7951,7 +8023,7 @@ function runAttached(tool, p, term0, windowId, deps, launched = false) {
   };
   const injector = new Injector({
     now: () => Date.now(),
-    view: () => term ? inspectLines(screenLines(term)) : null,
+    view: () => term ? inspectLines(screenLines(term), screenLinesUndimmed(term)) : null,
     lastEvent: () => readLastEvent(windowId),
     write: toPty,
     sleep: (ms) => new Promise((r) => setTimeout(r, ms)),
@@ -7982,8 +8054,8 @@ function runAttached(tool, p, term0, windowId, deps, launched = false) {
     injector.noteOutput();
   });
   const onStdin = (b) => {
-    injector.noteKey();
     const s = typeof b === "string" ? b : decoder.write(b);
+    injector.noteKey(s);
     if (!s) return;
     if (held) held.push(s);
     else toPty(s);

package/dist/hook.cjs

@@ -1077,6 +1077,19 @@ function codexRemoteHas(sessionId) {
   return !!r && r.has(sessionId)
 }
 
+/** 并发 hook 的先后差不会超过一次 hook 的执行时长；超出这个差值说明是时钟回拨，不能当作「更晚的事件」 */
+const SUPERSEDE_MAX_MS = 2 * 60 * 1000
+
+/**
+ * 状态里已是比这次事件更晚发生的事件写的（hook 并发、先发生的后写完），这次不能再覆盖。
+ * 🔴 差值带上限（评审）：开机后校时往回拨时，状态里的 updatedAt 落在「未来」，不设上限的话在墙钟追上之前该会话的事件全被丢掉
+ */
+function superseded(cur, eventAt) {
+  if (!cur || typeof cur.updatedAt !== 'number') return false
+  const ahead = cur.updatedAt - eventAt
+  return ahead > 0 && ahead < SUPERSEDE_MAX_MS
+}
+
 async function main(argv) {
   // 同一份 hook 被 Claude Code 与 Codex 复用，靠命令行参数区分是哪个工具
   const tool = (argv && argv[2]) || 'claude_code'
@@ -1084,6 +1097,10 @@ async function main(argv) {
   const event = payload.hook_event_name || ''
   const sessionId = payload.session_id || ''
   if (!sessionId) return
+  // 🔴 事件时间取在任何慢操作之前：Codex 的 hook 是 async（不等跑完），一轮很短时 UserPromptSubmit 与 Stop
+  //    的 hook 并发跑；Windows 上新会话首个 hook 要起 PowerShell 查进程，常比 Stop 晚写完，
+  //    按写完先后落盘就会把 done 覆盖回 watch，屏上一直「进行中」直到窗口关掉（10-01 WIN-LVT5M8H5670 实测）
+  const eventAt = Date.now()
 
   if (NOTICE_EVENTS[event]) {
     const notice = takeNotice(sessionId)
@@ -1140,6 +1157,7 @@ async function main(argv) {
   const prev = readState(sessionId)
   const now = Date.now()
   if (event === 'UserPromptSubmit') recordDir(payload.cwd, now)
+  if (superseded(prev, eventAt)) return
   // 状态里记的进程还活着才沿用（评审）：先远程 -p 跑过、后又在窗口 resume 同一会话时，
   // 不能拿死掉的 -p 进程的 interactive=false 挡不住窗口
   const prevAlive = !!(prev && prev.pid && pidExists(prev.pid))
@@ -1158,8 +1176,9 @@ async function main(argv) {
     //    ⚠️ 只落本机，绝不上报：快照里发出去的仍然只有 basename。
     cwd: payload.cwd || (prev && prev.cwd) || '',
     state: action,
-    startedAt: (prev && prev.startedAt) || now,
-    updatedAt: now,
+    startedAt: (prev && prev.startedAt) || eventAt,
+    // 记事件发生时间而不是写完时间，后来的事件才比得过先发生、却后写完的那个
+    updatedAt: eventAt,
     pid: pid,
     pidName: pid ? (prevAlive && prev.pidName) || processName(pid) || undefined : undefined,
     // 二期 P1：窗口开着的会话，设备不能再往里下指令（两个进程会互相吞掉对话）。每个会话只判一次
@@ -1181,7 +1200,11 @@ async function main(argv) {
 
   // 进 / 出 DeskBuddy 窗口不一定伴随状态跃迁（窗口里 --resume 一个已完成的会话），要立刻报，否则设备最长 2 分钟仍被 8348 挡
   const windowChanged = !!(prev && prev.remoteWindow) !== !!next.remoteWindow
-  if (!windowChanged && !shouldReport(prev, next, now)) {
+  // 跃迁要跟磁盘上的最新状态比，不能只跟开头读到的 prev 比（评审）：上一轮停在 done 时 Stop 读到的 prev 是旧 done，
+  // 并发的 UserPromptSubmit 已把 watch 写盘并上报了，Stop 若按 done→done 静默落盘，设备收到的最后一份就是 watch
+  const latest = readState(sessionId)
+  if (superseded(latest, eventAt)) return
+  if (!windowChanged && !shouldReport(latest || prev, next, now)) {
     writeState(next)
     return
   }
@@ -1197,6 +1220,8 @@ async function main(argv) {
     next.title ||
     ''
   next.lastReportAt = now
+  // 取标题 / 查进程期间可能已有更晚发生的事件写完了：那份更新，这次既不落盘也不上报
+  if (superseded(readState(sessionId), eventAt)) return
   writeState(next)
 
   await reportIfAuthorized(tool, now)
@@ -1248,6 +1273,7 @@ module.exports = {
   markClear,
   pairClear,
   shouldReport,
+  superseded,
   sign,
   titleSources,
   writeState,

package/hook/hook.cjs

@@ -1077,6 +1077,19 @@ function codexRemoteHas(sessionId) {
   return !!r && r.has(sessionId)
 }
 
+/** 并发 hook 的先后差不会超过一次 hook 的执行时长；超出这个差值说明是时钟回拨，不能当作「更晚的事件」 */
+const SUPERSEDE_MAX_MS = 2 * 60 * 1000
+
+/**
+ * 状态里已是比这次事件更晚发生的事件写的（hook 并发、先发生的后写完），这次不能再覆盖。
+ * 🔴 差值带上限（评审）：开机后校时往回拨时，状态里的 updatedAt 落在「未来」，不设上限的话在墙钟追上之前该会话的事件全被丢掉
+ */
+function superseded(cur, eventAt) {
+  if (!cur || typeof cur.updatedAt !== 'number') return false
+  const ahead = cur.updatedAt - eventAt
+  return ahead > 0 && ahead < SUPERSEDE_MAX_MS
+}
+
 async function main(argv) {
   // 同一份 hook 被 Claude Code 与 Codex 复用，靠命令行参数区分是哪个工具
   const tool = (argv && argv[2]) || 'claude_code'
@@ -1084,6 +1097,10 @@ async function main(argv) {
   const event = payload.hook_event_name || ''
   const sessionId = payload.session_id || ''
   if (!sessionId) return
+  // 🔴 事件时间取在任何慢操作之前：Codex 的 hook 是 async（不等跑完），一轮很短时 UserPromptSubmit 与 Stop
+  //    的 hook 并发跑；Windows 上新会话首个 hook 要起 PowerShell 查进程，常比 Stop 晚写完，
+  //    按写完先后落盘就会把 done 覆盖回 watch，屏上一直「进行中」直到窗口关掉（10-01 WIN-LVT5M8H5670 实测）
+  const eventAt = Date.now()
 
   if (NOTICE_EVENTS[event]) {
     const notice = takeNotice(sessionId)
@@ -1140,6 +1157,7 @@ async function main(argv) {
   const prev = readState(sessionId)
   const now = Date.now()
   if (event === 'UserPromptSubmit') recordDir(payload.cwd, now)
+  if (superseded(prev, eventAt)) return
   // 状态里记的进程还活着才沿用（评审）：先远程 -p 跑过、后又在窗口 resume 同一会话时，
   // 不能拿死掉的 -p 进程的 interactive=false 挡不住窗口
   const prevAlive = !!(prev && prev.pid && pidExists(prev.pid))
@@ -1158,8 +1176,9 @@ async function main(argv) {
     //    ⚠️ 只落本机，绝不上报：快照里发出去的仍然只有 basename。
     cwd: payload.cwd || (prev && prev.cwd) || '',
     state: action,
-    startedAt: (prev && prev.startedAt) || now,
-    updatedAt: now,
+    startedAt: (prev && prev.startedAt) || eventAt,
+    // 记事件发生时间而不是写完时间，后来的事件才比得过先发生、却后写完的那个
+    updatedAt: eventAt,
     pid: pid,
     pidName: pid ? (prevAlive && prev.pidName) || processName(pid) || undefined : undefined,
     // 二期 P1：窗口开着的会话，设备不能再往里下指令（两个进程会互相吞掉对话）。每个会话只判一次
@@ -1181,7 +1200,11 @@ async function main(argv) {
 
   // 进 / 出 DeskBuddy 窗口不一定伴随状态跃迁（窗口里 --resume 一个已完成的会话），要立刻报，否则设备最长 2 分钟仍被 8348 挡
   const windowChanged = !!(prev && prev.remoteWindow) !== !!next.remoteWindow
-  if (!windowChanged && !shouldReport(prev, next, now)) {
+  // 跃迁要跟磁盘上的最新状态比，不能只跟开头读到的 prev 比（评审）：上一轮停在 done 时 Stop 读到的 prev 是旧 done，
+  // 并发的 UserPromptSubmit 已把 watch 写盘并上报了，Stop 若按 done→done 静默落盘，设备收到的最后一份就是 watch
+  const latest = readState(sessionId)
+  if (superseded(latest, eventAt)) return
+  if (!windowChanged && !shouldReport(latest || prev, next, now)) {
     writeState(next)
     return
   }
@@ -1197,6 +1220,8 @@ async function main(argv) {
     next.title ||
     ''
   next.lastReportAt = now
+  // 取标题 / 查进程期间可能已有更晚发生的事件写完了：那份更新，这次既不落盘也不上报
+  if (superseded(readState(sessionId), eventAt)) return
   writeState(next)
 
   await reportIfAuthorized(tool, now)
@@ -1248,6 +1273,7 @@ module.exports = {
   markClear,
   pairClear,
   shouldReport,
+  superseded,
   sign,
   titleSources,
   writeState,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "deskbuddy",
-  "version": "0.2.0-beta.4",
+  "version": "0.2.0-beta.6",
   "description": "把 Claude Code、Codex 等 AI 编码智能体每个会话窗口的状态，实时同步到桌面硬件屏幕",
   "keywords": [
     "ai",