wherdr 1.3.4 → 2.0.1

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

@@ -1,9 +1,94 @@
-import { v as machineFor, x as herdrOn, H as HerdrError, f as findPane, ay as splitId, ag as log, aI as underHome, aO as isGitRepo, G as fmt, m as getState, a4 as sleep, au as IN_DOCKER, y as HERDR_CHILD_ENV, am as HOME, z as HERDR_BIN } from '../nitro/nitro.mjs';
-import { execFile } from 'node:child_process';
-import { b as binaryOn } from './projectBoard.mjs';
-import { p as projectsPluginState } from './projectsPlugin2.mjs';
-import { n as normalizeActions, P as PLUGIN_ID_RE, A as ACTION_ID_RE, a as actionContext, l as logResult, s as stripAnsi, o as outputTail, R as REMOTE_PROJECTS_SCRIPT } from './pluginPolicy.mjs';
-import { c as cleanProjectInput, r as repoArgument, a as projectCommandArgs, b as parseProfileList, t as tickerRunning, s as setupHeader, P as PROJECT_INPUTS, d as readOnlyMessage } from './projectsActions.mjs';
+import { m as machineFor, aZ as herdrOn, H as HerdrError, f as findPane, a_ as splitId, a$ as getState, aa as log, X as sleep } from '../nitro/nitro.mjs';
+
+const PLUGIN_ID_RE = /^[A-Za-z0-9.:_-]{1,100}$/;
+const ACTION_ID_RE = /^[A-Za-z0-9:_-]{1,100}$/;
+function actionContext(pane, workspaces = []) {
+  const context = { invocation_source: "wherdr" };
+  if (!pane) return context;
+  const local = (id) => id.includes("~") ? id.slice(id.indexOf("~") + 1) : id;
+  const workspace = workspaces.find((w) => w.id === pane.workspace);
+  return {
+    ...context,
+    focused_pane_id: local(pane.id),
+    tab_id: local(pane.tab),
+    workspace_id: local(pane.workspace),
+    workspace_label: (workspace == null ? void 0 : workspace.label) || "",
+    workspace_cwd: pane.cwd || "",
+    focused_pane_cwd: pane.cwd || ""
+  };
+}
+const AGENT_CONTEXTS = ["workspace", "tab", "pane"];
+const READ_ONLY = /\b(list|lists|show|status|view|info|doctor|check|help|preview|inspect|lister|liste|voir|afficher|état|etat|vérifier|verifier|aide)\b/i;
+function needsConfirm(a) {
+  return !(READ_ONLY.test(a.id.replace(/[_:]/g, "-")) || READ_ONLY.test(a.title));
+}
+function shortLabel(title, pluginName) {
+  const esc = pluginName.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const rest = title.replace(new RegExp(`^${esc}\\s*[:\xB7\u2014\u2013-]\\s*`, "i"), "").trim();
+  return rest ? rest[0].toUpperCase() + rest.slice(1) : title;
+}
+const isOwnPlugin = (id) => id === "wherdr" || id.endsWith(".wherdr");
+function opensInHerdr(a) {
+  if (a.placement === "popup" || a.placement === "overlay") return true;
+  const cmd = Array.isArray(a.command) ? a.command.map(String).join(" ") : "";
+  if (/\bplugin\s+pane\s+open\b/.test(cmd)) return true;
+  return /(^|[-_:])popup($|[-_:])/i.test(String(a.action_id || ""));
+}
+function normalizeActions(actions, plugins = []) {
+  const byId = new Map(plugins.filter((p) => p && p.plugin_id).map((p) => [p.plugin_id, p]));
+  const out = [];
+  for (const a of actions || []) {
+    const plugin = String((a == null ? void 0 : a.plugin_id) || "");
+    const id = String((a == null ? void 0 : a.action_id) || "");
+    if (!PLUGIN_ID_RE.test(plugin) || !ACTION_ID_RE.test(id) || isOwnPlugin(plugin)) continue;
+    const p = byId.get(plugin);
+    if (p && p.enabled === false) continue;
+    const ctx = (Array.isArray(a.contexts) ? a.contexts : []).map(String);
+    const agent = ctx.some((c) => AGENT_CONTEXTS.includes(c));
+    const machine = !ctx.length || ctx.includes("global");
+    if (!agent && !machine) continue;
+    const title = String(a.title || id).replace(/\s+/g, " ").trim().slice(0, 120) || id;
+    const description = a.description ? String(a.description).replace(/\s+/g, " ").trim().slice(0, 240) || null : null;
+    const pluginName = String((p == null ? void 0 : p.name) || plugin).trim() || plugin;
+    out.push({
+      plugin,
+      pluginName,
+      id,
+      title,
+      label: shortLabel(title, pluginName),
+      description,
+      agent,
+      machine,
+      confirm: needsConfirm({ id, title }),
+      inHerdr: opensInHerdr(a)
+    });
+  }
+  return out.sort((x, y) => x.pluginName.localeCompare(y.pluginName) || x.label.localeCompare(y.label));
+}
+const ANSI = /\x1B(?:\[[0-?]*[ -/]*[@-~]|\][^\x07\x1B]*(?:\x07|\x1B\\)|[@-Z\\-_])/g;
+function stripAnsi(text) {
+  return String(text || "").replace(ANSI, "").replace(/[\x00-\x08\x0B-\x1F\x7F]/g, "");
+}
+function outputTail(text, max = 300) {
+  const lines = stripAnsi(text).split("\n").map((l) => l.trim()).filter(Boolean);
+  let out = "";
+  for (let i = lines.length - 1; i >= 0; i--) {
+    const next = out ? `${lines[i]}
+${out}` : lines[i];
+    if (next.length > max) {
+      if (!out) out = "\u2026" + lines[i].slice(-(max - 1));
+      break;
+    }
+    out = next;
+  }
+  return out;
+}
+function logResult(log2) {
+  const status = (log2 == null ? void 0 : log2.status) === "succeeded" || (log2 == null ? void 0 : log2.status) === "failed" ? log2.status : "running";
+  const exitCode = typeof (log2 == null ? void 0 : log2.exit_code) === "number" ? log2.exit_code : null;
+  const output = status === "failed" ? outputTail(log2 == null ? void 0 : log2.stderr) || outputTail(log2 == null ? void 0 : log2.error) || outputTail(log2 == null ? void 0 : log2.stdout) : outputTail(log2 == null ? void 0 : log2.stdout) || outputTail(log2 == null ? void 0 : log2.stderr);
+  return { status, exitCode, output };
+}
 
 const CACHE_MS = 1e4;
 const cache = /* @__PURE__ */ new Map();
