hyper-pm 0.1.4 → 0.1.6

package/dist/main.cjs

@@ -11530,6 +11530,103 @@ var normalizeTicketBranchListFromPayloadValue = (value) => {
   return normalizeTicketBranchListFromStrings(strings);
 };
 
+// src/lib/ticket-depends-on.ts
+var normalizeTicketDependsOnIds = (ids) => {
+  const out = [];
+  const seen = /* @__PURE__ */ new Set();
+  for (const raw of ids) {
+    const t = raw.trim();
+    if (t === "") continue;
+    if (seen.has(t)) continue;
+    seen.add(t);
+    out.push(t);
+  }
+  return out;
+};
+var ticketDependsOnListsEqual = (a, b) => {
+  const an = normalizeTicketDependsOnIds(a ?? []);
+  const bn = normalizeTicketDependsOnIds(b ?? []);
+  if (an.length !== bn.length) return false;
+  return an.every((x, i) => x === bn[i]);
+};
+var parseTicketDependsOnFromPayloadValue = (value) => {
+  if (!Array.isArray(value)) return void 0;
+  const strings = [];
+  for (const x of value) {
+    if (typeof x !== "string") return void 0;
+    strings.push(x);
+  }
+  return normalizeTicketDependsOnIds(strings);
+};
+var parseTicketDependsOnFromFenceValue = (value) => {
+  if (!Array.isArray(value)) return void 0;
+  const strings = [];
+  for (const x of value) {
+    if (typeof x === "string") strings.push(x);
+  }
+  return normalizeTicketDependsOnIds(strings);
+};
+var wouldTicketDependsOnCreateCycle = (params) => {
+  const { fromTicketId, nextDependsOn, successorsFor } = params;
+  const dfsFromPrerequisite = (start) => {
+    const stack = [start];
+    const visited = /* @__PURE__ */ new Set();
+    while (stack.length > 0) {
+      const node = stack.pop();
+      if (node === fromTicketId) return true;
+      if (visited.has(node)) continue;
+      visited.add(node);
+      const next = successorsFor(node) ?? [];
+      for (let i = next.length - 1; i >= 0; i -= 1) {
+        stack.push(next[i]);
+      }
+    }
+    return false;
+  };
+  for (const p of nextDependsOn) {
+    if (dfsFromPrerequisite(p)) return true;
+  }
+  return false;
+};
+var ticketDependsOnSuccessorsForProjection = (projection, fromTicketId, nextDependsOn) => {
+  return (ticketId) => {
+    if (ticketId === fromTicketId) {
+      return nextDependsOn.length > 0 ? nextDependsOn : void 0;
+    }
+    const row = projection.tickets.get(ticketId);
+    if (!row || row.deleted) return void 0;
+    return row.dependsOn;
+  };
+};
+var validateTicketDependsOnForWrite = (params) => {
+  const { projection, fromTicketId, nextDependsOn } = params;
+  for (const id of nextDependsOn) {
+    if (id === fromTicketId) {
+      return `Ticket cannot depend on itself (${id})`;
+    }
+    const row = projection.tickets.get(id);
+    if (row === void 0) {
+      return `Dependency ticket not found: ${id}`;
+    }
+    if (row.deleted) {
+      return `Dependency ticket deleted: ${id}`;
+    }
+  }
+  const successorsFor = ticketDependsOnSuccessorsForProjection(
+    projection,
+    fromTicketId,
+    nextDependsOn
+  );
+  if (wouldTicketDependsOnCreateCycle({
+    fromTicketId,
+    nextDependsOn,
+    successorsFor
+  })) {
+    return "Ticket dependencies would create a cycle";
+  }
+  return void 0;
+};
+
 // src/lib/ticket-planning-fields.ts
 var PRIORITY_SET = /* @__PURE__ */ new Set([
   "low",
@@ -11698,6 +11795,9 @@ var formatOutput = (format, value) => {
   return JSON.stringify(value);
 };
 
+// src/cli/normalize-raw-cli-argv.ts
+var normalizeRawCliArgv = (argv) => argv.map((token) => token === "--no-github" ? "--skip-network" : token);
+
 // src/cli/prune-unchanged-work-item-update-payload.ts
 var branchListsEqual = (a, b) => a.length === b.length && a.every((x, i) => x === b[i]);
 var pruneEpicOrStoryUpdatePayloadAgainstRow = (cur, draft) => {
@@ -11753,6 +11853,20 @@ var pruneTicketUpdatePayloadAgainstRow = (cur, draft) => {
       out["labels"] = draft["labels"];
     }
   }
+  if (draft["dependsOn"] !== void 0) {
+    if (draft["dependsOn"] === null) {
+      if (!ticketDependsOnListsEqual(cur.dependsOn, [])) {
+        out["dependsOn"] = null;
+      }
+    } else {
+      const parsed = parseTicketDependsOnFromPayloadValue(draft["dependsOn"]);
+      if (parsed !== void 0) {
+        if (!ticketDependsOnListsEqual(cur.dependsOn, parsed)) {
+          out["dependsOn"] = parsed;
+        }
+      }
+    }
+  }
   if (draft["priority"] !== void 0) {
     const curP = cur.priority ?? null;
     const nextP = draft["priority"] === null ? null : draft["priority"];
@@ -11919,6 +12033,20 @@ var workItemUpdateAspects = (kind, payload) => {
       }
     }
   }
+  if (kind === "ticket" && payload["dependsOn"] !== void 0) {
+    if (payload["dependsOn"] === null) {
+      aspects.push("cleared ticket dependencies");
+    } else {
+      const d = normalizeBranchList(payload["dependsOn"]);
+      if (d.length > 0 && d.length <= MAX_BRANCH_NAMES_TO_LIST) {
+        aspects.push(`set ticket dependencies to (${d.join(", ")})`);
+      } else if (d.length > MAX_BRANCH_NAMES_TO_LIST) {
+        aspects.push("updated ticket dependencies");
+      } else {
+        aspects.push("cleared ticket dependencies");
+      }
+    }
+  }
   if (kind === "ticket" && payload["priority"] !== void 0) {
     if (payload["priority"] === null) {
       aspects.push("cleared priority");
@@ -12025,6 +12153,7 @@ var buildAuditLinkMetadata = (evt, githubRepo) => {
       if (p["status"] !== void 0) meta["status"] = String(p["status"]);
       if (p["assignee"] !== void 0) meta["assignee"] = p["assignee"];
       if (p["labels"] !== void 0) meta["labels"] = p["labels"];
+      if (p["dependsOn"] !== void 0) meta["dependsOn"] = p["dependsOn"];
       if (p["priority"] !== void 0) meta["priority"] = p["priority"];
       if (p["size"] !== void 0) meta["size"] = p["size"];
       if (p["estimate"] !== void 0) meta["estimate"] = p["estimate"];
@@ -12092,6 +12221,14 @@ var formatEpicStoryTicketCreated = (evt, entity) => {
         parts.push("with labels");
       }
     }
+    if (p["dependsOn"] !== void 0) {
+      const d = normalizeBranchList(p["dependsOn"]);
+      if (d.length > 0 && d.length <= MAX_BRANCH_NAMES_TO_LIST) {
+        parts.push(`depending on (${d.join(", ")})`);
+      } else if (d.length > MAX_BRANCH_NAMES_TO_LIST) {
+        parts.push("with ticket dependencies");
+      }
+    }
     if (p["priority"] !== void 0) {
       parts.push(`with priority ${quoteStatus(String(p["priority"]))}`);
     }
@@ -12185,6 +12322,18 @@ var formatAuditHumanSentence = (evt) => {
           bits.push("updated labels");
         }
       }
+      if (p["dependsOn"] !== void 0) {
+        if (p["dependsOn"] === null) {
+          bits.push("cleared ticket dependencies");
+        } else {
+          const d = normalizeBranchList(p["dependsOn"]);
+          if (d.length > 0 && d.length <= MAX_BRANCH_NAMES_TO_LIST) {
+            bits.push(`dependencies: ${d.join(", ")}`);
+          } else {
+            bits.push("updated ticket dependencies");
+          }
+        }
+      }
       if (p["priority"] !== void 0) {
         bits.push("updated priority");
       }
@@ -12464,6 +12613,13 @@ var ticketMatchesTicketListQuery = (ticket, projection, query) => {
       return false;
     }
   }
+  const dependsOnIncludesId = query.dependsOnIncludesId;
+  if (dependsOnIncludesId !== void 0) {
+    const deps = ticket.dependsOn ?? [];
+    if (!deps.includes(dependsOnIncludesId)) {
+      return false;
+    }
+  }
   return true;
 };
 
