jjhub 0.1.2 → 0.1.4

package/README.md

@@ -1,4 +1,4 @@
-# jjhub — the `jjh` CLI
+# jjhub
 
 GitHub CLI with Jujutsu-native superpowers: stable change IDs, stacks,
 platform-wide undo, and conflicts that wait — layered over plain GitHub
@@ -7,7 +7,7 @@ repos by a [JJHub](https://jjhub.johnhenry.me) server.
 ## Install
 
 ```sh
-npm install -g jjhub     # installs `jjhub` and its short alias `jjh`
+npm install -g jjhub     # installs the `jjhub` command
 # or one-off:
 npx jjhub --help
 ```
@@ -15,20 +15,20 @@ npx jjhub --help
 ## Quick start
 
 ```sh
-jjh auth login                 # device-flow sign-in to your JJHub server
-jjh repo list                  # what the server tracks
-jjh change create "Fix login"  # a change with a STABLE id (survives rebases)
-jjh change list
-jjh undo                       # platform-wide undo, from the op log
-jjh agents-md >> AGENTS.md     # teach your repo's coding agents to prefer jjh
-jjh mcp serve                  # stdio MCP server over the same API
-jjh acp serve                  # ACP agent (Zed etc.)
-jjh help                       # everything else
+jjhub auth login                 # device-flow sign-in to your JJHub server
+jjhub repo list                  # what the server tracks
+jjhub change create "Fix login"  # a change with a STABLE id (survives rebases)
+jjhub change list
+jjhub undo                       # platform-wide undo, from the op log
+jjhub agents-md >> AGENTS.md     # teach your repo's coding agents to prefer jjhub
+jjhub mcp serve                  # stdio MCP server over the same API
+jjhub acp serve                  # ACP agent (Zed etc.)
+jjhub help                       # everything else
 ```
 
 The CLI talks to the JJHub server at `JJHUB_URL` (default
-`http://localhost:3000`) — e.g. `JJHUB_URL=https://jjhub.johnhenry.me jjh repo list`,
-or use `jjh auth login --url https://jjhub.johnhenry.me` once and the saved
+`http://localhost:3000`) — e.g. `JJHUB_URL=https://jjhub.johnhenry.me jjhub repo list`,
+or use `jjhub auth login --url https://jjhub.johnhenry.me` once and the saved
 config takes over.
 
 This package is the standalone CLI build (single bundled file, no runtime

package/dist/cli/{jjh.mjs → jjhub.mjs}

@@ -83,7 +83,7 @@ var init_api_client = __esm({
       /**
        * `apiKey` falls back to JJHUB_API_KEY when omitted (the legacy shared
        * secret / ops credential). `opts.bearerToken` is an OAuth access token
-       * from `jjh auth login` (issue #43) — when present it wins, sent as
+       * from `jjhub auth login` (issue #43) — when present it wins, sent as
        * `Authorization: Bearer`.
        */
       constructor(baseUrl, apiKey, opts = {}) {
@@ -298,11 +298,11 @@ var init_api_client = __esm({
           {}
         );
       }
-      assessLandRisk(id, changeId2) {
+      assessLandRisk(id, changeId2, input) {
         return this.request(
           "POST",
           `/repositories/${encodeURIComponent(id)}/changes/${encodeURIComponent(changeId2)}/land-risk`,
-          {}
+          input
         );
       }
       listOperations(id) {
@@ -349,6 +349,16 @@ var init_api_client = __esm({
       reportCommit(repoId, changeId2, sha) {
         return this.request("POST", `/repositories/${enc(repoId)}/changes/${enc(changeId2)}/commit`, { sha });
       }
+      /**
+       * A short-lived GitHub push credential for real-commit push, minted
+       * server-side from this repo's GitHub App installation. Null means
+       * there's nothing to mint (no App configured, or not installed on this
+       * repo) — the caller (daemon.ts) treats that as a normal graceful-degrade.
+       * May not exist on older servers — callers should catch isMissingEndpoint.
+       */
+      getPushCredential(id) {
+        return this.request("POST", `/repositories/${enc(id)}/push-credential`);
+      }
       // --- deleteBookmark: force is a query param, not a JSON body (see operations.ts) ---
       deleteBookmark(repoId, name, opts) {
         const qs = opts?.force ? "?force=1" : "";
@@ -59435,9 +59445,12 @@ var init_operations = __esm({
           jjOverlayManaged: external_exports.boolean().optional().describe("Whether JJHub manages jj-native semantics for this repo."),
           stackReviewEnabled: external_exports.boolean().optional().describe("Whether the stack review screen is enabled."),
           defaultBookmark: external_exports.string().min(1).optional().describe("Default bookmark name, e.g. 'main'."),
-          contentMode: external_exports.enum(["github", "local"]).optional()
+          contentMode: external_exports.enum(["github", "local"]).optional(),
+          landCheckAppearTimeoutMs: external_exports.number().int().min(0).nullable().optional().describe(
+            "Per-repo override (ms) of how long land waits for a check-run to appear before concluding the repo has no CI. 0 skips the wait entirely. null clears the override (inherits the server-wide default)."
+          )
         }),
-        description: "Update a repository's post-creation settings (jjOverlayManaged, stackReviewEnabled, defaultBookmark, contentMode) \u2014 the update dual of createRepository's same-named fields. Omitted fields are left unchanged.",
+        description: "Update a repository's post-creation settings (jjOverlayManaged, stackReviewEnabled, defaultBookmark, contentMode, landCheckAppearTimeoutMs) \u2014 the update dual of createRepository's same-named fields. Omitted fields are left unchanged.",
         returns: "Repository"
       }),
       op({
@@ -59565,9 +59578,12 @@ var init_operations = __esm({
               content: external_exports.string().describe("File content \u2014 UTF-8 text, or base64 if encoding='base64'."),
               encoding: external_exports.enum(["utf-8", "base64"]).optional().describe("Defaults to 'utf-8'.")
             })
-          ).describe("Files to write.")
+          ).optional().describe("Files to write. May be omitted/empty for a delete-only commit."),
+          deletePaths: external_exports.array(external_exports.string()).optional().describe(
+            "Repo-relative paths to remove, in the same commit as `files`. A path may not appear in both."
+          )
         }),
-        description: "Commit one or more files directly onto a change's projected GitHub branch.",
+        description: "Commit one or more files directly onto a change's projected GitHub branch \u2014 write, delete, or both in one commit.",
         returns: "Change"
       }),
       op({
@@ -59749,7 +59765,10 @@ var init_operations = __esm({
         method: "POST",
         pathParams: ["id", "changeId"],
         path: ([id, changeId2]) => `/repositories/${id}/changes/${changeId2}/land-risk`,
-        body: external_exports.object({}),
+        // narrative:false = deterministic-only (skips the AI narrator entirely) —
+        // the web land modal uses it so risk renders in ~2 GitHub round trips
+        // instead of waiting up to the AI provider timeout.
+        body: external_exports.object({ narrative: external_exports.boolean().optional() }),
         description: "Deterministic land-risk assessment (checks/conflicts/restack/diff-size signals) with an optional AI narrative. Works without an AI provider; read-only.",
         returns: '{ riskLevel: "low" | "medium" | "high"; reasons: string[]; signals: Record<string, unknown>; narrative: string | null; model: string | null }'
       }),
@@ -64491,6 +64510,30 @@ var init_acp = __esm({
   }
 });
 
+// src/domain/issue-refs.ts
+function extractClosedIssueNumbers(description) {
+  const numbers = /* @__PURE__ */ new Set();
+  for (const m of description.matchAll(CLOSING_KEYWORD_RE)) {
+    const n = Number(m[1]);
+    if (Number.isInteger(n)) numbers.add(n);
+  }
+  return [...numbers];
+}
+function describesClosingIssue(description, issueNumber) {
+  return extractClosedIssueNumbers(description).includes(issueNumber);
+}
+function findChangeClosingIssue(items, issueNumber) {
+  const matches = items.filter((item) => describesClosingIssue(item.description, issueNumber));
+  return matches.length === 1 ? matches[0] : null;
+}
+var CLOSING_KEYWORD_RE;
+var init_issue_refs = __esm({
+  "src/domain/issue-refs.ts"() {
+    "use strict";
+    CLOSING_KEYWORD_RE = /\b(?:close[sd]?|fix(?:e[sd])?|resolve[sd]?)\s*:?\s*#(\d+)\b/gi;
+  }
+});
+
 // src/acp/commands.ts
 function toSnakeCase2(name) {
   return name.replace(/[A-Z]/g, (c) => `_${c.toLowerCase()}`);
@@ -64689,12 +64732,15 @@ async function serveAcp(api, opts = {}) {
     process.once("SIGINT", resolve);
   });
 }
-var JJHubAcpAgent;
+var CHANGE_ID_RE, ISSUE_REF_RE, JJHubAcpAgent;
 var init_agent = __esm({
   "src/acp/agent.ts"() {
     "use strict";
     init_acp();
+    init_issue_refs();
     init_commands();
+    CHANGE_ID_RE = /^CHG-\d+$/i;
+    ISSUE_REF_RE = /^#?(\d+)$/;
     JJHubAcpAgent = class {
       constructor(api, conn, opts = {}) {
         this.api = api;
@@ -64727,7 +64773,7 @@ var init_agent = __esm({
         });
         return { sessionId };
       }
-      /** Credentials come from ~/.config/jjhub (jjh auth login) — nothing to do in-protocol. */
+      /** Credentials come from ~/.config/jjhub (jjhub auth login) — nothing to do in-protocol. */
       authenticate() {
       }
       async prompt(params) {
@@ -64749,6 +64795,22 @@ var init_agent = __esm({
           await this.say(sessionId, `error: ${bound.error}`);
           return { stopReason: "end_turn" };
         }
+        const changeIdIdx = cmd.pathParams.indexOf("changeId");
+        if (changeIdIdx !== -1) {
+          const rawChangeId = bound.pathArgs[changeIdIdx];
+          const issueMatch = CHANGE_ID_RE.test(rawChangeId) ? null : rawChangeId.match(ISSUE_REF_RE);
+          if (issueMatch) {
+            const issueNumber = Number(issueMatch[1]);
+            const repositoryIdIdx = cmd.pathParams.indexOf("repositoryId");
+            const repositoryId2 = repositoryIdIdx !== -1 ? bound.pathArgs[repositoryIdIdx] : void 0;
+            const resolved = repositoryId2 ? await this.resolveIssueReference(repositoryId2, issueNumber) : null;
+            if (!resolved) {
+              await this.say(sessionId, `couldn't find a change that closes issue #${issueNumber} in this repo`);
+              return { stopReason: "end_turn" };
+            }
+            bound.pathArgs[changeIdIdx] = resolved.changeId;
+          }
+        }
         if (cmd.requiresForceConfirmation && bound.body.force === true) {
           const confirmed = await this.confirmForce(sessionId, cmd, bound.pathArgs);
           if (this.cancelled.has(sessionId)) return { stopReason: "cancelled" };
@@ -64838,6 +64900,17 @@ var init_agent = __esm({
           return true;
         }
       }
+      /**
+       * Resolve "#123" (or "123") to the change whose description closes that
+       * issue, using only data the agent already fetches over its normal API
+       * surface (list_changes) — no new endpoint or GitHub permission needed.
+       * Ambiguous (>1 match) or absent (0 matches) both resolve to null; the
+       * caller must not guess.
+       */
+      async resolveIssueReference(repositoryId2, issueNumber) {
+        const changes = await this.api.listChanges(repositoryId2);
+        return findChangeClosingIssue(changes, issueNumber);
+      }
       say(sessionId, text) {
         return this.conn.sessionUpdate({
           sessionId,
@@ -93318,7 +93391,7 @@ async function resolveRepoId(api, repoFlag, resolveContext) {
   const match = repos.find((r) => r.fullName === fullName);
   if (!match) {
     throw new Error(
-      `no JJHub repository for ${fullName} \u2014 run \`jjh repo init${repoFlag ? ` ${fullName}` : ""}\` to create it`
+      `no JJHub repository for ${fullName} \u2014 run \`jjhub repo init${repoFlag ? ` ${fullName}` : ""}\` to create it`
     );
   }
   return match.id;
@@ -93417,7 +93490,7 @@ async function runDaemonOnce(jj, api, repoId, opts = {}) {
     defaultBookmark = (await api.getRepository(repoId)).defaultBookmark;
   } catch {
   }
-  const pushEnabled = opts.pushCommits ?? Boolean(process.env.GITHUB_TOKEN);
+  const pushEnabled = opts.pushCommits ?? true;
   let pusher = pushEnabled ? void 0 : null;
   const resolvePusher = async () => {
     if (pusher !== void 0) return pusher;
@@ -93426,16 +93499,38 @@ async function runDaemonOnce(jj, api, repoId, opts = {}) {
       pusher = opts.pushCommit;
       return pusher;
     }
-    const token = process.env.GITHUB_TOKEN;
     try {
       const repo = await api.getRepository(repoId);
-      if (token && opts.repoPath && GITHUB_FULLNAME_RE.test(repo.fullName)) {
-        pusher = makeGitHubPushCommit(opts.repoPath, repo.fullName, token);
-      } else {
+      if (!opts.repoPath) {
+        log("[daemon] commit push skipped: no local repo path");
+        return pusher;
+      }
+      if (!GITHUB_FULLNAME_RE.test(repo.fullName)) {
+        log(
+          `[daemon] commit push skipped: repo fullName "${repo.fullName}" does not look like a GitHub repo`
+        );
+        return pusher;
+      }
+      let credential;
+      try {
+        credential = await api.getPushCredential(repoId);
+      } catch (err) {
+        if (isMissingEndpoint(err)) {
+          log(
+            "[daemon] commit push skipped: server does not support push credentials yet (upgrade the server)"
+          );
+        } else {
+          log(`[daemon] commit push disabled: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        return pusher;
+      }
+      if (!credential) {
         log(
-          `[daemon] commit push skipped: ${!token ? "no GITHUB_TOKEN" : !opts.repoPath ? "no local repo path" : `repo fullName "${repo.fullName}" does not look like a GitHub repo`}`
+          "[daemon] commit push skipped: install the JJHub GitHub App on this repository to enable real-commit push"
         );
+        return pusher;
       }
+      pusher = makeGitHubPushCommit(opts.repoPath, repo.fullName, credential.token);
     } catch (err) {
       log(`[daemon] commit push disabled: ${err instanceof Error ? err.message : String(err)}`);
     }
@@ -93631,7 +93726,7 @@ function isProcessAlive(pid) {
   }
 }
 var defaultSpawnFn = (command, args, options) => spawn(command, args, options);
-var CLI_ENTRY = fileURLToPath(new URL("../../bin/jjh.mjs", import.meta.url));
+var CLI_ENTRY = fileURLToPath(new URL("../../bin/jjhub.mjs", import.meta.url));
 function spawnDaemon(opts) {
   const args = [
     CLI_ENTRY,
@@ -93715,9 +93810,9 @@ var defaultSpawnGh = (argv) => new Promise((resolve, reject) => {
 });
 
 // src/cli/index.ts
-var USAGE = `jjh \u2014 GitHub CLI with Jujutsu-native superpowers (JJHub)
+var USAGE = `jjhub \u2014 GitHub CLI with Jujutsu-native superpowers (JJHub)
 
-Usage: jjh <command> [args] [--repo owner/name|repoId] [--json]
+Usage: jjhub <command> [args] [--repo owner/name|repoId] [--json]
 
   repo init [owner/name] [--github-token pat]
                                           create the JJHub overlay for this repo
@@ -93730,7 +93825,7 @@ Usage: jjh <command> [args] [--repo owner/name|repoId] [--json]
   repo delete                            hard-delete (ops credential only \u2014 archive is the normal path)
 
   user list                              list known users (identity is GitHub-federated;
-                                          sign in with "jjh auth login")
+                                          sign in with "jjhub auth login")
 
   change new <title> [--parent CHG-x] [--stack id]
   change list
@@ -93741,8 +93836,9 @@ Usage: jjh <command> [args] [--repo owner/name|repoId] [--json]
   change abandon <changeId>
   change restack <changeId>              rebase a needs-restack change onto its rewritten ancestor
   change land <changeId> [--force]       --force bypasses a failing/pending check-run gate
-  change commit <changeId> <file...> [-m msg]
-                                          commit working-tree files onto the change's branch
+  change commit <changeId> [<file...>] [-m msg] [--delete <path>]...
+                                          commit working-tree files onto the change's branch;
+                                          --delete removes a path in the same commit (repeatable)
   change diff <changeId>                 per-file diffs of what the change contains
   change split <changeId> <newTitle>
   change checks <changeId>               list GitHub check runs for a change
@@ -93777,7 +93873,7 @@ Usage: jjh <command> [args] [--repo owner/name|repoId] [--json]
                                           slash-commands for ACP clients (Zed's agent panel, ...)
 
   agents-md                              print an AGENTS.md section teaching coding agents to
-                                          prefer jjh over raw git/gh (jjh agents-md >> AGENTS.md)
+                                          prefer jjhub over raw git/gh (jjhub agents-md >> AGENTS.md)
 
   sync                                   push overlay state to GitHub
 
@@ -93800,9 +93896,9 @@ Usage: jjh <command> [args] [--repo owner/name|repoId] [--json]
       spawn the same sync as a detached background process
   daemon stop [alias]
   daemon status [alias]
-      omit alias to list every repo configured via "jjh daemon start"
+      omit alias to list every repo configured via "jjhub daemon start"
 
-Anything else (pr, issue, ...) is passed through to gh. (jjh's own "auth" command
+Anything else (pr, issue, ...) is passed through to gh. (jjhub's own "auth" command
 signs into the JJHub server \u2014 it uses your GitHub identity via the server's
 GitHub App, but is separate from "gh auth".)
 
@@ -93860,7 +93956,8 @@ async function runCli(argv, opts = {}) {
         "two-way": { type: "boolean", default: false },
         members: { type: "string" },
         "github-token": { type: "string" },
-        force: { type: "boolean", default: false }
+        force: { type: "boolean", default: false },
+        delete: { type: "string", multiple: true }
       }
     });
     positionals = parsed.positionals;
@@ -93937,7 +94034,7 @@ async function dispatch(ctx, pos, values) {
         const requiredBearer = process.env.JJHUB_API_KEY ?? config2.apiKey ?? config2.token;
         if (!requiredBearer) {
           ctx.err(
-            "warning: no credential configured (JJHUB_API_KEY / jjh auth login) \u2014 serving MCP over HTTP without authentication; do not expose this port publicly"
+            "warning: no credential configured (JJHUB_API_KEY / jjhub auth login) \u2014 serving MCP over HTTP without authentication; do not expose this port publicly"
           );
         }
         const server = await serveMcpHttp2(ctx.api, port, { requiredBearer, log: ctx.out });
@@ -93992,7 +94089,7 @@ async function repoCmd(ctx, pos, values) {
       const inferred = await ctx.resolveContext();
       if (!inferred) {
         ctx.err(
-          "error: could not infer a GitHub repository from the current directory \u2014 run `jjh repo init <owner/name>`"
+          "error: could not infer a GitHub repository from the current directory \u2014 run `jjhub repo init <owner/name>`"
         );
         return 1;
       }
@@ -94034,7 +94131,7 @@ async function repoCmd(ctx, pos, values) {
   }
   if (sub === "members") {
     ctx.err(
-      "error: `jjh repo members` was removed \u2014 repo access now derives live from GitHub collaborator permissions (manage collaborators on GitHub itself; see issue #43)"
+      "error: `jjhub repo members` was removed \u2014 repo access now derives live from GitHub collaborator permissions (manage collaborators on GitHub itself; see issue #43)"
     );
     return 1;
   }
@@ -94059,7 +94156,7 @@ async function userCmd(ctx, pos) {
   }
   if (sub === "create" || sub === "token" || sub === "tokens" || sub === "revoke-token") {
     ctx.err(
-      `error: \`jjh user ${sub}\` was removed \u2014 identity is GitHub-federated now. Sign in with \`jjh auth login\` (device flow); tokens come from the OAuth flow (issue #43).`
+      `error: \`jjhub user ${sub}\` was removed \u2014 identity is GitHub-federated now. Sign in with \`jjhub auth login\` (device flow); tokens come from the OAuth flow (issue #43).`
     );
     return 1;
   }
@@ -94175,19 +94272,23 @@ async function changeCmd(ctx, pos, values) {
     }
     case "commit": {
       const [changeId2, ...paths] = rest;
-      if (!changeId2 || paths.length === 0) {
-        return usageError(ctx, "change commit <changeId> <file...> [-m message]");
+      const deletePaths = values.delete;
+      if (!changeId2 || paths.length === 0 && (!deletePaths || deletePaths.length === 0)) {
+        return usageError(ctx, "change commit <changeId> [<file...>] [-m message] [--delete <path>]...");
       }
       const { readFileSync: readFileSync4 } = await import("node:fs");
       const files = paths.map((p) => ({ path: p, content: readFileSync4(p, "utf-8") }));
       const change = await ctx.api.commitFiles(await ctx.repoId(), changeId2, {
         message: values.message,
-        files
+        files,
+        deletePaths
       });
       if (ctx.json) return emitJson(ctx, change);
-      ctx.out(
-        `committed ${files.length} file${files.length === 1 ? "" : "s"} to ${change.changeId} (commit ${change.currentCommitSha})`
-      );
+      const parts = [
+        files.length > 0 ? `wrote ${files.length} file${files.length === 1 ? "" : "s"}` : null,
+        deletePaths && deletePaths.length > 0 ? `deleted ${deletePaths.length} file${deletePaths.length === 1 ? "" : "s"}` : null
+      ].filter((p) => p !== null);
+      ctx.out(`${parts.join(", ")} in ${change.changeId} (commit ${change.currentCommitSha})`);
       return 0;
     }
     case "diff": {
@@ -94525,7 +94626,7 @@ async function authCmd(ctx, pos, values) {
         throw e;
       }
     }
-    ctx.err("error: sign-in timed out \u2014 run `jjh auth login` again");
+    ctx.err("error: sign-in timed out \u2014 run `jjhub auth login` again");
     return 1;
   }
   if (sub === "sessions") {
@@ -94582,7 +94683,7 @@ async function authCmd(ctx, pos, values) {
             });
           }
           ctx.out(
-            `connected to ${ctx.api.baseUrl} (${repos.length} repositor${repos.length === 1 ? "y" : "ies"}, no user identity \u2014 sign in with \`jjh auth login\`)`
+            `connected to ${ctx.api.baseUrl} (${repos.length} repositor${repos.length === 1 ? "y" : "ies"}, no user identity \u2014 sign in with \`jjhub auth login\`)`
           );
           return 0;
         } catch {
@@ -94669,7 +94770,7 @@ async function resolveDaemonTarget(ctx, aliasOrPath, registerIfMissing) {
     const entry = config2.repos?.[aliasOrPath];
     if (!entry) {
       return {
-        error: `no configured repo alias "${aliasOrPath}" \u2014 run \`jjh daemon start <path>\` from that repo directory first`
+        error: `no configured repo alias "${aliasOrPath}" \u2014 run \`jjhub daemon start <path>\` from that repo directory first`
       };
     }
     return { repositoryId: entry.repositoryId, localPath: entry.localPath, alias: aliasOrPath };
@@ -94759,7 +94860,7 @@ async function daemonStatusCmd(ctx, rest) {
       ctx.err(`error: no configured repo alias "${aliasOrPath}"`);
       return 1;
     }
-    ctx.out("no repos configured \u2014 run `jjh daemon start` from a repo directory first");
+    ctx.out("no repos configured \u2014 run `jjhub daemon start` from a repo directory first");
     return 0;
   }
   const rows = [];
@@ -94842,7 +94943,7 @@ function emitJson(ctx, value) {
   return 0;
 }
 function usageError(ctx, usage) {
-  ctx.err(`usage: jjh ${usage}`);
+  ctx.err(`usage: jjhub ${usage}`);
   return 1;
 }
 var invokedDirectly = (() => {

package/package.json

@@ -1,10 +1,9 @@
 {
   "name": "jjhub",
-  "version": "0.1.2",
-  "description": "jjh — GitHub CLI with Jujutsu-native superpowers: stable change IDs, stacks, platform-wide undo, and conflicts that wait, layered over plain GitHub repos by a JJHub server.",
+  "version": "0.1.4",
+  "description": "jjhub — GitHub CLI with Jujutsu-native superpowers: stable change IDs, stacks, platform-wide undo, and conflicts that wait, layered over plain GitHub repos by a JJHub server.",
   "bin": {
-    "jjhub": "./dist/cli/jjh.mjs",
-    "jjh": "./dist/cli/jjh.mjs"
+    "jjhub": "./dist/cli/jjhub.mjs"
   },
   "type": "module",
   "engines": {

package/skills/jjhub-cli/SKILL.md

@@ -1,15 +1,15 @@
 ---
 name: jjhub-cli
-description: Drive a running JJHub instance from the command line with the `jjh` CLI — create and land changes, manage stacks and bookmarks, resolve conflicts, and undo/redo via the operation log. Use when scripting or automating repository operations against a JJHub server instead of the web UI.
+description: Drive a running JJHub instance from the command line with the `jjhub` CLI — create and land changes, manage stacks and bookmarks, resolve conflicts, and undo/redo via the operation log. Use when scripting or automating repository operations against a JJHub server instead of the web UI.
 ---
 
-# jjh — the JJHub CLI
+# jjhub — the JJHub CLI
 
-`jjh` is a GitHub CLI (`gh`)-like wrapper with Jujutsu-native superpowers. It is a thin
+`jjhub` is a GitHub CLI (`gh`)-like wrapper with Jujutsu-native superpowers. It is a thin
 client over JJHub's HTTP API: every command reads or mutates state on a running JJHub
 server, the same server backing the web UI. Repo context is inferred from the current
 directory's git `origin` remote (override with `--repo`), and any top-level command that
-isn't one of `jjh`'s own nouns is passed straight through to the real `gh` binary.
+isn't one of `jjhub`'s own nouns is passed straight through to the real `gh` binary.
 
 ## Setup
 
@@ -22,12 +22,12 @@ tests, requirements). This section covers just the CLI.
 2. **Point the CLI at it**: `export JJHUB_URL=http://localhost:3000` (this is the default,
    so only needed if the server is elsewhere). If the server was started with
    `JJHUB_API_KEY` set, also `export JJHUB_API_KEY=<the same key>` — every request will
-   otherwise get a `401 unauthorized`. (`jjh auth login` persists these to a config file
+   otherwise get a `401 unauthorized`. (`jjhub auth login` persists these to a config file
    instead of needing them exported every shell — see "Server connection" below.)
-3. **Invoke commands**: `npm run jjh -- <command> [args]` in development, or `jjh <command>`
-   directly if installed as a binary (`bin/jjh.mjs`).
+3. **Invoke commands**: `npm run jjhub -- <command> [args]` in development, or `jjhub <command>`
+   directly if installed as a binary (`bin/jjhub.mjs`).
 4. **Initialize the overlay** for a repo before using any other command:
-   `jjh repo init [owner/name]` (infers `owner/name` from the cwd's git origin if omitted).
+   `jjhub repo init [owner/name]` (infers `owner/name` from the cwd's git origin if omitted).
 
 The same JJHub server also backs a web UI (`npm run web:dev` from the repo root, in a
 second terminal — see [`web/README.md`](../../web/README.md)); the CLI and the web UI are
@@ -59,8 +59,9 @@ change amend <changeId>
 change squash <changeId>
 change abandon <changeId>
 change restack <changeId>              rebase a needs-restack change onto its rewritten ancestor
-change commit <changeId> <file...> [-m msg]
-                                        commit working-tree files onto the change's branch
+change commit <changeId> [<file...>] [-m msg] [--delete <path>]...
+                                        commit working-tree files onto the change's branch;
+                                        --delete removes a path in the same commit (repeatable)
 change diff <changeId>                 per-file diffs of what the change contains
 change files <changeId>                list locally-stored files (contentMode "local" repos only)
 change land <changeId> [--force]       waits for real CI triggered by its own ready flip,
@@ -104,7 +105,7 @@ mcp serve --http <port>                the same tools over Streamable HTTP (POST
 acp serve                              Agent Client Protocol agent over stdio (Zed's agent
                                        panel, ...) — every operation as a slash command
 agents-md                              print an AGENTS.md section teaching coding agents to
-                                       prefer jjh over raw git/gh (jjh agents-md >> AGENTS.md)
+                                       prefer jjhub over raw git/gh (jjhub agents-md >> AGENTS.md)
 
 daemon <localRepoPath> [--once] [--interval 5] [--engine auto|subprocess|isomorphic] [--two-way]
     sync a local jj working copy into JJHub (inbound; --two-way mirrors JJHub edits back)
@@ -113,22 +114,22 @@ daemon start [alias|localRepoPath] [--interval 5] [--engine ...] [--two-way]
 daemon stop [alias] | daemon status [alias]
 ```
 
-Anything else (`pr`, `issue`, ...) is passed through to `gh` — e.g. `jjh pr view 7`. `jjh auth`
-is jjh's own command (it manages the *JJHub server* connection); use `gh auth` for GitHub auth.
+Anything else (`pr`, `issue`, ...) is passed through to `gh` — e.g. `jjhub pr view 7`. `jjhub auth`
+is jjhub's own command (it manages the *JJHub server* connection); use `gh auth` for GitHub auth.
 
 ### Server connection: flags, env vars, or a config file
 
 Precedence is `--flag` > env var (`JJHUB_URL`/`JJHUB_API_KEY`) > `~/.config/jjhub/config.json`
-(written by `jjh auth login`). Run `jjh auth login --url http://localhost:3000 --api-key <key>`
+(written by `jjhub auth login`). Run `jjhub auth login --url http://localhost:3000 --api-key <key>`
 once and every subsequent command in that shell (any shell, any day) picks it up with no env
-vars needed. `jjh auth status` confirms what's currently in effect.
+vars needed. `jjhub auth status` confirms what's currently in effect.
 
 ### Identity & permissions (issue #43: GitHub-federated)
 
-A JJHub user IS a GitHub account. `jjh auth login` runs an OAuth device flow against the
+A JJHub user IS a GitHub account. `jjhub auth login` runs an OAuth device flow against the
 JJHub server's own authorization server: open the printed URL, sign in with GitHub, confirm
 the code, and the CLI saves a JJHub-issued OAuth token. Every mutation is attributed to that
-identity (visible in `jjh op log`).
+identity (visible in `jjhub op log`).
 
 What you can do on a repo is asked of GitHub LIVE at request time (cached ~60s):
 GitHub `admin` → owner, `maintain`/`write` → writer, `triage`/`read` → reader. There is no
@@ -142,26 +143,26 @@ credential: full access, RBAC bypassed, no attribution. Anonymous requests (no s
 
 This RBAC is entirely JJHub-internal — a JJHub "owner" isn't checked against real GitHub
 permissions at all. If the server has `JJHUB_REQUIRE_GITHUB_VERIFICATION=1` set,
-`jjh repo init` requires `--github-token <pat>` (or falls back to `$GITHUB_TOKEN`): the
+`jjhub repo init` requires `--github-token <pat>` (or falls back to `$GITHUB_TOKEN`): the
 server verifies that token has real `admin` access to the exact `owner/name` being created
 via a live GitHub API call, rejecting creation (403) otherwise. The verified token also
 becomes the new repo's GitHub connection automatically. See the top-level README's "GitHub
 admin verification (optional mode)" section.
 
-For exact, always-current syntax straight from the CLI binary, run `jjh help` — this file is
+For exact, always-current syntax straight from the CLI binary, run `jjhub help` — this file is
 an expanded, example-rich companion to that output, not a replacement for it.
 
-### Install into your repo (teach YOUR coding agents to prefer jjh)
+### Install into your repo (teach YOUR coding agents to prefer jjhub)
 
 [`agents-snippet.md`](./agents-snippet.md) is a short, imperative AGENTS.md
-section — "version control in this repo goes through JJHub; prefer `jjh
+section — "version control in this repo goes through JJHub; prefer `jjhub
 change/stack/undo` over raw git/gh mutations" — the same pattern as GitHub's
 `gh skill install github/gh-stack`. Append it to a tracked repo's own
 AGENTS.md so any AGENTS.md-aware coding agent (Claude Code, Copilot, Cursor,
 Codex, ...) picks up the workflow automatically:
 
 ```bash
-jjh agents-md >> AGENTS.md     # from the CLI
+jjhub agents-md >> AGENTS.md     # from the CLI
 # or fetch it from a running server:
 curl https://<your-jjhub>/.well-known/skills/jjhub-cli/agents-snippet.md >> AGENTS.md
 ```
@@ -171,14 +172,14 @@ curl https://<your-jjhub>/.well-known/skills/jjhub-cli/agents-snippet.md >> AGEN
 ### Create and land a change
 
 ```bash
-npm run jjh -- repo init owner/name
-npm run jjh -- change new "Fix: add user validation"
-npm run jjh -- change list                              # note the CHG-n id
-npm run jjh -- stack create "Fix bundle" --changes CHG-1
-npm run jjh -- stack land "Fix bundle"
+npm run jjhub -- repo init owner/name
+npm run jjhub -- change new "Fix: add user validation"
+npm run jjhub -- change list                              # note the CHG-n id
+npm run jjhub -- stack create "Fix bundle" --changes CHG-1
+npm run jjhub -- stack land "Fix bundle"
 ```
 
-A single change not part of a stack lands directly: `npm run jjh -- change land CHG-1`.
+A single change not part of a stack lands directly: `npm run jjhub -- change land CHG-1`.
 
 ### Sync a local jj working copy into JJHub
 
@@ -188,22 +189,22 @@ jj bookmark track main --remote=origin   # REQUIRED once per clone (issue #28):
                                          # without it, already-landed commits look
                                          # like new local work and the daemon could
                                          # try to re-project them
-npm run jjh -- repo init alice/my-project
+npm run jjhub -- repo init alice/my-project
 jj new -m "Implement feature X" && jj commit
-npm run jjh -- daemon . --once      # one-shot sync; omit --once to loop every 5s
-npm run jjh -- op log               # verify the sync landed as a new operation
+npm run jjhub -- daemon . --once      # one-shot sync; omit --once to loop every 5s
+npm run jjhub -- op log               # verify the sync landed as a new operation
 ```
 
 ### Resolve a conflict
 
 ```bash
-npm run jjh -- conflict list                              # note the conflict id
-npm run jjh -- conflict resolve CONFLICT-abc123 left       # or: right | edited | preserve_unresolved
-npm run jjh -- conflict list                               # confirm it now reads Resolved
+npm run jjhub -- conflict list                              # note the conflict id
+npm run jjhub -- conflict resolve CONFLICT-abc123 left       # or: right | edited | preserve_unresolved
+npm run jjhub -- conflict list                               # confirm it now reads Resolved
 ```
 
 ## Undo/redo caution
 
-`jjh undo` and `jjh redo` move the repository's operation-log head pointer — they affect
+`jjhub undo` and `jjhub redo` move the repository's operation-log head pointer — they affect
 *all* state (changes, stacks, bookmarks, conflicts), not just the last command's target.
-Run `jjh op log` first if you're not sure what the current head operation is before undoing.
+Run `jjhub op log` first if you're not sure what the current head operation is before undoing.

package/skills/jjhub-cli/agents-snippet.md

@@ -1,28 +1,28 @@
 # Version control in this repo goes through JJHub
 
 This repository is tracked by JJHub (a change/stack/operation overlay on
-GitHub). Use the `jjh` CLI for version-control mutations instead of raw
-`git`/`gh` — every `jjh` action is attributed in an operation log and
-reversible with `jjh undo`, and landing is CI-gated.
+GitHub). Use the `jjhub` CLI for version-control mutations instead of raw
+`git`/`gh` — every `jjhub` action is attributed in an operation log and
+reversible with `jjhub undo`, and landing is CI-gated.
 
-- Start work: `jjh change new "<title>"` (not a git branch).
-- Describe/retitle: `jjh change describe CHG-N --title t --description d`.
-- Amend after edits: `jjh change amend CHG-N` (descendants get flagged and
+- Start work: `jjhub change new "<title>"` (not a git branch).
+- Describe/retitle: `jjhub change describe CHG-N --title t --description d`.
+- Amend after edits: `jjhub change amend CHG-N` (descendants get flagged and
   restack with one command — no force-push ceremony).
-- Stacked work: `jjh stack create "<title>" --changes CHG-1,CHG-2`;
-  reorder with `jjh stack reorder`; land root-to-tip with
-  `jjh stack land <stackId>` (all-or-nothing, CI-gated).
-- Ship a single change: `jjh change land CHG-N`. Do NOT merge the PR with
+- Stacked work: `jjhub stack create "<title>" --changes CHG-1,CHG-2`;
+  reorder with `jjhub stack reorder`; land root-to-tip with
+  `jjhub stack land <stackId>` (all-or-nothing, CI-gated).
+- Ship a single change: `jjhub change land CHG-N`. Do NOT merge the PR with
   `gh pr merge` — that bypasses the gate and the op log.
-- Made a mistake: `jjh undo` (works across changes, stacks, bookmarks, and
-  conflicts; `jjh op log` shows what would be undone).
-- Conflicts: `jjh conflict list` / `jjh conflict resolve <id> <state>` —
+- Made a mistake: `jjhub undo` (works across changes, stacks, bookmarks, and
+  conflicts; `jjhub op log` shows what would be undone).
+- Conflicts: `jjhub conflict list` / `jjhub conflict resolve <id> <state>` —
   conflicts are durable objects; you can defer them and keep working.
 - Machine output: append `--json` to any command.
 - Repo context is inferred from the git `origin` remote; `--repo owner/name`
   overrides.
 
-Reads are fine with either tool. Any `jjh` command it doesn't recognize
+Reads are fine with either tool. Any `jjhub` command it doesn't recognize
 (`pr`, `issue`, ...) passes through to the real `gh` unchanged. Full command
-reference: run `jjh help`, or see the served skill at
+reference: run `jjhub help`, or see the served skill at
 `/.well-known/skills/jjhub-cli/SKILL.md` on your JJHub server.