@dylanpiercey/work 0.2.18 → 0.2.20

package/bin/cli/topic.mjs

@@ -170,65 +170,69 @@ function fetch(ctx, repo) {
 
 // -- new ---------------------------------------------------------------------
 
-async function topicNew(ctx) {
-  const [name] = ctx.parse(["--repo", "--from"]);
-  if (!name)
-    ctx.die("usage: work topic new <name> [--repo <repo>…] [--from <ref>]");
-  if (!NAME.test(name) || name.includes(".."))
-    ctx.die(
-      `"${name}" is not a topic name: letters, digits, \`-\`, \`_\`, and \`.\` for a group (\`<group>.<topic>\`)`,
-    );
-  const { ws, repos } = await context(ctx, false);
-  const branch = `${ws.branch}-${name}`;
-  const from = ctx.has("--from") ? ctx.flag("--from") : null;
-  const picked = pickRepos(ctx, ws, repos);
-  for (const repo of picked) {
-    if (
-      !git(repo.dir, ["check-ref-format", "--branch", branch], {
-        allowFail: true,
-      }).ok
-    )
-      ctx.die(`${branch} is not a branch name git takes`);
-  }
-  // Every refusal before anything is made: half a topic is worse than none.
-  const plans = [];
-  for (const repo of picked) {
-    fetch(ctx, repo);
-    const dest = topicDir(ws, name, repo);
-    if (has(repo.dir, `refs/heads/${branch}`))
+/** Make the topics `names`, each a branch off its base and a worktree in
+ * every repo `picked`, and run each's install with `install`. Every
+ * refusal comes before anything is made: half a topic is worse than
+ * none, and half a fan-out's worse still. Returns a row per worktree. */
+export function makeTopics(
+  ctx,
+  ws,
+  picked,
+  names,
+  { from = null, install = false } = {},
+) {
+  for (const name of names)
+    if (!NAME.test(name) || name.includes(".."))
       ctx.die(
-        `${repo.worktree}: ${branch} already exists${worktreesOf(repo.dir).get(branch) ? ` (at ${worktreesOf(repo.dir).get(branch)})` : ""} — pick another name, or work in it`,
+        `"${name}" is not a topic name: letters, digits, \`-\`, \`_\`, and \`.\` for a group (\`<group>.<topic>\`)`,
       );
-    if (has(repo.dir, `refs/remotes/origin/${branch}`))
-      ctx.die(
-        `${repo.worktree}: ${branch} is already on origin — check it out there (git -C ${repo.dir} worktree add ${dest} ${branch}) rather than starting it again`,
-      );
-    if (fs.existsSync(dest)) ctx.die(`${dest} already exists`);
-    const start = from ?? `origin/${repo.base_branch}`;
-    if (!has(repo.dir, `${start}^{commit}`))
-      ctx.die(`${repo.worktree}: no ${start} to start from`);
-    plans.push({ repo, dest, start });
+  for (const repo of picked) fetch(ctx, repo);
+  const plans = [];
+  for (const name of names) {
+    const branch = `${ws.branch}-${name}`;
+    for (const repo of picked) {
+      if (
+        !git(repo.dir, ["check-ref-format", "--branch", branch], {
+          allowFail: true,
+        }).ok
+      )
+        ctx.die(`${branch} is not a branch name git takes`);
+      const dest = topicDir(ws, name, repo);
+      if (has(repo.dir, `refs/heads/${branch}`))
+        ctx.die(
+          `${repo.worktree}: ${branch} already exists${worktreesOf(repo.dir).get(branch) ? ` (at ${worktreesOf(repo.dir).get(branch)})` : ""} — pick another name, or work in it`,
+        );
+      if (has(repo.dir, `refs/remotes/origin/${branch}`))
+        ctx.die(
+          `${repo.worktree}: ${branch} is already on origin — check it out there (git -C ${repo.dir} worktree add ${dest} ${branch}) rather than starting it again`,
+        );
+      if (fs.existsSync(dest)) ctx.die(`${dest} already exists`);
+      const start = from ?? `origin/${repo.base_branch}`;
+      if (!has(repo.dir, `${start}^{commit}`))
+        ctx.die(`${repo.worktree}: no ${start} to start from`);
+      plans.push({ name, branch, repo, dest, start });
+    }
   }
   const made = [];
-  for (const { repo, dest, start } of plans) {
+  for (const { name, branch, repo, dest, start } of plans) {
     fs.mkdirSync(path.dirname(dest), { recursive: true });
     // --no-track: its upstream is set by the first push, to its own name on
     // origin, never to the base it was cut from.
     git(repo.dir, ["worktree", "add", "--no-track", "-b", branch, dest, start]);
-    const install = installFor(dest);
     const stacked = from && from !== `origin/${repo.base_branch}` ? from : null;
     made.push({
+      topic: name,
       repo: repo.worktree,
       branch,
       path: dest,
       base: repo.base_branch,
       from: start,
       stacked,
-      install,
+      install: installFor(dest),
       link: link(ws, repo, name),
     });
   }
-  if (ctx.has("--install")) {
+  if (install) {
     for (const m of made) {
       if (!m.install) continue;
       ctx.log(`${m.repo}: ${m.install}`);
@@ -242,6 +246,25 @@ async function topicNew(ctx) {
       if (!m.installed) ctx.warn(`${m.repo}: \`${m.install}\` failed`);
     }
   }
+  return made;
+}
+
+/** The workspace, its repos, and the ones a command names (`--repo`, else
+ * the one the cwd is in): what `makeTopics` takes. */
+export async function topicRepos(ctx) {
+  const { ws, repos } = await context(ctx, false);
+  return { ws, picked: pickRepos(ctx, ws, repos) };
+}
+
+async function topicNew(ctx) {
+  const [name] = ctx.parse(["--repo", "--from"]);
+  if (!name)
+    ctx.die("usage: work topic new <name> [--repo <repo>…] [--from <ref>]");
+  const { ws, picked } = await topicRepos(ctx);
+  const made = makeTopics(ctx, ws, picked, [name], {
+    from: ctx.has("--from") ? ctx.flag("--from") : null,
+    install: ctx.has("--install"),
+  }).map(({ topic: _, ...m }) => m);
   ctx.out(made, (rows) => {
     for (const m of rows) {
       console.log(`${m.repo}/ on ${m.branch}`);

package/bin/work.mjs

@@ -133,7 +133,9 @@ const cli = await cliCommand(command, positional[0]);
 
 switch (cli ? "" : command) {
   case "":
-    await cli.cmd.run(cliContext(cli.words));
+    // `work session --help` is what an agent tries before `work help`.
+    if (args.includes("--help") || args.includes("-h")) await helpCmd(command);
+    else await cli.cmd.run(cliContext(cli.words));
     break;
   case "help":
   case "--help":
@@ -285,6 +287,13 @@ async function apiCall(method, path, body, timeoutMs = 30_000) {
       signal: AbortSignal.timeout(timeoutMs),
     });
   } catch {
+    // Codex runs commands in a sandbox with no network, a local socket
+    // included: the server is up, the command has to run outside it,
+    // which the agent asks the user for.
+    if (process.env.CODEX_SANDBOX_NETWORK_DISABLED)
+      die(
+        "work cannot reach its server from inside Codex's sandbox (no network there): run this command outside the sandbox, with escalated permissions",
+      );
     die(`no work server on port ${port}. Start one with: work start`);
   }
   const text = await res.text();

package/dist/_BHlbSSAl.js

@@ -0,0 +1,182 @@
+var glyphBadgeNum = "_P _O";
+var usageInk = {
+	ok: "_Q",
+	mid: "_R",
+	warm: "_S",
+	hot: "_T"
+};
+var usageFill = {
+	ok: "_U",
+	mid: "_V",
+	warm: "_W",
+	hot: "_X"
+};
+var prTone = {
+	open: "_Y",
+	draft: "_Z",
+	merged: "_0",
+	closed: "_1"
+};
+var phaseIcon = {
+	working: "_bd _bc",
+	waiting: "_be _bc",
+	idle: "_bf _bc",
+	off: "_bg _bc"
+};
+var btnSm = "_bn _I";
+var btnLg = "_bo _I";
+var tone = {
+	accent: "_bs",
+	ok: "_bt",
+	warn: "_bu",
+	danger: "_bv",
+	merged: "_bw",
+	closed: "_bx"
+};
+var inputLg = "_bB _bA";
+var iconBtnXs = "_bF _D";
+var iconBtnRow = "_bG _D";
+var iconBtnLg = "_bH _D";
+var chipBtn = "_bI _D";
+var toastStack = "_o _n";
+var toastKind = {
+	error: "_s",
+	warn: "_t",
+	info: "_u"
+};
+var toastTitle = {
+	error: "_v",
+	warn: "_w",
+	info: "_x"
+};
+var tocDot = "_dh _ba";
+//#endregion
+//#region src/styles/tokens.css.ts
+var color = {
+	ok: "light-dark(#1a7f37, #57d364)",
+	okStrong: "light-dark(#116329, #7ee787)",
+	warn: "light-dark(#bf8700, #d4a72c)",
+	warnStrong: "light-dark(#8a5a00, #f0b84a)",
+	merged: "light-dark(#8250df, #a371f7)",
+	closed: "light-dark(#cf222e, #f85149)",
+	onAccent: "#fff",
+	onDanger: "#fff",
+	accentDefault: "light-dark(#4f5bd5, #6470e6)",
+	bg: "var(--bg)",
+	panel: "var(--panel)",
+	border: "var(--border)",
+	text: "var(--text)",
+	dim: "var(--dim)",
+	accent: "var(--accent)",
+	accentFill: "var(--accent-fill)",
+	accentText: "var(--accent-text)",
+	danger: "var(--danger)",
+	fieldBorder: "var(--field-border)",
+	raised: "color-mix(in srgb, var(--panel) 94%, var(--text))",
+	raisedHover: "color-mix(in srgb, var(--panel) 90%, var(--text))",
+	onScrim: "#fff"
+};
+var sans = "Inter, ui-sans-serif, system-ui, -apple-system, \"Segoe UI\", sans-serif";
+var iconSize = {
+	sm: 12,
+	md: 14,
+	lg: 16,
+	xl: 18
+};
+//#endregion
+//#region src/tags/settings-agents.css.ts
+var agentRow = "_fj _ef";
+var list$3 = "_ej _dJ _ee _eh";
+var metaChip = "_ex _bz _by";
+var sectionCount = "_dG _bp _bq";
+var usageNote = "_kc _by";
+var pop$2 = "_hf _bN";
+var spinner = "_hi _bD _bi";
+var toolLead = "_g1 _es";
+var name$4 = "_gT _es";
+var desc$1 = "_gU _et";
+//#endregion
+//#region src/tags/lsp-add-dialog.css.ts
+var addDlg = "_lK _bV";
+var key$1 = "_me _mc";
+var addTile = "_mg _mc";
+var field$3 = "_mr _bA";
+var keyField = "_ms _mr _bA";
+var labelField = "_mt _mr _bA";
+var detailsToggle = "_gA _6";
+var themeSeg = "_fR _bR";
+var checkList = "_hJ _dH";
+//#endregion
+//#region src/tags/prompt-dialog.css.ts
+var promptDlg = "_bZ _bV";
+var item$1 = "_b6 _D";
+var glance = "_dT _D";
+//#endregion
+//#region src/tags/side-nav.css.ts
+var iconBtn = "_cr _D";
+var settingsDot = "_cs _bQ";
+var notifyBtn = "_cx _D";
+//#endregion
+//#region src/styles/session-pop.css.ts
+var sessionPop = "_cz _bN";
+var sessionPopBtn = "_cA _bk";
+var wsBtn = "_fz _bk";
+var rowIcon = "_fB _bF _D";
+var prChip = "_lp _M _lj";
+//#endregion
+//#region src/tags/port-chip.css.ts
+var port = "_o1 _M _lj";
+var depth = {
+	"1": "_ku",
+	"2": "_kv",
+	"3": "_kw"
+};
+var open = "_kC _bk";
+var action = "_kH _bI _D";
+var toggle = "_eC _6";
+var fold = "_eD _eg";
+var item = "_ko _bk";
+var statusOf = {
+	queued: "_nB",
+	starting: "_nC",
+	working: "_nD",
+	waiting: "_nE",
+	idle: "_nF",
+	done: "_nG",
+	closed: "_nH"
+};
+var menu = "_m5 _cz _bN";
+var menuItem = "_m7 _bk";
+var findBtn$1 = "_jp _hS _bG _D";
+var tool = "_hS _bG _D";
+var heldRefresh = "_h0 _M";
+var pop$1 = "_l_ _cz _bN";
+var fileFilter = "_o5 _F";
+var findInput = "_d5 _F";
+var keybarIconBtn = "_ed _bI _D";
+var input = "_c1 _F";
+var group = "_c4 _6";
+var hint$1 = "_mI _bp _3";
+var sheetDir = "_oj _bP";
+var upBtn = "_iJ _bG _D";
+var findBtn = "_iN _hS _bG _D";
+var goBtn = "_iO _hS _bG _D";
+var note = "_lZ _by";
+//#endregion
+//#region src/tags/manage-workspace.css.ts
+var procCmd = "_hn _es";
+var factCopy = "_hu _bI _D";
+var resultRow = "_k5 _bk";
+var resultBranch = "_k6 _ex _bz _by _bF _D";
+var urlAction = "_k7 _ex _bz _by _ey";
+var curRow = "_gP _em";
+//#endregion
+//#region src/tags/join-dialog.css.ts
+var dlg = "_lP _bV";
+var hint = "_lQ _by";
+var kbtn = "_cj _bH _D";
+var repeat = "_cm _cl";
+var dpadUser = "_cp _cl";
+var dpadEsc = "_cq _cl";
+//#endregion
+export { field$3 as $, statusOf as A, prTone as At, wsBtn as B, fileFilter as C, chipBtn as Ct, findBtn$1 as D, iconBtnXs as Dt, tool as E, iconBtnRow as Et, depth as F, settingsDot as G, sessionPopBtn as H, open as I, promptDlg as J, glance as K, port as L, fold as M, usageFill as Mt, toggle as N, usageInk as Nt, menu as O, inputLg as Ot, action as P, addTile as Q, prChip as R, keybarIconBtn as S, btnSm as St, heldRefresh as T, iconBtnLg as Tt, iconBtn as U, sessionPop as V, notifyBtn as W, themeSeg as X, checkList as Y, detailsToggle as Z, sheetDir as _, tocDot as _t, dlg as a, name$4 as at, input as b, toastTitle as bt, resultBranch as c, spinner as ct, factCopy as d, list$3 as dt, key$1 as et, procCmd as f, metaChip as ft, upBtn as g, sans as gt, goBtn as h, iconSize as ht, repeat as i, desc$1 as it, item as j, tone as jt, menuItem as k, phaseIcon as kt, resultRow as l, usageNote as lt, findBtn as m, color as mt, dpadUser as n, labelField as nt, hint as o, toolLead as ot, note as p, agentRow as pt, item$1 as q, kbtn as r, addDlg as rt, curRow as s, pop$2 as st, dpadEsc as t, keyField as tt, urlAction as u, sectionCount as ut, hint$1 as v, toastKind as vt, pop$1 as w, glyphBadgeNum as wt, findInput as x, btnLg as xt, group as y, toastStack as yt, rowIcon as z };