wherdr 1.3.2 → 1.3.3

package/.output/server/chunks/_/restart.mjs

@@ -1,317 +1,6 @@
-import { H as HerdrError, K as codexMenuOpen, L as terminalUpdateLine, N as terminalUpdateDone, F as sleep, f as findPane, O as restarts, Q as log, R as withPaneLock, q as transcripts, h as herdr, p as poll } from '../nitro/nitro.mjs';
+import { H as HerdrError, a4 as paneForeground, a5 as codexMenuOpen, a6 as stopAgent, a7 as terminalUpdateLine, a8 as waitFor, a9 as terminalUpdateDone, aa as startAgent, $ as sleep, f as findPane, Y as restarts, ab as log, R as withPaneLock, ac as RESTARTABLE, G as transcripts, ad as claudeFooterMode, ae as planRestart, h as herdr, p as poll } from '../nitro/nitro.mjs';
 import crypto from 'node:crypto';
 
-const CLAUDE = {
-  keep: {
-    "--model": 1,
-    "--effort": 1,
-    "--permission-mode": 1,
-    "--fallback-model": 1,
-    "--agent": 1,
-    "--agents": 1,
-    "--settings": 1,
-    "--setting-sources": 1,
-    "--system-prompt": 1,
-    "--append-system-prompt": 1,
-    "--autocompact": 1,
-    "-n": 1,
-    "--name": 1,
-    "--debug-file": 1,
-    "--add-dir": "*",
-    "--mcp-config": "*",
-    "--plugin-dir": "*",
-    "--allowedTools": "*",
-    "--allowed-tools": "*",
-    "--disallowedTools": "*",
-    "--disallowed-tools": "*",
-    "--tools": "*",
-    "--betas": "*",
-    "--dangerously-skip-permissions": 0,
-    "--allow-dangerously-skip-permissions": 0,
-    "--verbose": 0,
-    "--ide": 0,
-    "--chrome": 0,
-    "--no-chrome": 0,
-    "--strict-mcp-config": 0,
-    "--bare": 0,
-    "--brief": 0,
-    "--disable-slash-commands": 0,
-    "--safe-mode": 0,
-    "--restricted": 0
-  },
-  // Conversation choice, one-off launch or already done (worktree created).
-  drop: {
-    "-c": 0,
-    "--continue": 0,
-    "-r": "?",
-    "--resume": "?",
-    "--session-id": 1,
-    "--fork-session": 0,
-    "-w": "?",
-    "--worktree": "?",
-    "--tmux": 0,
-    "--from-pr": "?",
-    "--teleport": "?",
-    "-p": 0,
-    "--print": 0,
-    "--bg": 0,
-    "--background": 0,
-    "--remote-control": "?",
-    "--cloud": "?",
-    "--file": "*",
-    "-d": "?",
-    "--debug": "?"
-  }
-};
-const CODEX = {
-  keep: {
-    "-c": 1,
-    "--config": 1,
-    "--enable": 1,
-    "--disable": 1,
-    "-m": 1,
-    "--model": 1,
-    "--local-provider": 1,
-    "-p": 1,
-    "--profile": 1,
-    "-s": 1,
-    "--sandbox": 1,
-    "-C": 1,
-    "--cd": 1,
-    "--add-dir": 1,
-    "-a": 1,
-    "--ask-for-approval": 1,
-    "--remote": 1,
-    "--remote-auth-token-env": 1,
-    "--oss": 0,
-    "--search": 0,
-    "--no-alt-screen": 0,
-    "--no-daemon": 0,
-    "--full-auto": 0,
-    "--dangerously-bypass-approvals-and-sandbox": 0,
-    "--yolo": 0,
-    "--approve-for-me": 0,
-    "--strict-config": 0,
-    "--dangerously-bypass-hook-trust": 0
-  },
-  drop: { "--last": 0, "--all": 0, "--include-non-interactive": 0, "-i": "*", "--image": "*", "--worktree": 0 }
-};
-const OMP = {
-  keep: {
-    "--model": 1,
-    "--smol": 1,
-    "--slow": 1,
-    "--plan": 1,
-    "--prewalk-into": 1,
-    "--plan-yolo-into": 1,
-    "--provider": 1,
-    "--system-prompt": 1,
-    "--system-prompt-template": 1,
-    "--append-system-prompt": 1,
-    "--profile": 1,
-    "--cwd": 1,
-    "--config": 1,
-    "--add-dir": 1,
-    "--session-dir": 1,
-    "--models": 1,
-    "--tools": 1,
-    "--thinking": 1,
-    "--service-tier": 1,
-    "--hook": 1,
-    "-e": 1,
-    "--extension": 1,
-    "--skills": 1,
-    "--approval-mode": 1,
-    "--plugin-dir": 1,
-    "--allow-home": 0,
-    "--prewalk": 0,
-    "--no-prewalk": 0,
-    "--no-tools": 0,
-    "--no-lsp": 0,
-    "--no-pty": 0,
-    "--hide-thinking": 0,
-    "--advisor": 0,
-    "--external-thinking": 0,
-    "--no-extensions": 0,
-    "--no-skills": 0,
-    "--no-rules": 0,
-    "--no-title": 0,
-    "--auto-approve": 0
-  },
-  // Conversation choice, one-off launch; the API key is never replayed
-  // (it would show in the confirmation).
-  drop: {
-    "-c": 0,
-    "--continue": 0,
-    "-r": "?",
-    "--resume": "?",
-    "-p": 0,
-    "--print": 0,
-    "--plan-yolo": 0,
-    "--from-claude": 0,
-    "--from-codex": 0,
-    "--no-session": 0,
-    "--export": 1,
-    "--mode": 1,
-    "--max-time": 1,
-    "--alias": 1,
-    "--api-key": 1,
-    "--no-ui": 0,
-    "--print-thoughts": 0
-  }
-};
-const SILENT = /* @__PURE__ */ new Set(["-c", "--continue", "-r", "--resume", "--session-id", "--fork-session", "--last", "--all"]);
-const SPECS = { claude: CLAUDE, codex: CODEX, omp: OMP };
-const RESTARTABLE = new Set(Object.keys(SPECS));
-const base$1 = (s) => s.replace(/^.*\//, "").replace(/\.(c?js|mjs)$/, "");
-function launchOptions(kind, argv) {
-  const spec = SPECS[kind];
-  const kept = [];
-  const dropped = [];
-  if (!spec) return { kept, dropped };
-  let i = argv.findIndex((a) => base$1(a) === kind);
-  i = i < 0 ? 1 : i + 1;
-  for (; i < argv.length; i++) {
-    const a = argv[i];
-    if (a === "--") break;
-    if (!a.startsWith("-") || a === "-") continue;
-    const eq = a.indexOf("=");
-    const flag = eq > 0 ? a.slice(0, eq) : a;
-    const keep = flag in spec.keep;
-    const arity = keep ? spec.keep[flag] : spec.drop[flag];
-    const out = [a];
-    if (keep) kept.push(out);
-    else if (!SILENT.has(flag)) dropped.push(out);
-    if (arity === void 0) {
-      if (eq < 0 && argv[i + 1] !== void 0 && !argv[i + 1].startsWith("-")) out.push(argv[++i]);
-      continue;
-    }
-    if (eq > 0 || arity === 0) continue;
-    if (arity === 1) {
-      if (argv[i + 1] !== void 0) out.push(argv[++i]);
-      continue;
-    }
-    while (argv[i + 1] !== void 0 && !argv[i + 1].startsWith("-")) {
-      out.push(argv[++i]);
-      if (arity === "?") break;
-    }
-  }
-  return { kept, dropped };
-}
-const EFFORTS = /* @__PURE__ */ new Set(["low", "medium", "high", "xhigh", "max"]);
-function planRestart(o) {
-  const opts = o.argv ? launchOptions(o.kind, o.argv) : { kept: [], dropped: [] };
-  const mode = o.session ? "resume" : o.hadSession ? "fresh" : "continue";
-  let groups = opts.kept;
-  const without = (...flags) => {
-    groups = groups.filter((g) => !flags.includes(g[0].split("=")[0]));
-  };
-  if (o.kind === "omp" && mode === "resume") without("--model", "--thinking");
-  if (o.kind === "claude") {
-    const cur = o.current || {};
-    if (mode === "resume") without("--model");
-    const effort = String(cur.effort || "").toLowerCase();
-    if (EFFORTS.has(effort)) {
-      without("--effort");
-      groups.push(["--effort", effort]);
-    }
-    if (cur.permissionMode) {
-      without("--permission-mode");
-      if (cur.permissionMode !== "default") groups.push(["--permission-mode", cur.permissionMode]);
-    }
-  }
-  const kept = groups.flat();
-  const dropped = opts.dropped.flat();
-  let args;
-  if (o.kind === "codex") {
-    args = mode === "fresh" ? kept : ["resume", ...kept, mode === "resume" ? o.session : "--last"];
-  } else {
-    args = mode === "resume" ? [...kept, "--resume", o.session] : mode === "continue" ? [...kept, "--continue"] : kept;
-  }
-  return { args, mode, kept, dropped, unknownArgs: !o.argv };
-}
-const FOOTER_MODES = [
-  [/\bplan mode on\b/i, "plan"],
-  [/\baccept edits on\b/i, "acceptEdits"],
-  [/\bauto mode on\b/i, "auto"],
-  [/\bbypass permissions on\b/i, "bypassPermissions"],
-  [/\bdon'?t ask (?:mode )?on\b/i, "dontAsk"]
-];
-function claudeFooterMode(text) {
-  const lines = String(text || "").split("\n");
-  let rule = -1;
-  for (let i = lines.length - 1; i >= 0 && rule < 0; i--) if (/^\s*─{20,}\s*$/.test(lines[i])) rule = i;
-  if (rule < 1 || !lines.slice(Math.max(0, rule - 6), rule).some((l) => /^\s*❯/.test(l))) return null;
-  for (const l of lines.slice(rule + 1)) {
-    for (const [re, mode] of FOOTER_MODES) if (re.test(l)) return mode;
-  }
-  return "default";
-}
-
-const base = (s) => s.replace(/^.*\//, "").replace(/\.(c?js|mjs)$/, "");
-async function paneForeground(d, paneId, kind) {
-  const r = await d.call("pane.process_info", { pane_id: paneId }, 4e3);
-  const info = r && r.process_info || {};
-  const procs = info.foreground_processes || [];
-  const agent = procs.find((p) => p.name === kind || (p.argv || []).some((a) => base(a) === kind)) || null;
-  const atShell = !agent && Boolean(info.shell_pid) && info.foreground_process_group_id === info.shell_pid;
-  const sh = procs.find((p) => info.shell_pid && p.pid === info.shell_pid);
-  const shell = { pid: Number(info.shell_pid) || null, name: sh ? String(sh.name || (sh.argv || [])[0] || "") || null : null };
-  return { agent, atShell, shell, argv: agent && Array.isArray(agent.argv) ? agent.argv.map(String) : null };
-}
-async function waitFor(d, ms, test) {
-  const end = d.now() + ms;
-  while (d.now() < end) {
-    await d.sleep(500);
-    try {
-      if (await test()) return true;
-    } catch {
-    }
-  }
-  return false;
-}
-const waitShell = (d, paneId, kind, ms) => waitFor(d, ms, async () => (await paneForeground(d, paneId, kind)).atShell);
-const busy = async (d, paneId) => {
-  const r = await d.call("pane.get", { pane_id: paneId }, 4e3);
-  const s = r && r.pane && r.pane.agent_status;
-  return s === "working" || s === "blocked";
-};
-async function stopAgent(d, p) {
-  const kind = p.agent;
-  const key = (k) => d.call("pane.send_input", { pane_id: p.id, keys: [k] });
-  if (p.status === "working" || p.status === "blocked") {
-    for (let i = 0; i < 2; i++) {
-      await key("esc");
-      if (await waitFor(d, 3e3, async () => !await busy(d, p.id))) break;
-    }
-  }
-  await d.call("pane.send_input", { pane_id: p.id, text: "/exit" });
-  await d.sleep(300);
-  await key("enter");
-  if (await waitShell(d, p.id, kind, 8e3)) return "exit";
-  await key("ctrl+c");
-  await d.sleep(400);
-  await key("ctrl+c");
-  if (await waitShell(d, p.id, kind, 6e3)) return "ctrl-c";
-  throw new HerdrError("restart_stop", "the agent did not stop");
-}
-async function startAgent(d, p, plan) {
-  const name = p.name || `${p.agent}-${crypto.randomBytes(2).toString("hex")}`;
-  let last = null;
-  for (let i = 0; i < 6; i++) {
-    try {
-      await d.call("agent.start", { name, kind: p.agent, pane_id: p.id, timeout_ms: 6e4, ...plan.args.length ? { args: plan.args } : {} }, 75e3);
-      return;
-    } catch (e) {
-      last = e;
-      if (last.code === "agent_not_ready") return;
-      if (last.code === "timeout" || last.code === "unreachable") break;
-      await d.sleep(500);
-    }
-  }
-  throw last || new HerdrError("restart_start", "the agent did not restart");
-}
-
 const TERM_UPDATE_MS = 10 * 6e4;
 const READ_LINES = 400;
 const readRecent = async (d, paneId) => {
@@ -379,6 +68,7 @@ async function restartPlanFor(p, d = defaultDeps) {
 const planning = /* @__PURE__ */ new Set();
 async function restartAgent(paneId) {
   const p = findPane(paneId);
+  if (p == null ? void 0 : p.stopped) throw new HerdrError("stale", "Use the restart buttons for this stopped agent.");
   if (!p || !p.agent) throw new HerdrError("bad_pane", "agent not found");
   const cur = restarts.get(paneId);
   if (planning.has(paneId) || cur && cur.phase !== "failed") throw new HerdrError("restart_busy", "restart already in progress");

package/.output/server/chunks/_/reveal.mjs

@@ -1,29 +1,7 @@
 import { execFile } from 'node:child_process';
 import { existsSync } from 'node:fs';
-import { a1 as IN_DOCKER, a2 as HOST_OPEN_TARGET, a3 as HOST_OPEN_KEY, H as HerdrError, a4 as PANE_RE, f as findPane, G as getMachine, a5 as splitId, o as fmt, Q as log, a6 as HOST_OPEN_USER } from '../nitro/nitro.mjs';
-
-function posixResolve(base, p) {
-  const out = [];
-  for (const seg of (p.startsWith("/") ? p : `${base}/${p}`).split("/")) {
-    if (seg === "" || seg === ".") continue;
-    if (seg === "..") out.pop();
-    else out.push(seg);
-  }
-  return "/" + out.join("/");
-}
-const POSITION = /:\d+(?::\d+)?$/;
-const stripPosition = (s) => s.replace(POSITION, "");
-function resolveAgentPath(written, cwd, home) {
-  const p = stripPosition(String(written || "").trim());
-  if (!p || !home.startsWith("/") || /[\0\n\r]/.test(p)) return null;
-  const root = posixResolve("/", home);
-  const inside = (r2) => r2 === root || r2.startsWith(root === "/" ? "/" : root + "/");
-  const base = cwd && cwd.startsWith("/") && inside(posixResolve("/", cwd)) ? posixResolve("/", cwd) : root;
-  const r = posixResolve(base, p.replace(/^~(?=$|\/)/, root));
-  return inside(r) ? r : null;
-}
-const RUNNABLE = /\.(app|command|tool|terminal|pkg|mpkg|workflow|action|scpt|scptd|applescript|jar|sh|bash|zsh|csh|fish|py|rb|pl|webloc|inetloc|fileloc|prefpane|qlgenerator|saver|kext|osax|dmg)\/?$/i;
-const runnablePath = (p) => RUNNABLE.test(p);
+import { ap as IN_DOCKER, aq as HOST_OPEN_TARGET, ar as HOST_OPEN_KEY, H as HerdrError, as as PANE_RE, f as findPane, a1 as getMachine, at as splitId, E as fmt, ab as log, au as HOST_OPEN_USER } from '../nitro/nitro.mjs';
+import { r as resolveAgentPath, a as runnablePath } from './filePaths.mjs';
 
 const REVEAL_CHECKS = `p=$2
 [ -e "$p" ] || exit 3

package/.output/server/chunks/_/selfupdate.mjs

@@ -3,8 +3,8 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { p as pkg } from './package.mjs';
-import { bh as installMode, H as HerdrError, Q as log, bi as oneTapMode, bl as updateRunning } from '../nitro/nitro.mjs';
-import { c as checkUpdate } from './updates.mjs';
+import { bB as installMode, H as HerdrError, ab as log, bC as oneTapMode, bF as updateRunning } from '../nitro/nitro.mjs';
+import { c as checkUpdate, R as REPO } from './updates.mjs';
 
 function wherdrDir(env = process.env) {
   const home = os.homedir();
@@ -33,6 +33,7 @@ function buildPlan(o) {
     serverPid: o.pid,
     port: String(o.env.NITRO_PORT || o.env.PORT || 3e3),
     host: String(o.env.NITRO_HOST || o.env.HOST || "127.0.0.1"),
+    releaseBase: `https://github.com/${REPO}/releases/download`,
     registry: o.env.npm_config_registry || "https://registry.npmjs.org"
   };
 }

package/.output/server/chunks/_/updates.mjs

@@ -1,8 +1,8 @@
 import { p as pkg } from './package.mjs';
-import { bh as installMode, bi as oneTapMode, bj as updateCommand, bk as compareVersions } from '../nitro/nitro.mjs';
+import { bB as installMode, bC as oneTapMode, bD as updateCommand, bE as compareVersions } from '../nitro/nitro.mjs';
 
 const REPO = "afloury/wherdr";
-const RELEASES_URL = `https://api.github.com/repos/${REPO}/releases/latest`;
+const RELEASES_URL = `https://api.github.com/repos/${REPO}/releases?per_page=100`;
 const DAY_MS = 24 * 60 * 60 * 1e3;
 const RETRY_MS = 60 * 60 * 1e3;
 function createUpdateChecker(opts) {
@@ -12,12 +12,46 @@ function createUpdateChecker(opts) {
   let nextAt = 0;
   let pending = null;
   async function refresh() {
+    var _a2;
     try {
       const res = await opts.fetch(RELEASES_URL);
       if (!res.ok) throw new Error("http");
-      const body = await res.json();
-      if (typeof body.tag_name !== "string") throw new Error("tag");
-      cached = { version: body.tag_name.replace(/^v/, ""), url: typeof body.html_url === "string" ? body.html_url : "" };
+      const releases = await res.json();
+      const body = releases.filter((r) => !r.draft && !r.prerelease && /^v\d+\.\d+\.\d+$/.test(String(r.tag_name))).sort((a, b) => compareVersions(String(b.tag_name), String(a.tag_name)))[0];
+      if (!body || typeof body.tag_name !== "string") throw new Error("tag");
+      const candidate = { version: body.tag_name.replace(/^v/, ""), url: typeof body.html_url === "string" ? body.html_url : "" };
+      const mode = installMode(opts.env.WHERDR_INSTALL);
+      if (mode === "plugin") {
+        const archive = `https://github.com/${REPO}/releases/download/v${candidate.version}/wherdr-${candidate.version}.tgz`;
+        if (!(await opts.fetch(archive)).ok || !(await opts.fetch(`${archive}.sha256`)).ok) {
+          nextAt = now() + RETRY_MS;
+          return;
+        }
+      }
+      if (mode === "npm" || mode === "npm-global") {
+        const registry = (opts.env.npm_config_registry || "https://registry.npmjs.org").replace(/\/$/, "");
+        const available = await opts.fetch(`${registry}/wherdr/-/wherdr-${candidate.version}.tgz`);
+        if (!available.ok) {
+          nextAt = now() + RETRY_MS;
+          return;
+        }
+        if (mode === "npm") {
+          const latest = await opts.fetch(`${registry}/wherdr/latest`);
+          if (!latest.ok || (await latest.json()).version !== candidate.version) {
+            nextAt = now() + RETRY_MS;
+            return;
+          }
+        }
+      }
+      if (mode === "brew") {
+        const formula = await opts.fetch("https://raw.githubusercontent.com/afloury/homebrew-tap/main/Formula/wherdr.rb");
+        const text = formula.ok ? await ((_a2 = formula.text) == null ? void 0 : _a2.call(formula)) : "";
+        if (!(text == null ? void 0 : text.includes(`/v${candidate.version}/wherdr-${candidate.version}.tgz"`))) {
+          nextAt = now() + RETRY_MS;
+          return;
+        }
+      }
+      cached = candidate;
       nextAt = now() + DAY_MS;
     } catch {
       nextAt = now() + RETRY_MS;
@@ -37,14 +71,21 @@ function createUpdateChecker(opts) {
     return { ...base, latest: newer ? cached.version : null, url: newer ? cached.url || null : null, checked: !!cached };
   };
 }
+function fetchUpdateResource(url, request = fetch) {
+  return request(url, {
+    method: /\.tgz(?:\.sha256)?$/.test(url) ? "HEAD" : "GET",
+    headers: {
+      ...new URL(url).hostname === "api.github.com" ? { accept: "application/vnd.github+json" } : {},
+      "user-agent": "wherdr"
+    },
+    signal: AbortSignal.timeout(1e4)
+  });
+}
 const checkUpdate = createUpdateChecker({
   current: pkg.version,
   env: process.env,
-  fetch: (url) => fetch(url, {
-    headers: { accept: "application/vnd.github+json", "user-agent": "wherdr" },
-    signal: AbortSignal.timeout(1e4)
-  })
+  fetch: fetchUpdateResource
 });
 
-export { checkUpdate as c };
+export { REPO as R, checkUpdate as c };
 //# sourceMappingURL=updates.mjs.map

package/.output/server/chunks/_/worktrees.mjs

@@ -1,4 +1,4 @@
-import { bm as allMachines, G as getMachine, H as HerdrError, a5 as splitId, aA as herdrOn, p as poll, bn as recentDirs, bo as joinId, aB as getState } from '../nitro/nitro.mjs';
+import { bG as allMachines, a1 as getMachine, H as HerdrError, at as splitId, x as herdrOn, p as poll, bH as recentDirs, bI as joinId, m as getState } from '../nitro/nitro.mjs';
 
 const opts = { trust_repository: true };
 async function machineWorktrees(m) {

package/.output/server/chunks/_/ws.mjs

@@ -1,4 +1,4 @@
-import { bw as hostAllowed, bx as sameOrigin, k as auth } from '../nitro/nitro.mjs';
+import { bP as hostAllowed, bQ as sameOrigin, k as auth } from '../nitro/nitro.mjs';
 
 var _a, _b;
 const WS_MAX = 256 * 1024;