@@ -20,80 +105,6 @@ async function listPluginActions(machineKey, fresh = false) {
   return actions;
 }
 const WAIT_MS = 12e3;
-function pluginInputFields(plugin, action) {
-  return plugin === "herdr-projects" ? PROJECT_INPUTS[action] || [] : [];
-}
-async function runProjects(m, bin, args, timeoutMs = 6e4) {
-  var _a;
-  if (m.exec) {
-    const herdrBin = "bin" in m && typeof m.bin === "string" && m.bin ? m.bin : "herdr";
-    const r = await m.exec(REMOTE_PROJECTS_SCRIPT, [herdrBin, bin, ...args], { timeoutMs });
-    return { code: (_a = r.code) != null ? _a : 1, stdout: r.stdout.toString("utf8").trim(), stderr: r.stderr.trim() };
-  }
-  return new Promise((resolve) => execFile(bin, args, {
-    env: { ...HERDR_CHILD_ENV, HERDR_BIN_PATH: HERDR_BIN },
-    timeout: timeoutMs,
-    maxBuffer: 1024 * 1024
-  }, (err, stdout, stderr) => resolve({
-    code: err ? typeof err.code === "number" ? err.code : 1 : 0,
-    stdout: String(stdout).trim(),
-    stderr: String(stderr || (err && !stdout ? err.message : "")).trim()
-  })));
-}
-async function projectsBin(m) {
-  var _a;
-  const bin = await binaryOn(m);
-  if (bin) return bin;
-  if ((_a = await projectsPluginState(m).catch(() => null)) == null ? void 0 : _a.unsupported) throw new HerdrError("plugin_unsupported", "herdr-projects 1.x is not supported by wherdr yet: install the 0.2 line (Settings \u203A Plugins \u203A herdr-projects)");
-  throw new HerdrError("plugin_unavailable", "Projects binary not found");
-}
-async function projectsCommand(m, args, lang = "en") {
-  const r = await runProjects(m, await projectsBin(m), args);
-  if (r.code !== 0) {
-    const error = r.stderr || r.stdout || `code ${r.code}`;
-    const readOnly = readOnlyMessage(error, { docker: m.local && IN_DOCKER });
-    if (readOnly) log(`herdr-projects ${args[0]}: ${error}`);
-    throw new HerdrError(readOnly ? "read_only" : "plugin_failed", readOnly || error);
-  }
-  return r.stdout;
-}
-async function withoutContainerTicker(m, run) {
-  if (!m.local || !IN_DOCKER) return run();
-  const bin = await projectsBin(m);
-  const before = await runProjects(m, bin, ["ticker", "status"]).catch(() => null);
-  try {
-    return await run();
-  } finally {
-    if (before && before.code === 0 && !tickerRunning(before.stdout)) {
-      const after = await runProjects(m, bin, ["ticker", "status"]).catch(() => null);
-      if (after && tickerRunning(after.stdout)) {
-        log("herdr-projects: ticker started in the container, stop requested (it will restart on the host)");
-        runProjects(m, bin, ["ticker", "stop"]).then((r) => r.code && log(`herdr-projects ticker stop: ${r.stderr || r.code}`));
-      }
-    }
-  }
-}
-async function projectsDoctor(m) {
-  const bin = await projectsBin(m);
-  const [version, doctor] = await Promise.all([
-    runProjects(m, bin, ["--version"]).catch(() => null),
-    runProjects(m, bin, projectCommandArgs("doctor", {}, { session: m.session }))
-  ]);
-  const home = m.local ? String(HERDR_CHILD_ENV.HOME || HOME) : m.home;
-  const full = stripAnsi([doctor.stdout, doctor.stderr].filter(Boolean).join("\n")).slice(-12e3);
-  return {
-    status: doctor.code === 0 ? "succeeded" : "failed",
-    exitCode: doctor.code,
-    output: outputTail(full),
-    full,
-    setup: setupHeader({ version: version && version.code === 0 ? version.stdout : null, binary: bin, home })
-  };
-}
-async function projectProfiles(machineKey) {
-  const m = machineFor(machineKey);
-  const r = await runProjects(m, await projectsBin(m), ["profile", "list"], 1e4);
-  return r.code === 0 ? parseProfileList(stripAnsi(r.stdout)) : null;
-}
 async function invokePluginAction(body) {
   const plugin = String(body.plugin || "");
   const action = String(body.action || "");
@@ -105,50 +116,6 @@ async function invokePluginAction(body) {
   const known = (await listPluginActions(m.key, true)).find((a) => a.plugin === plugin && a.id === action);
   if (!known) throw new HerdrError("plugin_action_not_found", "Action not found on this machine");
   if (pane ? !known.agent : !known.machine) throw new HerdrError("bad_context", "Action not available here");
-  if (plugin === "herdr-projects" && action === "open-popup") {
-    throw new HerdrError("popup_unavailable", "The Projects panel is available in the Herdr client; its inputs are not reachable through the Herdr API.");
-  }
-  if (plugin === "herdr-projects" && action === "doctor") {
-    log(`plugin ${plugin}.${action}${m.local ? "" : ` on ${m.label}`} (command)`);
-    return projectsDoctor(m);
-  }
-  const fields = pluginInputFields(plugin, action);
-  if (fields.length) {
-    const input = cleanProjectInput(action, body.input);
-    if (!input) throw new HerdrError("bad_input", "Invalid plugin input");
-    if (action === "adopt-workspace" && (!pane || !pane.agent || !pane.cwd)) {
-      throw new HerdrError("bad_context", "This space needs an agent and its folder");
-    }
-    if (input.repo) {
-      const rm = input.machine ? machineFor(input.machine) : m;
-      const repo = underHome(input.repo, rm.home);
-      if (!repo || !await isGitRepo(repo, rm)) throw new HerdrError("bad_input", fmt("Not a Git repository: {path}", { path: input.repo }));
-      const arg = repoArgument(repo, rm, m);
-      if (!arg) throw new HerdrError("bad_input", fmt("Repository unusable from {machine}: {path}", { machine: m.label, path: `${repo}${rm === m ? "" : ` (${rm.label})`}` }));
-      input.repo = arg;
-    }
-    delete input.machine;
-    const lang = body.lang === "fr" ? "fr" : "en";
-    const args = projectCommandArgs(action, input, { pane: pane ? splitId(pane.id).local : void 0, cwd: (pane == null ? void 0 : pane.cwd) || void 0, session: m.session, lang });
-    const exec = async () => {
-      var _a;
-      const output = await projectsCommand(m, args, lang);
-      if (action === "new") {
-        const slug = (_a = /created `([^`]+)`/.exec(output)) == null ? void 0 : _a[1];
-        if (slug) {
-          try {
-            return { status: "succeeded", exitCode: 0, output: outputTail(`${output}
-${await projectsCommand(m, projectCommandArgs("open", { slug }, { session: m.session }), lang)}`) };
-          } catch (e) {
-            return { status: "failed", exitCode: null, output: outputTail(`${output}
-${e.message}`) };
-          }
-        }
-      }
-      return { status: "succeeded", exitCode: 0, output: outputTail(output) };
-    };
-    return ["new", "open", "adopt-workspace"].includes(action) ? withoutContainerTicker(m, exec) : exec();
-  }
   const context = actionContext(pane || null, getState().workspaces);
   const r = await herdrOn(m.key, "plugin.action.invoke", { plugin_id: plugin, action_id: action, context }, 1e4);
   const logId = r.log && r.log.log_id;
@@ -165,5 +132,5 @@ ${e.message}`) };
   return res;
 }
 
-export { invokePluginAction as i, listPluginActions as l, projectProfiles as p, withoutContainerTicker as w };
+export { invokePluginAction as i, listPluginActions as l };
 //# sourceMappingURL=plugins.mjs.map

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

@@ -1,4 +1,4 @@
-import { H as HerdrError, a9 as paneForeground, aa as codexMenuOpen, ab as stopAgent, ac as terminalUpdateLine, ad as waitFor, ae as terminalUpdateDone, af as startAgent, a4 as sleep, f as findPane, a1 as restarts, ag as log, X as withPaneLock, ah as RESTARTABLE, J as transcripts, ai as claudeFooterMode, aj as planRestart, h as herdr, p as poll } from '../nitro/nitro.mjs';
+import { H as HerdrError, a3 as paneForeground, a4 as codexMenuOpen, a5 as stopAgent, a6 as terminalUpdateLine, a7 as waitFor, a8 as terminalUpdateDone, a9 as startAgent, X as sleep, f as findPane, T as restarts, aa as log, M as withPaneLock, ab as RESTARTABLE, y as transcripts, ac as claudeFooterMode, ad as planRestart, h as herdr, p as poll } from '../nitro/nitro.mjs';
 import crypto from 'node:crypto';
 
 const TERM_UPDATE_MS = 10 * 6e4;

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

@@ -3,7 +3,7 @@ import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
 import { p as pkg } from './package.mjs';
-import { bK as installMode, H as HerdrError, ag as log, bL as oneTapMode, bO as updateRunning } from '../nitro/nitro.mjs';
+import { c6 as installMode, H as HerdrError, aa as log, c7 as oneTapMode, ca as updateRunning } from '../nitro/nitro.mjs';
 import { c as checkUpdate, R as REPO } from './updates.mjs';
 
 function wherdrDir(env = process.env) {

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

@@ -1,5 +1,5 @@
 import { p as pkg } from './package.mjs';
-import { bK as installMode, bL as oneTapMode, bM as updateCommand, bN as compareVersions } from '../nitro/nitro.mjs';
+import { c6 as installMode, c7 as oneTapMode, c8 as updateCommand, c9 as compareVersions } from '../nitro/nitro.mjs';
 
 const REPO = "afloury/wherdr";
 const RELEASES_URL = `https://api.github.com/repos/${REPO}/releases?per_page=100`;

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

@@ -1,4 +1,4 @@
-import { bP as allMachines, a6 as getMachine, H as HerdrError, ay as splitId, x as herdrOn, p as poll, bQ as recentDirs, bR as joinId, m as getState } from '../nitro/nitro.mjs';
+import { cb as allMachines, $ as getMachine, H as HerdrError, a_ as splitId, aZ as herdrOn, p as poll, an as recentDirs, cc as joinId, a$ 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 { bY as hostAllowed, bZ as sameOrigin, k as auth } from '../nitro/nitro.mjs';
+import { ck as networkReady, cl as ensureFresh, cm as gateDecision, cn as sameOrigin, co as hostAllowed, k as auth, cp as checkRequestClient, cq as onNetworkReading } from '../nitro/nitro.mjs';
 
 var _a, _b;
 const WS_MAX = 256 * 1024;
@@ -9,11 +9,25 @@ function headersOf(h) {
   });
   return out;
 }
-function checkUpgrade(request) {
-  const headers = headersOf(request.headers);
-  if (!hostAllowed(headers.host)) return new Response(null, { status: 403, statusText: "Host not allowed" });
-  if (!sameOrigin(headers)) return new Response(null, { status: 403, statusText: "Forbidden" });
-  if (!auth.isUnlocked({ headers })) return new Response(null, { status: 401, statusText: "Unauthorized" });
+function upgradeVerdict(headers, remoteAddress) {
+  return gateDecision({
+    check: checkRequestClient(remoteAddress, headers),
+    unlocked: auth.isUnlocked({ headers }),
+    hostOk: hostAllowed(headers.host),
+    crossSite: !sameOrigin(headers),
+    path: "/ws",
+    ws: true
+  });
+}
+async function checkUpgrade(request) {
+  var _a2, _b2;
+  await networkReady();
+  await ensureFresh(0);
+  const verdict = upgradeVerdict(headersOf(request.headers), (_b2 = (_a2 = request._req) == null ? void 0 : _a2.socket) == null ? void 0 : _b2.remoteAddress);
+  if (verdict === "network") return new Response(null, { status: 403, statusText: "Network not allowed" });
+  if (verdict === "host") return new Response(null, { status: 403, statusText: "Host not allowed" });
+  if (verdict === "origin") return new Response(null, { status: 403, statusText: "Forbidden" });
+  if (verdict === "locked") return new Response(null, { status: 401, statusText: "Unauthorized" });
 }
 const rawWs = (peer) => {
   var _a2;
@@ -32,6 +46,29 @@ function watchPeer(peer) {
 function unwatchPeer(peer) {
   alive.delete(peer);
 }
+function revalidatePeers(peers = alive.keys(), judge = upgradeVerdict) {
+  var _a2;
+  let closed = 0;
+  for (const peer of [...peers]) {
+    let verdict;
+    try {
+      verdict = judge(((_a2 = peer.request) == null ? void 0 : _a2.headers) ? headersOf(peer.request.headers) : {}, peer.remoteAddress);
+    } catch {
+      verdict = "network";
+    }
+    if (verdict === "ok") continue;
+    closed++;
+    alive.delete(peer);
+    try {
+      peer.close(1008, "Network policy changed");
+    } catch {
+    }
+  }
+  return closed;
+}
+onNetworkReading(() => {
+  revalidatePeers();
+});
 (_b = (_a = setInterval(() => {
   for (const [peer, ok] of alive) {
     const ws = rawWs(peer);