droid-patch 0.7.0 → 0.7.1

package/README.md

@@ -214,6 +214,7 @@ Enables WebSearch functionality through a local proxy server that intercepts `/a
 - **Per-instance proxy**: Each droid instance runs its own proxy on an auto-assigned port
 - **Auto-cleanup**: Proxy automatically stops when droid exits
 - **Forward target**: Use `--api-base` with `--websearch` to forward non-search requests to a custom backend
+- **Non-interactive passthrough**: `--version`/`version`, `--help`/`help`, `completion(s)`, `exec` do not start the proxy
 
 **Usage**:
 
@@ -339,6 +340,7 @@ Enables a Claude-style statusline at the bottom of the terminal, displaying real
 - **Git integration**: Shows current branch and diff summary (+insertions, -deletions)
 - **Compaction indicator**: Shows when context compaction is in progress
 - **PTY proxy architecture**: Reserves bottom row(s) for statusline without flickering
+- **Non-interactive passthrough**: `--version`/`version`, `--help`/`help`, `completion(s)`, `exec` (or non-TTY) bypass the statusline wrapper
 
 **How it works**:
 

package/README.zh-CN.md

@@ -214,6 +214,7 @@ npx droid-patch --websearch --api-base "http://my-proxy.example.com:3000" droid-
 - **每实例独立代理**：每个 droid 实例运行自己的代理，自动分配端口
 - **自动清理**：droid 退出时代理自动停止
 - **转发目标**：使用 `--api-base` 配合 `--websearch` 可将非搜索请求转发到自定义后端
+- **非交互直通**：运行 `--version`/`version`、`--help`/`help`、`completion(s)`、`exec` 等命令时不会启动代理
 
 **使用方法**：
 
@@ -339,6 +340,7 @@ npx droid-patch --is-custom --skip-login --disable-telemetry droid-private
 - **Git 集成**：显示当前分支和差异摘要（+插入行数，-删除行数）
 - **压缩指示器**：显示上下文压缩正在进行中
 - **PTY 代理架构**：为状态栏预留底部行，避免闪烁
+- **非交互直通**：运行 `--version`/`version`、`--help`/`help`、`completion(s)`、`exec` 或在非 TTY（管道/重定向）时自动绕过状态栏
 
 **工作原理**：
 

package/dist/cli.mjs

@@ -531,6 +531,45 @@ PROXY_PID=""
 PORT_FILE="/tmp/droid-websearch-\$\$.port"
 STANDALONE="${standalone ? "1" : "0"}"
 
+# Passthrough for non-interactive/meta commands (avoid starting a proxy for help/version/etc)
+should_passthrough() {
+  # Any help/version flags before "--"
+  for arg in "\$@"; do
+    if [ "\$arg" = "--" ]; then
+      break
+    fi
+    case "\$arg" in
+      --help|-h|--version|-V)
+        return 0
+        ;;
+    esac
+  done
+
+  # Top-level command token
+  local end_opts=0
+  for arg in "\$@"; do
+    if [ "\$arg" = "--" ]; then
+      end_opts=1
+      continue
+    fi
+    if [ "\$end_opts" -eq 0 ] && [[ "\$arg" == -* ]]; then
+      continue
+    fi
+    case "\$arg" in
+      help|version|completion|completions|exec)
+        return 0
+        ;;
+    esac
+    break
+  done
+
+  return 1
+}
+
+if should_passthrough "\$@"; then
+  exec "\$DROID_BIN" "\$@"
+fi
+
 # Cleanup function - kill proxy when droid exits
 cleanup() {
   if [ -n "\$PROXY_PID" ] && kill -0 "\$PROXY_PID" 2>/dev/null; then
@@ -660,6 +699,33 @@ function isPositiveInt(n) {
   return Number.isFinite(n) && n > 0;
 }
 
+function firstNonNull(promises) {
+  const list = Array.isArray(promises) ? promises : [];
+  if (list.length === 0) return Promise.resolve(null);
+  return new Promise((resolve) => {
+    let pending = list.length;
+    let done = false;
+    for (const p of list) {
+      Promise.resolve(p)
+        .then((value) => {
+          if (done) return;
+          if (value) {
+            done = true;
+            resolve(value);
+            return;
+          }
+          pending -= 1;
+          if (pending <= 0) resolve(null);
+        })
+        .catch(() => {
+          if (done) return;
+          pending -= 1;
+          if (pending <= 0) resolve(null);
+        });
+    }
+  });
+}
+
 function listPidsInProcessGroup(pgid) {
   if (!isPositiveInt(pgid)) return [];
   try {
@@ -712,10 +778,11 @@ function resolveOpenSessionFromPids(pids) {
   return null;
 }
 
-async function resolveSessionFromProcessGroup() {
+async function resolveSessionFromProcessGroup(shouldAbort, maxTries = 20) {
   if (!isPositiveInt(PGID)) return null;
   // Wait a little for droid to create/open the session files.
-  for (let i = 0; i < 80; i++) {
+  for (let i = 0; i < maxTries; i++) {
+    if (shouldAbort && shouldAbort()) return null;
     const pids = listPidsInProcessGroup(PGID);
     const found = resolveOpenSessionFromPids(pids);
     if (found) return found;
@@ -872,8 +939,9 @@ function pickLatestSessionAcross(workspaceDirs) {
   return best ? { workspaceDir: best.workspaceDir, id: best.id } : null;
 }
 
-async function waitForNewSessionAcross(workspaceDirs, knownIdsByWorkspace, startMs) {
+async function waitForNewSessionAcross(workspaceDirs, knownIdsByWorkspace, startMs, shouldAbort) {
   for (let i = 0; i < 80; i++) {
+    if (shouldAbort && shouldAbort()) return null;
     let best = null;
     for (const dir of workspaceDirs) {
       const known = knownIdsByWorkspace.get(dir) || new Set();
@@ -1113,25 +1181,30 @@ async function main() {
     sessionId = resumeId;
     workspaceDir = findWorkspaceDirForSessionId(workspaceDirs, sessionId) || workspaceDirs[0] || null;
   } else {
-    const byProc = await resolveSessionFromProcessGroup();
-    if (byProc?.id) {
-      sessionId = byProc.id;
-      workspaceDir = byProc.workspaceDir;
-    } else if (resumeFlag) {
-      const latest = pickLatestSessionAcross(workspaceDirs);
-      sessionId = latest?.id || null;
-      workspaceDir = latest?.workspaceDir || workspaceDirs[0] || null;
+    let abortResolve = false;
+    const shouldAbort = () => abortResolve;
+
+    const byProcPromise = resolveSessionFromProcessGroup(shouldAbort, 20);
+
+    let picked = null;
+    if (resumeFlag) {
+      // For --resume without an explicit id, don't block startup too long on ps/lsof.
+      // Prefer process-group resolution when it is fast; otherwise fall back to latest.
+      picked = await Promise.race([
+        byProcPromise,
+        sleep(400).then(() => null),
+      ]);
+      if (!picked) picked = pickLatestSessionAcross(workspaceDirs);
     } else {
-      const fresh = await waitForNewSessionAcross(workspaceDirs, knownIdsByWorkspace, START_MS);
-      if (fresh) {
-        sessionId = fresh.id;
-        workspaceDir = fresh.workspaceDir;
-      } else {
-        const latest = pickLatestSessionAcross(workspaceDirs);
-        sessionId = latest?.id || null;
-        workspaceDir = latest?.workspaceDir || workspaceDirs[0] || null;
-      }
+      const freshPromise = waitForNewSessionAcross(workspaceDirs, knownIdsByWorkspace, START_MS, shouldAbort);
+      picked = await firstNonNull([byProcPromise, freshPromise]);
+      if (!picked) picked = pickLatestSessionAcross(workspaceDirs);
     }
+
+    abortResolve = true;
+
+    sessionId = picked?.id || null;
+    workspaceDir = picked?.workspaceDir || workspaceDirs[0] || null;
   }
 
   if (!sessionId || !workspaceDir) return;
@@ -1148,8 +1221,8 @@ async function main() {
   let compacting = false;
   let lastRenderAt = 0;
   let lastRenderedLine = '';
-  const gitBranch = resolveGitBranch(cwd);
-  const gitDiff = resolveGitDiffSummary(cwd);
+  let gitBranch = '';
+  let gitDiff = '';
 
   function renderNow() {
     const usedTokens = (last.cacheReadInputTokens || 0) + (last.contextCount || 0);
@@ -1172,79 +1245,93 @@ async function main() {
     }
   }
 
-  // Seed prompt-context usage from existing logs (important for resumed sessions and early calls).
-  // This avoids showing "Ctx: 0" until the next streaming event arrives.
-  try {
-    // Backward scan to find the most recent streaming-context entry for this session.
-    // The log can be large and shared across multiple sessions, so a small tail slice
-    // may miss older resumed sessions.
-    const MAX_SCAN_BYTES = 64 * 1024 * 1024; // 64 MiB
-    const CHUNK_BYTES = 1024 * 1024; // 1 MiB
+  // Initial render.
+  renderNow();
 
-    const fd = fs.openSync(LOG_PATH, 'r');
+  // Resolve git info asynchronously so startup isn't blocked on large repos.
+  setTimeout(() => {
     try {
-      const stat = fs.fstatSync(fd);
-      const size = Number(stat?.size ?? 0);
-      let pos = size;
-      let scanned = 0;
-      let remainder = '';
-      let seeded = false;
-
-      while (pos > 0 && scanned < MAX_SCAN_BYTES && !seeded) {
-        const readSize = Math.min(CHUNK_BYTES, pos);
-        const start = pos - readSize;
-        const buf = Buffer.alloc(readSize);
-        fs.readSync(fd, buf, 0, readSize, start);
-        pos = start;
-        scanned += readSize;
-
-        let text = buf.toString('utf8') + remainder;
-        let lines = String(text).split('\\n');
-        remainder = lines.shift() || '';
-        if (pos === 0 && remainder) {
-          lines.unshift(remainder);
-          remainder = '';
-        }
+      gitBranch = resolveGitBranch(cwd);
+      gitDiff = resolveGitDiffSummary(cwd);
+      renderNow();
+    } catch {}
+  }, 0).unref();
+
+  // Seed prompt-context usage from existing logs (important for resumed sessions).
+  // Do this asynchronously to avoid delaying the first statusline frame.
+  if (resumeFlag || resumeId) {
+    setTimeout(() => {
+      try {
+        // Backward scan to find the most recent streaming-context entry for this session.
+        // The log can be large and shared across multiple sessions.
+        const MAX_SCAN_BYTES = 64 * 1024 * 1024; // 64 MiB
+        const CHUNK_BYTES = 1024 * 1024; // 1 MiB
 
-        for (let i = lines.length - 1; i >= 0; i--) {
-          const line = String(lines[i] || '').trimEnd();
-          if (!line) continue;
-          if (!line.includes('Context:')) continue;
-          if (!line.includes('"sessionId":"' + sessionId + '"')) continue;
-          if (!line.includes('[Agent] Streaming result')) continue;
-          const ctxIndex = line.indexOf('Context: ');
-          if (ctxIndex === -1) continue;
-          const jsonStr = line.slice(ctxIndex + 'Context: '.length).trim();
-          let ctx;
-          try {
-            ctx = JSON.parse(jsonStr);
-          } catch {
-            continue;
+        const fd = fs.openSync(LOG_PATH, 'r');
+        try {
+          const stat = fs.fstatSync(fd);
+          const size = Number(stat?.size ?? 0);
+          let pos = size;
+          let scanned = 0;
+          let remainder = '';
+          let seeded = false;
+
+          while (pos > 0 && scanned < MAX_SCAN_BYTES && !seeded) {
+            const readSize = Math.min(CHUNK_BYTES, pos);
+            const start = pos - readSize;
+            const buf = Buffer.alloc(readSize);
+            fs.readSync(fd, buf, 0, readSize, start);
+            pos = start;
+            scanned += readSize;
+
+            let text = buf.toString('utf8') + remainder;
+            let lines = String(text).split('\\n');
+            remainder = lines.shift() || '';
+            if (pos === 0 && remainder) {
+              lines.unshift(remainder);
+              remainder = '';
+            }
+
+            for (let i = lines.length - 1; i >= 0; i--) {
+              const line = String(lines[i] || '').trimEnd();
+              if (!line) continue;
+              if (!line.includes('Context:')) continue;
+              if (!line.includes('"sessionId":"' + sessionId + '"')) continue;
+              if (!line.includes('[Agent] Streaming result')) continue;
+              const ctxIndex = line.indexOf('Context: ');
+              if (ctxIndex === -1) continue;
+              const jsonStr = line.slice(ctxIndex + 'Context: '.length).trim();
+              let ctx;
+              try {
+                ctx = JSON.parse(jsonStr);
+              } catch {
+                continue;
+              }
+              const cacheRead = Number(ctx?.cacheReadInputTokens ?? 0);
+              const contextCount = Number(ctx?.contextCount ?? 0);
+              const out = Number(ctx?.outputTokens ?? 0);
+              if (Number.isFinite(cacheRead)) last.cacheReadInputTokens = cacheRead;
+              if (Number.isFinite(contextCount)) last.contextCount = contextCount;
+              if (Number.isFinite(out)) last.outputTokens = out;
+              seeded = true;
+              break;
+            }
+
+            if (remainder.length > 8192) remainder = remainder.slice(-8192);
           }
-          const cacheRead = Number(ctx?.cacheReadInputTokens ?? 0);
-          const contextCount = Number(ctx?.contextCount ?? 0);
-          const out = Number(ctx?.outputTokens ?? 0);
-          if (Number.isFinite(cacheRead)) last.cacheReadInputTokens = cacheRead;
-          if (Number.isFinite(contextCount)) last.contextCount = contextCount;
-          if (Number.isFinite(out)) last.outputTokens = out;
-          seeded = true;
-          break;
+        } finally {
+          try {
+            fs.closeSync(fd);
+          } catch {}
         }
 
-        if (remainder.length > 8192) remainder = remainder.slice(-8192);
+        renderNow();
+      } catch {
+        // ignore
       }
-    } finally {
-      try {
-        fs.closeSync(fd);
-      } catch {}
-    }
-  } catch {
-    // ignore
+    }, 0).unref();
   }
 
-  // Initial render.
-  renderNow();
-
   // Watch session settings for autonomy/reasoning changes (cheap polling with mtime).
   let settingsMtimeMs = 0;
   setInterval(() => {
@@ -1364,6 +1451,42 @@ QUIET_MS = 50  # Reduced to prevent statusline disappearing
 FORCE_REPAINT_INTERVAL_MS = 2000  # Force repaint every 2 seconds
 RESERVED_ROWS = 1
 
+BYPASS_FLAGS = {"--help", "-h", "--version", "-V"}
+BYPASS_COMMANDS = {"help", "version", "completion", "completions", "exec"}
+
+def _should_passthrough(argv):
+    # Any help/version flags before "--"
+    for a in argv:
+        if a == "--":
+            break
+        if a in BYPASS_FLAGS:
+            return True
+
+    # Top-level command token
+    end_opts = False
+    cmd = None
+    for a in argv:
+        if a == "--":
+            end_opts = True
+            continue
+        if (not end_opts) and a.startswith("-"):
+            continue
+        cmd = a
+        break
+
+    return cmd in BYPASS_COMMANDS
+
+def _exec_passthrough():
+    try:
+        os.execvp(EXEC_TARGET, [EXEC_TARGET] + sys.argv[1:])
+    except Exception as e:
+        sys.stderr.write(f"[statusline] passthrough failed: {e}\\n")
+        sys.exit(1)
+
+# Passthrough for non-interactive/meta commands (avoid clearing screen / PTY proxy)
+if (not sys.stdin.isatty()) or (not sys.stdout.isatty()) or _should_passthrough(sys.argv[1:]):
+    _exec_passthrough()
+
 ANSI_RE = re.compile(r"\\x1b\\[[0-9;]*m")
 RESET_SGR = "\\x1b[0m"
 
@@ -1975,9 +2098,6 @@ class CursorTracker:
 
 
 def main():
-    if not (sys.stdin.isatty() and sys.stdout.isatty()):
-        os.execv(EXEC_TARGET, [EXEC_TARGET] + sys.argv[1:])
-
     # Start from a clean viewport. Droid's TUI assumes a fresh screen; without this,
     # it can visually mix with prior shell output (especially when scrollback exists).
     try:
@@ -2125,7 +2245,7 @@ def main():
                         )
                         # Also detect scroll region changes with parameters (DECSTBM pattern ESC[n;mr)
                         if b"\\x1b[" in detect_buf and b"r" in detect_buf:
-                            if re.search(b"\\x1b\\[\\d*;?\\d*r", detect_buf):
+                            if re.search(b"\\x1b\\\\[[0-9]*;?[0-9]*r", detect_buf):
                                 needs_scroll_region_reset = True
                         if needs_scroll_region_reset:
                             renderer.force_repaint(True)