deskbuddy 0.2.0-beta.46 → 0.2.0-beta.48

package/dist/{chunk-Y6D6FMMF.js → chunk-XWSJEGGS.js}

@@ -8,6 +8,8 @@ import { randomUUID } from "crypto";
 import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "fs";
 import { homedir, hostname } from "os";
 import { dirname, join, resolve } from "path";
+var DEFAULT_FOCUS_IDLE_SECONDS = 5;
+var MAX_FOCUS_IDLE_SECONDS = 600;
 function defaultRemoteCwd(home = homedir()) {
   return process.env.DESKBUDDY_DEFAULT_REMOTE_CWD || join(home, "DeskBuddy");
 }
@@ -203,7 +205,11 @@ function loadConfig() {
       cozeApp: typeof parsed.cozeApp === "boolean" ? parsed.cozeApp : void 0,
       cozeCdpPort: portOrUndefined(parsed.cozeCdpPort),
       chatgptAppPort: typeof parsed.chatgptAppPort === "boolean" ? parsed.chatgptAppPort : void 0,
-      chatgptCdpPort: portOrUndefined(parsed.chatgptCdpPort)
+      chatgptCdpPort: portOrUndefined(parsed.chatgptCdpPort),
+      focusSessionOnRemote: typeof parsed.focusSessionOnRemote === "boolean" ? parsed.focusSessionOnRemote : void 0,
+      focusSessionOnRemoteWindows: typeof parsed.focusSessionOnRemoteWindows === "boolean" ? parsed.focusSessionOnRemoteWindows : void 0,
+      focusSessionInApp: typeof parsed.focusSessionInApp === "boolean" ? parsed.focusSessionInApp : void 0,
+      focusIdleSeconds: typeof parsed.focusIdleSeconds === "number" && Number.isInteger(parsed.focusIdleSeconds) && parsed.focusIdleSeconds >= 0 && parsed.focusIdleSeconds <= MAX_FOCUS_IDLE_SECONDS ? parsed.focusIdleSeconds : void 0
     };
   } catch {
     return fallback;
@@ -1711,10 +1717,19 @@ var CODEX_EVENTS = [
   "SessionEnd",
   "PermissionRequest"
 ];
-var CODEX_TRUST_NOTICE = "\u26A0\uFE0F  \u4E0B\u6B21\u542F\u52A8 Codex \u65F6\u4F1A\u8981\u6C42\u4F60\u786E\u8BA4\u4FE1\u4EFB\u8FD9\u4E2A hook\uFF0C\u8BF7\u9009\u62E9\u540C\u610F\u2014\u2014\u4E0D\u786E\u8BA4\u7684\u8BDD Codex \u4E0D\u4F1A\u6267\u884C\u5B83\u3002\n   DeskBuddy \u5347\u7EA7\uFF08\u542B\u81EA\u52A8\u5347\u7EA7\uFF09\u65B0\u589E hook \u6761\u76EE\u65F6\uFF0CCodex \u53EA\u4F1A\u5C31\u65B0\u6761\u76EE\u518D\u95EE\u4E00\u6B21\uFF0C\u540C\u6837\u9009\u540C\u610F\uFF1B\u539F\u6709\u6761\u76EE\u4E0D\u53D7\u5F71\u54CD\u3001\u72B6\u6001\u7167\u5E38\u4E0A\u62A5\u3002\n   Codex \u7ECF `--remote` \u8FDE\u5E38\u9A7B app-server \u4F7F\u7528\u65F6\uFF0C\u7A97\u53E3\u91CC\u7684\u6388\u6743\u6846\u4E5F\u80FD\u5728\u8BBE\u5907\u4E0A\u786E\u8BA4\uFF08\u5B88\u62A4\u8FDB\u7A0B\u5728\u8DD1\u65F6\u751F\u6548\uFF09";
+var CODEX_TRUST_NOTICE = "\u26A0\uFE0F  \u4E0B\u6B21\u542F\u52A8 Codex \u65F6\u4F1A\u8981\u6C42\u4F60\u786E\u8BA4\u4FE1\u4EFB\u8FD9\u4E2A hook\uFF0C\u8BF7\u9009\u62E9\u540C\u610F\u2014\u2014\u4E0D\u786E\u8BA4\u7684\u8BDD Codex \u4E0D\u4F1A\u6267\u884C\u5B83\u3002\n   \u6BCF\u6761 hook \u90FD\u5E26\u300CDeskBuddy\uFF1A\u2026\u300D\u540D\u5B57\uFF0C\u5BA1\u67E5\u6846\u91CC\u80FD\u770B\u5230\u5B83\u662F\u505A\u4EC0\u4E48\u7684\u3002\n   DeskBuddy \u5347\u7EA7\uFF08\u542B\u81EA\u52A8\u5347\u7EA7\uFF09\u65B0\u589E\u6216\u6539\u52A8 hook \u6761\u76EE\u65F6\uFF0CCodex \u4F1A\u5C31\u8FD9\u4E9B\u6761\u76EE\u518D\u95EE\u4E00\u6B21\uFF0C\u540C\u6837\u9009\u540C\u610F\uFF1B\u786E\u8BA4\u524D\u8FD9\u4E9B\u6761\u76EE\u4E0D\u6267\u884C\u3002\n   Codex \u7ECF `--remote` \u8FDE\u5E38\u9A7B app-server \u4F7F\u7528\u65F6\uFF0C\u7A97\u53E3\u91CC\u7684\u6388\u6743\u6846\u4E5F\u80FD\u5728\u8BBE\u5907\u4E0A\u786E\u8BA4\uFF08\u5B88\u62A4\u8FDB\u7A0B\u5728\u8DD1\u65F6\u751F\u6548\uFF09";
 function codexConfigPath() {
   return join7(codexHome(), "config.toml");
 }
+var CODEX_HOOK_LABELS = {
+  UserPromptSubmit: "DeskBuddy\uFF1A\u628A\u4F60\u53D1\u7684\u6D88\u606F\u540C\u6B65\u5230\u684C\u9762\u8BBE\u5907",
+  PreToolUse: "DeskBuddy\uFF1A\u628A\u6B63\u5728\u6267\u884C\u7684\u64CD\u4F5C\u540C\u6B65\u5230\u684C\u9762\u8BBE\u5907",
+  PostToolUse: "DeskBuddy\uFF1A\u628A\u64CD\u4F5C\u7ED3\u679C\u540C\u6B65\u5230\u684C\u9762\u8BBE\u5907",
+  Stop: "DeskBuddy\uFF1A\u4EFB\u52A1\u5B8C\u6210\u65F6\u901A\u77E5\u684C\u9762\u8BBE\u5907",
+  SessionEnd: "DeskBuddy\uFF1A\u4F1A\u8BDD\u7ED3\u675F\u65F6\u901A\u77E5\u684C\u9762\u8BBE\u5907",
+  PermissionRequest: "DeskBuddy\uFF1A\u628A\u6388\u6743\u8BF7\u6C42\u540C\u6B65\u5230\u684C\u9762\u8BBE\u5907"
+};
+var CODEX_APPENDED_LABEL = "DeskBuddy\uFF1A\u8BFB\u53D6\u4F60\u5728\u684C\u9762\u8BBE\u5907\u4E0A\u8FFD\u52A0\u7684\u6307\u4EE4";
 var CODEX_APPENDED_TIMEOUT_S = 3;
 function renderBlock(hookPath, events, tool, platform) {
   const script = platform === "win32" ? winPsPath(hookPath) : hookPath;
@@ -1722,9 +1737,10 @@ function renderBlock(hookPath, events, tool, platform) {
   const appended = JSON.stringify(`node ${script} ${tool} --appended`);
   const lines = [CODEX_MARKER_BEGIN];
   for (const event of events) {
-    lines.push(`[[hooks.${event}]]`, 'matcher = ""', "hooks = [", `  { type = "command", command = ${command}, async = true, timeoutSec = 5 }`);
+    const label2 = JSON.stringify(CODEX_HOOK_LABELS[event] ?? `DeskBuddy\uFF1A${event} \u65F6\u540C\u6B65\u5230\u684C\u9762\u8BBE\u5907`);
+    lines.push(`[[hooks.${event}]]`, 'matcher = ""', "hooks = [", `  { type = "command", command = ${command}, async = true, timeoutSec = 5, statusMessage = ${label2} }`);
     if (event === "UserPromptSubmit") {
-      lines.push(`  , { type = "command", command = ${appended}, async = false, timeout = ${CODEX_APPENDED_TIMEOUT_S} }`);
+      lines.push(`  , { type = "command", command = ${appended}, async = false, timeout = ${CODEX_APPENDED_TIMEOUT_S}, statusMessage = ${JSON.stringify(CODEX_APPENDED_LABEL)} }`);
     }
     lines.push("]", "");
   }
@@ -6338,6 +6354,52 @@ var WsCdpClient = class {
 
 // src/daemon/workbuddyApp/keeper.ts
 import { posix as posix2, win32 as win326 } from "path";
+
+// src/daemon/userIdle.ts
+function parseHidIdleMs(out) {
+  const m = /"HIDIdleTime"\s*=\s*(\d+)/.exec(out);
+  return m ? Math.floor(Number(m[1]) / 1e6) : null;
+}
+var WIN_PRESENCE_PS = String.raw`Add-Type @"
+using System; using System.Runtime.InteropServices;
+public class DbUserIdle {
+  [StructLayout(LayoutKind.Sequential)] public struct LII { public uint cbSize; public uint dwTime; }
+  [DllImport("user32.dll")] public static extern bool GetLastInputInfo(ref LII p);
+  [DllImport("kernel32.dll")] public static extern uint GetTickCount();
+  [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
+  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint pid);
+}
+"@
+$l = New-Object DbUserIdle+LII; $l.cbSize = 8
+if (-not [DbUserIdle]::GetLastInputInfo([ref]$l)) { exit 1 }
+$idle = (([uint64][DbUserIdle]::GetTickCount()) - [uint64]$l.dwTime + 4294967296) % 4294967296
+$fp = [uint32]0; [void][DbUserIdle]::GetWindowThreadProcessId([DbUserIdle]::GetForegroundWindow(), [ref]$fp)
+$n = ''; try { $n = (Get-Process -Id $fp -ErrorAction Stop).ProcessName } catch {}
+Write-Output ("{0}|{1}" -f $idle, $n)`;
+function parseWinPresence(code, stdout2) {
+  const m = /^(\d+)\|(.*)$/m.exec(stdout2.trim());
+  if (code !== 0 || !m) return null;
+  return { idleMs: Number(m[1]), front: m[2].trim() };
+}
+async function macIdleMs(exec) {
+  const r = await exec("ioreg", ["-c", "IOHIDSystem", "-d", "4"]);
+  return r.code === 0 ? parseHidIdleMs(r.stdout) : null;
+}
+async function winPresence(exec) {
+  const r = await exec("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", WIN_PRESENCE_PS], 15e3);
+  return parseWinPresence(r.code, r.stdout);
+}
+async function userIdleMs(exec, platform = process.platform) {
+  try {
+    if (platform === "darwin") return await macIdleMs(exec);
+    if (platform === "win32") return (await winPresence(exec))?.idleMs ?? null;
+  } catch {
+    return null;
+  }
+  return null;
+}
+
+// src/daemon/workbuddyApp/keeper.ts
 var DEFAULT_CDP_PORT = 39217;
 var ENV_NAME = "WORKBUDDY_REMOTE_DEBUGGING_PORT";
 var RESTART_GAP_MS = 30 * 60 * 1e3;
@@ -6418,26 +6480,6 @@ var filePersist = {
     }
   }
 };
-function parseHidIdleMs(out) {
-  const m = /"HIDIdleTime"\s*=\s*(\d+)/.exec(out);
-  return m ? Math.floor(Number(m[1]) / 1e6) : null;
-}
-var WIN_PRESENCE_PS = String.raw`Add-Type @"
-using System; using System.Runtime.InteropServices;
-public class DbUserIdle {
-  [StructLayout(LayoutKind.Sequential)] public struct LII { public uint cbSize; public uint dwTime; }
-  [DllImport("user32.dll")] public static extern bool GetLastInputInfo(ref LII p);
-  [DllImport("kernel32.dll")] public static extern uint GetTickCount();
-  [DllImport("user32.dll")] public static extern IntPtr GetForegroundWindow();
-  [DllImport("user32.dll")] public static extern uint GetWindowThreadProcessId(IntPtr h, out uint pid);
-}
-"@
-$l = New-Object DbUserIdle+LII; $l.cbSize = 8
-if (-not [DbUserIdle]::GetLastInputInfo([ref]$l)) { exit 1 }
-$idle = (([uint64][DbUserIdle]::GetTickCount()) - [uint64]$l.dwTime + 4294967296) % 4294967296
-$fp = [uint32]0; [void][DbUserIdle]::GetWindowThreadProcessId([DbUserIdle]::GetForegroundWindow(), [ref]$fp)
-$n = ''; try { $n = (Get-Process -Id $fp -ErrorAction Stop).ProcessName } catch {}
-Write-Output ("{0}|{1}" -f $idle, $n)`;
 var WAKE_LAUNCH_GAP_MS = 60 * 1e3;
 var APP_PATH_TTL_MS = 5 * 60 * 1e3;
 function defaultWorkbuddyAppPath() {
@@ -6692,7 +6734,7 @@ var CdpKeeper = class {
       if (this.#d.userAway) return await this.#d.userAway();
       const exec = this.#exec();
       if (this.#platform() === "darwin") {
-        const idle = parseHidIdleMs((await exec("ioreg", ["-c", "IOHIDSystem", "-d", "4"])).stdout);
+        const idle = await macIdleMs(exec);
         if (idle === null || idle < AWAY_IDLE_MS) return false;
         const asn = (await exec("lsappinfo", ["front"])).stdout.trim();
         if (!asn) return false;
@@ -6700,10 +6742,9 @@ var CdpKeeper = class {
         return !!name.trim() && !/WorkBuddy/i.test(name);
       }
       if (this.#platform() === "win32") {
-        const r = await exec("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", WIN_PRESENCE_PS], 15e3);
-        const m = /^(\d+)\|(.*)$/m.exec(r.stdout.trim());
-        if (r.code !== 0 || !m) return false;
-        return Number(m[1]) >= AWAY_IDLE_MS && !/^WorkBuddy$/i.test(m[2].trim());
+        const p = await winPresence(exec);
+        if (!p) return false;
+        return p.idleMs >= AWAY_IDLE_MS && !/^WorkBuddy$/i.test(p.front);
       }
     } catch {
       return false;
@@ -7197,6 +7238,16 @@ var TYPE_TEXT = "text";
 var TYPE_SUMMARY = "summary";
 var MAX_TEXT_LENGTH = 2e3;
 var MAX_ID_LENGTH = 64;
+function parseFocusOverride(d) {
+  const o = {};
+  const e = typeof d.focusEnabled === "string" ? d.focusEnabled.trim() : d.focusEnabled;
+  if (e === true || e === "true") o.enabled = true;
+  else if (e === false || e === "false") o.enabled = false;
+  const raw = d.focusIdleSec;
+  const sec = typeof raw === "number" ? raw : typeof raw === "string" && /^\d{1,3}$/.test(raw.trim()) ? Number(raw.trim()) : NaN;
+  if (Number.isInteger(sec) && sec >= 0 && sec <= 600) o.idleMs = sec * 1e3;
+  return o.enabled === void 0 && o.idleMs === void 0 ? void 0 : o;
+}
 function str2(v) {
   return typeof v === "string" ? v : "";
 }
@@ -7233,6 +7284,10 @@ function parseCommand(frame) {
   const dirRef = !sessionId && /^[0-9a-f]{16}$/.test(rawDir) ? rawDir : "";
   const cmd = { instructionId, type, sessionId, tool, text, expireAt: parseMillis(d.expireAt), dirRef };
   if (type === TYPE_SUMMARY) cmd.kind = "summary";
+  else {
+    const focus = parseFocusOverride(d);
+    if (focus) cmd.focus = focus;
+  }
   return cmd;
 }
 var TYPE_APPROVAL = "approval";
@@ -9023,10 +9078,6 @@ function hasMainProc(psOut, brand) {
   }
   return false;
 }
-function parseHidIdleMs2(out) {
-  const m = /"HIDIdleTime"\s*=\s*(\d+)/.exec(out);
-  return m ? Math.floor(Number(m[1]) / 1e6) : null;
-}
 function parseLsappBundle(out) {
   const m = /"CFBundleIdentifier"\s*=\s*"([^"]+)"/.exec(out);
   return m ? m[1] : null;
@@ -9307,10 +9358,9 @@ var QoderCdpKeeper = class {
   async userAway() {
     if (this.#isWin() && !this.#d.frontBundle && !this.#d.idleMs) {
       try {
-        const r = await this.#exec()("powershell.exe", ["-NoProfile", "-NonInteractive", "-Command", WIN_PRESENCE_PS], 15e3);
-        const m = /^(\d+)\|(.*)$/m.exec(r.stdout.trim());
-        if (r.code !== 0 || !m) return false;
-        return Number(m[1]) >= USER_IDLE_MS && !!m[2].trim() && !this.#d.brand.win.fgName.test(m[2].trim());
+        const p = await winPresence(this.#exec());
+        if (!p) return false;
+        return p.idleMs >= USER_IDLE_MS && !!p.front && !this.#d.brand.win.fgName.test(p.front);
       } catch {
         return false;
       }
@@ -9333,8 +9383,7 @@ var QoderCdpKeeper = class {
     return parseLsappBundle((await exec("lsappinfo", ["info", "-only", "bundleid", asn])).stdout);
   }
   async #defaultIdle() {
-    const r = await this.#exec()("ioreg", ["-c", "IOHIDSystem", "-d", "4"]);
-    return r.code === 0 ? parseHidIdleMs2(r.stdout) : null;
+    return macIdleMs(this.#exec());
   }
   /** 主进程（macOS；只认唯一一个；没有 / 认不出 / 多个 → null） */
   async #brandMain() {
@@ -11541,7 +11590,7 @@ var defaultLoginOpenDeps = () => ({
 });
 async function installCodebuddyHooks(log) {
   try {
-    const { installTools: installTools2 } = await import("./enable-XTCQ6IFF.js");
+    const { installTools: installTools2 } = await import("./enable-W4R6MJGE.js");
     installTools2(["workbuddy"], () => {
     }, null, { auto: true });
   } catch (e) {
@@ -12055,7 +12104,7 @@ function defaultOfferDeps(log) {
     }),
     openLogin: () => defaultOpenLogin(platform),
     installHooks: async () => {
-      const { installTools: installTools2 } = await import("./enable-XTCQ6IFF.js");
+      const { installTools: installTools2 } = await import("./enable-W4R6MJGE.js");
       installTools2(["workbuddy"], (l) => log(`[WorkBuddy \u72EC\u7ACB\u7248] ${l}`), null, { auto: true });
     },
     log: (l) => log(`[WorkBuddy \u72EC\u7ACB\u7248] ${l}`),
@@ -12295,6 +12344,8 @@ async function runEnable(tools, opts = {}) {
 }
 
 export {
+  DEFAULT_FOCUS_IDLE_SECONDS,
+  MAX_FOCUS_IDLE_SECONDS,
   defaultRemoteCwd,
   ensureDefaultRemoteCwd,
   remoteCwdReady,
@@ -12483,6 +12534,7 @@ export {
   registerWorkbuddySession,
   flushPendingWorkbuddy,
   connectCdp,
+  userIdleMs,
   DEFAULT_CDP_PORT,
   defaultExec,
   APP_PORT_HUNG_REASON,