hyper-pm 0.1.2 → 0.1.4

package/dist/index.cjs

@@ -7622,6 +7622,20 @@ var envSchema = external_exports.object({
   HYPER_PM_AI_API_KEY: external_exports.string().optional(),
   /** Optional override for hyper-pm JSONL event `actor` on CLI mutations. */
   HYPER_PM_ACTOR: external_exports.string().optional(),
+  /**
+   * Optional `git user.name` for hyper-pm data-branch commits when repo git
+   * identity is unset (falls back after `GIT_AUTHOR_*`, then a built-in default).
+   */
+  HYPER_PM_GIT_USER_NAME: external_exports.string().optional(),
+  /**
+   * Optional `git user.email` for hyper-pm data-branch commits when repo git
+   * identity is unset (falls back after `GIT_AUTHOR_*`, then a built-in default).
+   */
+  HYPER_PM_GIT_USER_EMAIL: external_exports.string().optional(),
+  /** Standard Git override for commit author name (optional). */
+  GIT_AUTHOR_NAME: external_exports.string().optional(),
+  /** Standard Git override for commit author email (optional). */
+  GIT_AUTHOR_EMAIL: external_exports.string().optional(),
   /**
    * Absolute path to the hyper-pm CLI bundle (`main.cjs`) for hyper-pm-mcp and
    * other integrations when auto-resolution from the `hyper-pm` package is insufficient.
@@ -12681,6 +12695,336 @@ var listActiveTicketSummaries = (projection, options) => {
   });
 };
 
+// src/lib/github-issue-body.ts
+var FENCE_JSON_RE = /```json\s*([\s\S]*?)```/i;
+var parseHyperPmFenceObject = (body) => {
+  const fence = body.match(FENCE_JSON_RE);
+  if (!fence?.[1]) return void 0;
+  try {
+    const data = JSON.parse(fence[1].trim());
+    if (typeof data !== "object" || data === null) return void 0;
+    return data;
+  } catch {
+    return void 0;
+  }
+};
+var parseHyperPmIdFromIssueBody = (body) => {
+  const meta = parseHyperPmFenceObject(body);
+  if (meta === void 0) return void 0;
+  const id = meta["hyper_pm_id"];
+  return typeof id === "string" ? id : void 0;
+};
+var extractDescriptionBeforeFirstFence = (body) => {
+  const fenceIdx = body.indexOf("```");
+  if (fenceIdx === -1) {
+    return body.trim();
+  }
+  return body.slice(0, fenceIdx).trim();
+};
+var inboundTicketPlanningPayloadFromFenceMeta = (meta) => {
+  const out = {};
+  if (Object.prototype.hasOwnProperty.call(meta, "priority")) {
+    const v = meta["priority"];
+    if (v === null) {
+      out["priority"] = null;
+    } else if (typeof v === "string") {
+      const p = tryParseTicketPriority(v);
+      if (p !== void 0) {
+        out["priority"] = p;
+      }
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(meta, "size")) {
+    const v = meta["size"];
+    if (v === null) {
+      out["size"] = null;
+    } else if (typeof v === "string") {
+      const s = tryParseTicketSize(v);
+      if (s !== void 0) {
+        out["size"] = s;
+      }
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(meta, "estimate")) {
+    const v = meta["estimate"];
+    if (v === null) {
+      out["estimate"] = null;
+    } else if (typeof v === "number" && Number.isFinite(v) && v >= 0) {
+      out["estimate"] = v;
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(meta, "start_work_at")) {
+    const v = meta["start_work_at"];
+    if (v === null) {
+      out["startWorkAt"] = null;
+    } else if (typeof v === "string") {
+      const t = v.trim();
+      if (t !== "" && Number.isFinite(Date.parse(t))) {
+        out["startWorkAt"] = t;
+      }
+    }
+  }
+  if (Object.prototype.hasOwnProperty.call(meta, "target_finish_at")) {
+    const v = meta["target_finish_at"];
+    if (v === null) {
+      out["targetFinishAt"] = null;
+    } else if (typeof v === "string") {
+      const t = v.trim();
+      if (t !== "" && Number.isFinite(Date.parse(t))) {
+        out["targetFinishAt"] = t;
+      }
+    }
+  }
+  return out;
+};
+var buildGithubIssueBody = (params) => {
+  const meta = {
+    hyper_pm_id: params.hyperPmId,
+    type: params.type,
+    parent_ids: params.parentIds
+  };
+  if (params.type === "ticket" && params.ticketPlanning !== void 0) {
+    const p = params.ticketPlanning;
+    if (p.priority !== void 0) {
+      meta.priority = p.priority;
+    }
+    if (p.size !== void 0) {
+      meta.size = p.size;
+    }
+    if (p.estimate !== void 0) {
+      meta.estimate = p.estimate;
+    }
+    if (p.startWorkAt !== void 0) {
+      meta.start_work_at = p.startWorkAt;
+    }
+    if (p.targetFinishAt !== void 0) {
+      meta.target_finish_at = p.targetFinishAt;
+    }
+  }
+  return `${params.description.trim()}
+
+\`\`\`json
+${JSON.stringify(meta, null, 2)}
+\`\`\`
+`;
+};
+var ticketPlanningForGithubIssueBody = (ticket) => {
+  const out = {};
+  if (ticket.priority !== void 0) {
+    out.priority = ticket.priority;
+  }
+  if (ticket.size !== void 0) {
+    out.size = ticket.size;
+  }
+  if (ticket.estimate !== void 0) {
+    out.estimate = ticket.estimate;
+  }
+  if (ticket.startWorkAt !== void 0) {
+    out.startWorkAt = ticket.startWorkAt;
+  }
+  if (ticket.targetFinishAt !== void 0) {
+    out.targetFinishAt = ticket.targetFinishAt;
+  }
+  return Object.keys(out).length > 0 ? out : void 0;
+};
+
+// src/lib/github-issue-labels.ts
+var RESERVED_LOWER = /* @__PURE__ */ new Set(["hyper-pm", "ticket"]);
+var GITHUB_LABEL_NAME_MAX_LENGTH = 50;
+var isReservedHyperPmGithubLabel = (name) => {
+  return RESERVED_LOWER.has(name.trim().toLowerCase());
+};
+var labelNameFromGithubLabelEntry = (entry) => {
+  if (typeof entry === "string") {
+    const t = entry.trim();
+    return t === "" ? void 0 : t;
+  }
+  if (typeof entry === "object" && entry !== null && "name" in entry) {
+    const n = entry.name;
+    if (typeof n !== "string") return void 0;
+    const t = n.trim();
+    return t === "" ? void 0 : t;
+  }
+  return void 0;
+};
+var ticketLabelsFromGithubIssueLabels = (labels) => {
+  if (!Array.isArray(labels)) {
+    return [];
+  }
+  const raw = [];
+  for (const item of labels) {
+    const n = labelNameFromGithubLabelEntry(item);
+    if (n === void 0) continue;
+    if (isReservedHyperPmGithubLabel(n)) continue;
+    raw.push(n);
+  }
+  return normalizeTicketLabelList(raw);
+};
+var mergeOutboundGithubIssueLabelsForTicket = (ticketLabels) => {
+  const base = ["hyper-pm", "ticket"];
+  const seen = new Set(base.map((x) => x.toLowerCase()));
+  const out = [...base];
+  const norm = normalizeTicketLabelList(ticketLabels ?? []);
+  for (const lab of norm) {
+    if (lab.length > GITHUB_LABEL_NAME_MAX_LENGTH) {
+      continue;
+    }
+    const low = lab.toLowerCase();
+    if (seen.has(low)) continue;
+    seen.add(low);
+    out.push(lab);
+  }
+  return out;
+};
+
+// src/cli/github-issue-import.ts
+var collectLinkedGithubIssueNumbers = (projection) => {
+  const out = /* @__PURE__ */ new Set();
+  for (const ticket of projection.tickets.values()) {
+    if (ticket.deleted) continue;
+    const n = ticket.githubIssueNumber;
+    if (n !== void 0 && Number.isFinite(n)) {
+      out.add(n);
+    }
+  }
+  return out;
+};
+var stripHyperPmGithubIssueTitle = (title) => title.replace(/^\[hyper-pm\]\s*/i, "").trim();
+var tryParseGithubImportListState = (raw) => {
+  if (raw === void 0 || raw === "") return "all";
+  const t = raw.trim().toLowerCase();
+  if (t === "open" || t === "closed" || t === "all") return t;
+  return void 0;
+};
+var parseGithubImportIssueNumberSet = (raw) => {
+  if (raw === void 0 || raw.length === 0) return void 0;
+  const out = /* @__PURE__ */ new Set();
+  for (const piece of raw) {
+    for (const token of piece.split(",")) {
+      const t = token.trim();
+      if (t === "") continue;
+      const n = Number.parseInt(t, 10);
+      if (!Number.isFinite(n) || n < 1) {
+        throw new Error(`Invalid --issue value: ${JSON.stringify(token)}`);
+      }
+      out.add(n);
+    }
+  }
+  if (out.size === 0) {
+    throw new Error("No valid --issue numbers after parsing flags");
+  }
+  return out;
+};
+var ticketCreatePlanningFragmentFromFenceMeta = (meta) => {
+  if (meta === void 0) return {};
+  const src = inboundTicketPlanningPayloadFromFenceMeta(meta);
+  const out = {};
+  for (const [k, v] of Object.entries(src)) {
+    if (v !== null && v !== void 0) {
+      out[k] = v;
+    }
+  }
+  return out;
+};
+var buildTicketCreatedPayloadBaseFromGithubIssue = (issue) => {
+  const bodyText = issue.body ?? "";
+  const title = stripHyperPmGithubIssueTitle(String(issue.title ?? ""));
+  const desc = extractDescriptionBeforeFirstFence(bodyText);
+  const payload = {
+    title,
+    body: desc
+  };
+  if (issue.state === "closed") {
+    payload["state"] = "closed";
+  }
+  const assignee = assigneeFromGithubIssue(issue);
+  if (assignee !== void 0 && assignee !== "") {
+    payload["assignee"] = assignee;
+  }
+  const labels = ticketLabelsFromGithubIssueLabels(issue.labels);
+  if (labels.length > 0) {
+    payload["labels"] = labels;
+  }
+  const meta = parseHyperPmFenceObject(bodyText);
+  Object.assign(payload, ticketCreatePlanningFragmentFromFenceMeta(meta));
+  return payload;
+};
+var classifyGithubIssueForImport = (params) => {
+  const num = params.issue.number;
+  if (!Number.isFinite(num) || num < 1) {
+    return {
+      result: "skip",
+      skip: { issueNumber: 0, reason: "issue_filter" }
+    };
+  }
+  if (params.onlyIssueNumbers !== void 0 && !params.onlyIssueNumbers.has(num)) {
+    return {
+      result: "skip",
+      skip: { issueNumber: num, reason: "issue_filter" }
+    };
+  }
+  if (params.issue.pull_request !== void 0 && params.issue.pull_request !== null) {
+    return {
+      result: "skip",
+      skip: { issueNumber: num, reason: "pull_request" }
+    };
+  }
+  if (params.linkedNumbers.has(num)) {
+    return {
+      result: "skip",
+      skip: { issueNumber: num, reason: "already_linked" }
+    };
+  }
+  const body = params.issue.body ?? "";
+  const hyperPmId = parseHyperPmIdFromIssueBody(body);
+  if (hyperPmId !== void 0 && hyperPmId.trim() !== "") {
+    const row = params.projection.tickets.get(hyperPmId);
+    if (row !== void 0 && !row.deleted) {
+      return {
+        result: "skip",
+        skip: { issueNumber: num, reason: "body_hyper_pm_existing_ticket" }
+      };
+    }
+    return {
+      result: "skip",
+      skip: { issueNumber: num, reason: "body_hyper_pm_orphan_ref" }
+    };
+  }
+  return {
+    result: "candidate",
+    ticketCreatedPayloadBase: buildTicketCreatedPayloadBaseFromGithubIssue(
+      params.issue
+    )
+  };
+};
+var partitionGithubIssuesForImport = (params) => {
+  const linkedNumbers = collectLinkedGithubIssueNumbers(params.projection);
+  const candidates = [];
+  const skipped = [];
+  for (const issue of params.issues) {
+    const r = classifyGithubIssueForImport({
+      projection: params.projection,
+      linkedNumbers,
+      onlyIssueNumbers: params.onlyIssueNumbers,
+      issue
+    });
+    if (r.result === "skip") {
+      skipped.push(r.skip);
+    } else {
+      candidates.push({
+        issueNumber: issue.number,
+        ticketCreatedPayloadBase: r.ticketCreatedPayloadBase
+      });
+    }
+  }
+  return { candidates, skipped };
+};
+var mergeTicketImportCreatePayload = (ticketId, base, storyId) => {
+  const storyTrimmed = storyId !== void 0 && storyId !== "" ? storyId.trim() : void 0;
+  const storyPayload = storyTrimmed !== void 0 && storyTrimmed !== "" ? { storyId: storyTrimmed } : {};
+  return { id: ticketId, ...base, ...storyPayload };
+};
+
 // src/config/hyper-pm-config.ts
 var hyperPmConfigSchema = external_exports.object({
   schema: external_exports.literal(1),
@@ -13033,6 +13377,33 @@ var tryReadGithubOwnerRepoSlugFromGit = async (params) => {
   }
 };
 
+// src/git/resolve-effective-git-author-for-data-commit.ts
+var defaultDataCommitName = "hyper-pm";
+var defaultDataCommitEmail = "hyper-pm@users.noreply.github.com";
+var tryReadGitConfigUserName = async (cwd, runGit2) => {
+  try {
+    const { stdout } = await runGit2(cwd, ["config", "--get", "user.name"]);
+    return stdout.trim();
+  } catch {
+    return "";
+  }
+};
+var tryReadGitConfigUserEmail = async (cwd, runGit2) => {
+  try {
+    const { stdout } = await runGit2(cwd, ["config", "--get", "user.email"]);
+    return stdout.trim();
+  } catch {
+    return "";
+  }
+};
+var resolveEffectiveGitAuthorForDataCommit = async (cwd, runGit2, authorEnv) => {
+  const fromGitName = await tryReadGitConfigUserName(cwd, runGit2);
+  const fromGitEmail = await tryReadGitConfigUserEmail(cwd, runGit2);
+  const name = fromGitName || authorEnv.HYPER_PM_GIT_USER_NAME?.trim() || authorEnv.GIT_AUTHOR_NAME?.trim() || defaultDataCommitName;
+  const email = fromGitEmail || authorEnv.HYPER_PM_GIT_USER_EMAIL?.trim() || authorEnv.GIT_AUTHOR_EMAIL?.trim() || defaultDataCommitEmail;
+  return { name, email };
+};
+
 // src/run/commit-data.ts
 var maxActorSuffixLen = 60;
 var formatDataBranchCommitMessage = (base, actorSuffix) => {
@@ -13044,15 +13415,55 @@ var formatDataBranchCommitMessage = (base, actorSuffix) => {
   const suffix = collapsed.length > maxActorSuffixLen ? `${collapsed.slice(0, maxActorSuffixLen - 1)}\u2026` : collapsed;
   return `${base} (${suffix})`;
 };
-var commitDataWorktreeIfNeeded = async (worktreePath, message, runGit2) => {
+var commitDataWorktreeIfNeeded = async (worktreePath, message, runGit2, opts) => {
   const { stdout } = await runGit2(worktreePath, ["status", "--porcelain"]);
   if (!stdout.trim()) return;
   await runGit2(worktreePath, ["add", "."]);
-  await runGit2(worktreePath, ["commit", "-m", message]);
-};
-
-// src/storage/append-event.ts
-var import_promises5 = require("node:fs/promises");
+  const authorEnv = opts?.authorEnv ?? env;
+  const { name, email } = await resolveEffectiveGitAuthorForDataCommit(
+    worktreePath,
+    runGit2,
+    authorEnv
+  );
+  await runGit2(worktreePath, [
+    "-c",
+    `user.name=${name}`,
+    "-c",
+    `user.email=${email}`,
+    "commit",
+    "-m",
+    message
+  ]);
+};
+
+// src/run/push-data-branch.ts
+var firstLineFromUnknown = (err) => {
+  const raw = err instanceof Error ? err.message : String(err);
+  const line = raw.trim().split("\n")[0]?.trim() ?? raw.trim();
+  return line.length > 0 ? line : "git error";
+};
+var tryPushDataBranchToRemote = async (worktreePath, remote, branch, runGit2) => {
+  try {
+    await runGit2(worktreePath, ["remote", "get-url", remote]);
+  } catch (e) {
+    return {
+      status: "skipped_no_remote",
+      detail: firstLineFromUnknown(e)
+    };
+  }
+  try {
+    await runGit2(worktreePath, ["push", "-u", remote, branch]);
+    return { status: "pushed" };
+  } catch (e) {
+    return {
+      status: "failed",
+      detail: firstLineFromUnknown(e)
+    };
+  }
+};
+
+// src/storage/append-event.ts
+var import_promises5 = require("node:fs/promises");
 var import_node_path5 = require("node:path");
 
 // src/storage/event-path.ts
@@ -13765,188 +14176,6 @@ var defaultGithubPrActivitySyncDeps = (params) => ({
   }
 });
 
-// src/lib/github-issue-body.ts
-var FENCE_JSON_RE = /```json\s*([\s\S]*?)```/i;
-var parseHyperPmFenceObject = (body) => {
-  const fence = body.match(FENCE_JSON_RE);
-  if (!fence?.[1]) return void 0;
-  try {
-    const data = JSON.parse(fence[1].trim());
-    if (typeof data !== "object" || data === null) return void 0;
-    return data;
-  } catch {
-    return void 0;
-  }
-};
-var parseHyperPmIdFromIssueBody = (body) => {
-  const meta = parseHyperPmFenceObject(body);
-  if (meta === void 0) return void 0;
-  const id = meta["hyper_pm_id"];
-  return typeof id === "string" ? id : void 0;
-};
-var extractDescriptionBeforeFirstFence = (body) => {
-  const fenceIdx = body.indexOf("```");
-  if (fenceIdx === -1) {
-    return body.trim();
-  }
-  return body.slice(0, fenceIdx).trim();
-};
-var inboundTicketPlanningPayloadFromFenceMeta = (meta) => {
-  const out = {};
-  if (Object.prototype.hasOwnProperty.call(meta, "priority")) {
-    const v = meta["priority"];
-    if (v === null) {
-      out["priority"] = null;
-    } else if (typeof v === "string") {
-      const p = tryParseTicketPriority(v);
-      if (p !== void 0) {
-        out["priority"] = p;
-      }
-    }
-  }
-  if (Object.prototype.hasOwnProperty.call(meta, "size")) {
-    const v = meta["size"];
-    if (v === null) {
-      out["size"] = null;
-    } else if (typeof v === "string") {
-      const s = tryParseTicketSize(v);
-      if (s !== void 0) {
-        out["size"] = s;
-      }
-    }
-  }
-  if (Object.prototype.hasOwnProperty.call(meta, "estimate")) {
-    const v = meta["estimate"];
-    if (v === null) {
-      out["estimate"] = null;
-    } else if (typeof v === "number" && Number.isFinite(v) && v >= 0) {
-      out["estimate"] = v;
-    }
-  }
-  if (Object.prototype.hasOwnProperty.call(meta, "start_work_at")) {
-    const v = meta["start_work_at"];
-    if (v === null) {
-      out["startWorkAt"] = null;
-    } else if (typeof v === "string") {
-      const t = v.trim();
-      if (t !== "" && Number.isFinite(Date.parse(t))) {
-        out["startWorkAt"] = t;
-      }
-    }
-  }
-  if (Object.prototype.hasOwnProperty.call(meta, "target_finish_at")) {
-    const v = meta["target_finish_at"];
-    if (v === null) {
-      out["targetFinishAt"] = null;
-    } else if (typeof v === "string") {
-      const t = v.trim();
-      if (t !== "" && Number.isFinite(Date.parse(t))) {
-        out["targetFinishAt"] = t;
-      }
-    }
-  }
-  return out;
-};
-var buildGithubIssueBody = (params) => {
-  const meta = {
-    hyper_pm_id: params.hyperPmId,
-    type: params.type,
-    parent_ids: params.parentIds
-  };
-  if (params.type === "ticket" && params.ticketPlanning !== void 0) {
-    const p = params.ticketPlanning;
-    if (p.priority !== void 0) {
-      meta.priority = p.priority;
-    }
-    if (p.size !== void 0) {
-      meta.size = p.size;
-    }
-    if (p.estimate !== void 0) {
-      meta.estimate = p.estimate;
-    }
-    if (p.startWorkAt !== void 0) {
-      meta.start_work_at = p.startWorkAt;
-    }
-    if (p.targetFinishAt !== void 0) {
-      meta.target_finish_at = p.targetFinishAt;
-    }
-  }
-  return `${params.description.trim()}
-
-\`\`\`json
-${JSON.stringify(meta, null, 2)}
-\`\`\`
-`;
-};
-var ticketPlanningForGithubIssueBody = (ticket) => {
-  const out = {};
-  if (ticket.priority !== void 0) {
-    out.priority = ticket.priority;
-  }
-  if (ticket.size !== void 0) {
-    out.size = ticket.size;
-  }
-  if (ticket.estimate !== void 0) {
-    out.estimate = ticket.estimate;
-  }
-  if (ticket.startWorkAt !== void 0) {
-    out.startWorkAt = ticket.startWorkAt;
-  }
-  if (ticket.targetFinishAt !== void 0) {
-    out.targetFinishAt = ticket.targetFinishAt;
-  }
-  return Object.keys(out).length > 0 ? out : void 0;
-};
-
-// src/lib/github-issue-labels.ts
-var RESERVED_LOWER = /* @__PURE__ */ new Set(["hyper-pm", "ticket"]);
-var GITHUB_LABEL_NAME_MAX_LENGTH = 50;
-var isReservedHyperPmGithubLabel = (name) => {
-  return RESERVED_LOWER.has(name.trim().toLowerCase());
-};
-var labelNameFromGithubLabelEntry = (entry) => {
-  if (typeof entry === "string") {
-    const t = entry.trim();
-    return t === "" ? void 0 : t;
-  }
-  if (typeof entry === "object" && entry !== null && "name" in entry) {
-    const n = entry.name;
-    if (typeof n !== "string") return void 0;
-    const t = n.trim();
-    return t === "" ? void 0 : t;
-  }
-  return void 0;
-};
-var ticketLabelsFromGithubIssueLabels = (labels) => {
-  if (!Array.isArray(labels)) {
-    return [];
-  }
-  const raw = [];
-  for (const item of labels) {
-    const n = labelNameFromGithubLabelEntry(item);
-    if (n === void 0) continue;
-    if (isReservedHyperPmGithubLabel(n)) continue;
-    raw.push(n);
-  }
-  return normalizeTicketLabelList(raw);
-};
-var mergeOutboundGithubIssueLabelsForTicket = (ticketLabels) => {
-  const base = ["hyper-pm", "ticket"];
-  const seen = new Set(base.map((x) => x.toLowerCase()));
-  const out = [...base];
-  const norm = normalizeTicketLabelList(ticketLabels ?? []);
-  for (const lab of norm) {
-    if (lab.length > GITHUB_LABEL_NAME_MAX_LENGTH) {
-      continue;
-    }
-    const low = lab.toLowerCase();
-    if (seen.has(low)) continue;
-    seen.add(low);
-    out.push(lab);
-  }
-  return out;
-};
-
 // src/sync/github-inbound-actor.ts
 var githubInboundActorFromIssue = (issue) => {
   const login = issue.user?.login?.trim();
@@ -15228,7 +15457,174 @@ ${body}`
       return { id: o.id, deleted: true };
     });
   });
-  program2.command("sync").description("GitHub Issues sync").option("--no-github", "skip network sync", false).action(async function() {
+  ticket.command("import-github").description(
+    "Create local tickets for GitHub issues not yet represented in hyper-pm"
+  ).option("--dry-run", "list import candidates without writing events", false).option(
+    "--story <id>",
+    "optional story id applied to every imported ticket (must exist)"
+  ).option(
+    "--state <s>",
+    "GitHub list filter: open | closed | all (default all)",
+    "all"
+  ).option(
+    "--issue <n>",
+    "only consider these issue numbers (repeatable or comma-separated)",
+    (value, previous) => [...previous, value],
+    []
+  ).action(async function() {
+    const g = readGlobals(this);
+    const o = this.opts();
+    const listState = tryParseGithubImportListState(o.state);
+    if (listState === void 0) {
+      deps.error(
+        `Invalid --state ${JSON.stringify(o.state)} (use open, closed, or all)`
+      );
+      deps.exit(ExitCode.UserError);
+    }
+    let onlyIssueNumbers;
+    try {
+      onlyIssueNumbers = parseGithubImportIssueNumberSet(o.issue);
+    } catch (e) {
+      deps.error(e instanceof Error ? e.message : String(e));
+      deps.exit(ExitCode.UserError);
+    }
+    const repoRoot = await resolveRepoRoot(g.repo);
+    const cfg = await loadMergedConfig(repoRoot, g);
+    if (cfg.issueMapping !== "ticket") {
+      deps.error(
+        'ticket import-github requires config issueMapping "ticket" (other mappings are not supported yet).'
+      );
+      deps.exit(ExitCode.UserError);
+    }
+    const githubToken = await resolveGithubTokenForSync({
+      envToken: env.GITHUB_TOKEN,
+      cwd: repoRoot
+    });
+    if (!githubToken) {
+      deps.error(
+        "GitHub auth required: set GITHUB_TOKEN or run `gh auth login`"
+      );
+      deps.exit(ExitCode.EnvironmentAuth);
+    }
+    const actor = await resolveCliActor({
+      repoRoot,
+      cliActor: g.actor,
+      envActor: env.HYPER_PM_ACTOR
+    });
+    const tmpBase = g.tempDir ?? env.TMPDIR ?? (0, import_node_os2.tmpdir)();
+    const session = await openDataBranchWorktree({
+      repoRoot,
+      dataBranch: cfg.dataBranch,
+      tmpBase,
+      keepWorktree: g.keepWorktree,
+      runGit
+    });
+    try {
+      const lines = await readAllEventLines(session.worktreePath);
+      const proj = replayEvents(lines);
+      const storyRaw = o.story;
+      const storyTrimmed = storyRaw !== void 0 && storyRaw !== "" ? storyRaw.trim() : void 0;
+      if (storyTrimmed !== void 0 && storyTrimmed !== "") {
+        const storyRow = proj.stories.get(storyTrimmed);
+        if (!storyRow || storyRow.deleted) {
+          deps.error(`Story not found: ${storyTrimmed}`);
+          deps.exit(ExitCode.UserError);
+        }
+      }
+      try {
+        const gitDerivedSlug = await tryReadGithubOwnerRepoSlugFromGit({
+          repoRoot,
+          remote: cfg.remote,
+          runGit
+        });
+        const { owner, repo: repo2 } = resolveGithubRepo(
+          cfg,
+          env.GITHUB_REPO,
+          gitDerivedSlug
+        );
+        const octokit = new Octokit2({ auth: githubToken });
+        const issues = await octokit.paginate(
+          octokit.rest.issues.listForRepo,
+          {
+            owner,
+            repo: repo2,
+            state: listState,
+            per_page: 100
+          }
+        );
+        const { candidates, skipped } = partitionGithubIssuesForImport({
+          projection: proj,
+          issues,
+          onlyIssueNumbers
+        });
+        if (o.dryRun) {
+          deps.log(
+            formatOutput(g.format, {
+              ok: true,
+              dryRun: true,
+              candidates,
+              skipped
+            })
+          );
+        } else {
+          const imported = [];
+          for (const c of candidates) {
+            const ticketId = ulid();
+            const createPayload = mergeTicketImportCreatePayload(
+              ticketId,
+              c.ticketCreatedPayloadBase,
+              storyTrimmed
+            );
+            const createdEvt = makeEvent(
+              "TicketCreated",
+              createPayload,
+              deps.clock,
+              actor
+            );
+            await appendEventLine(
+              session.worktreePath,
+              createdEvt,
+              deps.clock
+            );
+            const linkEvt = makeEvent(
+              "GithubIssueLinked",
+              { ticketId, issueNumber: c.issueNumber },
+              deps.clock,
+              actor
+            );
+            await appendEventLine(session.worktreePath, linkEvt, deps.clock);
+            imported.push({ ticketId, issueNumber: c.issueNumber });
+          }
+          await commitDataWorktreeIfNeeded(
+            session.worktreePath,
+            formatDataBranchCommitMessage(
+              "hyper-pm: import-github-issues",
+              actor
+            ),
+            runGit
+          );
+          deps.log(
+            formatOutput(g.format, {
+              ok: true,
+              imported,
+              skipped
+            })
+          );
+        }
+      } catch (e) {
+        deps.error(e instanceof Error ? e.message : String(e));
+        deps.exit(ExitCode.ExternalApi);
+      }
+    } finally {
+      await session.dispose();
+    }
+    deps.exit(ExitCode.Success);
+  });
+  program2.command("sync").description("GitHub Issues sync").option("--no-github", "skip network sync", false).option(
+    "--skip-push",
+    "after a successful sync, do not push the data branch to the remote",
+    false
+  ).action(async function() {
     const g = readGlobals(this);
     const o = this.opts();
     const repoRoot = await resolveRepoRoot(g.repo);
@@ -15310,7 +15706,33 @@ ${body}`
         formatDataBranchCommitMessage("hyper-pm: sync", outboundActor),
         runGit
       );
-      deps.log(formatOutput(g.format, { ok: true }));
+      let dataBranchPush;
+      let dataBranchPushDetail;
+      if (o.skipPush) {
+        dataBranchPush = "skipped_cli";
+        dataBranchPushDetail = "skip-push";
+      } else {
+        const pushResult = await tryPushDataBranchToRemote(
+          session.worktreePath,
+          cfg.remote,
+          cfg.dataBranch,
+          runGit
+        );
+        dataBranchPush = pushResult.status;
+        dataBranchPushDetail = pushResult.detail;
+        if (pushResult.status === "failed" && pushResult.detail) {
+          deps.error(
+            `hyper-pm: data branch not pushed (${cfg.remote}/${cfg.dataBranch}): ${pushResult.detail}`
+          );
+        }
+      }
+      deps.log(
+        formatOutput(g.format, {
+          ok: true,
+          dataBranchPush,
+          ...dataBranchPushDetail !== void 0 ? { dataBranchPushDetail } : {}
+        })
+      );
     } catch (e) {
       deps.error(e instanceof Error ? e.message : String(e));
       deps.exit(ExitCode.ExternalApi);