@@ -12616,6 +12772,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,
@@ -12627,6 +12784,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,
@@ -12659,6 +12817,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,
@@ -12669,6 +12828,7 @@ var listActiveTicketSummaries = (projection, options) => {
       ...t.estimate !== void 0 ? { estimate: t.estimate } : {},
       ...t.startWorkAt !== void 0 ? { startWorkAt: t.startWorkAt } : {},
       ...t.targetFinishAt !== void 0 ? { targetFinishAt: t.targetFinishAt } : {},
+      ...t.dependsOn !== void 0 && t.dependsOn.length > 0 ? { dependsOn: t.dependsOn } : {},
       ...t.linkedBranches.length > 0 ? { linkedBranches: t.linkedBranches } : {},
       ...last !== void 0 ? {
         lastPrActivity: {
@@ -12765,6 +12925,17 @@ var inboundTicketPlanningPayloadFromFenceMeta = (meta) => {
       }
     }
   }
+  if (Object.prototype.hasOwnProperty.call(meta, "depends_on")) {
+    const v = meta["depends_on"];
+    if (v === null) {
+      out["dependsOn"] = null;
+    } else {
+      const parsed = parseTicketDependsOnFromFenceValue(v);
+      if (parsed !== void 0) {
+        out["dependsOn"] = parsed;
+      }
+    }
+  }
   return out;
 };
 var buildGithubIssueBody = (params) => {
@@ -12790,6 +12961,9 @@ var buildGithubIssueBody = (params) => {
     if (p.targetFinishAt !== void 0) {
       meta.target_finish_at = p.targetFinishAt;
     }
+    if (p.dependsOn !== void 0 && p.dependsOn.length > 0) {
+      meta.depends_on = p.dependsOn;
+    }
   }
   return `${params.description.trim()}
 
@@ -12815,6 +12989,9 @@ var ticketPlanningForGithubIssueBody = (ticket) => {
   if (ticket.targetFinishAt !== void 0) {
     out.targetFinishAt = ticket.targetFinishAt;
   }
+  if (ticket.dependsOn !== void 0 && ticket.dependsOn.length > 0) {
+    out.dependsOn = ticket.dependsOn;
+  }
   return Object.keys(out).length > 0 ? out : void 0;
 };
 
@@ -13009,750 +13186,302 @@ 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;
 };
-
-// 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 maxNumberAmongRows = (rows) => {
+  let m = 0;
+  for (const r of rows) {
+    if (r.number > m) m = r.number;
   }
-  return issues;
+  return m;
 };
-
-// src/git/create-and-checkout-branch.ts
-var createAndCheckoutBranch = async (opts) => {
-  await opts.runGit(opts.repoRoot, [
-    "switch",
-    "-c",
-    opts.branchName,
-    opts.startPoint
-  ]);
+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/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 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];
 };
-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 };
-  }
-  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;
-  }
-  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 };
-};
-
-// src/git/find-git-root.ts
-var findGitRoot = async (cwd, deps) => {
-  const { stdout } = await deps.runGit(cwd, ["rev-parse", "--show-toplevel"]);
-  return stdout;
-};
-
-// 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 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;
 };
-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 linkedBranchesFromTicketCreatedPayload = (payload) => {
+  if (!Object.prototype.hasOwnProperty.call(payload, "branches")) {
+    return [];
   }
-  throw new Error(
-    `Could not allocate a free local branch name from ${JSON.stringify(preferredBase)} (tried suffixes up to -${String(max)})`
-  );
+  return normalizeTicketBranchListFromPayloadValue(payload["branches"]);
 };
-
-// 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 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 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;
+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;
     }
-  } catch {
   }
-  for (const head of ["refs/heads/main", "refs/heads/master"]) {
-    try {
-      await git(repoRoot, ["rev-parse", "-q", "--verify", head]);
-      return head;
-    } catch {
-    }
+  const pr = readTicketPriorityPatch(payload);
+  if (typeof pr === "string") {
+    row.priority = pr;
   }
-  try {
-    await git(repoRoot, ["rev-parse", "-q", "--verify", "HEAD"]);
-    return "HEAD";
-  } catch {
+  const sz = readTicketSizePatch(payload);
+  if (typeof sz === "string") {
+    row.size = sz;
   }
-  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 }
-      );
-    }
-    return out;
-  } catch {
-    return [];
+  const est = readTicketEstimatePatch(payload);
+  if (typeof est === "number") {
+    row.estimate = est;
   }
-};
-
-// src/git/parse-github-owner-repo-from-remote-url.ts
-var parseGithubOwnerRepoFromRemoteUrl = (rawUrl) => {
-  const trimmed = rawUrl.trim();
-  if (!trimmed) {
-    return void 0;
+  const sw = readTicketIsoInstantPatch(payload, "startWorkAt");
+  if (typeof sw === "string") {
+    row.startWorkAt = sw;
   }
-  const scpMatch = /^git@github\.com:(?<path>.+)$/i.exec(trimmed);
-  if (scpMatch?.groups?.path) {
-    return slugFromGithubPath(scpMatch.groups.path);
+  const tf = readTicketIsoInstantPatch(payload, "targetFinishAt");
+  if (typeof tf === "string") {
+    row.targetFinishAt = tf;
   }
-  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;
+  if (Object.prototype.hasOwnProperty.call(payload, "dependsOn")) {
+    const v = parseTicketDependsOnFromPayloadValue(payload["dependsOn"]);
+    if (v !== void 0 && v.length > 0) {
+      row.dependsOn = 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;
+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 owner = segments[0];
-  const repo = segments[1];
-  if (!owner || !repo) {
-    return void 0;
+  const pr = readTicketPriorityPatch(payload);
+  if (pr === null) {
+    delete row.priority;
+  } else if (typeof pr === "string") {
+    row.priority = pr;
   }
-  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 sz = readTicketSizePatch(payload);
+  if (sz === null) {
+    delete row.size;
+  } else if (typeof sz === "string") {
+    row.size = sz;
   }
-};
-
-// 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 est = readTicketEstimatePatch(payload);
+  if (est === null) {
+    delete row.estimate;
+  } else if (typeof est === "number") {
+    row.estimate = est;
   }
-};
-var tryReadGitConfigUserEmail = async (cwd, runGit2) => {
-  try {
-    const { stdout } = await runGit2(cwd, ["config", "--get", "user.email"]);
-    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 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 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;
+        }
+      }
+    }
   }
-  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 applyCreatedAudit = (row, evt) => {
+  row.createdAt = evt.ts;
+  row.createdBy = evt.actor;
+  row.updatedAt = evt.ts;
+  row.updatedBy = evt.actor;
 };
-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)
-    };
-  }
+var applyLastUpdate = (row, evt) => {
+  row.updatedAt = evt.ts;
+  row.updatedBy = evt.actor;
 };
-
-// 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 applyStatusIfChanged = (row, evt, nextStatus) => {
+  if (row.status === nextStatus) return false;
+  row.status = nextStatus;
+  row.statusChangedAt = evt.ts;
+  row.statusChangedBy = evt.actor;
+  return true;
 };
-
-// src/storage/append-event.ts
-var appendEventLine = async (dataRoot, event, clock, opts) => {
-  const rel = nextEventRelPath(clock.now(), {
-    nextId: opts?.nextEventId
+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
   });
-  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;
+  applyLastUpdate(ticket, evt);
 };
-
-// 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 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
+    });
   }
-  return out;
+  return void 0;
 };
-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;
-  }
-  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];
-};
-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 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;
-};
-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;
-};
-var linkedBranchesFromTicketCreatedPayload = (payload) => {
-  if (!Object.prototype.hasOwnProperty.call(payload, "branches")) {
-    return [];
-  }
-  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;
-    }
-  }
-  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;
-  }
-};
-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;
-  }
-  const tf = readTicketIsoInstantPatch(payload, "targetFinishAt");
-  if (tf === null) {
-    delete row.targetFinishAt;
-  } else if (typeof tf === "string") {
-    row.targetFinishAt = tf;
-  }
-};
-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;
-};
-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 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 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
-    });
-  }
-  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 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;
     }
     case "EpicUpdated": {
       const id = String(evt.payload["id"]);
@@ -13785,6 +13514,7 @@ var applyEvent = (projection, evt) => {
       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"] ?? ""),
@@ -13832,6 +13562,7 @@ var applyEvent = (projection, evt) => {
       const status = resolveStatusForNewTicketPayload(evt.payload);
       const row = {
         id,
+        number: resolveWorkItemCreateNumber(projection, "ticket", evt.payload),
         storyId: storyIdFromTicketCreatedPayload(evt.payload),
         title: String(evt.payload["title"] ?? ""),
         body,
@@ -13944,28 +13675,733 @@ var applyEvent = (projection, evt) => {
       }
       break;
     }
-    default:
-      break;
+    default:
+      break;
+  }
+};
+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/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;
+  });
+  return normalizeTicketDependsOnIds(mapped);
+};
+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}.`
+    );
+  }
+};
+
+// 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/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/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;
+    }
+  }
+  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 });
+};
+var defaultPathExists = async (path) => {
+  try {
+    await (0, import_promises3.access)(path);
+    return true;
+  } catch {
+    return false;
+  }
+};
+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;
+    }
+  }
+  return void 0;
+};
+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 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;
+  }
+  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 };
+};
+
+// src/git/find-git-root.ts
+var findGitRoot = async (cwd, deps) => {
+  const { stdout } = await deps.runGit(cwd, ["rev-parse", "--show-toplevel"]);
+  return stdout;
+};
+
+// 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 };
+    }
+  }
+  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;
+    }
+  } catch {
+  }
+  for (const head of ["refs/heads/main", "refs/heads/master"]) {
+    try {
+      await git(repoRoot, ["rev-parse", "-q", "--verify", head]);
+      return head;
+    } catch {
+    }
+  }
+  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 }
+      );
+    }
+    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;
+    }
+    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";
+    }
+    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
+      );
+    }
+  }
+  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;
+    }
+    const tracking = remoteTrackingRef(remote, dataBranch);
+    const exists = await refExists(worktreePath, tracking, runGit2);
+    if (!exists) {
+      return;
+    }
+    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;
+    }
+    if (lastPush.status === "failed" && isLikelyNonFastForwardPushFailure(lastPush.detail) && attempt < maxPushAttempts) {
+      await refetchAndMerge();
+      continue;
+    }
+    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("/"));
+    }
   }
