hyper-pm 0.1.5 → 0.1.6

package/dist/index.cjs

@@ -12782,6 +12782,7 @@ var sortTicketRecordsForList = (tickets, field, dir) => [...tickets].sort((x, y)
 // src/cli/list-projection-summaries.ts
 var listActiveEpicSummaries = (projection) => [...projection.epics.values()].filter((e) => !e.deleted).map((e) => ({
   id: e.id,
+  number: e.number,
   title: e.title,
   status: e.status,
   createdAt: e.createdAt,
@@ -12793,6 +12794,7 @@ var listActiveStorySummaries = (projection, options) => [...projection.stories.v
   (s) => !s.deleted && (options?.epicId === void 0 || s.epicId === options.epicId)
 ).map((s) => ({
   id: s.id,
+  number: s.number,
   title: s.title,
   epicId: s.epicId,
   status: s.status,
@@ -12825,6 +12827,7 @@ var listActiveTicketSummaries = (projection, options) => {
     const last = recent !== void 0 && recent.length > 0 ? recent[recent.length - 1] : void 0;
     return {
       id: t.id,
+      number: t.number,
       title: t.title,
       status: t.status,
       storyId: t.storyId,
@@ -13193,1137 +13196,1222 @@ var partitionGithubIssuesForImport = (params) => {
   }
   return { candidates, skipped };
 };
-var mergeTicketImportCreatePayload = (ticketId, base, storyId) => {
+var mergeTicketImportCreatePayload = (ticketId, base, storyId, number) => {
   const storyTrimmed = storyId !== void 0 && storyId !== "" ? storyId.trim() : void 0;
   const storyPayload = storyTrimmed !== void 0 && storyTrimmed !== "" ? { storyId: storyTrimmed } : {};
-  return { id: ticketId, ...base, ...storyPayload };
+  return { id: ticketId, number, ...base, ...storyPayload };
 };
 
-// src/config/hyper-pm-config.ts
-var hyperPmConfigSchema = external_exports.object({
-  schema: external_exports.literal(1),
-  dataBranch: external_exports.string().min(1),
-  remote: external_exports.string().min(1).default("origin"),
-  sync: external_exports.enum(["off", "outbound", "full"]).default("outbound"),
-  githubRepo: external_exports.string().optional(),
-  issueMapping: external_exports.enum(["ticket", "story", "epic"]).default("ticket")
-});
-
-// src/config/load-config.ts
-var import_promises = require("node:fs/promises");
-var import_node_path = require("node:path");
-var CONFIG_DIR = ".hyper-pm";
-var CONFIG_FILE = "config.json";
-var getHyperPmConfigPath = (repoRoot) => {
-  return (0, import_node_path.join)(repoRoot, CONFIG_DIR, CONFIG_FILE);
-};
-var loadHyperPmConfig = async (repoRoot, overrides = {}) => {
-  const raw = await (0, import_promises.readFile)(getHyperPmConfigPath(repoRoot), "utf8");
-  const parsed = JSON.parse(raw);
-  const base = hyperPmConfigSchema.parse(parsed);
-  const merged = { ...base, ...stripUndefined(overrides) };
-  return hyperPmConfigSchema.parse(merged);
-};
-var stripUndefined = (obj) => {
-  const out = {};
-  for (const [k, v] of Object.entries(obj)) {
-    if (v !== void 0) out[k] = v;
+// src/lib/github-pr-activity.ts
+var GITHUB_PR_ACTIVITY_RECENT_CAP = 20;
+var githubPrActivityKindSchema = external_exports.enum([
+  "opened",
+  "updated",
+  "commented",
+  "reviewed",
+  "merged",
+  "closed",
+  "ready_for_review"
+]);
+var githubPrReviewStateSchema = external_exports.enum([
+  "approved",
+  "changes_requested",
+  "commented"
+]);
+var buildPrOpenSourceId = (ticketId, prNumber) => `hyper-pm:pr-open:${ticketId}:${prNumber}`;
+var parseGithubPrActivityPayload = (payload) => {
+  const ticketId = payload["ticketId"];
+  const prRaw = payload["prNumber"];
+  const kindRaw = payload["kind"];
+  const occurredAt = payload["occurredAt"];
+  const sourceId = payload["sourceId"];
+  if (typeof ticketId !== "string" || typeof occurredAt !== "string" || typeof sourceId !== "string") {
+    return void 0;
+  }
+  const prNumber = typeof prRaw === "number" ? prRaw : Number(prRaw);
+  if (!Number.isFinite(prNumber)) return void 0;
+  const kindParsed = githubPrActivityKindSchema.safeParse(kindRaw);
+  if (!kindParsed.success) return void 0;
+  const out = {
+    prNumber,
+    kind: kindParsed.data,
+    occurredAt,
+    sourceId
+  };
+  const url = payload["url"];
+  if (typeof url === "string" && url.length > 0) {
+    out.url = url;
+  }
+  const rs = githubPrReviewStateSchema.safeParse(payload["reviewState"]);
+  if (rs.success) {
+    out.reviewState = rs.data;
   }
   return out;
 };
 
-// src/config/save-config.ts
-var import_promises2 = require("node:fs/promises");
-var import_node_path2 = require("node:path");
-var saveHyperPmConfig = async (repoRoot, config) => {
-  const target = getHyperPmConfigPath(repoRoot);
-  await (0, import_promises2.mkdir)((0, import_node_path2.dirname)(target), { recursive: true });
-  await (0, import_promises2.writeFile)(target, `${JSON.stringify(config, null, 2)}
-`, "utf8");
+// src/storage/projection.ts
+var readOptionalPositiveIntegerFromPayload = (payload, key) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, key)) return void 0;
+  const raw = payload[key];
+  if (typeof raw !== "number" || !Number.isFinite(raw)) return void 0;
+  if (!Number.isInteger(raw)) return void 0;
+  if (raw < 1 || raw > Number.MAX_SAFE_INTEGER) return void 0;
+  return raw;
+};
+var maxNumberAmongRows = (rows) => {
+  let m = 0;
+  for (const r of rows) {
+    if (r.number > m) m = r.number;
+  }
+  return m;
+};
+var maxEpicNumberInProjection = (projection) => maxNumberAmongRows(projection.epics.values());
+var maxStoryNumberInProjection = (projection) => maxNumberAmongRows(projection.stories.values());
+var maxTicketNumberInProjection = (projection) => maxNumberAmongRows(projection.tickets.values());
+var nextEpicNumberForCreate = (projection) => maxEpicNumberInProjection(projection) + 1;
+var nextStoryNumberForCreate = (projection) => maxStoryNumberInProjection(projection) + 1;
+var nextTicketNumberForCreate = (projection) => maxTicketNumberInProjection(projection) + 1;
+var resolveWorkItemCreateNumber = (projection, kind, payload) => {
+  const explicit = readOptionalPositiveIntegerFromPayload(payload, "number");
+  if (explicit !== void 0) {
+    return explicit;
+  }
+  return (kind === "epic" ? maxEpicNumberInProjection(projection) : kind === "story" ? maxStoryNumberInProjection(projection) : maxTicketNumberInProjection(projection)) + 1;
 };
-
-// src/doctor/run-doctor.ts
-var runDoctorOnLines = (lines) => {
-  const issues = [];
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i]?.trim() ?? "";
-    if (!line) continue;
-    let json;
-    try {
-      json = JSON.parse(line);
-    } catch (e) {
-      issues.push({
-        kind: "invalid-json",
-        line: i + 1,
-        message: e instanceof Error ? e.message : "parse error"
-      });
-      return issues;
-    }
-    const parsed = eventLineSchema.safeParse(json);
-    if (!parsed.success) {
-      issues.push({
-        kind: "invalid-event",
-        line: i + 1,
-        message: parsed.error.message
-      });
-      return issues;
-    }
+var emptyProjection = () => ({
+  epics: /* @__PURE__ */ new Map(),
+  stories: /* @__PURE__ */ new Map(),
+  tickets: /* @__PURE__ */ new Map()
+});
+var parsePrRefs = (body) => {
+  const out = /* @__PURE__ */ new Set();
+  const re = /\b(?:Closes|Refs|Fixes)\s+#(\d+)\b/gi;
+  let m = re.exec(body);
+  while (m !== null) {
+    out.add(Number(m[1]));
+    m = re.exec(body);
   }
-  return issues;
-};
-
-// src/git/create-and-checkout-branch.ts
-var createAndCheckoutBranch = async (opts) => {
-  await opts.runGit(opts.repoRoot, [
-    "switch",
-    "-c",
-    opts.branchName,
-    opts.startPoint
-  ]);
-};
-
-// src/git/data-worktree-session.ts
-var import_promises3 = require("node:fs/promises");
-var import_node_path3 = require("node:path");
-var ensureDir = async (path) => {
-  await (0, import_promises3.mkdir)(path, { recursive: true });
+  return [...out];
 };
-var defaultPathExists = async (path) => {
-  try {
-    await (0, import_promises3.access)(path);
-    return true;
-  } catch {
-    return false;
+var applyTicketAssigneeFromPayload = (row, payload) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, "assignee")) return;
+  const v = payload["assignee"];
+  if (v === null) {
+    delete row.assignee;
+    return;
   }
+  if (typeof v !== "string") return;
+  const n = normalizeGithubLogin(v);
+  if (n === "") delete row.assignee;
+  else row.assignee = n;
 };
-var parseDataBranchWorktreeFromPorcelain = (stdout, dataBranch) => {
-  const wantRef = `refs/heads/${dataBranch}`;
-  const blocks = stdout.split(/\n\n+/).map((b) => b.trim()).filter(Boolean);
-  for (const block of blocks) {
-    const lines = block.split("\n");
-    let worktreePath;
-    let branch;
-    for (const line of lines) {
-      if (line.startsWith("worktree ")) {
-        worktreePath = line.slice("worktree ".length);
-      } else if (line.startsWith("branch ")) {
-        branch = line.slice("branch ".length);
-      }
-    }
-    if (worktreePath !== void 0 && branch === wantRef) {
-      return worktreePath;
-    }
+var storyIdFromTicketCreatedPayload = (payload) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, "storyId")) {
+    return null;
   }
-  return void 0;
+  const v = payload["storyId"];
+  if (v === null) return null;
+  if (typeof v !== "string") return null;
+  const t = v.trim();
+  return t === "" ? null : t;
 };
-var openDataBranchWorktree = async (opts) => {
-  const pathExists = opts.pathExists ?? defaultPathExists;
-  const { stdout: listOut } = await opts.runGit(opts.repoRoot, [
-    "worktree",
-    "list",
-    "--porcelain"
-  ]);
-  const listedPath = parseDataBranchWorktreeFromPorcelain(
-    listOut,
-    opts.dataBranch
-  );
-  if (listedPath !== void 0 && await pathExists(listedPath)) {
-    const dispose2 = async () => {
-      return;
-    };
-    return { worktreePath: listedPath, dispose: dispose2 };
+var applyTicketStoryIdFromPayload = (row, payload) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, "storyId")) return;
+  const v = payload["storyId"];
+  if (v === null) {
+    row.storyId = null;
+    return;
   }
-  const worktreePath = (0, import_node_path3.join)(
-    opts.tmpBase,
-    `hyper-pm-worktree-${ulid().toLowerCase()}`
-  );
-  await ensureDir(opts.tmpBase);
-  try {
-    await opts.runGit(opts.repoRoot, [
-      "worktree",
-      "add",
-      worktreePath,
-      opts.dataBranch
-    ]);
-  } catch (err) {
-    await (0, import_promises3.rm)(worktreePath, { recursive: true, force: true }).catch(() => {
-    });
-    throw err;
+  if (typeof v !== "string") return;
+  const t = v.trim();
+  row.storyId = t === "" ? null : t;
+};
+var linkedBranchesFromTicketCreatedPayload = (payload) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, "branches")) {
+    return [];
   }
-  const dispose = async () => {
-    if (opts.keepWorktree) {
-      return;
-    }
-    await opts.runGit(opts.repoRoot, ["worktree", "remove", "--force", worktreePath]).catch(() => {
-    });
-    await (0, import_promises3.rm)(worktreePath, { recursive: true, force: true }).catch(() => {
-    });
-  };
-  return { worktreePath, dispose };
+  return normalizeTicketBranchListFromPayloadValue(payload["branches"]);
 };
-
-// src/git/find-git-root.ts
-var findGitRoot = async (cwd, deps) => {
-  const { stdout } = await deps.runGit(cwd, ["rev-parse", "--show-toplevel"]);
-  return stdout;
+var applyTicketBranchesFromUpdatePayload = (row, payload) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, "branches")) return;
+  const v = payload["branches"];
+  if (!Array.isArray(v)) return;
+  row.linkedBranches = normalizeTicketBranchListFromPayloadValue(v);
 };
-
-// src/git/init-orphan-data-branch.ts
-var import_promises4 = require("node:fs/promises");
-var import_node_path4 = require("node:path");
-var initOrphanDataBranchInWorktree = async (opts) => {
-  const { stdout: tip } = await opts.runGit(opts.repoRoot, [
-    "rev-parse",
-    "HEAD"
-  ]);
-  const tipCommit = tip.trim();
-  await opts.runGit(opts.repoRoot, [
-    "worktree",
-    "add",
-    opts.worktreePath,
-    tipCommit
-  ]);
-  await opts.runGit(opts.worktreePath, [
-    "checkout",
-    "--orphan",
-    opts.dataBranch
-  ]);
-  await opts.runGit(opts.worktreePath, ["rm", "-rf", "."]).catch(() => {
-  });
-  const marker = (0, import_node_path4.join)(opts.worktreePath, "README.hyper-pm.md");
-  await (0, import_promises4.writeFile)(
-    marker,
-    "# hyper-pm data branch\n\nAppend-only events live under `events/`.\n",
-    "utf8"
-  );
-  await opts.runGit(opts.worktreePath, ["add", "."]);
-  await opts.runGit(opts.worktreePath, [
-    "commit",
-    "-m",
-    "init hyper-pm data branch"
-  ]);
-};
-
-// src/git/pick-unique-local-branch-name.ts
-var DEFAULT_MAX_SUFFIX = 1e3;
-var localBranchRefExists = async (repoRoot, name, git) => {
-  try {
-    await git(repoRoot, ["show-ref", "--verify", `refs/heads/${name}`]);
-    return true;
-  } catch {
-    return false;
-  }
-};
-var pickUniqueLocalBranchName = async (opts) => {
-  const max = opts.maxSuffix ?? DEFAULT_MAX_SUFFIX;
-  const { preferredBase, repoRoot, runGit: git } = opts;
-  for (let n = 1; n <= max; n += 1) {
-    const raw = n === 1 ? preferredBase : `${preferredBase}-${n}`;
-    const norm = normalizeTicketBranchName(raw);
-    if (norm === void 0) {
-      continue;
-    }
-    if (!await localBranchRefExists(repoRoot, norm, git)) {
-      return { branch: norm, preferred: preferredBase };
+var applyTicketPlanningFieldsFromCreatePayload = (row, payload) => {
+  if (Object.prototype.hasOwnProperty.call(payload, "labels")) {
+    const v = ticketLabelsFromPayloadValue(payload["labels"]);
+    if (v !== void 0 && v.length > 0) {
+      row.labels = v;
     }
   }
-  throw new Error(
-    `Could not allocate a free local branch name from ${JSON.stringify(preferredBase)} (tried suffixes up to -${String(max)})`
-  );
-};
-
-// src/git/resolve-integration-start-point.ts
-var assertGitRefResolvable = async (repoRoot, ref, git) => {
-  try {
-    await git(repoRoot, ["rev-parse", "-q", "--verify", ref]);
-  } catch {
-    throw new Error(`Invalid or ambiguous --from ref: ${ref}`);
+  const pr = readTicketPriorityPatch(payload);
+  if (typeof pr === "string") {
+    row.priority = pr;
   }
-};
-var resolveIntegrationStartPoint = async (repoRoot, remote, git) => {
-  const symRef = `refs/remotes/${remote}/HEAD`;
-  try {
-    const { stdout } = await git(repoRoot, ["symbolic-ref", "-q", symRef]);
-    const target = stdout.trim();
-    if (target !== "") {
-      await git(repoRoot, ["rev-parse", "-q", "--verify", target]);
-      return target;
-    }
-  } catch {
+  const sz = readTicketSizePatch(payload);
+  if (typeof sz === "string") {
+    row.size = sz;
   }
-  for (const head of ["refs/heads/main", "refs/heads/master"]) {
-    try {
-      await git(repoRoot, ["rev-parse", "-q", "--verify", head]);
-      return head;
-    } catch {
-    }
+  const est = readTicketEstimatePatch(payload);
+  if (typeof est === "number") {
+    row.estimate = est;
   }
-  try {
-    await git(repoRoot, ["rev-parse", "-q", "--verify", "HEAD"]);
-    return "HEAD";
-  } catch {
+  const sw = readTicketIsoInstantPatch(payload, "startWorkAt");
+  if (typeof sw === "string") {
+    row.startWorkAt = sw;
   }
-  throw new Error(
-    "Could not resolve a default branch to branch from; pass --from <ref> (e.g. main or origin/main)."
-  );
-};
-
-// src/git/list-repo-commit-authors.ts
-var listRepoCommitAuthors = async (repoRoot, git) => {
-  try {
-    const { stdout } = await git(repoRoot, [
-      "-c",
-      "log.showSignature=false",
-      "log",
-      "--all",
-      "--format=%an%x1f%ae"
-    ]);
-    if (stdout === "") return [];
-    const lines = stdout.split("\n").filter((l) => l.length > 0);
-    const seenEmail = /* @__PURE__ */ new Set();
-    const out = [];
-    for (const line of lines) {
-      const sep2 = line.indexOf("");
-      if (sep2 <= 0) continue;
-      const name = line.slice(0, sep2).trim();
-      const email = line.slice(sep2 + 1).trim();
-      if (email === "") continue;
-      const key = email.toLowerCase();
-      if (seenEmail.has(key)) continue;
-      seenEmail.add(key);
-      const loginGuess = guessGithubLoginFromContact(name, email);
-      out.push(
-        loginGuess !== void 0 ? { name, email, loginGuess } : { name, email }
-      );
+  const tf = readTicketIsoInstantPatch(payload, "targetFinishAt");
+  if (typeof tf === "string") {
+    row.targetFinishAt = tf;
+  }
+  if (Object.prototype.hasOwnProperty.call(payload, "dependsOn")) {
+    const v = parseTicketDependsOnFromPayloadValue(payload["dependsOn"]);
+    if (v !== void 0 && v.length > 0) {
+      row.dependsOn = v;
     }
-    return out;
-  } catch {
-    return [];
   }
 };
-
-// src/git/parse-github-owner-repo-from-remote-url.ts
-var parseGithubOwnerRepoFromRemoteUrl = (rawUrl) => {
-  const trimmed = rawUrl.trim();
-  if (!trimmed) {
-    return void 0;
-  }
-  const scpMatch = /^git@github\.com:(?<path>.+)$/i.exec(trimmed);
-  if (scpMatch?.groups?.path) {
-    return slugFromGithubPath(scpMatch.groups.path);
-  }
-  try {
-    const withScheme = trimmed.includes("://") ? trimmed : `https://${trimmed}`;
-    const u = new URL(withScheme);
-    const host = u.hostname.toLowerCase();
-    if (host !== "github.com" && host !== "www.github.com") {
-      return void 0;
+var applyTicketPlanningFieldsFromUpdatePayload = (row, payload) => {
+  if (Object.prototype.hasOwnProperty.call(payload, "labels")) {
+    if (payload["labels"] === null) {
+      delete row.labels;
+    } else {
+      const v = ticketLabelsFromPayloadValue(payload["labels"]);
+      if (v !== void 0) {
+        if (v.length === 0) {
+          delete row.labels;
+        } else {
+          row.labels = v;
+        }
+      }
     }
-    return slugFromGithubPath(u.pathname);
-  } catch {
-    return void 0;
   }
-};
-var slugFromGithubPath = (path) => {
-  const segments = path.replace(/^\/+/, "").split("/").filter((s) => s.length > 0).map((s) => s.replace(/\.git$/i, ""));
-  if (segments.length < 2) {
-    return void 0;
+  const pr = readTicketPriorityPatch(payload);
+  if (pr === null) {
+    delete row.priority;
+  } else if (typeof pr === "string") {
+    row.priority = pr;
   }
-  const owner = segments[0];
-  const repo = segments[1];
-  if (!owner || !repo) {
-    return void 0;
+  const sz = readTicketSizePatch(payload);
+  if (sz === null) {
+    delete row.size;
+  } else if (typeof sz === "string") {
+    row.size = sz;
   }
-  return `${owner}/${repo}`;
-};
-
-// src/git/try-read-github-owner-repo-slug-from-git.ts
-var tryReadGithubOwnerRepoSlugFromGit = async (params) => {
-  try {
-    const { stdout } = await params.runGit(params.repoRoot, [
-      "remote",
-      "get-url",
-      params.remote
-    ]);
-    return parseGithubOwnerRepoFromRemoteUrl(stdout);
-  } catch {
-    return void 0;
+  const est = readTicketEstimatePatch(payload);
+  if (est === null) {
+    delete row.estimate;
+  } else if (typeof est === "number") {
+    row.estimate = est;
   }
-};
-
-// 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 "";
+  const sw = readTicketIsoInstantPatch(payload, "startWorkAt");
+  if (sw === null) {
+    delete row.startWorkAt;
+  } else if (typeof sw === "string") {
+    row.startWorkAt = sw;
   }
-};
-var tryReadGitConfigUserEmail = async (cwd, runGit2) => {
-  try {
-    const { stdout } = await runGit2(cwd, ["config", "--get", "user.email"]);
-    return stdout.trim();
-  } catch {
-    return "";
+  const tf = readTicketIsoInstantPatch(payload, "targetFinishAt");
+  if (tf === null) {
+    delete row.targetFinishAt;
+  } else if (typeof tf === "string") {
+    row.targetFinishAt = tf;
+  }
+  if (Object.prototype.hasOwnProperty.call(payload, "dependsOn")) {
+    if (payload["dependsOn"] === null) {
+      delete row.dependsOn;
+    } else {
+      const v = parseTicketDependsOnFromPayloadValue(payload["dependsOn"]);
+      if (v !== void 0) {
+        if (v.length === 0) {
+          delete row.dependsOn;
+        } else {
+          row.dependsOn = v;
+        }
+      }
+    }
   }
 };
-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) => {
-  const raw = actorSuffix?.trim();
-  if (!raw) {
-    return base;
-  }
-  const collapsed = raw.replace(/\s+/g, " ");
-  const suffix = collapsed.length > maxActorSuffixLen ? `${collapsed.slice(0, maxActorSuffixLen - 1)}\u2026` : collapsed;
-  return `${base} (${suffix})`;
-};
-var commitDataWorktreeIfNeeded = async (worktreePath, message, runGit2, opts) => {
-  const { stdout } = await runGit2(worktreePath, ["status", "--porcelain"]);
-  if (!stdout.trim()) return;
-  await runGit2(worktreePath, ["add", "."]);
-  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/run/sync-remote-data-branch.ts
-var SyncRemoteDataBranchMergeError = class extends Error {
-  /** @param message - Human-readable reason (stderr excerpt or generic text). */
-  constructor(message) {
-    super(message);
-    this.name = "SyncRemoteDataBranchMergeError";
-  }
-};
-var remoteTrackingRef = (remote, dataBranch) => `refs/remotes/${remote}/${dataBranch}`;
-var mergeRefSpecifier = (remote, dataBranch) => `${remote}/${dataBranch}`;
-var isLikelyNonFastForwardPushFailure = (detail) => {
-  if (detail === void 0) return false;
-  const d = detail.toLowerCase();
-  return d.includes("non-fast-forward") || d.includes("failed to push");
+var applyCreatedAudit = (row, evt) => {
+  row.createdAt = evt.ts;
+  row.createdBy = evt.actor;
+  row.updatedAt = evt.ts;
+  row.updatedBy = evt.actor;
 };
-var classifyMergeOutput = (combined) => {
-  const c = combined.toLowerCase();
-  if (c.includes("already up to date")) {
-    return "up_to_date";
-  }
-  if (c.includes("fast-forward")) {
-    return "fast_forward";
-  }
-  return "merge_commit";
+var applyLastUpdate = (row, evt) => {
+  row.updatedAt = evt.ts;
+  row.updatedBy = evt.actor;
 };
-var refExists = async (cwd, ref, runGit2) => {
-  try {
-    await runGit2(cwd, ["show-ref", "--verify", "--quiet", ref]);
-    return true;
-  } catch {
-    return false;
-  }
+var applyStatusIfChanged = (row, evt, nextStatus) => {
+  if (row.status === nextStatus) return false;
+  row.status = nextStatus;
+  row.statusChangedAt = evt.ts;
+  row.statusChangedBy = evt.actor;
+  return true;
 };
-var fetchRemoteDataBranch = async (worktreePath, remote, dataBranch, runGit2) => {
-  try {
-    await runGit2(worktreePath, ["remote", "get-url", remote]);
-  } catch {
-    return "skipped_no_remote";
-  }
-  try {
-    await runGit2(worktreePath, ["fetch", remote, dataBranch]);
-    return "ok";
-  } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
-    if (/couldn't find remote ref|could not find remote ref/i.test(msg)) {
-      return "remote_branch_absent";
-    }
-    throw e;
-  }
+var appendTicketCommentFromEvent = (ticket, evt) => {
+  const list = ticket.comments ?? (ticket.comments = []);
+  list.push({
+    id: evt.id,
+    body: String(evt.payload["body"] ?? ""),
+    createdAt: evt.ts,
+    createdBy: evt.actor
+  });
+  applyLastUpdate(ticket, evt);
 };
-var mergeRemoteTrackingIntoHead = async (worktreePath, remote, dataBranch, runGit2, authorEnv = env) => {
-  const spec = mergeRefSpecifier(remote, dataBranch);
-  const { name, email } = await resolveEffectiveGitAuthorForDataCommit(
-    worktreePath,
-    runGit2,
-    authorEnv
-  );
-  try {
-    const { stdout, stderr } = await runGit2(worktreePath, [
-      "-c",
-      `user.name=${name}`,
-      "-c",
-      `user.email=${email}`,
-      "merge",
-      "--no-edit",
-      spec
-    ]);
-    return classifyMergeOutput(`${stdout}
-${stderr}`);
-  } catch (e) {
-    await runGit2(worktreePath, ["merge", "--abort"]).catch(() => {
+var resolveInboundTicketStatusFromPayload = (ticket, payload) => {
+  const explicit = parseWorkItemStatus(payload["status"]);
+  if (explicit !== void 0) return explicit;
+  const legacySt = payload["state"];
+  if (legacySt === "open" || legacySt === "closed") {
+    return resolveTicketInboundStatus({
+      issueState: legacySt,
+      currentStatus: ticket.status
     });
-    const msg = e instanceof Error ? e.message : String(e);
-    throw new SyncRemoteDataBranchMergeError(
-      msg.toLowerCase().includes("conflict") ? "Merge conflict while syncing hyper-pm data branch; merge aborted. Resolve manually on the data branch if needed." : `git merge failed: ${msg.trim().split("\n")[0] ?? msg}`
-    );
   }
+  return void 0;
 };
-var runRemoteDataBranchGitSync = async (worktreePath, remote, dataBranch, runGit2, skipPush, deps = {}) => {
-  const tryPushFn = deps.tryPush ?? tryPushDataBranchToRemote;
-  const maxPushAttempts = deps.maxPushAttempts ?? 3;
-  const authorEnv = deps.authorEnv ?? env;
-  let dataBranchFetch = await fetchRemoteDataBranch(worktreePath, remote, dataBranch, runGit2);
-  let dataBranchMerge = dataBranchFetch === "skipped_no_remote" ? "skipped_no_remote" : dataBranchFetch === "remote_branch_absent" ? "skipped_missing_remote_branch" : "up_to_date";
-  if (dataBranchFetch === "ok") {
-    const tracking = remoteTrackingRef(remote, dataBranch);
-    const exists = await refExists(worktreePath, tracking, runGit2);
-    if (!exists) {
-      dataBranchMerge = "skipped_missing_remote_branch";
-    } else {
-      dataBranchMerge = await mergeRemoteTrackingIntoHead(
-        worktreePath,
-        remote,
-        dataBranch,
-        runGit2,
-        authorEnv
-      );
+var applyEvent = (projection, evt) => {
+  switch (evt.type) {
+    case "EpicCreated": {
+      const id = String(evt.payload["id"]);
+      const status = resolveStatusForNewEpicStoryPayload(evt.payload);
+      const row = {
+        id,
+        number: resolveWorkItemCreateNumber(projection, "epic", evt.payload),
+        title: String(evt.payload["title"] ?? ""),
+        body: String(evt.payload["body"] ?? ""),
+        status,
+        statusChangedAt: evt.ts,
+        statusChangedBy: evt.actor,
+        createdAt: "",
+        createdBy: "",
+        updatedAt: "",
+        updatedBy: ""
+      };
+      applyCreatedAudit(row, evt);
+      projection.epics.set(id, row);
+      break;
     }
-  }
-  if (skipPush) {
-    return {
-      dataBranchFetch,
-      dataBranchMerge,
-      dataBranchPush: "skipped_cli",
-      dataBranchPushDetail: "skip-push",
-      pushAttempts: 0
-    };
-  }
-  let pushAttempts = 0;
-  let lastPush = { status: "skipped_no_remote" };
-  const refetchAndMerge = async () => {
-    dataBranchFetch = await fetchRemoteDataBranch(
-      worktreePath,
-      remote,
-      dataBranch,
-      runGit2
-    );
-    if (dataBranchFetch !== "ok") {
-      return;
+    case "EpicUpdated": {
+      const id = String(evt.payload["id"]);
+      const cur = projection.epics.get(id);
+      if (!cur) break;
+      if (evt.payload["title"] !== void 0) {
+        cur.title = String(evt.payload["title"]);
+      }
+      if (evt.payload["body"] !== void 0) {
+        cur.body = String(evt.payload["body"]);
+      }
+      const nextStatus = parseWorkItemStatus(evt.payload["status"]);
+      if (nextStatus !== void 0) {
+        applyStatusIfChanged(cur, evt, nextStatus);
+      }
+      applyLastUpdate(cur, evt);
+      break;
     }
-    const tracking = remoteTrackingRef(remote, dataBranch);
-    const exists = await refExists(worktreePath, tracking, runGit2);
-    if (!exists) {
-      return;
+    case "EpicDeleted": {
+      const id = String(evt.payload["id"]);
+      const cur = projection.epics.get(id);
+      if (cur) {
+        cur.deleted = true;
+        applyLastUpdate(cur, evt);
+      }
+      break;
     }
-    dataBranchMerge = await mergeRemoteTrackingIntoHead(
-      worktreePath,
-      remote,
-      dataBranch,
-      runGit2,
-      authorEnv
-    );
-  };
-  for (let attempt = 1; attempt <= maxPushAttempts; attempt += 1) {
-    pushAttempts = attempt;
-    lastPush = await tryPushFn(worktreePath, remote, dataBranch, runGit2);
-    if (lastPush.status === "pushed" || lastPush.status === "skipped_no_remote") {
+    case "StoryCreated": {
+      const id = String(evt.payload["id"]);
+      const status = resolveStatusForNewEpicStoryPayload(evt.payload);
+      const row = {
+        id,
+        number: resolveWorkItemCreateNumber(projection, "story", evt.payload),
+        epicId: String(evt.payload["epicId"]),
+        title: String(evt.payload["title"] ?? ""),
+        body: String(evt.payload["body"] ?? ""),
+        status,
+        statusChangedAt: evt.ts,
+        statusChangedBy: evt.actor,
+        createdAt: "",
+        createdBy: "",
+        updatedAt: "",
+        updatedBy: ""
+      };
+      applyCreatedAudit(row, evt);
+      projection.stories.set(id, row);
       break;
     }
-    if (lastPush.status === "failed" && isLikelyNonFastForwardPushFailure(lastPush.detail) && attempt < maxPushAttempts) {
-      await refetchAndMerge();
-      continue;
+    case "StoryUpdated": {
+      const id = String(evt.payload["id"]);
+      const cur = projection.stories.get(id);
+      if (!cur) break;
+      if (evt.payload["title"] !== void 0) {
+        cur.title = String(evt.payload["title"]);
+      }
+      if (evt.payload["body"] !== void 0) {
+        cur.body = String(evt.payload["body"]);
+      }
+      const nextStatus = parseWorkItemStatus(evt.payload["status"]);
+      if (nextStatus !== void 0) {
+        applyStatusIfChanged(cur, evt, nextStatus);
+      }
+      applyLastUpdate(cur, evt);
+      break;
     }
-    break;
+    case "StoryDeleted": {
+      const id = String(evt.payload["id"]);
+      const cur = projection.stories.get(id);
+      if (cur) {
+        cur.deleted = true;
+        applyLastUpdate(cur, evt);
+      }
+      break;
+    }
+    case "TicketCreated": {
+      const id = String(evt.payload["id"]);
+      const body = String(evt.payload["body"] ?? "");
+      const status = resolveStatusForNewTicketPayload(evt.payload);
+      const row = {
+        id,
+        number: resolveWorkItemCreateNumber(projection, "ticket", evt.payload),
+        storyId: storyIdFromTicketCreatedPayload(evt.payload),
+        title: String(evt.payload["title"] ?? ""),
+        body,
+        status,
+        statusChangedAt: evt.ts,
+        statusChangedBy: evt.actor,
+        linkedPrs: parsePrRefs(body),
+        linkedBranches: linkedBranchesFromTicketCreatedPayload(evt.payload),
+        prActivityRecent: [],
+        createdAt: "",
+        createdBy: "",
+        updatedAt: "",
+        updatedBy: ""
+      };
+      applyCreatedAudit(row, evt);
+      applyTicketAssigneeFromPayload(row, evt.payload);
+      applyTicketPlanningFieldsFromCreatePayload(row, evt.payload);
+      projection.tickets.set(id, row);
+      break;
+    }
+    case "TicketUpdated": {
+      const id = String(evt.payload["id"]);
+      const cur = projection.tickets.get(id);
+      if (!cur) break;
+      if (evt.payload["title"] !== void 0) {
+        cur.title = String(evt.payload["title"]);
+      }
+      if (evt.payload["body"] !== void 0) {
+        cur.body = String(evt.payload["body"]);
+        cur.linkedPrs = parsePrRefs(cur.body);
+      }
+      const nextStatus = resolveTicketStatusFromUpdatePayload(evt.payload);
+      if (nextStatus !== void 0) {
+        applyStatusIfChanged(cur, evt, nextStatus);
+      }
+      applyTicketAssigneeFromPayload(cur, evt.payload);
+      applyTicketStoryIdFromPayload(cur, evt.payload);
+      applyTicketBranchesFromUpdatePayload(cur, evt.payload);
+      applyTicketPlanningFieldsFromUpdatePayload(cur, evt.payload);
+      applyLastUpdate(cur, evt);
+      break;
+    }
+    case "TicketDeleted": {
+      const id = String(evt.payload["id"]);
+      const cur = projection.tickets.get(id);
+      if (cur) {
+        cur.deleted = true;
+        applyLastUpdate(cur, evt);
+      }
+      break;
+    }
+    case "TicketCommentAdded": {
+      const ticketId = String(evt.payload["ticketId"] ?? "");
+      const ticket = projection.tickets.get(ticketId);
+      if (!ticket || ticket.deleted) break;
+      appendTicketCommentFromEvent(ticket, evt);
+      break;
+    }
+    case "SyncCursor": {
+      projection.syncCursor = String(evt.payload["cursor"] ?? "");
+      break;
+    }
+    case "GithubIssueLinked": {
+      const ticketId = String(evt.payload["ticketId"]);
+      const num = Number(evt.payload["issueNumber"]);
+      const ticket = projection.tickets.get(ticketId);
+      if (ticket && Number.isFinite(num)) {
+        ticket.githubIssueNumber = num;
+        applyLastUpdate(ticket, evt);
+      }
+      break;
+    }
+    case "GithubInboundUpdate": {
+      const entity = String(evt.payload["entity"]);
+      const entityId = String(evt.payload["entityId"]);
+      if (entity === "ticket") {
+        const ticket = projection.tickets.get(entityId);
+        if (!ticket) break;
+        if (evt.payload["title"] !== void 0) {
+          ticket.title = String(evt.payload["title"]);
+        }
+        if (evt.payload["body"] !== void 0) {
+          ticket.body = String(evt.payload["body"]);
+          ticket.linkedPrs = parsePrRefs(ticket.body);
+        }
+        const inboundStatus = resolveInboundTicketStatusFromPayload(
+          ticket,
+          evt.payload
+        );
+        if (inboundStatus !== void 0) {
+          applyStatusIfChanged(ticket, evt, inboundStatus);
+        }
+        applyTicketAssigneeFromPayload(ticket, evt.payload);
+        applyTicketPlanningFieldsFromUpdatePayload(ticket, evt.payload);
+        applyLastUpdate(ticket, evt);
+      }
+      break;
+    }
+    case "GithubPrActivity": {
+      const summary = parseGithubPrActivityPayload(evt.payload);
+      if (!summary) break;
+      const ticket = projection.tickets.get(
+        String(evt.payload["ticketId"] ?? "")
+      );
+      if (!ticket || ticket.deleted) break;
+      const list = ticket.prActivityRecent ?? (ticket.prActivityRecent = []);
+      list.push(summary);
+      if (list.length > GITHUB_PR_ACTIVITY_RECENT_CAP) {
+        ticket.prActivityRecent = list.slice(-GITHUB_PR_ACTIVITY_RECENT_CAP);
+      }
+      break;
+    }
+    default:
+      break;
   }
-  return {
-    dataBranchFetch,
-    dataBranchMerge,
-    dataBranchPush: lastPush.status,
-    ...lastPush.detail !== void 0 ? { dataBranchPushDetail: lastPush.detail } : {},
-    pushAttempts
-  };
 };
-
-// src/storage/append-event.ts
-var import_promises5 = require("node:fs/promises");
-var import_node_path5 = require("node:path");
-
-// src/storage/event-path.ts
-var nextEventRelPath = (now, deps) => {
-  const y = String(now.getUTCFullYear());
-  const m = String(now.getUTCMonth() + 1).padStart(2, "0");
-  const nextId = deps?.nextId ?? (() => ulid().toLowerCase());
-  const part = `part-${nextId()}`;
-  return `events/${y}/${m}/${part}.jsonl`;
+var replayEvents = (lines) => {
+  const proj = emptyProjection();
+  const events = [];
+  for (const line of lines) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    const json = JSON.parse(trimmed);
+    events.push(eventLineSchema.parse(json));
+  }
+  events.sort((a, b) => {
+    const t = a.ts.localeCompare(b.ts);
+    if (t !== 0) return t;
+    return a.id.localeCompare(b.id);
+  });
+  for (const e of events) {
+    applyEvent(proj, e);
+  }
+  return proj;
 };
 
-// src/storage/append-event.ts
-var appendEventLine = async (dataRoot, event, clock, opts) => {
-  const rel = nextEventRelPath(clock.now(), {
-    nextId: opts?.nextEventId
+// src/cli/resolve-projection-work-item-id.ts
+var isDigitOnlyWorkItemRef = (raw) => /^\d+$/.test(raw.trim());
+var resolveEpicId = (projection, raw) => {
+  const t = raw.trim();
+  if (t === "") return void 0;
+  if (projection.epics.has(t)) return t;
+  if (!isDigitOnlyWorkItemRef(t)) return void 0;
+  const n = Number(t);
+  const hits = [...projection.epics.values()].filter((e) => e.number === n);
+  if (hits.length !== 1) return void 0;
+  return hits[0].id;
+};
+var resolveStoryId = (projection, raw) => {
+  const t = raw.trim();
+  if (t === "") return void 0;
+  if (projection.stories.has(t)) return t;
+  if (!isDigitOnlyWorkItemRef(t)) return void 0;
+  const n = Number(t);
+  const hits = [...projection.stories.values()].filter((s) => s.number === n);
+  if (hits.length !== 1) return void 0;
+  return hits[0].id;
+};
+var resolveTicketId = (projection, raw) => {
+  const t = raw.trim();
+  if (t === "") return void 0;
+  if (projection.tickets.has(t)) return t;
+  if (!isDigitOnlyWorkItemRef(t)) return void 0;
+  const n = Number(t);
+  const hits = [...projection.tickets.values()].filter((x) => x.number === n);
+  if (hits.length !== 1) return void 0;
+  return hits[0].id;
+};
+var resolveTicketDependsOnTokensToIds = (projection, tokens) => {
+  const mapped = tokens.map((raw) => {
+    const t = raw.trim();
+    if (t === "") return "";
+    if (projection.tickets.has(t)) return t;
+    if (!isDigitOnlyWorkItemRef(t)) return t;
+    const hit = resolveTicketId(projection, t);
+    return hit ?? t;
   });
-  const abs = `${dataRoot.replace(/\/$/, "")}/${rel}`;
-  await (0, import_promises5.mkdir)((0, import_node_path5.dirname)(abs), { recursive: true });
-  await (0, import_promises5.appendFile)(abs, `${JSON.stringify(event)}
-`, "utf8");
-  return rel;
+  return normalizeTicketDependsOnIds(mapped);
 };
-
-// src/storage/read-event-lines.ts
-var import_promises6 = require("node:fs/promises");
-var import_node_path6 = require("node:path");
-var listJsonlFiles = async (dir, root) => {
-  const out = [];
-  const entries = await (0, import_promises6.readdir)(dir, { withFileTypes: true });
-  for (const e of entries) {
-    const abs = (0, import_node_path6.join)(dir, e.name);
-    if (e.isDirectory()) {
-      out.push(...await listJsonlFiles(abs, root));
-    } else if (e.isFile() && e.name.endsWith(".jsonl")) {
-      out.push((0, import_node_path6.relative)(root, abs).split("\\").join("/"));
-    }
+var assertCreatePayloadUsesExpectedHeadNumber = (projection, kind, payload) => {
+  const n = readOptionalPositiveIntegerFromPayload(payload, "number");
+  const expected = kind === "epic" ? nextEpicNumberForCreate(projection) : kind === "story" ? nextStoryNumberForCreate(projection) : nextTicketNumberForCreate(projection);
+  if (n !== expected) {
+    const got = n === void 0 ? "missing" : String(n);
+    throw new Error(
+      `Invalid ${kind} number for this data branch: expected ${String(expected)}, got ${got}.`
+    );
   }
-  return out;
-};
-var readAllEventLines = async (dataRoot) => {
-  const eventsRoot = (0, import_node_path6.join)(dataRoot, "events");
-  let files = [];
-  try {
-    files = await listJsonlFiles(eventsRoot, dataRoot);
-  } catch {
-    return [];
-  }
-  files.sort((a, b) => a.localeCompare(b));
-  const lines = [];
-  for (const rel of files) {
-    const content = await (0, import_promises6.readFile)((0, import_node_path6.join)(dataRoot, rel), "utf8");
-    for (const line of content.split("\n")) {
-      if (line.trim()) lines.push(line);
-    }
-  }
-  return lines;
 };
 
-// src/lib/github-pr-activity.ts
-var GITHUB_PR_ACTIVITY_RECENT_CAP = 20;
-var githubPrActivityKindSchema = external_exports.enum([
-  "opened",
-  "updated",
-  "commented",
-  "reviewed",
-  "merged",
-  "closed",
-  "ready_for_review"
-]);
-var githubPrReviewStateSchema = external_exports.enum([
-  "approved",
-  "changes_requested",
-  "commented"
-]);
-var buildPrOpenSourceId = (ticketId, prNumber) => `hyper-pm:pr-open:${ticketId}:${prNumber}`;
-var parseGithubPrActivityPayload = (payload) => {
-  const ticketId = payload["ticketId"];
-  const prRaw = payload["prNumber"];
-  const kindRaw = payload["kind"];
-  const occurredAt = payload["occurredAt"];
-  const sourceId = payload["sourceId"];
-  if (typeof ticketId !== "string" || typeof occurredAt !== "string" || typeof sourceId !== "string") {
-    return void 0;
-  }
-  const prNumber = typeof prRaw === "number" ? prRaw : Number(prRaw);
-  if (!Number.isFinite(prNumber)) return void 0;
-  const kindParsed = githubPrActivityKindSchema.safeParse(kindRaw);
-  if (!kindParsed.success) return void 0;
-  const out = {
-    prNumber,
-    kind: kindParsed.data,
-    occurredAt,
-    sourceId
-  };
-  const url = payload["url"];
-  if (typeof url === "string" && url.length > 0) {
-    out.url = url;
-  }
-  const rs = githubPrReviewStateSchema.safeParse(payload["reviewState"]);
-  if (rs.success) {
-    out.reviewState = rs.data;
+// src/config/hyper-pm-config.ts
+var hyperPmConfigSchema = external_exports.object({
+  schema: external_exports.literal(1),
+  dataBranch: external_exports.string().min(1),
+  remote: external_exports.string().min(1).default("origin"),
+  sync: external_exports.enum(["off", "outbound", "full"]).default("outbound"),
+  githubRepo: external_exports.string().optional(),
+  issueMapping: external_exports.enum(["ticket", "story", "epic"]).default("ticket")
+});
+
+// src/config/load-config.ts
+var import_promises = require("node:fs/promises");
+var import_node_path = require("node:path");
+var CONFIG_DIR = ".hyper-pm";
+var CONFIG_FILE = "config.json";
+var getHyperPmConfigPath = (repoRoot) => {
+  return (0, import_node_path.join)(repoRoot, CONFIG_DIR, CONFIG_FILE);
+};
+var loadHyperPmConfig = async (repoRoot, overrides = {}) => {
+  const raw = await (0, import_promises.readFile)(getHyperPmConfigPath(repoRoot), "utf8");
+  const parsed = JSON.parse(raw);
+  const base = hyperPmConfigSchema.parse(parsed);
+  const merged = { ...base, ...stripUndefined(overrides) };
+  return hyperPmConfigSchema.parse(merged);
+};
+var stripUndefined = (obj) => {
+  const out = {};
+  for (const [k, v] of Object.entries(obj)) {
+    if (v !== void 0) out[k] = v;
   }
   return out;
 };
 
-// src/storage/projection.ts
-var emptyProjection = () => ({
-  epics: /* @__PURE__ */ new Map(),
-  stories: /* @__PURE__ */ new Map(),
-  tickets: /* @__PURE__ */ new Map()
-});
-var parsePrRefs = (body) => {
-  const out = /* @__PURE__ */ new Set();
-  const re = /\b(?:Closes|Refs|Fixes)\s+#(\d+)\b/gi;
-  let m = re.exec(body);
-  while (m !== null) {
-    out.add(Number(m[1]));
-    m = re.exec(body);
-  }
-  return [...out];
+// src/config/save-config.ts
+var import_promises2 = require("node:fs/promises");
+var import_node_path2 = require("node:path");
+var saveHyperPmConfig = async (repoRoot, config) => {
+  const target = getHyperPmConfigPath(repoRoot);
+  await (0, import_promises2.mkdir)((0, import_node_path2.dirname)(target), { recursive: true });
+  await (0, import_promises2.writeFile)(target, `${JSON.stringify(config, null, 2)}
+`, "utf8");
 };
-var applyTicketAssigneeFromPayload = (row, payload) => {
-  if (!Object.prototype.hasOwnProperty.call(payload, "assignee")) return;
-  const v = payload["assignee"];
-  if (v === null) {
-    delete row.assignee;
-    return;
+
+// src/doctor/run-doctor.ts
+var runDoctorOnLines = (lines) => {
+  const issues = [];
+  for (let i = 0; i < lines.length; i++) {
+    const line = lines[i]?.trim() ?? "";
+    if (!line) continue;
+    let json;
+    try {
+      json = JSON.parse(line);
+    } catch (e) {
+      issues.push({
+        kind: "invalid-json",
+        line: i + 1,
+        message: e instanceof Error ? e.message : "parse error"
+      });
+      return issues;
+    }
+    const parsed = eventLineSchema.safeParse(json);
+    if (!parsed.success) {
+      issues.push({
+        kind: "invalid-event",
+        line: i + 1,
+        message: parsed.error.message
+      });
+      return issues;
+    }
   }
-  if (typeof v !== "string") return;
-  const n = normalizeGithubLogin(v);
-  if (n === "") delete row.assignee;
-  else row.assignee = n;
+  return issues;
 };
-var storyIdFromTicketCreatedPayload = (payload) => {
-  if (!Object.prototype.hasOwnProperty.call(payload, "storyId")) {
-    return null;
-  }
-  const v = payload["storyId"];
-  if (v === null) return null;
-  if (typeof v !== "string") return null;
-  const t = v.trim();
-  return t === "" ? null : t;
+
+// src/git/create-and-checkout-branch.ts
+var createAndCheckoutBranch = async (opts) => {
+  await opts.runGit(opts.repoRoot, [
+    "switch",
+    "-c",
+    opts.branchName,
+    opts.startPoint
+  ]);
 };
-var applyTicketStoryIdFromPayload = (row, payload) => {
-  if (!Object.prototype.hasOwnProperty.call(payload, "storyId")) return;
-  const v = payload["storyId"];
-  if (v === null) {
-    row.storyId = null;
-    return;
-  }
-  if (typeof v !== "string") return;
-  const t = v.trim();
-  row.storyId = t === "" ? null : t;
+
+// src/git/data-worktree-session.ts
+var import_promises3 = require("node:fs/promises");
+var import_node_path3 = require("node:path");
+var ensureDir = async (path) => {
+  await (0, import_promises3.mkdir)(path, { recursive: true });
 };
-var linkedBranchesFromTicketCreatedPayload = (payload) => {
-  if (!Object.prototype.hasOwnProperty.call(payload, "branches")) {
-    return [];
+var defaultPathExists = async (path) => {
+  try {
+    await (0, import_promises3.access)(path);
+    return true;
+  } catch {
+    return false;
   }
-  return normalizeTicketBranchListFromPayloadValue(payload["branches"]);
-};
-var applyTicketBranchesFromUpdatePayload = (row, payload) => {
-  if (!Object.prototype.hasOwnProperty.call(payload, "branches")) return;
-  const v = payload["branches"];
-  if (!Array.isArray(v)) return;
-  row.linkedBranches = normalizeTicketBranchListFromPayloadValue(v);
 };
-var applyTicketPlanningFieldsFromCreatePayload = (row, payload) => {
-  if (Object.prototype.hasOwnProperty.call(payload, "labels")) {
-    const v = ticketLabelsFromPayloadValue(payload["labels"]);
-    if (v !== void 0 && v.length > 0) {
-      row.labels = v;
+var parseDataBranchWorktreeFromPorcelain = (stdout, dataBranch) => {
+  const wantRef = `refs/heads/${dataBranch}`;
+  const blocks = stdout.split(/\n\n+/).map((b) => b.trim()).filter(Boolean);
+  for (const block of blocks) {
+    const lines = block.split("\n");
+    let worktreePath;
+    let branch;
+    for (const line of lines) {
+      if (line.startsWith("worktree ")) {
+        worktreePath = line.slice("worktree ".length);
+      } else if (line.startsWith("branch ")) {
+        branch = line.slice("branch ".length);
+      }
     }
-  }
-  const pr = readTicketPriorityPatch(payload);
-  if (typeof pr === "string") {
-    row.priority = pr;
-  }
-  const sz = readTicketSizePatch(payload);
-  if (typeof sz === "string") {
-    row.size = sz;
-  }
-  const est = readTicketEstimatePatch(payload);
-  if (typeof est === "number") {
-    row.estimate = est;
-  }
-  const sw = readTicketIsoInstantPatch(payload, "startWorkAt");
-  if (typeof sw === "string") {
-    row.startWorkAt = sw;
-  }
-  const tf = readTicketIsoInstantPatch(payload, "targetFinishAt");
-  if (typeof tf === "string") {
-    row.targetFinishAt = tf;
-  }
-  if (Object.prototype.hasOwnProperty.call(payload, "dependsOn")) {
-    const v = parseTicketDependsOnFromPayloadValue(payload["dependsOn"]);
-    if (v !== void 0 && v.length > 0) {
-      row.dependsOn = v;
+    if (worktreePath !== void 0 && branch === wantRef) {
+      return worktreePath;
     }
   }
+  return void 0;
 };
-var applyTicketPlanningFieldsFromUpdatePayload = (row, payload) => {
-  if (Object.prototype.hasOwnProperty.call(payload, "labels")) {
-    if (payload["labels"] === null) {
-      delete row.labels;
-    } else {
-      const v = ticketLabelsFromPayloadValue(payload["labels"]);
-      if (v !== void 0) {
-        if (v.length === 0) {
-          delete row.labels;
-        } else {
-          row.labels = v;
-        }
-      }
-    }
-  }
-  const pr = readTicketPriorityPatch(payload);
-  if (pr === null) {
-    delete row.priority;
-  } else if (typeof pr === "string") {
-    row.priority = pr;
-  }
-  const sz = readTicketSizePatch(payload);
-  if (sz === null) {
-    delete row.size;
-  } else if (typeof sz === "string") {
-    row.size = sz;
-  }
-  const est = readTicketEstimatePatch(payload);
-  if (est === null) {
-    delete row.estimate;
-  } else if (typeof est === "number") {
-    row.estimate = est;
-  }
-  const sw = readTicketIsoInstantPatch(payload, "startWorkAt");
-  if (sw === null) {
-    delete row.startWorkAt;
-  } else if (typeof sw === "string") {
-    row.startWorkAt = sw;
+var openDataBranchWorktree = async (opts) => {
+  const pathExists = opts.pathExists ?? defaultPathExists;
+  const { stdout: listOut } = await opts.runGit(opts.repoRoot, [
+    "worktree",
+    "list",
+    "--porcelain"
+  ]);
+  const listedPath = parseDataBranchWorktreeFromPorcelain(
+    listOut,
+    opts.dataBranch
+  );
+  if (listedPath !== void 0 && await pathExists(listedPath)) {
+    const dispose2 = async () => {
+      return;
+    };
+    return { worktreePath: listedPath, dispose: dispose2 };
   }
-  const tf = readTicketIsoInstantPatch(payload, "targetFinishAt");
-  if (tf === null) {
-    delete row.targetFinishAt;
-  } else if (typeof tf === "string") {
-    row.targetFinishAt = tf;
+  const worktreePath = (0, import_node_path3.join)(
+    opts.tmpBase,
+    `hyper-pm-worktree-${ulid().toLowerCase()}`
+  );
+  await ensureDir(opts.tmpBase);
+  try {
+    await opts.runGit(opts.repoRoot, [
+      "worktree",
+      "add",
+      worktreePath,
+      opts.dataBranch
+    ]);
+  } catch (err) {
+    await (0, import_promises3.rm)(worktreePath, { recursive: true, force: true }).catch(() => {
+    });
+    throw err;
   }
-  if (Object.prototype.hasOwnProperty.call(payload, "dependsOn")) {
-    if (payload["dependsOn"] === null) {
-      delete row.dependsOn;
-    } else {
-      const v = parseTicketDependsOnFromPayloadValue(payload["dependsOn"]);
-      if (v !== void 0) {
-        if (v.length === 0) {
-          delete row.dependsOn;
-        } else {
-          row.dependsOn = v;
-        }
-      }
+  const dispose = async () => {
+    if (opts.keepWorktree) {
+      return;
     }
-  }
-};
-var applyCreatedAudit = (row, evt) => {
-  row.createdAt = evt.ts;
-  row.createdBy = evt.actor;
-  row.updatedAt = evt.ts;
-  row.updatedBy = evt.actor;
-};
-var applyLastUpdate = (row, evt) => {
-  row.updatedAt = evt.ts;
-  row.updatedBy = evt.actor;
+    await opts.runGit(opts.repoRoot, ["worktree", "remove", "--force", worktreePath]).catch(() => {
+    });
+    await (0, import_promises3.rm)(worktreePath, { recursive: true, force: true }).catch(() => {
+    });
+  };
+  return { worktreePath, dispose };
 };
-var applyStatusIfChanged = (row, evt, nextStatus) => {
-  if (row.status === nextStatus) return false;
-  row.status = nextStatus;
-  row.statusChangedAt = evt.ts;
-  row.statusChangedBy = evt.actor;
-  return true;
+
+// src/git/find-git-root.ts
+var findGitRoot = async (cwd, deps) => {
+  const { stdout } = await deps.runGit(cwd, ["rev-parse", "--show-toplevel"]);
+  return stdout;
 };
-var appendTicketCommentFromEvent = (ticket, evt) => {
-  const list = ticket.comments ?? (ticket.comments = []);
-  list.push({
-    id: evt.id,
-    body: String(evt.payload["body"] ?? ""),
-    createdAt: evt.ts,
-    createdBy: evt.actor
+
+// src/git/init-orphan-data-branch.ts
+var import_promises4 = require("node:fs/promises");
+var import_node_path4 = require("node:path");
+var initOrphanDataBranchInWorktree = async (opts) => {
+  const { stdout: tip } = await opts.runGit(opts.repoRoot, [
+    "rev-parse",
+    "HEAD"
+  ]);
+  const tipCommit = tip.trim();
+  await opts.runGit(opts.repoRoot, [
+    "worktree",
+    "add",
+    opts.worktreePath,
+    tipCommit
+  ]);
+  await opts.runGit(opts.worktreePath, [
+    "checkout",
+    "--orphan",
+    opts.dataBranch
+  ]);
+  await opts.runGit(opts.worktreePath, ["rm", "-rf", "."]).catch(() => {
   });
-  applyLastUpdate(ticket, evt);
+  const marker = (0, import_node_path4.join)(opts.worktreePath, "README.hyper-pm.md");
+  await (0, import_promises4.writeFile)(
+    marker,
+    "# hyper-pm data branch\n\nAppend-only events live under `events/`.\n",
+    "utf8"
+  );
+  await opts.runGit(opts.worktreePath, ["add", "."]);
+  await opts.runGit(opts.worktreePath, [
+    "commit",
+    "-m",
+    "init hyper-pm data branch"
+  ]);
 };
-var resolveInboundTicketStatusFromPayload = (ticket, payload) => {
-  const explicit = parseWorkItemStatus(payload["status"]);
-  if (explicit !== void 0) return explicit;
-  const legacySt = payload["state"];
-  if (legacySt === "open" || legacySt === "closed") {
-    return resolveTicketInboundStatus({
-      issueState: legacySt,
-      currentStatus: ticket.status
-    });
+
+// src/git/pick-unique-local-branch-name.ts
+var DEFAULT_MAX_SUFFIX = 1e3;
+var localBranchRefExists = async (repoRoot, name, git) => {
+  try {
+    await git(repoRoot, ["show-ref", "--verify", `refs/heads/${name}`]);
+    return true;
+  } catch {
+    return false;
   }
-  return void 0;
 };
-var applyEvent = (projection, evt) => {
-  switch (evt.type) {
-    case "EpicCreated": {
-      const id = String(evt.payload["id"]);
-      const status = resolveStatusForNewEpicStoryPayload(evt.payload);
-      const row = {
-        id,
-        title: String(evt.payload["title"] ?? ""),
-        body: String(evt.payload["body"] ?? ""),
-        status,
-        statusChangedAt: evt.ts,
-        statusChangedBy: evt.actor,
-        createdAt: "",
-        createdBy: "",
-        updatedAt: "",
-        updatedBy: ""
-      };
-      applyCreatedAudit(row, evt);
-      projection.epics.set(id, row);
-      break;
+var pickUniqueLocalBranchName = async (opts) => {
+  const max = opts.maxSuffix ?? DEFAULT_MAX_SUFFIX;
+  const { preferredBase, repoRoot, runGit: git } = opts;
+  for (let n = 1; n <= max; n += 1) {
+    const raw = n === 1 ? preferredBase : `${preferredBase}-${n}`;
+    const norm = normalizeTicketBranchName(raw);
+    if (norm === void 0) {
+      continue;
     }
-    case "EpicUpdated": {
-      const id = String(evt.payload["id"]);
-      const cur = projection.epics.get(id);
-      if (!cur) break;
-      if (evt.payload["title"] !== void 0) {
-        cur.title = String(evt.payload["title"]);
-      }
-      if (evt.payload["body"] !== void 0) {
-        cur.body = String(evt.payload["body"]);
-      }
-      const nextStatus = parseWorkItemStatus(evt.payload["status"]);
-      if (nextStatus !== void 0) {
-        applyStatusIfChanged(cur, evt, nextStatus);
-      }
-      applyLastUpdate(cur, evt);
-      break;
+    if (!await localBranchRefExists(repoRoot, norm, git)) {
+      return { branch: norm, preferred: preferredBase };
     }
-    case "EpicDeleted": {
-      const id = String(evt.payload["id"]);
-      const cur = projection.epics.get(id);
-      if (cur) {
-        cur.deleted = true;
-        applyLastUpdate(cur, evt);
-      }
-      break;
+  }
+  throw new Error(
+    `Could not allocate a free local branch name from ${JSON.stringify(preferredBase)} (tried suffixes up to -${String(max)})`
+  );
+};
+
+// src/git/resolve-integration-start-point.ts
+var assertGitRefResolvable = async (repoRoot, ref, git) => {
+  try {
+    await git(repoRoot, ["rev-parse", "-q", "--verify", ref]);
+  } catch {
+    throw new Error(`Invalid or ambiguous --from ref: ${ref}`);
+  }
+};
+var resolveIntegrationStartPoint = async (repoRoot, remote, git) => {
+  const symRef = `refs/remotes/${remote}/HEAD`;
+  try {
+    const { stdout } = await git(repoRoot, ["symbolic-ref", "-q", symRef]);
+    const target = stdout.trim();
+    if (target !== "") {
+      await git(repoRoot, ["rev-parse", "-q", "--verify", target]);
+      return target;
     }
-    case "StoryCreated": {
-      const id = String(evt.payload["id"]);
-      const status = resolveStatusForNewEpicStoryPayload(evt.payload);
-      const row = {
-        id,
-        epicId: String(evt.payload["epicId"]),
-        title: String(evt.payload["title"] ?? ""),
-        body: String(evt.payload["body"] ?? ""),
-        status,
-        statusChangedAt: evt.ts,
-        statusChangedBy: evt.actor,
-        createdAt: "",
-        createdBy: "",
-        updatedAt: "",
-        updatedBy: ""
-      };
-      applyCreatedAudit(row, evt);
-      projection.stories.set(id, row);
-      break;
-    }
-    case "StoryUpdated": {
-      const id = String(evt.payload["id"]);
-      const cur = projection.stories.get(id);
-      if (!cur) break;
-      if (evt.payload["title"] !== void 0) {
-        cur.title = String(evt.payload["title"]);
-      }
-      if (evt.payload["body"] !== void 0) {
-        cur.body = String(evt.payload["body"]);
-      }
-      const nextStatus = parseWorkItemStatus(evt.payload["status"]);
-      if (nextStatus !== void 0) {
-        applyStatusIfChanged(cur, evt, nextStatus);
-      }
-      applyLastUpdate(cur, evt);
-      break;
+  } catch {
+  }
+  for (const head of ["refs/heads/main", "refs/heads/master"]) {
+    try {
+      await git(repoRoot, ["rev-parse", "-q", "--verify", head]);
+      return head;
+    } catch {
     }
-    case "StoryDeleted": {
-      const id = String(evt.payload["id"]);
-      const cur = projection.stories.get(id);
-      if (cur) {
-        cur.deleted = true;
-        applyLastUpdate(cur, evt);
-      }
-      break;
+  }
+  try {
+    await git(repoRoot, ["rev-parse", "-q", "--verify", "HEAD"]);
+    return "HEAD";
+  } catch {
+  }
+  throw new Error(
+    "Could not resolve a default branch to branch from; pass --from <ref> (e.g. main or origin/main)."
+  );
+};
+
+// src/git/list-repo-commit-authors.ts
+var listRepoCommitAuthors = async (repoRoot, git) => {
+  try {
+    const { stdout } = await git(repoRoot, [
+      "-c",
+      "log.showSignature=false",
+      "log",
+      "--all",
+      "--format=%an%x1f%ae"
+    ]);
+    if (stdout === "") return [];
+    const lines = stdout.split("\n").filter((l) => l.length > 0);
+    const seenEmail = /* @__PURE__ */ new Set();
+    const out = [];
+    for (const line of lines) {
+      const sep2 = line.indexOf("");
+      if (sep2 <= 0) continue;
+      const name = line.slice(0, sep2).trim();
+      const email = line.slice(sep2 + 1).trim();
+      if (email === "") continue;
+      const key = email.toLowerCase();
+      if (seenEmail.has(key)) continue;
+      seenEmail.add(key);
+      const loginGuess = guessGithubLoginFromContact(name, email);
+      out.push(
+        loginGuess !== void 0 ? { name, email, loginGuess } : { name, email }
+      );
     }
-    case "TicketCreated": {
-      const id = String(evt.payload["id"]);
-      const body = String(evt.payload["body"] ?? "");
-      const status = resolveStatusForNewTicketPayload(evt.payload);
-      const row = {
-        id,
-        storyId: storyIdFromTicketCreatedPayload(evt.payload),
-        title: String(evt.payload["title"] ?? ""),
-        body,
-        status,
-        statusChangedAt: evt.ts,
-        statusChangedBy: evt.actor,
-        linkedPrs: parsePrRefs(body),
-        linkedBranches: linkedBranchesFromTicketCreatedPayload(evt.payload),
-        prActivityRecent: [],
-        createdAt: "",
-        createdBy: "",
-        updatedAt: "",
-        updatedBy: ""
-      };
-      applyCreatedAudit(row, evt);
-      applyTicketAssigneeFromPayload(row, evt.payload);
-      applyTicketPlanningFieldsFromCreatePayload(row, evt.payload);
-      projection.tickets.set(id, row);
-      break;
+    return out;
+  } catch {
+    return [];
+  }
+};
+
+// src/git/parse-github-owner-repo-from-remote-url.ts
+var parseGithubOwnerRepoFromRemoteUrl = (rawUrl) => {
+  const trimmed = rawUrl.trim();
+  if (!trimmed) {
+    return void 0;
+  }
+  const scpMatch = /^git@github\.com:(?<path>.+)$/i.exec(trimmed);
+  if (scpMatch?.groups?.path) {
+    return slugFromGithubPath(scpMatch.groups.path);
+  }
+  try {
+    const withScheme = trimmed.includes("://") ? trimmed : `https://${trimmed}`;
+    const u = new URL(withScheme);
+    const host = u.hostname.toLowerCase();
+    if (host !== "github.com" && host !== "www.github.com") {
+      return void 0;
     }
-    case "TicketUpdated": {
-      const id = String(evt.payload["id"]);
-      const cur = projection.tickets.get(id);
-      if (!cur) break;
-      if (evt.payload["title"] !== void 0) {
-        cur.title = String(evt.payload["title"]);
-      }
-      if (evt.payload["body"] !== void 0) {
-        cur.body = String(evt.payload["body"]);
-        cur.linkedPrs = parsePrRefs(cur.body);
-      }
-      const nextStatus = resolveTicketStatusFromUpdatePayload(evt.payload);
-      if (nextStatus !== void 0) {
-        applyStatusIfChanged(cur, evt, nextStatus);
-      }
-      applyTicketAssigneeFromPayload(cur, evt.payload);
-      applyTicketStoryIdFromPayload(cur, evt.payload);
-      applyTicketBranchesFromUpdatePayload(cur, evt.payload);
-      applyTicketPlanningFieldsFromUpdatePayload(cur, evt.payload);
-      applyLastUpdate(cur, evt);
-      break;
+    return slugFromGithubPath(u.pathname);
+  } catch {
+    return void 0;
+  }
+};
+var slugFromGithubPath = (path) => {
+  const segments = path.replace(/^\/+/, "").split("/").filter((s) => s.length > 0).map((s) => s.replace(/\.git$/i, ""));
+  if (segments.length < 2) {
+    return void 0;
+  }
+  const owner = segments[0];
+  const repo = segments[1];
+  if (!owner || !repo) {
+    return void 0;
+  }
+  return `${owner}/${repo}`;
+};
+
+// src/git/try-read-github-owner-repo-slug-from-git.ts
+var tryReadGithubOwnerRepoSlugFromGit = async (params) => {
+  try {
+    const { stdout } = await params.runGit(params.repoRoot, [
+      "remote",
+      "get-url",
+      params.remote
+    ]);
+    return parseGithubOwnerRepoFromRemoteUrl(stdout);
+  } catch {
+    return void 0;
+  }
+};
+
+// 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) => {
+  const raw = actorSuffix?.trim();
+  if (!raw) {
+    return base;
+  }
+  const collapsed = raw.replace(/\s+/g, " ");
+  const suffix = collapsed.length > maxActorSuffixLen ? `${collapsed.slice(0, maxActorSuffixLen - 1)}\u2026` : collapsed;
+  return `${base} (${suffix})`;
+};
+var commitDataWorktreeIfNeeded = async (worktreePath, message, runGit2, opts) => {
+  const { stdout } = await runGit2(worktreePath, ["status", "--porcelain"]);
+  if (!stdout.trim()) return;
+  await runGit2(worktreePath, ["add", "."]);
+  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/run/sync-remote-data-branch.ts
+var SyncRemoteDataBranchMergeError = class extends Error {
+  /** @param message - Human-readable reason (stderr excerpt or generic text). */
+  constructor(message) {
+    super(message);
+    this.name = "SyncRemoteDataBranchMergeError";
+  }
+};
+var remoteTrackingRef = (remote, dataBranch) => `refs/remotes/${remote}/${dataBranch}`;
+var mergeRefSpecifier = (remote, dataBranch) => `${remote}/${dataBranch}`;
+var isLikelyNonFastForwardPushFailure = (detail) => {
+  if (detail === void 0) return false;
+  const d = detail.toLowerCase();
+  return d.includes("non-fast-forward") || d.includes("failed to push");
+};
+var classifyMergeOutput = (combined) => {
+  const c = combined.toLowerCase();
+  if (c.includes("already up to date")) {
+    return "up_to_date";
+  }
+  if (c.includes("fast-forward")) {
+    return "fast_forward";
+  }
+  return "merge_commit";
+};
+var refExists = async (cwd, ref, runGit2) => {
+  try {
+    await runGit2(cwd, ["show-ref", "--verify", "--quiet", ref]);
+    return true;
+  } catch {
+    return false;
+  }
+};
+var fetchRemoteDataBranch = async (worktreePath, remote, dataBranch, runGit2) => {
+  try {
+    await runGit2(worktreePath, ["remote", "get-url", remote]);
+  } catch {
+    return "skipped_no_remote";
+  }
+  try {
+    await runGit2(worktreePath, ["fetch", remote, dataBranch]);
+    return "ok";
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : String(e);
+    if (/couldn't find remote ref|could not find remote ref/i.test(msg)) {
+      return "remote_branch_absent";
     }
-    case "TicketDeleted": {
-      const id = String(evt.payload["id"]);
-      const cur = projection.tickets.get(id);
-      if (cur) {
-        cur.deleted = true;
-        applyLastUpdate(cur, evt);
-      }
-      break;
+    throw e;
+  }
+};
+var mergeRemoteTrackingIntoHead = async (worktreePath, remote, dataBranch, runGit2, authorEnv = env) => {
+  const spec = mergeRefSpecifier(remote, dataBranch);
+  const { name, email } = await resolveEffectiveGitAuthorForDataCommit(
+    worktreePath,
+    runGit2,
+    authorEnv
+  );
+  try {
+    const { stdout, stderr } = await runGit2(worktreePath, [
+      "-c",
+      `user.name=${name}`,
+      "-c",
+      `user.email=${email}`,
+      "merge",
+      "--no-edit",
+      spec
+    ]);
+    return classifyMergeOutput(`${stdout}
+${stderr}`);
+  } catch (e) {
+    await runGit2(worktreePath, ["merge", "--abort"]).catch(() => {
+    });
+    const msg = e instanceof Error ? e.message : String(e);
+    throw new SyncRemoteDataBranchMergeError(
+      msg.toLowerCase().includes("conflict") ? "Merge conflict while syncing hyper-pm data branch; merge aborted. Resolve manually on the data branch if needed." : `git merge failed: ${msg.trim().split("\n")[0] ?? msg}`
+    );
+  }
+};
+var runRemoteDataBranchGitSync = async (worktreePath, remote, dataBranch, runGit2, skipPush, deps = {}) => {
+  const tryPushFn = deps.tryPush ?? tryPushDataBranchToRemote;
+  const maxPushAttempts = deps.maxPushAttempts ?? 3;
+  const authorEnv = deps.authorEnv ?? env;
+  let dataBranchFetch = await fetchRemoteDataBranch(worktreePath, remote, dataBranch, runGit2);
+  let dataBranchMerge = dataBranchFetch === "skipped_no_remote" ? "skipped_no_remote" : dataBranchFetch === "remote_branch_absent" ? "skipped_missing_remote_branch" : "up_to_date";
+  if (dataBranchFetch === "ok") {
+    const tracking = remoteTrackingRef(remote, dataBranch);
+    const exists = await refExists(worktreePath, tracking, runGit2);
+    if (!exists) {
+      dataBranchMerge = "skipped_missing_remote_branch";
+    } else {
+      dataBranchMerge = await mergeRemoteTrackingIntoHead(
+        worktreePath,
+        remote,
+        dataBranch,
+        runGit2,
+        authorEnv
+      );
     }
-    case "TicketCommentAdded": {
-      const ticketId = String(evt.payload["ticketId"] ?? "");
-      const ticket = projection.tickets.get(ticketId);
-      if (!ticket || ticket.deleted) break;
-      appendTicketCommentFromEvent(ticket, evt);
-      break;
+  }
+  if (skipPush) {
+    return {
+      dataBranchFetch,
+      dataBranchMerge,
+      dataBranchPush: "skipped_cli",
+      dataBranchPushDetail: "skip-push",
+      pushAttempts: 0
+    };
+  }
+  let pushAttempts = 0;
+  let lastPush = { status: "skipped_no_remote" };
+  const refetchAndMerge = async () => {
+    dataBranchFetch = await fetchRemoteDataBranch(
+      worktreePath,
+      remote,
+      dataBranch,
+      runGit2
+    );
+    if (dataBranchFetch !== "ok") {
+      return;
     }
-    case "SyncCursor": {
-      projection.syncCursor = String(evt.payload["cursor"] ?? "");
-      break;
+    const tracking = remoteTrackingRef(remote, dataBranch);
+    const exists = await refExists(worktreePath, tracking, runGit2);
+    if (!exists) {
+      return;
     }
-    case "GithubIssueLinked": {
-      const ticketId = String(evt.payload["ticketId"]);
-      const num = Number(evt.payload["issueNumber"]);
-      const ticket = projection.tickets.get(ticketId);
-      if (ticket && Number.isFinite(num)) {
-        ticket.githubIssueNumber = num;
-        applyLastUpdate(ticket, evt);
-      }
+    dataBranchMerge = await mergeRemoteTrackingIntoHead(
+      worktreePath,
+      remote,
+      dataBranch,
+      runGit2,
+      authorEnv
+    );
+  };
+  for (let attempt = 1; attempt <= maxPushAttempts; attempt += 1) {
+    pushAttempts = attempt;
+    lastPush = await tryPushFn(worktreePath, remote, dataBranch, runGit2);
+    if (lastPush.status === "pushed" || lastPush.status === "skipped_no_remote") {
       break;
     }
-    case "GithubInboundUpdate": {
-      const entity = String(evt.payload["entity"]);
-      const entityId = String(evt.payload["entityId"]);
-      if (entity === "ticket") {
-        const ticket = projection.tickets.get(entityId);
-        if (!ticket) break;
-        if (evt.payload["title"] !== void 0) {
-          ticket.title = String(evt.payload["title"]);
-        }
-        if (evt.payload["body"] !== void 0) {
-          ticket.body = String(evt.payload["body"]);
-          ticket.linkedPrs = parsePrRefs(ticket.body);
-        }
-        const inboundStatus = resolveInboundTicketStatusFromPayload(
-          ticket,
-          evt.payload
-        );
-        if (inboundStatus !== void 0) {
-          applyStatusIfChanged(ticket, evt, inboundStatus);
-        }
-        applyTicketAssigneeFromPayload(ticket, evt.payload);
-        applyTicketPlanningFieldsFromUpdatePayload(ticket, evt.payload);
-        applyLastUpdate(ticket, evt);
-      }
-      break;
+    if (lastPush.status === "failed" && isLikelyNonFastForwardPushFailure(lastPush.detail) && attempt < maxPushAttempts) {
+      await refetchAndMerge();
+      continue;
     }
-    case "GithubPrActivity": {
-      const summary = parseGithubPrActivityPayload(evt.payload);
-      if (!summary) break;
-      const ticket = projection.tickets.get(
-        String(evt.payload["ticketId"] ?? "")
-      );
-      if (!ticket || ticket.deleted) break;
-      const list = ticket.prActivityRecent ?? (ticket.prActivityRecent = []);
-      list.push(summary);
-      if (list.length > GITHUB_PR_ACTIVITY_RECENT_CAP) {
-        ticket.prActivityRecent = list.slice(-GITHUB_PR_ACTIVITY_RECENT_CAP);
-      }
-      break;
+    break;
+  }
+  return {
+    dataBranchFetch,
+    dataBranchMerge,
+    dataBranchPush: lastPush.status,
+    ...lastPush.detail !== void 0 ? { dataBranchPushDetail: lastPush.detail } : {},
+    pushAttempts
+  };
+};
+
+// src/storage/append-event.ts
+var import_promises5 = require("node:fs/promises");
+var import_node_path5 = require("node:path");
+
+// src/storage/event-path.ts
+var nextEventRelPath = (now, deps) => {
+  const y = String(now.getUTCFullYear());
+  const m = String(now.getUTCMonth() + 1).padStart(2, "0");
+  const nextId = deps?.nextId ?? (() => ulid().toLowerCase());
+  const part = `part-${nextId()}`;
+  return `events/${y}/${m}/${part}.jsonl`;
+};
+
+// src/storage/append-event.ts
+var appendEventLine = async (dataRoot, event, clock, opts) => {
+  const rel = nextEventRelPath(clock.now(), {
+    nextId: opts?.nextEventId
+  });
+  const abs = `${dataRoot.replace(/\/$/, "")}/${rel}`;
+  await (0, import_promises5.mkdir)((0, import_node_path5.dirname)(abs), { recursive: true });
+  await (0, import_promises5.appendFile)(abs, `${JSON.stringify(event)}
+`, "utf8");
+  return rel;
+};
+
+// src/storage/read-event-lines.ts
+var import_promises6 = require("node:fs/promises");
+var import_node_path6 = require("node:path");
+var listJsonlFiles = async (dir, root) => {
+  const out = [];
+  const entries = await (0, import_promises6.readdir)(dir, { withFileTypes: true });
+  for (const e of entries) {
+    const abs = (0, import_node_path6.join)(dir, e.name);
+    if (e.isDirectory()) {
+      out.push(...await listJsonlFiles(abs, root));
+    } else if (e.isFile() && e.name.endsWith(".jsonl")) {
+      out.push((0, import_node_path6.relative)(root, abs).split("\\").join("/"));
     }
-    default:
-      break;
   }
+  return out;
 };
-var replayEvents = (lines) => {
-  const proj = emptyProjection();
-  const events = [];
-  for (const line of lines) {
-    const trimmed = line.trim();
-    if (!trimmed) continue;
-    const json = JSON.parse(trimmed);
-    events.push(eventLineSchema.parse(json));
+var readAllEventLines = async (dataRoot) => {
+  const eventsRoot = (0, import_node_path6.join)(dataRoot, "events");
+  let files = [];
+  try {
+    files = await listJsonlFiles(eventsRoot, dataRoot);
+  } catch {
+    return [];
   }
-  events.sort((a, b) => {
-    const t = a.ts.localeCompare(b.ts);
-    if (t !== 0) return t;
-    return a.id.localeCompare(b.id);
-  });
-  for (const e of events) {
-    applyEvent(proj, e);
+  files.sort((a, b) => a.localeCompare(b));
+  const lines = [];
+  for (const rel of files) {
+    const content = await (0, import_promises6.readFile)((0, import_node_path6.join)(dataRoot, rel), "utf8");
+    for (const line of content.split("\n")) {
+      if (line.trim()) lines.push(line);
+    }
   }
-  return proj;
+  return lines;
 };
 
 // src/sync/collect-github-pr-activity-source-ids.ts
@@ -14883,14 +14971,15 @@ var parseCliWorkItemStatusList = (raws, deps) => {
   }
   return out;
 };
-var buildTicketListQueryFromReadListOpts = (o, deps) => {
+var buildTicketListQueryFromReadListOpts = (projection, o, deps) => {
   const query = {};
   const statusTokens = normalizeCliStringList(o.status);
   if (statusTokens.length > 0) {
     query.statuses = parseCliWorkItemStatusList(statusTokens, deps);
   }
   if (o.epic !== void 0 && o.epic !== "") {
-    query.epicId = o.epic;
+    const trimmed = o.epic.trim();
+    query.epicId = resolveEpicId(projection, trimmed) ?? trimmed;
   }
   const createdAfterMs = parseCliOptionalIsoMillis(
     o.createdAfter,
@@ -15028,7 +15117,8 @@ var buildTicketListQueryFromReadListOpts = (o, deps) => {
     query.targetFinishBeforeMs = targetFinishBeforeMs;
   }
   if (o.dependsOn !== void 0 && o.dependsOn.trim() !== "") {
-    query.dependsOnIncludesId = o.dependsOn.trim();
+    const trimmed = o.dependsOn.trim();
+    query.dependsOnIncludesId = resolveTicketId(projection, trimmed) ?? trimmed;
   }
   return Object.keys(query).length > 0 ? query : void 0;
 };
@@ -15105,19 +15195,19 @@ var runCli = async (argv, deps = {
     const g = readGlobals(this);
     const o = this.opts();
     await mutateDataBranch(g, deps, async (root, { actor }) => {
+      const lines = await readAllEventLines(root);
+      const proj = replayEvents(lines);
       const id = o.id ?? ulid();
       const status = parseCliWorkItemStatus(o.status, deps);
-      const evt = makeEvent(
-        "EpicCreated",
-        {
-          id,
-          title: o.title,
-          body: o.body,
-          ...status !== void 0 ? { status } : {}
-        },
-        deps.clock,
-        actor
-      );
+      const payload = {
+        id,
+        number: nextEpicNumberForCreate(proj),
+        title: o.title,
+        body: o.body,
+        ...status !== void 0 ? { status } : {}
+      };
+      assertCreatePayloadUsesExpectedHeadNumber(proj, "epic", payload);
+      const evt = makeEvent("EpicCreated", payload, deps.clock, actor);
       await appendEventLine(root, evt, deps.clock);
       return evt.payload;
     });
@@ -15133,18 +15223,19 @@ var runCli = async (argv, deps = {
     await mutateDataBranch(g, deps, async (root, { actor }) => {
       const lines = await readAllEventLines(root);
       const proj = replayEvents(lines);
-      const cur = proj.epics.get(o.id);
+      const epicId = resolveEpicId(proj, o.id) ?? o.id.trim();
+      const cur = proj.epics.get(epicId);
       if (!cur || cur.deleted) {
         throw new Error(`Epic not found: ${o.id}`);
       }
       const status = parseCliWorkItemStatus(o.status, deps);
-      const draft = { id: o.id };
+      const draft = { id: epicId };
       if (o.title !== void 0) draft["title"] = o.title;
       if (o.body !== void 0) draft["body"] = o.body;
       if (status !== void 0) draft["status"] = status;
       const payload = pruneEpicOrStoryUpdatePayloadAgainstRow(cur, draft);
       if (isNoOpUpdatePayload(payload)) {
-        return { id: o.id, noChanges: true };
+        return { id: epicId, noChanges: true };
       }
       const evt = makeEvent("EpicUpdated", payload, deps.clock, actor);
       await appendEventLine(root, evt, deps.clock);
@@ -15155,9 +15246,12 @@ var runCli = async (argv, deps = {
     const g = readGlobals(this);
     const o = this.opts();
     await mutateDataBranch(g, deps, async (root, { actor }) => {
-      const evt = makeEvent("EpicDeleted", { id: o.id }, deps.clock, actor);
+      const lines = await readAllEventLines(root);
+      const proj = replayEvents(lines);
+      const epicId = resolveEpicId(proj, o.id) ?? o.id.trim();
+      const evt = makeEvent("EpicDeleted", { id: epicId }, deps.clock, actor);
       await appendEventLine(root, evt, deps.clock);
-      return { id: o.id, deleted: true };
+      return { id: epicId, deleted: true };
     });
   });
   const story = program2.command("story");
@@ -15170,24 +15264,23 @@ var runCli = async (argv, deps = {
     await mutateDataBranch(g, deps, async (root, { actor }) => {
       const lines = await readAllEventLines(root);
       const proj = replayEvents(lines);
-      const epic2 = proj.epics.get(o.epic);
+      const epicId = resolveEpicId(proj, o.epic) ?? o.epic.trim();
+      const epic2 = proj.epics.get(epicId);
       if (!epic2 || epic2.deleted) {
         throw new Error(`Epic not found: ${o.epic}`);
       }
       const id = o.id ?? ulid();
       const status = parseCliWorkItemStatus(o.status, deps);
-      const evt = makeEvent(
-        "StoryCreated",
-        {
-          id,
-          epicId: o.epic,
-          title: o.title,
-          body: o.body,
-          ...status !== void 0 ? { status } : {}
-        },
-        deps.clock,
-        actor
-      );
+      const payload = {
+        id,
+        number: nextStoryNumberForCreate(proj),
+        epicId,
+        title: o.title,
+        body: o.body,
+        ...status !== void 0 ? { status } : {}
+      };
+      assertCreatePayloadUsesExpectedHeadNumber(proj, "story", payload);
+      const evt = makeEvent("StoryCreated", payload, deps.clock, actor);
       await appendEventLine(root, evt, deps.clock);
       return evt.payload;
     });
@@ -15206,18 +15299,19 @@ var runCli = async (argv, deps = {
     await mutateDataBranch(g, deps, async (root, { actor }) => {
       const lines = await readAllEventLines(root);
       const proj = replayEvents(lines);
-      const cur = proj.stories.get(o.id);
+      const storyId = resolveStoryId(proj, o.id) ?? o.id.trim();
+      const cur = proj.stories.get(storyId);
       if (!cur || cur.deleted) {
         throw new Error(`Story not found: ${o.id}`);
       }
       const status = parseCliWorkItemStatus(o.status, deps);
-      const draft = { id: o.id };
+      const draft = { id: storyId };
       if (o.title !== void 0) draft["title"] = o.title;
       if (o.body !== void 0) draft["body"] = o.body;
       if (status !== void 0) draft["status"] = status;
       const payload = pruneEpicOrStoryUpdatePayloadAgainstRow(cur, draft);
       if (isNoOpUpdatePayload(payload)) {
-        return { id: o.id, noChanges: true };
+        return { id: storyId, noChanges: true };
       }
       const evt = makeEvent("StoryUpdated", payload, deps.clock, actor);
       await appendEventLine(root, evt, deps.clock);
@@ -15228,9 +15322,17 @@ var runCli = async (argv, deps = {
     const g = readGlobals(this);
     const o = this.opts();
     await mutateDataBranch(g, deps, async (root, { actor }) => {
-      const evt = makeEvent("StoryDeleted", { id: o.id }, deps.clock, actor);
+      const lines = await readAllEventLines(root);
+      const proj = replayEvents(lines);
+      const storyId = resolveStoryId(proj, o.id) ?? o.id.trim();
+      const evt = makeEvent(
+        "StoryDeleted",
+        { id: storyId },
+        deps.clock,
+        actor
+      );
       await appendEventLine(root, evt, deps.clock);
-      return { id: o.id, deleted: true };
+      return { id: storyId, deleted: true };
     });
   });
   const ticket = program2.command("ticket");
@@ -15321,9 +15423,6 @@ var runCli = async (argv, deps = {
       deps
     );
     const dependsOnTokensCreate = normalizeCliStringList(o.dependsOn);
-    const dependsOnNormCreate = normalizeTicketDependsOnIds(
-      dependsOnTokensCreate
-    );
     const planningPayload = {
       ...labelsPayloadCreate,
       ...priorityParsed !== void 0 ? { priority: priorityParsed } : {},
@@ -15337,16 +15436,21 @@ var runCli = async (argv, deps = {
       const proj = replayEvents(lines);
       const storyRaw = o.story;
       const storyTrimmed = storyRaw !== void 0 && storyRaw !== "" ? storyRaw.trim() : void 0;
+      const storyIdResolved = storyTrimmed !== void 0 ? resolveStoryId(proj, storyTrimmed) ?? storyTrimmed : void 0;
       if (storyTrimmed !== void 0) {
-        const storyRow = proj.stories.get(storyTrimmed);
+        const storyRow = proj.stories.get(storyIdResolved ?? "");
         if (!storyRow || storyRow.deleted) {
           throw new Error(`Story not found: ${storyTrimmed}`);
         }
       }
       const id = o.id ?? ulid();
+      const dependsOnNormCreate = resolveTicketDependsOnTokensToIds(
+        proj,
+        dependsOnTokensCreate
+      );
       const status = parseCliWorkItemStatus(o.status, deps);
       const assigneeCreate = o.assignee !== void 0 ? { assignee: normalizeGithubLogin(o.assignee) } : {};
-      const storyPayload = storyTrimmed !== void 0 ? { storyId: storyTrimmed } : {};
+      const storyPayload = storyIdResolved !== void 0 ? { storyId: storyIdResolved } : {};
       const branchTokens = normalizeCliStringList(o.branch);
       const branchesNorm = normalizeTicketBranchListFromStrings(branchTokens);
       const branchesPayload = branchesNorm.length > 0 ? { branches: branchesNorm } : {};
@@ -15359,19 +15463,26 @@ var runCli = async (argv, deps = {
         throw new Error(dependsOnErr);
       }
       const dependsOnPayloadCreate = dependsOnNormCreate.length > 0 ? { dependsOn: dependsOnNormCreate } : {};
+      const createPayload = {
+        id,
+        number: nextTicketNumberForCreate(proj),
+        ...storyPayload,
+        title: o.title,
+        body,
+        ...status !== void 0 ? { status } : {},
+        ...assigneeCreate,
+        ...branchesPayload,
+        ...dependsOnPayloadCreate,
+        ...planningPayload
+      };
+      assertCreatePayloadUsesExpectedHeadNumber(
+        proj,
+        "ticket",
+        createPayload
+      );
       const evt = makeEvent(
         "TicketCreated",
-        {
-          id,
-          ...storyPayload,
-          title: o.title,
-          body,
-          ...status !== void 0 ? { status } : {},
-          ...assigneeCreate,
-          ...branchesPayload,
-          ...dependsOnPayloadCreate,
-          ...planningPayload
-        },
+        createPayload,
         deps.clock,
         actor
       );
@@ -15643,25 +15754,27 @@ ${body}`
     await mutateDataBranch(g, deps, async (root, { actor }) => {
       const lines = await readAllEventLines(root);
       const proj = replayEvents(lines);
+      const ticketId = resolveTicketId(proj, o.id) ?? o.id.trim();
+      const storyIdResolved = storyTrimmed !== void 0 ? resolveStoryId(proj, storyTrimmed) ?? storyTrimmed : void 0;
       if (storyTrimmed !== void 0) {
-        const storyRow = proj.stories.get(storyTrimmed);
+        const storyRow = proj.stories.get(storyIdResolved ?? "");
         if (!storyRow || storyRow.deleted) {
           throw new Error(`Story not found: ${storyTrimmed}`);
         }
       }
-      const curTicket = proj.tickets.get(o.id);
+      const curTicket = proj.tickets.get(ticketId);
       if (curTicket === void 0 || curTicket.deleted) {
         throw new Error(`Ticket not found: ${o.id}`);
       }
       const status = parseCliWorkItemStatus(o.status, deps);
-      const payload = { id: o.id };
+      const payload = { id: ticketId };
       if (o.title !== void 0) payload["title"] = o.title;
       if (body !== void 0) payload["body"] = body;
       if (status !== void 0) payload["status"] = status;
       if (o.unlinkStory) {
         payload["storyId"] = null;
       } else if (storyTrimmed !== void 0) {
-        payload["storyId"] = storyTrimmed;
+        payload["storyId"] = storyIdResolved;
       }
       if (o.unassign) {
         payload["assignee"] = null;
@@ -15718,19 +15831,19 @@ ${body}`
           nextDepends = [];
         } else {
           const removeDepSet = new Set(
-            normalizeTicketDependsOnIds(removeDependsOnTokens)
+            resolveTicketDependsOnTokensToIds(proj, removeDependsOnTokens)
           );
           nextDepends = normalizeTicketDependsOnIds(
             (curTicket.dependsOn ?? []).filter((d) => !removeDepSet.has(d))
           );
           nextDepends = normalizeTicketDependsOnIds([
             ...nextDepends,
-            ...addDependsOnTokens
+            ...resolveTicketDependsOnTokensToIds(proj, addDependsOnTokens)
           ]);
         }
         const depErr = validateTicketDependsOnForWrite({
           projection: proj,
-          fromTicketId: o.id,
+          fromTicketId: ticketId,
           nextDependsOn: nextDepends
         });
         if (depErr !== void 0) {
@@ -15760,7 +15873,7 @@ ${body}`
         payload
       );
       if (isNoOpUpdatePayload(prunedPayload)) {
-        return { id: o.id, noChanges: true };
+        return { id: ticketId, noChanges: true };
       }
       const evt = makeEvent(
         "TicketUpdated",
@@ -15797,25 +15910,25 @@ ${body}`
         runGit
       );
     }
-    const preferred = normalizeTicketBranchName(
-      o.branch ?? `hyper-pm/${o.id}`
-    );
-    if (preferred === void 0) {
-      deps.error(
-        "Invalid --branch or default branch name for this ticket id"
-      );
-      deps.exit(ExitCode.UserError);
-    }
     await mutateDataBranch(g, deps, async (root, { actor }) => {
       const lines = await readAllEventLines(root);
       const proj = replayEvents(lines);
-      const curRow = proj.tickets.get(o.id);
+      const ticketId = resolveTicketId(proj, o.id) ?? o.id.trim();
+      const preferred = normalizeTicketBranchName(
+        o.branch ?? `hyper-pm/${ticketId}`
+      );
+      if (preferred === void 0) {
+        throw new Error(
+          "Invalid --branch or default branch name for this ticket id"
+        );
+      }
+      const curRow = proj.tickets.get(ticketId);
       if (curRow === void 0 || curRow.deleted) {
         throw new Error(`Ticket not found: ${o.id}`);
       }
       if (curRow.status === "done" || curRow.status === "cancelled") {
         throw new Error(
-          `Ticket ${o.id} is ${curRow.status}; change status before starting work`
+          `Ticket ${ticketId} is ${curRow.status}; change status before starting work`
         );
       }
       const { branch: chosenBranch } = await pickUniqueLocalBranchName({
@@ -15836,7 +15949,7 @@ ${body}`
       }
       next = normalizeTicketBranchListFromStrings(next);
       const payload = {
-        id: o.id,
+        id: ticketId,
         status: "in_progress"
       };
       if (!ticketBranchListsEqual(next, curRow.linkedBranches)) {
@@ -15845,7 +15958,7 @@ ${body}`
       const evt = makeEvent("TicketUpdated", payload, deps.clock, actor);
       await appendEventLine(root, evt, deps.clock);
       const result = {
-        id: o.id,
+        id: ticketId,
         status: "in_progress",
         branch: chosenBranch,
         branches: next
@@ -15867,27 +15980,36 @@ ${body}`
     await mutateDataBranch(g, deps, async (root, { actor }) => {
       const lines = await readAllEventLines(root);
       const proj = replayEvents(lines);
-      const row = proj.tickets.get(o.id);
+      const ticketId = resolveTicketId(proj, o.id) ?? o.id.trim();
+      const row = proj.tickets.get(ticketId);
       if (!row || row.deleted) {
         throw new Error(`Ticket not found: ${o.id}`);
       }
       const evt = makeEvent(
         "TicketCommentAdded",
-        { ticketId: o.id, body: trimmed },
+        { ticketId, body: trimmed },
         deps.clock,
         actor
       );
       await appendEventLine(root, evt, deps.clock);
-      return { commentId: evt.id, ticketId: o.id, body: trimmed };
+      return { commentId: evt.id, ticketId, body: trimmed };
     });
   });
   ticket.command("delete").requiredOption("--id <id>").action(async function() {
     const g = readGlobals(this);
     const o = this.opts();
     await mutateDataBranch(g, deps, async (root, { actor }) => {
-      const evt = makeEvent("TicketDeleted", { id: o.id }, deps.clock, actor);
+      const lines = await readAllEventLines(root);
+      const proj = replayEvents(lines);
+      const ticketId = resolveTicketId(proj, o.id) ?? o.id.trim();
+      const evt = makeEvent(
+        "TicketDeleted",
+        { id: ticketId },
+        deps.clock,
+        actor
+      );
       await appendEventLine(root, evt, deps.clock);
-      return { id: o.id, deleted: true };
+      return { id: ticketId, deleted: true };
     });
   });
   ticket.command("import-github").description(
@@ -15958,7 +16080,8 @@ ${body}`
       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);
+        const storyIdForImport = resolveStoryId(proj, storyTrimmed) ?? storyTrimmed;
+        const storyRow = proj.stories.get(storyIdForImport);
         if (!storyRow || storyRow.deleted) {
           deps.error(`Story not found: ${storyTrimmed}`);
           deps.exit(ExitCode.UserError);
@@ -16001,12 +16124,22 @@ ${body}`
           );
         } else {
           const imported = [];
+          let importProj = proj;
+          let importLines = lines;
+          const storyIdForPayload = storyTrimmed !== void 0 && storyTrimmed !== "" ? resolveStoryId(importProj, storyTrimmed) ?? storyTrimmed : void 0;
           for (const c of candidates) {
             const ticketId = ulid();
+            const nextNum = nextTicketNumberForCreate(importProj);
             const createPayload = mergeTicketImportCreatePayload(
               ticketId,
               c.ticketCreatedPayloadBase,
-              storyTrimmed
+              storyIdForPayload,
+              nextNum
+            );
+            assertCreatePayloadUsesExpectedHeadNumber(
+              importProj,
+              "ticket",
+              createPayload
             );
             const createdEvt = makeEvent(
               "TicketCreated",
@@ -16027,6 +16160,8 @@ ${body}`
             );
             await appendEventLine(session.worktreePath, linkEvt, deps.clock);
             imported.push({ ticketId, issueNumber: c.issueNumber });
+            importLines = await readAllEventLines(session.worktreePath);
+            importProj = replayEvents(importLines);
           }
           await commitDataWorktreeIfNeeded(
             session.worktreePath,
@@ -16494,7 +16629,8 @@ var readEpic = async (g, id, deps) => {
           formatOutput(g.format, { items: listActiveEpicSummaries(proj) })
         );
       } else {
-        const row = proj.epics.get(id);
+        const epicId = resolveEpicId(proj, id) ?? id.trim();
+        const row = proj.epics.get(epicId);
         if (!row || row.deleted) {
           deps.error("Epic not found");
           exitCode = ExitCode.UserError;
@@ -16529,7 +16665,8 @@ var readStory = async (g, opts, deps) => {
       const proj = replayEvents(lines);
       const { id, epicId } = opts;
       if (id === void 0 || id === "") {
-        const epicFilter = epicId !== void 0 && epicId !== "" ? epicId : void 0;
+        const epicFilterRaw = epicId !== void 0 && epicId !== "" ? epicId : void 0;
+        const epicFilter = epicFilterRaw !== void 0 ? resolveEpicId(proj, epicFilterRaw) ?? epicFilterRaw.trim() : void 0;
         if (epicFilter !== void 0) {
           const epicRow = proj.epics.get(epicFilter);
           if (!epicRow || epicRow.deleted) {
@@ -16550,7 +16687,8 @@ var readStory = async (g, opts, deps) => {
           );
         }
       } else {
-        const row = proj.stories.get(id);
+        const storyId = resolveStoryId(proj, id) ?? id.trim();
+        const row = proj.stories.get(storyId);
         if (!row || row.deleted) {
           deps.error("Story not found");
           exitCode = ExitCode.UserError;
@@ -16594,8 +16732,8 @@ var readTicket = async (g, opts, deps) => {
       } = opts;
       if (id === void 0 || id === "") {
         const listWithoutStory = withoutStoryRaw === true;
-        const storyFilter = storyIdRaw !== void 0 && storyIdRaw !== "" ? storyIdRaw : void 0;
-        const epicFilter = epicIdRaw !== void 0 && epicIdRaw !== "" ? epicIdRaw : void 0;
+        const storyFilter = storyIdRaw !== void 0 && storyIdRaw !== "" ? resolveStoryId(proj, storyIdRaw) ?? storyIdRaw.trim() : void 0;
+        const epicFilter = epicIdRaw !== void 0 && epicIdRaw !== "" ? resolveEpicId(proj, epicIdRaw) ?? epicIdRaw.trim() : void 0;
         const sortBy = tryParseTicketListSortField(sortByOpt);
         const sortDir = tryParseTicketListSortDir(sortDirOpt);
         if (sortBy === void 0) {
@@ -16634,6 +16772,7 @@ var readTicket = async (g, opts, deps) => {
             exitCode = ExitCode.UserError;
           } else {
             const listQuery = buildTicketListQueryFromReadListOpts(
+              proj,
               { epic: epicFilter, ...listFlagRest },
               deps
             );
@@ -16654,6 +16793,7 @@ var readTicket = async (g, opts, deps) => {
             exitCode = ExitCode.UserError;
           } else {
             const listQuery = buildTicketListQueryFromReadListOpts(
+              proj,
               listFlagRest,
               deps
             );
@@ -16670,6 +16810,7 @@ var readTicket = async (g, opts, deps) => {
           }
         } else if (listWithoutStory) {
           const listQuery = buildTicketListQueryFromReadListOpts(
+            proj,
             { withoutStory: true, ...listFlagRest },
             deps
           );
@@ -16684,6 +16825,7 @@ var readTicket = async (g, opts, deps) => {
           );
         } else {
           const listQuery = buildTicketListQueryFromReadListOpts(
+            proj,
             { epic: epicFilter, ...listFlagRest },
             deps
           );
@@ -16698,7 +16840,8 @@ var readTicket = async (g, opts, deps) => {
           );
         }
       } else {
-        const row = proj.tickets.get(id);
+        const ticketId = resolveTicketId(proj, id) ?? id.trim();
+        const row = proj.tickets.get(ticketId);
         if (!row || row.deleted) {
           deps.error("Ticket not found");
           exitCode = ExitCode.UserError;