jjhub 0.1.3 → 0.1.4

package/dist/cli/jjhub.mjs

@@ -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;
@@ -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,
@@ -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)}`);
     }
@@ -93741,8 +93836,9 @@ Usage: jjhub <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
@@ -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;
@@ -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": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jjhub",
-  "version": "0.1.3",
+  "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/jjhub.mjs"

package/skills/jjhub-cli/SKILL.md

@@ -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,