+  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
@@ -14319,6 +14755,19 @@ var runGithubInboundSync = async (params) => {
     const planningSource = inboundTicketPlanningPayloadFromFenceMeta(meta);
     const planningPayload = {};
     for (const [k, v] of Object.entries(planningSource)) {
+      if (k === "dependsOn") {
+        if (v === null) {
+          if (!ticketDependsOnListsEqual(ticket.dependsOn, [])) {
+            planningPayload["dependsOn"] = null;
+          }
+        } else if (Array.isArray(v)) {
+          const parsed = parseTicketDependsOnFromPayloadValue(v);
+          if (parsed !== void 0 && !ticketDependsOnListsEqual(ticket.dependsOn, parsed)) {
+            planningPayload["dependsOn"] = parsed;
+          }
+        }
+        continue;
+      }
       const tk = k;
       const cur = ticket[tk];
       if (v === null) {
@@ -14512,14 +14961,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,
@@ -14656,6 +15106,10 @@ var buildTicketListQueryFromReadListOpts = (o, deps) => {
   if (targetFinishBeforeMs !== void 0) {
     query.targetFinishBeforeMs = targetFinishBeforeMs;
   }
+  if (o.dependsOn !== void 0 && o.dependsOn.trim() !== "") {
+    const trimmed = o.dependsOn.trim();
+    query.dependsOnIncludesId = resolveTicketId(projection, trimmed) ?? trimmed;
+  }
   return Object.keys(query).length > 0 ? query : void 0;
 };
 var runCli = async (argv, deps = {
@@ -14731,19 +15185,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;
     });
@@ -14759,18 +15213,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);
@@ -14781,9 +15236,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");
@@ -14796,24 +15254,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;
     });
@@ -14832,18 +15289,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);
@@ -14854,9 +15312,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");
@@ -14879,6 +15345,11 @@ var runCli = async (argv, deps = {
     "planning label (repeatable)",
     (value, previous) => [...previous, value],
     []
+  ).option(
+    "--depends-on <id>",
+    "prerequisite ticket id (repeatable)",
+    (value, previous) => [...previous, value],
+    []
   ).option("--priority <p>", "low|medium|high|urgent").option("--size <s>", "xs|s|m|l|xl").option("--estimate <n>", "non-negative estimate (e.g. story points)").option("--start-at <iso>", "planned start work at (ISO-8601)").option("--target-finish-at <iso>", "planned target finish at (ISO-8601)").option("--ai-draft", "draft body via AI (explicit)", false).action(async function() {
     const g = readGlobals(this);
     const o = this.opts();
@@ -14941,6 +15412,7 @@ var runCli = async (argv, deps = {
       "--target-finish-at",
       deps
     );
+    const dependsOnTokensCreate = normalizeCliStringList(o.dependsOn);
     const planningPayload = {
       ...labelsPayloadCreate,
       ...priorityParsed !== void 0 ? { priority: priorityParsed } : {},
@@ -14954,31 +15426,53 @@ 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 } : {};
+      const dependsOnErr = validateTicketDependsOnForWrite({
+        projection: proj,
+        fromTicketId: id,
+        nextDependsOn: dependsOnNormCreate
+      });
+      if (dependsOnErr !== void 0) {
+        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,
-          ...planningPayload
-        },
+        createPayload,
         deps.clock,
         actor
       );
@@ -15034,6 +15528,9 @@ var runCli = async (argv, deps = {
   ).option(
     "--branch <name>",
     "when listing (no --id): only tickets linked to this branch (normalized exact match)"
+  ).option(
+    "--depends-on <id>",
+    "when listing (no --id): only tickets that list this ticket id in dependsOn"
   ).option(
     "--priority <p>",
     "when listing (no --id): OR-set of priorities (repeat flag); low|medium|high|urgent",
@@ -15113,7 +15610,17 @@ var runCli = async (argv, deps = {
     "--clear-labels",
     "remove all planning labels from the ticket",
     false
-  ).option("--priority <p>", "low|medium|high|urgent").option("--clear-priority", "remove priority", false).option("--size <s>", "xs|s|m|l|xl").option("--clear-size", "remove size", false).option("--estimate <n>", "non-negative estimate (e.g. story points)").option("--clear-estimate", "remove estimate", false).option("--start-at <iso>", "planned start work at (ISO-8601)").option("--clear-start-at", "remove start work date", false).option("--target-finish-at <iso>", "planned target finish at (ISO-8601)").option("--clear-target-finish-at", "remove target finish date", false).option("--ai-improve", "expand description via AI (explicit)", false).action(async function() {
+  ).option(
+    "--add-depends-on <id>",
+    "add a prerequisite ticket id (repeatable)",
+    (value, previous) => [...previous, value],
+    []
+  ).option(
+    "--remove-depends-on <id>",
+    "remove a prerequisite ticket id (repeatable)",
+    (value, previous) => [...previous, value],
+    []
+  ).option("--clear-depends-on", "remove all ticket dependencies", false).option("--priority <p>", "low|medium|high|urgent").option("--clear-priority", "remove priority", false).option("--size <s>", "xs|s|m|l|xl").option("--clear-size", "remove size", false).option("--estimate <n>", "non-negative estimate (e.g. story points)").option("--clear-estimate", "remove estimate", false).option("--start-at <iso>", "planned start work at (ISO-8601)").option("--clear-start-at", "remove start work date", false).option("--target-finish-at <iso>", "planned target finish at (ISO-8601)").option("--clear-target-finish-at", "remove target finish date", false).option("--ai-improve", "expand description via AI (explicit)", false).action(async function() {
     const g = readGlobals(this);
     const o = this.opts();
     let body = o.body;
@@ -15165,6 +15672,14 @@ ${body}`
       );
       deps.exit(ExitCode.UserError);
     }
+    const addDependsOnTokens = normalizeCliStringList(o.addDependsOn);
+    const removeDependsOnTokens = normalizeCliStringList(o.removeDependsOn);
+    if (o.clearDependsOn === true && (addDependsOnTokens.length > 0 || removeDependsOnTokens.length > 0)) {
+      deps.error(
+        "Cannot use --clear-depends-on with --add-depends-on or --remove-depends-on"
+      );
+      deps.exit(ExitCode.UserError);
+    }
     const mutual = (clear, set, clearName, setName) => {
       if (clear === true && set !== void 0 && set !== "") {
         deps.error(`Cannot use ${clearName} and ${setName} together`);
@@ -15229,25 +15744,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;
@@ -15297,6 +15814,35 @@ ${body}`
           payload["labels"] = nextLabels;
         }
       }
+      const wantsDependsOnChange = o.clearDependsOn === true || addDependsOnTokens.length > 0 || removeDependsOnTokens.length > 0;
+      if (wantsDependsOnChange) {
+        let nextDepends;
+        if (o.clearDependsOn === true) {
+          nextDepends = [];
+        } else {
+          const removeDepSet = new Set(
+            resolveTicketDependsOnTokensToIds(proj, removeDependsOnTokens)
+          );
+          nextDepends = normalizeTicketDependsOnIds(
+            (curTicket.dependsOn ?? []).filter((d) => !removeDepSet.has(d))
+          );
+          nextDepends = normalizeTicketDependsOnIds([
+            ...nextDepends,
+            ...resolveTicketDependsOnTokensToIds(proj, addDependsOnTokens)
+          ]);
+        }
+        const depErr = validateTicketDependsOnForWrite({
+          projection: proj,
+          fromTicketId: ticketId,
+          nextDependsOn: nextDepends
+        });
+        if (depErr !== void 0) {
+          throw new Error(depErr);
+        }
+        if (!ticketDependsOnListsEqual(curTicket.dependsOn, nextDepends)) {
+          payload["dependsOn"] = nextDepends;
+        }
+      }
       if (priorityUpdate !== void 0) {
         payload["priority"] = priorityUpdate;
       }
@@ -15317,7 +15863,7 @@ ${body}`
         payload
       );
       if (isNoOpUpdatePayload(prunedPayload)) {
-        return { id: o.id, noChanges: true };
+        return { id: ticketId, noChanges: true };
       }
       const evt = makeEvent(
         "TicketUpdated",
@@ -15354,25 +15900,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({
@@ -15393,7 +15939,7 @@ ${body}`
       }
       next = normalizeTicketBranchListFromStrings(next);
       const payload = {
-        id: o.id,
+        id: ticketId,
         status: "in_progress"
       };
       if (!ticketBranchListsEqual(next, curRow.linkedBranches)) {
@@ -15402,7 +15948,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
@@ -15424,27 +15970,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(
@@ -15515,7 +16070,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);
@@ -15558,12 +16114,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",
@@ -15584,6 +16150,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,
@@ -15610,7 +16178,19 @@ ${body}`
     }
     deps.exit(ExitCode.Success);
   });
-  program2.command("sync").description("GitHub Issues sync").option("--no-github", "skip network sync", false).option(
+  program2.command("sync").description("Sync data branch over git; optional GitHub Issues sync").option(
+    "--skip-network",
+    "skip all sync network operations (git fetch/merge/push and GitHub); legacy: --no-github",
+    false
+  ).option(
+    "--with-github",
+    "also run GitHub Issues sync (requires GITHUB_TOKEN or gh; needs sync not off in config)",
+    false
+  ).option(
+    "--git-data",
+    "legacy no-op: default sync already updates the data branch via git only",
+    false
+  ).option(
     "--skip-push",
     "after a successful sync, do not push the data branch to the remote",
     false
@@ -15619,115 +16199,171 @@ ${body}`
     const o = this.opts();
     const repoRoot = await resolveRepoRoot(g.repo);
     const cfg = await loadMergedConfig(repoRoot, g);
-    if (cfg.sync === "off" || o.noGithub) {
+    if (o.withGithub && o.skipNetwork) {
+      deps.error("Cannot use --with-github together with --skip-network");
+      deps.exit(ExitCode.UserError);
+    }
+    if (o.skipNetwork) {
       deps.log(formatOutput(g.format, { ok: true, skipped: true }));
       deps.exit(ExitCode.Success);
     }
-    const githubToken = await resolveGithubTokenForSync({
-      envToken: env.GITHUB_TOKEN,
-      cwd: repoRoot
-    });
-    if (!githubToken) {
-      deps.error(
-        "GitHub auth required for sync: set GITHUB_TOKEN or run `gh auth login`"
-      );
-      deps.exit(ExitCode.EnvironmentAuth);
-    }
-    const tmpBase = g.tempDir ?? env.TMPDIR ?? (0, import_node_os2.tmpdir)();
-    const session = await openDataBranchWorktree({
-      repoRoot,
-      dataBranch: cfg.dataBranch,
-      tmpBase,
-      keepWorktree: g.keepWorktree,
-      runGit
-    });
-    try {
-      const projection = await loadProjectionFromDataRoot(
-        session.worktreePath
-      );
-      const gitDerivedSlug = await tryReadGithubOwnerRepoSlugFromGit({
+    if (o.withGithub) {
+      if (cfg.sync === "off") {
+        deps.error(
+          "GitHub Issues sync is off in config (sync: off). Omit --with-github to sync the data branch via git only, or set sync to outbound/full."
+        );
+        deps.exit(ExitCode.UserError);
+      }
+      const githubToken = await resolveGithubTokenForSync({
+        envToken: env.GITHUB_TOKEN,
+        cwd: repoRoot
+      });
+      if (!githubToken) {
+        deps.error(
+          "GitHub auth required for sync --with-github: set GITHUB_TOKEN or run `gh auth login`"
+        );
+        deps.exit(ExitCode.EnvironmentAuth);
+      }
+      const tmpBase = g.tempDir ?? env.TMPDIR ?? (0, import_node_os2.tmpdir)();
+      const session = await openDataBranchWorktree({
         repoRoot,
-        remote: cfg.remote,
+        dataBranch: cfg.dataBranch,
+        tmpBase,
+        keepWorktree: g.keepWorktree,
         runGit
       });
-      const { owner, repo: repo2 } = resolveGithubRepo(
-        cfg,
-        env.GITHUB_REPO,
-        gitDerivedSlug
-      );
-      const octokit = new Octokit2({ auth: githubToken });
-      const outboundActor = await resolveGithubTokenActor(octokit);
-      const depsGh = {
-        octokit,
-        owner,
-        repo: repo2,
-        clock: deps.clock,
-        outboundActor
-      };
-      await runGithubOutboundSync({
-        dataRoot: session.worktreePath,
-        projection,
-        config: cfg,
-        deps: depsGh
-      });
-      await runGithubInboundSync({
-        dataRoot: session.worktreePath,
-        projection,
-        config: cfg,
-        deps: depsGh
-      });
-      const projectionAfterInbound = await loadProjectionFromDataRoot(
-        session.worktreePath
-      );
-      await runGithubPrActivitySync({
-        projection: projectionAfterInbound,
-        config: cfg,
-        deps: defaultGithubPrActivitySyncDeps({
-          dataRoot: session.worktreePath,
-          clock: deps.clock,
+      try {
+        const projection = await loadProjectionFromDataRoot(
+          session.worktreePath
+        );
+        const gitDerivedSlug = await tryReadGithubOwnerRepoSlugFromGit({
+          repoRoot,
+          remote: cfg.remote,
+          runGit
+        });
+        const { owner, repo: repo2 } = resolveGithubRepo(
+          cfg,
+          env.GITHUB_REPO,
+          gitDerivedSlug
+        );
+        const octokit = new Octokit2({ auth: githubToken });
+        const outboundActor = await resolveGithubTokenActor(octokit);
+        const depsGh = {
           octokit,
           owner,
           repo: repo2,
-          actor: outboundActor
-        })
-      });
-      await commitDataWorktreeIfNeeded(
-        session.worktreePath,
-        formatDataBranchCommitMessage("hyper-pm: sync", outboundActor),
-        runGit
-      );
-      let dataBranchPush;
-      let dataBranchPushDetail;
-      if (o.skipPush) {
-        dataBranchPush = "skipped_cli";
-        dataBranchPushDetail = "skip-push";
-      } else {
-        const pushResult = await tryPushDataBranchToRemote(
+          clock: deps.clock,
+          outboundActor
+        };
+        await runGithubOutboundSync({
+          dataRoot: session.worktreePath,
+          projection,
+          config: cfg,
+          deps: depsGh
+        });
+        await runGithubInboundSync({
+          dataRoot: session.worktreePath,
+          projection,
+          config: cfg,
+          deps: depsGh
+        });
+        const projectionAfterInbound = await loadProjectionFromDataRoot(
+          session.worktreePath
+        );
+        await runGithubPrActivitySync({
+          projection: projectionAfterInbound,
+          config: cfg,
+          deps: defaultGithubPrActivitySyncDeps({
+            dataRoot: session.worktreePath,
+            clock: deps.clock,
+            octokit,
+            owner,
+            repo: repo2,
+            actor: outboundActor
+          })
+        });
+        await commitDataWorktreeIfNeeded(
           session.worktreePath,
-          cfg.remote,
-          cfg.dataBranch,
+          formatDataBranchCommitMessage("hyper-pm: sync", outboundActor),
           runGit
         );
-        dataBranchPush = pushResult.status;
-        dataBranchPushDetail = pushResult.detail;
-        if (pushResult.status === "failed" && pushResult.detail) {
-          deps.error(
-            `hyper-pm: data branch not pushed (${cfg.remote}/${cfg.dataBranch}): ${pushResult.detail}`
+        let dataBranchPush;
+        let dataBranchPushDetail;
+        if (o.skipPush) {
+          dataBranchPush = "skipped_cli";
+          dataBranchPushDetail = "skip-push";
+        } else {
+          const pushResult = await tryPushDataBranchToRemote(
+            session.worktreePath,
+            cfg.remote,
+            cfg.dataBranch,
+            runGit
           );
+          dataBranchPush = pushResult.status;
+          dataBranchPushDetail = pushResult.detail;
+          if (pushResult.status === "failed" && pushResult.detail) {
+            deps.error(
+              `hyper-pm: data branch not pushed (${cfg.remote}/${cfg.dataBranch}): ${pushResult.detail}`
+            );
+          }
         }
+        deps.log(
+          formatOutput(g.format, {
+            ok: true,
+            githubSync: true,
+            dataBranchPush,
+            ...dataBranchPushDetail !== void 0 ? { dataBranchPushDetail } : {}
+          })
+        );
+      } catch (e) {
+        deps.error(e instanceof Error ? e.message : String(e));
+        deps.exit(ExitCode.ExternalApi);
+      } finally {
+        await session.dispose();
+      }
+      deps.exit(ExitCode.Success);
+    }
+    const tmpBaseGit = g.tempDir ?? env.TMPDIR ?? (0, import_node_os2.tmpdir)();
+    const sessionGit = await openDataBranchWorktree({
+      repoRoot,
+      dataBranch: cfg.dataBranch,
+      tmpBase: tmpBaseGit,
+      keepWorktree: g.keepWorktree,
+      runGit
+    });
+    try {
+      let syncResult;
+      try {
+        syncResult = await runRemoteDataBranchGitSync(
+          sessionGit.worktreePath,
+          cfg.remote,
+          cfg.dataBranch,
+          runGit,
+          Boolean(o.skipPush)
+        );
+      } catch (e) {
+        if (e instanceof SyncRemoteDataBranchMergeError) {
+          deps.error(e.message);
+          deps.exit(ExitCode.UserError);
+        }
+        deps.error(e instanceof Error ? e.message : String(e));
+        deps.exit(ExitCode.UserError);
+      }
+      if (syncResult.dataBranchPush === "failed" && syncResult.dataBranchPushDetail !== void 0) {
+        deps.error(
+          `hyper-pm: data branch not pushed (${cfg.remote}/${cfg.dataBranch}): ${syncResult.dataBranchPushDetail}`
+        );
       }
       deps.log(
         formatOutput(g.format, {
           ok: true,
-          dataBranchPush,
-          ...dataBranchPushDetail !== void 0 ? { dataBranchPushDetail } : {}
+          gitDataOnly: true,
+          ...o.gitData ? { legacyGitDataFlag: true } : {},
+          ...syncResult
         })
       );
-    } catch (e) {
-      deps.error(e instanceof Error ? e.message : String(e));
-      deps.exit(ExitCode.ExternalApi);
     } finally {
-      await session.dispose();
+      await sessionGit.dispose();
     }
     deps.exit(ExitCode.Success);
   });
@@ -15893,7 +16529,7 @@ ${body}`
       await session.dispose();
     }
   });
-  await program2.parseAsync(argv, { from: "node" });
+  await program2.parseAsync(normalizeRawCliArgv(argv), { from: "node" });
 };
 var makeEvent = (type, payload, clock, actor) => ({
   schema: 1,
@@ -15983,7 +16619,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;
@@ -16018,7 +16655,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) {
@@ -16039,7 +16677,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;
@@ -16083,8 +16722,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) {
@@ -16123,6 +16762,7 @@ var readTicket = async (g, opts, deps) => {
             exitCode = ExitCode.UserError;
           } else {
             const listQuery = buildTicketListQueryFromReadListOpts(
+              proj,
               { epic: epicFilter, ...listFlagRest },
               deps
             );
@@ -16143,6 +16783,7 @@ var readTicket = async (g, opts, deps) => {
             exitCode = ExitCode.UserError;
           } else {
             const listQuery = buildTicketListQueryFromReadListOpts(
+              proj,
               listFlagRest,
               deps
             );
@@ -16159,6 +16800,7 @@ var readTicket = async (g, opts, deps) => {
           }
         } else if (listWithoutStory) {
           const listQuery = buildTicketListQueryFromReadListOpts(
+            proj,
             { withoutStory: true, ...listFlagRest },
             deps
           );
@@ -16173,6 +16815,7 @@ var readTicket = async (g, opts, deps) => {
           );
         } else {
           const listQuery = buildTicketListQueryFromReadListOpts(
+            proj,
             { epic: epicFilter, ...listFlagRest },
             deps
           );
@@ -16187,7 +16830,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;