runcastle 1.0.26 → 1.0.28

package/bin/runcastle.js

@@ -32,7 +32,8 @@ __export(exports_paths, {
   dbPath: () => dbPath,
   dataDir: () => dataDir,
   configPath: () => configPath,
-  burnCacheDir: () => burnCacheDir
+  burnCacheDir: () => burnCacheDir,
+  PROJECT_WORKTREE_SLUG: () => PROJECT_WORKTREE_SLUG
 });
 import { homedir } from "os";
 import { join, resolve } from "path";
@@ -84,6 +85,7 @@ function sandboxBuildDir() {
 function featureDocsRel(slug) {
   return `docs/features/${slug}`;
 }
+var PROJECT_WORKTREE_SLUG = "__project";
 var init_paths = () => {};
 
 // ../core/src/config.ts
@@ -131,6 +133,7 @@ var init_config = __esm(() => {
     "research",
     "implement",
     "prepare",
+    "project",
     "smoke"
   ];
   ModelStep = z.enum(MODEL_STEPS);
@@ -255,7 +258,15 @@ var init_schemas = __esm(() => {
     "shipped"
   ]);
   TicketStatus = z2.enum(["pending", "burning", "done", "failed", "cancelled"]);
-  SessionKind = z2.enum(["ideation", "qa", "waypoint", "converge", "revisit", "prepare"]);
+  SessionKind = z2.enum([
+    "ideation",
+    "qa",
+    "waypoint",
+    "converge",
+    "revisit",
+    "prepare",
+    "project"
+  ]);
   RunStatus = z2.enum(["running", "succeeded", "failed", "cancelled"]);
   FeatureStatus = z2.enum(["active", "shipped", "archived"]);
   SessionStatus = z2.enum(["launching", "live", "ended"]);
@@ -272,6 +283,7 @@ var init_schemas = __esm(() => {
     featureId: z2.string(),
     seq: z2.number(),
     status: TicketStatus,
+    lap: z2.number(),
     commits: z2.array(z2.string()),
     error: z2.string().optional(),
     attemptBranch: z2.string().optional(),
@@ -349,6 +361,7 @@ var init_schemas = __esm(() => {
     title: z2.string(),
     oneLiner: z2.string(),
     mapped: z2.boolean(),
+    lap: z2.number(),
     phase: Phase,
     branch: z2.string(),
     baseBranch: z2.string().optional(),
@@ -485,7 +498,7 @@ function nextGate(feature) {
     return MAPPED_G1;
   return gate;
 }
-var PIPELINE, ORDER, REVIEW_LOOP_BACK, MAPPED_G1;
+var PIPELINE, ORDER, REVIEW_LOOP_BACK, RETHINK_LOOP_BACK, MAPPED_G1;
 var init_pipeline = __esm(() => {
   PIPELINE = [
     { phase: "ideation" },
@@ -532,6 +545,7 @@ var init_pipeline = __esm(() => {
   ];
   ORDER = PIPELINE.map((p) => p.phase);
   REVIEW_LOOP_BACK = { from: "review", to: "implementation" };
+  RETHINK_LOOP_BACK = { from: "review", to: "ideation" };
   MAPPED_G1 = {
     id: "G1",
     description: "Every waypoint resolved or dropped before converging",
@@ -584,6 +598,7 @@ var init_db_schema = __esm(() => {
     title: text("title").notNull(),
     oneLiner: text("one_liner").notNull(),
     mapped: integer("mapped", { mode: "boolean" }).notNull().default(false),
+    lap: integer("lap").notNull().default(1),
     phase: text("phase").notNull().$type(),
     branch: text("branch").notNull(),
     baseBranch: text("base_branch"),
@@ -594,6 +609,7 @@ var init_db_schema = __esm(() => {
     id: text("id").primaryKey(),
     featureId: text("feature_id"),
     projectId: text("project_id"),
+    lap: integer("lap").notNull().default(1),
     kind: text("kind").notNull().$type(),
     ccSessionId: text("cc_session_id"),
     transcriptPath: text("transcript_path"),
@@ -610,6 +626,7 @@ var init_db_schema = __esm(() => {
     acceptanceCriteria: text("acceptance_criteria", { mode: "json" }).notNull().$type(),
     seams: text("seams", { mode: "json" }).notNull().$type(),
     blockedBy: text("blocked_by", { mode: "json" }).notNull().$type(),
+    lap: integer("lap").notNull().default(1),
     status: text("status").notNull().$type(),
     commits: text("commits", { mode: "json" }).notNull().$type(),
     error: text("error"),
@@ -645,6 +662,7 @@ var init_db_schema = __esm(() => {
     featureId: text("feature_id"),
     runId: text("run_id"),
     ticketId: text("ticket_id"),
+    lap: integer("lap").notNull().default(1),
     ts: integer("ts").notNull(),
     type: text("type").notNull(),
     message: text("message").notNull(),
@@ -1363,7 +1381,7 @@ var init_bus = __esm(() => {
 });
 
 // src/services/events.ts
-import { and, asc, eq, gt } from "drizzle-orm";
+import { and, asc, desc, eq, gt } from "drizzle-orm";
 function rowToEvent(row) {
   return {
     id: row.id,
@@ -1383,6 +1401,10 @@ function projectIdForFeature(ctx, featureId) {
     throw new NotFoundError(`feature ${featureId} not found`);
   return row.projectId;
 }
+function lapForFeature(ctx, featureId) {
+  const row = ctx.db.select({ lap: features.lap }).from(features).where(eq(features.id, featureId)).get();
+  return row?.lap ?? 1;
+}
 function emit(ctx, featureId, e) {
   return insertEvent(ctx, projectIdForFeature(ctx, featureId), featureId, e);
 }
@@ -1400,6 +1422,7 @@ function insertEvent(ctx, projectId, featureId, e) {
   const row = ctx.db.insert(events).values({
     projectId,
     featureId,
+    lap: featureId ? lapForFeature(ctx, featureId) : 1,
     runId: e.runId ?? null,
     ticketId: e.ticketId ?? null,
     ts: Date.now(),
@@ -1420,6 +1443,10 @@ function listAfter(ctx, featureId, afterId = 0) {
   const rows = ctx.db.select().from(events).where(and(eq(events.featureId, featureId), gt(events.id, afterId))).orderBy(asc(events.id)).all();
   return rows.map(rowToEvent);
 }
+function latestEventTs(ctx, featureId, type) {
+  const row = ctx.db.select({ ts: events.ts }).from(events).where(and(eq(events.featureId, featureId), eq(events.type, type))).orderBy(desc(events.ts)).limit(1).get();
+  return row?.ts;
+}
 function listByProject(ctx, projectId, afterId = 0) {
   const rows = ctx.db.select().from(events).where(and(eq(events.projectId, projectId), gt(events.id, afterId))).orderBy(asc(events.id)).all();
   return rows.map(rowToEvent);
@@ -1431,7 +1458,7 @@ var init_events = __esm(() => {
 });
 
 // src/services/repo.ts
-import { and as and2, desc, eq as eq2 } from "drizzle-orm";
+import { and as and2, desc as desc2, eq as eq2 } from "drizzle-orm";
 function rowToFeature(row) {
   return {
     id: row.id,
@@ -1440,6 +1467,7 @@ function rowToFeature(row) {
     title: row.title,
     oneLiner: row.oneLiner,
     mapped: row.mapped,
+    lap: row.lap,
     phase: row.phase,
     branch: row.branch,
     baseBranch: row.baseBranch ?? undefined,
@@ -1531,7 +1559,7 @@ function getRunRow(ctx, id) {
   return rowToRun(row);
 }
 function listRunsByFeature(ctx, featureId) {
-  return ctx.db.select().from(runs).where(eq2(runs.featureId, featureId)).orderBy(desc(runs.startedAt)).all().map(rowToRun);
+  return ctx.db.select().from(runs).where(eq2(runs.featureId, featureId)).orderBy(desc2(runs.startedAt)).all().map(rowToRun);
 }
 function listSessionsByFeature(ctx, featureId) {
   return ctx.db.select().from(sessions).where(eq2(sessions.featureId, featureId)).all().map(rowToSession);
@@ -1734,594 +1762,274 @@ var init_waypoints = __esm(() => {
   TERMINAL = new Set(["resolved", "dropped"]);
 });
 
-// src/launcher/sessions.ts
-import { and as and4, desc as desc2, eq as eq4, inArray, isNotNull, sql as sql2 } from "drizzle-orm";
-function createSessionRow(ctx, input) {
-  const row = ctx.db.insert(sessions).values({
-    id: newId("sess"),
-    featureId: input.featureId ?? null,
-    projectId: input.projectId ?? null,
-    kind: input.kind,
-    ccSessionId: null,
-    transcriptPath: null,
-    status: "launching",
-    worktreePath: input.worktreePath
-  }).returning().get();
-  return rowToSession(row);
-}
-function getSessionRow(ctx, id) {
-  const row = ctx.db.select().from(sessions).where(eq4(sessions.id, id)).get();
-  return row ? rowToSession(row) : null;
+// src/pty/dev-pane.ts
+function drivePaneId(featureId) {
+  return `${DRIVE_PREFIX}${featureId}`;
 }
-function activeSessionsForFeature(ctx, featureId) {
-  return ctx.db.select().from(sessions).where(and4(eq4(sessions.featureId, featureId), inArray(sessions.status, ["launching", "live"]))).all().map(rowToSession);
+function sniffDevUrl(text2) {
+  const m = text2.match(/https?:\/\/(?:localhost|127\.0\.0\.1|\[::1\])(?::\d+)?(?:\/[^\s"'<>`\x1b]*)?/i);
+  return m ? m[0] : undefined;
 }
-function markSessionLive(ctx, id, input = {}) {
-  const existing = getSessionRow(ctx, id);
-  if (!existing)
-    return null;
-  ctx.db.update(sessions).set({
-    status: "live",
-    ccSessionId: input.ccSessionId ?? existing.ccSessionId ?? null,
-    transcriptPath: input.transcriptPath ?? existing.transcriptPath ?? null
-  }).where(eq4(sessions.id, id)).run();
-  const firstTimeLive = existing.status !== "live";
-  if (firstTimeLive) {
-    promoteLastSession(ctx, id);
-    scheduleKickoff(ctx, existing);
+function devSpawnTarget(devCommand) {
+  if (process.platform === "win32") {
+    return { file: process.env.ComSpec ?? "cmd.exe", args: ["/d", "/s", "/c", devCommand] };
   }
-  return getSessionRow(ctx, id);
-}
-function kickoffLineFor(kind, override) {
-  return override ?? KICKOFF_LINES[kind];
-}
-function resumeKickoffLine(kind) {
-  return RESUME_KICKOFF_PREFIX + KICKOFF_LINES[kind];
-}
-function setKickoffOverride(sessionId, line) {
-  pendingKickoffOverrides.set(sessionId, line);
+  return { file: "/bin/sh", args: ["-c", devCommand] };
 }
-function writeKickoffSequence(line, io, submitDelayMs = KICKOFF_SUBMIT_DELAY_MS) {
-  if (!io.alive())
+function startDevPane(input) {
+  const { ctx, featureId, repoPath, devCommand, env, onUrl } = input;
+  const paneId = drivePaneId(featureId);
+  const { file, args } = devSpawnTarget(devCommand);
+  try {
+    ptyRegistry().create({
+      sessionId: paneId,
+      cmd: file,
+      args,
+      opts: { cwd: repoPath, env: env ?? process.env, cols: 80, rows: 24, useConpty: true }
+    });
+  } catch (err) {
+    emit(ctx, featureId, {
+      type: "testdrive.dev_failed",
+      message: `dev server failed to start: ${err instanceof Error ? err.message : String(err)}`,
+      data: { paneId }
+    });
     return;
-  io.write(line);
-  const submit = setTimeout(() => {
-    try {
-      if (!io.alive())
+  }
+  let scanned = "";
+  let found = false;
+  const sniffer = {
+    sendData(chunk) {
+      if (found)
         return;
-      io.write("\r");
-      io.onSubmitted?.();
-    } catch {}
-  }, submitDelayMs);
-  submit.unref?.();
-}
-function stopTimers(d) {
-  for (const t of d.timers)
-    clearTimeout(t);
-  d.timers.clear();
+      scanned = (scanned + chunk.toString("utf8")).slice(-SNIFF_WINDOW);
+      const url = sniffDevUrl(scanned);
+      if (url) {
+        found = true;
+        onUrl(url);
+      }
+    },
+    sendControl() {}
+  };
+  ptyRegistry().attach(paneId, sniffer);
+  emit(ctx, featureId, {
+    type: "testdrive.dev_started",
+    message: `dev server spawned: ${devCommand}`,
+    data: { paneId }
+  });
+  return paneId;
 }
-function forgetKickoff(sessionId) {
-  const d = deliveries.get(sessionId);
-  if (d)
-    stopTimers(d);
-  deliveries.delete(sessionId);
-  pendingKickoffOverrides.delete(sessionId);
+function stopDevPane(paneId) {
+  const reg = ptyRegistry();
+  const entry = reg.get(paneId);
+  if (entry && !entry.exited && process.platform !== "win32") {
+    try {
+      process.kill(-entry.pty.pid, "SIGTERM");
+    } catch {}
+  }
+  reg.kill(paneId);
+  reg.remove(paneId);
 }
-function ptyIo(sessionId) {
-  return {
-    write: (data) => ptyRegistry().get(sessionId)?.pty.write(data),
-    alive: () => {
-      const entry = ptyRegistry().get(sessionId);
-      return !!entry && !entry.exited;
-    }
-  };
+var DRIVE_PREFIX = "drive:", SNIFF_WINDOW = 8192;
+var init_dev_pane = __esm(() => {
+  init_events();
+  init_registry();
+});
+
+// src/services/drive-hooks.ts
+import { spawn as spawn2 } from "child_process";
+function tailLines(text2, max = OUTPUT_TAIL_LINES) {
+  const lines = text2.replace(/\r\n/g, `
+`).split(`
+`);
+  while (lines.length > 0 && lines[lines.length - 1]?.trim() === "")
+    lines.pop();
+  return lines.slice(-max).join(`
+`).trim();
 }
-function track(d, timer) {
-  timer.unref?.();
-  d.timers.add(timer);
+function hookSpawnTarget(command) {
+  if (process.platform === "win32") {
+    return {
+      file: process.env.ComSpec ?? "cmd.exe",
+      args: ["/d", "/s", "/c", `"${command}"`],
+      verbatim: true
+    };
+  }
+  return { file: "/bin/sh", args: ["-c", command], verbatim: false };
 }
-function attemptKickoff(ctx, session, d, delayMs, clearFirst = false) {
-  track(d, setTimeout(() => {
-    if (d.settled)
-      return;
-    const io = ptyIo(session.id);
-    if (!io.alive()) {
-      d.settled = true;
-      return;
-    }
-    d.attempts += 1;
-    const attempt = d.attempts;
+function runDriveHook(command, opts) {
+  const spawnFn = opts.spawnFn ?? spawn2;
+  const now = opts.now ?? Date.now;
+  const timeoutMs = opts.timeoutMs ?? DRIVE_HOOK_TIMEOUT_MS;
+  const startedAt = now();
+  const { file, args, verbatim } = hookSpawnTarget(command);
+  return new Promise((resolve4) => {
+    let output = "";
+    let timedOut = false;
+    let settled = false;
+    let timer;
+    const finish = (exitCode) => {
+      if (settled)
+        return;
+      settled = true;
+      if (timer)
+        clearTimeout(timer);
+      resolve4({
+        ok: !timedOut && exitCode === 0,
+        exitCode,
+        timedOut,
+        output: tailLines(output),
+        durationMs: now() - startedAt
+      });
+    };
+    let child;
     try {
-      if (clearFirst)
-        io.write(CLEAR_INPUT);
-      writeKickoffSequence(d.line, {
-        write: io.write,
-        alive: io.alive,
-        onSubmitted: () => emitForSession(ctx, session, {
-          type: "session.kickoff",
-          message: attempt === 1 ? `${session.kind} session kicked off automatically` : `${session.kind} kickoff re-sent (attempt ${attempt}) \u2014 the first was never acknowledged`,
-          data: { sessionId: session.id, kind: session.kind, attempt }
-        })
+      child = spawnFn(file, args, {
+        cwd: opts.cwd,
+        env: opts.env ?? process.env,
+        windowsHide: true,
+        windowsVerbatimArguments: verbatim
       });
-    } catch {}
-    armConfirmation(ctx, session, d);
-  }, delayMs));
-}
-function armConfirmation(ctx, session, d) {
-  track(d, setTimeout(() => {
-    if (d.settled || d.confirmed)
-      return;
-    if (d.attempts < KICKOFF_MAX_ATTEMPTS && ptyIo(session.id).alive()) {
-      attemptKickoff(ctx, session, d, 0, true);
+    } catch (err) {
+      output = err instanceof Error ? err.message : String(err);
+      finish(null);
       return;
     }
-    settleUndelivered(ctx, session, d, "unacknowledged");
-  }, KICKOFF_CONFIRM_MS));
+    timer = setTimeout(() => {
+      timedOut = true;
+      child.kill();
+      const grace = setTimeout(() => finish(null), KILL_GRACE_MS);
+      grace.unref?.();
+    }, timeoutMs);
+    timer.unref?.();
+    child.stdout?.on("data", (d) => {
+      output += d.toString();
+    });
+    child.stderr?.on("data", (d) => {
+      output += d.toString();
+    });
+    child.on("error", (err) => {
+      output += `
+${err instanceof Error ? err.message : String(err)}`;
+      finish(null);
+    });
+    child.on("close", (code) => {
+      finish(code);
+    });
+  });
 }
-function settleUndelivered(ctx, session, d, reason) {
-  d.settled = true;
-  stopTimers(d);
-  emitForSession(ctx, session, {
-    type: "session.kickoff_undelivered",
-    message: reason === "superseded" ? `the ${session.kind} briefing was never delivered \u2014 you typed first, so runcastle stopped injecting it` : `the ${session.kind} briefing was typed ${d.attempts}\xD7 but Claude Code never acknowledged it \u2014 send it again from the session strip`,
-    data: { sessionId: session.id, kind: session.kind, reason, attempts: d.attempts, line: d.line }
-  });
-}
-function noteKickoffPrompt(ctx, sessionId, prompt) {
-  const d = deliveries.get(sessionId);
-  if (!d || d.confirmed)
-    return;
-  const session = getSessionRow(ctx, sessionId);
-  if (!session)
-    return;
-  if (promptMatchesKickoff(d.line, prompt)) {
-    d.confirmed = true;
-    d.settled = true;
-    stopTimers(d);
-    return;
-  }
-  if (d.settled)
-    return;
-  settleUndelivered(ctx, session, d, "superseded");
+function describeHookResult(command, result) {
+  const secs = Math.max(1, Math.round(result.durationMs / 1000));
+  if (result.timedOut)
+    return `\`${command}\` timed out after ${secs}s`;
+  if (result.ok)
+    return `\`${command}\` finished in ${secs}s`;
+  return `\`${command}\` exited ${result.exitCode ?? "without a code"} after ${secs}s`;
 }
-function promptMatchesKickoff(line, prompt) {
-  if (!prompt)
-    return false;
-  const norm = (s) => s.replace(/\s+/g, " ").trim().toLowerCase();
-  const want = norm(line);
-  const got = norm(prompt);
-  if (!want || !got)
-    return false;
-  return got.includes(want.slice(0, MATCH_PREFIX));
+var DRIVE_HOOK_TIMEOUT_MS, OUTPUT_TAIL_LINES = 40, KILL_GRACE_MS = 2000;
+var init_drive_hooks = __esm(() => {
+  DRIVE_HOOK_TIMEOUT_MS = 10 * 60000;
+});
+
+// src/services/drive-env.ts
+import { createHash } from "crypto";
+function identifierSafe(slug, max = MAX_ID_LENGTH) {
+  const cleaned = slug.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
+  const safe = cleaned === "" || /^[0-9]/.test(cleaned) ? `x_${cleaned}` : cleaned;
+  if (safe.length <= max)
+    return safe;
+  const digest = createHash("sha1").update(slug).digest("hex").slice(0, 6);
+  return `${safe.slice(0, max - digest.length - 1)}_${digest}`;
 }
-function resendKickoff(ctx, sessionId) {
-  const session = getSessionRow(ctx, sessionId);
-  if (!session)
-    throw new Error(`unknown session ${sessionId}`);
-  if (session.status === "ended")
-    throw new Error("that session has ended \u2014 open a new terminal");
-  if (!ptyIo(sessionId).alive())
-    throw new Error("the terminal for that session is no longer running");
-  const existing = deliveries.get(sessionId);
-  const d = existing ?? {
-    line: kickoffLineFor(session.kind, pendingKickoffOverrides.get(sessionId)),
-    attempts: 0,
-    confirmed: false,
-    settled: false,
-    timers: new Set
+function driveVars(identity) {
+  return {
+    slug: identity.slug,
+    branch: identity.branch,
+    id: identifierSafe(identity.slug)
   };
-  stopTimers(d);
-  d.attempts = 0;
-  d.confirmed = false;
-  d.settled = false;
-  deliveries.set(sessionId, d);
-  attemptKickoff(ctx, session, d, 0, true);
-  return { line: d.line };
-}
-function armSessionReadyWatchdog(ctx, session) {
-  const timer = setTimeout(() => {
-    const row = getSessionRow(ctx, session.id);
-    if (!row || row.status !== "launching")
-      return;
-    if (!ptyIo(session.id).alive())
-      return;
-    emitForSession(ctx, session, {
-      type: "session.not_ready",
-      message: `the ${session.kind} terminal is open but Claude Code has not reported ready \u2014 check it for a prompt or dialog waiting on you, then send the briefing`,
-      data: { sessionId: session.id, kind: session.kind }
-    });
-  }, SESSION_READY_TIMEOUT_MS);
-  timer.unref?.();
 }
-function scheduleKickoff(ctx, session) {
-  const line = kickoffLineFor(session.kind, pendingKickoffOverrides.get(session.id));
-  pendingKickoffOverrides.delete(session.id);
-  const existing = deliveries.get(session.id);
-  if (existing)
-    stopTimers(existing);
-  const d = { line, attempts: 0, confirmed: false, settled: false, timers: new Set };
-  deliveries.set(session.id, d);
-  attemptKickoff(ctx, session, d, KICKOFF_DELAY_MS);
-}
-function markSessionEnded(ctx, id) {
-  const existing = getSessionRow(ctx, id);
-  if (!existing)
-    return null;
-  forgetKickoff(id);
-  ctx.db.update(sessions).set({ status: "ended" }).where(eq4(sessions.id, id)).run();
-  return getSessionRow(ctx, id);
-}
-function mostRecentResumableSession(ctx, featureId, kind) {
-  const row = ctx.db.select().from(sessions).where(and4(eq4(sessions.featureId, featureId), eq4(sessions.status, "ended"), isNotNull(sessions.ccSessionId), ...kind ? [eq4(sessions.kind, kind)] : [])).orderBy(desc2(sql2`rowid`)).limit(1).get();
-  return row ? rowToSession(row) : null;
+function renderTemplate(value, vars) {
+  const unknown2 = [];
+  const out = value.replace(PLACEHOLDER_RE, (match, name) => {
+    const replacement = vars[name];
+    if (replacement === undefined) {
+      if (!unknown2.includes(name))
+        unknown2.push(name);
+      return match;
+    }
+    return replacement;
+  });
+  return { value: out, unknown: unknown2 };
 }
-function activeProjectSession(ctx, projectId, kind) {
-  const row = ctx.db.select().from(sessions).where(and4(eq4(sessions.projectId, projectId), eq4(sessions.kind, kind), inArray(sessions.status, ["launching", "live"]))).orderBy(desc2(sql2`rowid`)).limit(1).get();
-  return row ? rowToSession(row) : null;
+function parseDriveEnv(raw, identity) {
+  const vars = {};
+  const unknown2 = [];
+  if (!raw?.trim())
+    return { vars, unknown: unknown2 };
+  const substitutions = driveVars(identity);
+  for (const line of raw.split(/\r?\n/)) {
+    const trimmed = line.trim();
+    if (trimmed === "" || trimmed.startsWith("#"))
+      continue;
+    const eq4 = trimmed.indexOf("=");
+    if (eq4 <= 0)
+      continue;
+    const key = trimmed.slice(0, eq4).trim().replace(/^export\s+/, "");
+    if (key === "")
+      continue;
+    const rendered = renderTemplate(unquote(trimmed.slice(eq4 + 1).trim()), substitutions);
+    vars[key] = rendered.value;
+    for (const name of rendered.unknown)
+      if (!unknown2.includes(name))
+        unknown2.push(name);
+  }
+  return { vars, unknown: unknown2 };
 }
-function mostRecentResumableProjectSession(ctx, projectId, kind) {
-  const row = ctx.db.select().from(sessions).where(and4(eq4(sessions.projectId, projectId), eq4(sessions.kind, kind), eq4(sessions.status, "ended"), isNotNull(sessions.ccSessionId))).orderBy(desc2(sql2`rowid`)).limit(1).get();
-  return row ? rowToSession(row) : null;
+function unquote(value) {
+  if (value.length < 2)
+    return value;
+  const first = value[0];
+  if ((first === '"' || first === "'") && value.endsWith(first))
+    return value.slice(1, -1);
+  return value;
 }
-function mostRecentLiveSession(ctx) {
-  const row = ctx.db.select().from(sessions).where(eq4(sessions.status, "live")).orderBy(desc2(sql2`rowid`)).limit(1).get();
-  return row ? rowToSession(row) : null;
+function driveProcessEnv(overrides, base = process.env) {
+  return { ...base, ...overrides };
 }
-var KICKOFF_DELAY_MS = 1500, KICKOFF_SUBMIT_DELAY_MS = 350, KICKOFF_CONFIRM_MS = 12000, KICKOFF_MAX_ATTEMPTS = 3, CLEAR_INPUT = "\x15", SESSION_READY_TIMEOUT_MS = 25000, CONVERGE_KICKOFF_LINE, KICKOFF_LINES, RESUME_KICKOFF_PREFIX, pendingKickoffOverrides, deliveries, MATCH_PREFIX = 40;
-var init_sessions = __esm(() => {
-  init_src();
-  init_schema();
-  init_registry();
-  init_events();
-  init_waypoints();
-  init_repo();
-  CONVERGE_KICKOFF_LINE = "Proceed with your task: invoke /runcastle:converge and drive spec then tickets " + "from map.md + decisions.md, per your system prompt.";
-  KICKOFF_LINES = {
-    ideation: "Proceed with your task: invoke the /runcastle:ideate skill and drive the ideation session.",
-    qa: "Proceed with your task: invoke the /runcastle:qa skill and answer questions from the " + "docs and code \u2014 do not advance phases or emit tickets.",
-    waypoint: "Proceed with your task: invoke the /runcastle:waypoint skill and work your assigned " + "waypoint to a resolution.",
-    converge: CONVERGE_KICKOFF_LINE,
-    revisit: "Proceed with your task: invoke the /runcastle:revisit skill and work through what the " + "human brings up.",
-    prepare: "Proceed with your task: work through the unestablished preparation fields with the human. " + "Start by telling them which fields are still open and what you need from them for each; " + "ask before running anything that touches their database or services."
-  };
-  RESUME_KICKOFF_PREFIX = "We are picking this conversation back up \u2014 runcastle restarted and closed the terminal, " + "but this conversation is intact. Do NOT start over: tell me in one or two lines where we " + "left off and what is next, then carry on. Your original instruction was: ";
-  pendingKickoffOverrides = new Map;
-  deliveries = new Map;
-});
-
-// src/launcher/reconcile.ts
-import { inArray as inArray2 } from "drizzle-orm";
-function reconcileStaleSessions(ctx) {
-  const stale = ctx.db.select().from(sessions).where(inArray2(sessions.status, ["launching", "live"])).all().map(rowToSession);
-  const reconciled = [];
-  for (const session of stale) {
-    const entry = ptyRegistry().get(session.id);
-    if (entry && !entry.exited)
-      continue;
-    markSessionEnded(ctx, session.id);
-    const released = releaseForSession(ctx, session.id);
-    emitForSession(ctx, session, {
-      type: "session.reconciled",
-      message: `session marked ended at boot \u2014 the server restarted while it was ${session.status}`,
-      data: {
-        sessionId: session.id,
-        previousStatus: session.status,
-        releasedWaypointIds: released.map((w) => w.id)
-      }
-    });
-    reconciled.push(session);
-  }
-  return reconciled;
+function describeDriveEnv(vars) {
+  const keys = Object.keys(vars);
+  return `drive environment: ${keys.join(", ")}`;
 }
-var init_reconcile = __esm(() => {
-  init_schema();
-  init_registry();
-  init_events();
-  init_repo();
-  init_waypoints();
-  init_sessions();
+var MAX_ID_LENGTH = 40, PLACEHOLDER_RE;
+var init_drive_env = __esm(() => {
+  PLACEHOLDER_RE = /\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g;
 });
 
-// src/launcher/skills-root.ts
-import { existsSync as existsSync5 } from "fs";
+// src/services/git.ts
+import { existsSync as existsSync5, mkdirSync as mkdirSync2, mkdtempSync, realpathSync, rmSync } from "fs";
+import { tmpdir } from "os";
 import { dirname, join as join5, resolve as resolve4 } from "path";
-function resolveSkillsRoot(fromDir) {
-  const override = process.env[SKILLS_DIR_ENV];
-  if (override) {
-    const root = resolve4(override);
-    if (existsSync5(join5(root, SKILLS_MARKER)))
-      return root;
-    throw new Error(`${SKILLS_DIR_ENV}=${override} is not a runcastle skills root (missing ${SKILLS_MARKER})`);
-  }
-  const searched = [];
-  let dir = fromDir;
-  for (let i = 0;i < 8; i += 1) {
-    const candidate = join5(dir, "packages", "skills");
-    searched.push(candidate);
-    if (existsSync5(join5(candidate, SKILLS_MARKER)))
-      return candidate;
-    const parent = dirname(dir);
-    if (parent === dir)
-      break;
-    dir = parent;
-  }
-  throw new Error(`runcastle skills root not found; searched:
-  ${searched.join(`
-  `)}`);
+import { simpleGit } from "simple-git";
+function migrationPaths(paths) {
+  return paths.filter((p) => MIGRATION_DIR_RE.test(p) || DRIZZLE_SQL_RE.test(p));
 }
-var SKILLS_DIR_ENV = "RUNCASTLE_SKILLS_DIR", SKILLS_MARKER;
-var init_skills_root = __esm(() => {
-  SKILLS_MARKER = join5("packs", "runcastle");
-});
-
-// src/pty/dev-pane.ts
-function drivePaneId(featureId) {
-  return `${DRIVE_PREFIX}${featureId}`;
+function featureBranch(slug) {
+  return `feature/${slug}`;
 }
-function sniffDevUrl(text2) {
-  const m = text2.match(/https?:\/\/(?:localhost|127\.0\.0\.1|\[::1\])(?::\d+)?(?:\/[^\s"'<>`\x1b]*)?/i);
-  return m ? m[0] : undefined;
-}
-function devSpawnTarget(devCommand) {
-  if (process.platform === "win32") {
-    return { file: process.env.ComSpec ?? "cmd.exe", args: ["/d", "/s", "/c", devCommand] };
-  }
-  return { file: "/bin/sh", args: ["-c", devCommand] };
-}
-function startDevPane(input) {
-  const { ctx, featureId, repoPath, devCommand, env, onUrl } = input;
-  const paneId = drivePaneId(featureId);
-  const { file, args } = devSpawnTarget(devCommand);
-  try {
-    ptyRegistry().create({
-      sessionId: paneId,
-      cmd: file,
-      args,
-      opts: { cwd: repoPath, env: env ?? process.env, cols: 80, rows: 24, useConpty: true }
-    });
-  } catch (err) {
-    emit(ctx, featureId, {
-      type: "testdrive.dev_failed",
-      message: `dev server failed to start: ${err instanceof Error ? err.message : String(err)}`,
-      data: { paneId }
-    });
-    return;
-  }
-  let scanned = "";
-  let found = false;
-  const sniffer = {
-    sendData(chunk) {
-      if (found)
-        return;
-      scanned = (scanned + chunk.toString("utf8")).slice(-SNIFF_WINDOW);
-      const url = sniffDevUrl(scanned);
-      if (url) {
-        found = true;
-        onUrl(url);
-      }
-    },
-    sendControl() {}
-  };
-  ptyRegistry().attach(paneId, sniffer);
-  emit(ctx, featureId, {
-    type: "testdrive.dev_started",
-    message: `dev server spawned: ${devCommand}`,
-    data: { paneId }
-  });
-  return paneId;
-}
-function stopDevPane(paneId) {
-  const reg = ptyRegistry();
-  const entry = reg.get(paneId);
-  if (entry && !entry.exited && process.platform !== "win32") {
-    try {
-      process.kill(-entry.pty.pid, "SIGTERM");
-    } catch {}
-  }
-  reg.kill(paneId);
-  reg.remove(paneId);
-}
-var DRIVE_PREFIX = "drive:", SNIFF_WINDOW = 8192;
-var init_dev_pane = __esm(() => {
-  init_events();
-  init_registry();
-});
-
-// src/services/drive-hooks.ts
-import { spawn as spawn2 } from "child_process";
-function tailLines(text2, max = OUTPUT_TAIL_LINES) {
-  const lines = text2.replace(/\r\n/g, `
-`).split(`
-`);
-  while (lines.length > 0 && lines[lines.length - 1]?.trim() === "")
-    lines.pop();
-  return lines.slice(-max).join(`
-`).trim();
-}
-function hookSpawnTarget(command) {
-  if (process.platform === "win32") {
-    return {
-      file: process.env.ComSpec ?? "cmd.exe",
-      args: ["/d", "/s", "/c", `"${command}"`],
-      verbatim: true
-    };
-  }
-  return { file: "/bin/sh", args: ["-c", command], verbatim: false };
-}
-function runDriveHook(command, opts) {
-  const spawnFn = opts.spawnFn ?? spawn2;
-  const now = opts.now ?? Date.now;
-  const timeoutMs = opts.timeoutMs ?? DRIVE_HOOK_TIMEOUT_MS;
-  const startedAt = now();
-  const { file, args, verbatim } = hookSpawnTarget(command);
-  return new Promise((resolve5) => {
-    let output = "";
-    let timedOut = false;
-    let settled = false;
-    let timer;
-    const finish = (exitCode) => {
-      if (settled)
-        return;
-      settled = true;
-      if (timer)
-        clearTimeout(timer);
-      resolve5({
-        ok: !timedOut && exitCode === 0,
-        exitCode,
-        timedOut,
-        output: tailLines(output),
-        durationMs: now() - startedAt
-      });
-    };
-    let child;
-    try {
-      child = spawnFn(file, args, {
-        cwd: opts.cwd,
-        env: opts.env ?? process.env,
-        windowsHide: true,
-        windowsVerbatimArguments: verbatim
-      });
-    } catch (err) {
-      output = err instanceof Error ? err.message : String(err);
-      finish(null);
-      return;
-    }
-    timer = setTimeout(() => {
-      timedOut = true;
-      child.kill();
-      const grace = setTimeout(() => finish(null), KILL_GRACE_MS);
-      grace.unref?.();
-    }, timeoutMs);
-    timer.unref?.();
-    child.stdout?.on("data", (d) => {
-      output += d.toString();
-    });
-    child.stderr?.on("data", (d) => {
-      output += d.toString();
-    });
-    child.on("error", (err) => {
-      output += `
-${err instanceof Error ? err.message : String(err)}`;
-      finish(null);
-    });
-    child.on("close", (code) => {
-      finish(code);
-    });
-  });
-}
-function describeHookResult(command, result) {
-  const secs = Math.max(1, Math.round(result.durationMs / 1000));
-  if (result.timedOut)
-    return `\`${command}\` timed out after ${secs}s`;
-  if (result.ok)
-    return `\`${command}\` finished in ${secs}s`;
-  return `\`${command}\` exited ${result.exitCode ?? "without a code"} after ${secs}s`;
-}
-var DRIVE_HOOK_TIMEOUT_MS, OUTPUT_TAIL_LINES = 40, KILL_GRACE_MS = 2000;
-var init_drive_hooks = __esm(() => {
-  DRIVE_HOOK_TIMEOUT_MS = 10 * 60000;
-});
-
-// src/services/drive-env.ts
-import { createHash } from "crypto";
-function identifierSafe(slug, max = MAX_ID_LENGTH) {
-  const cleaned = slug.toLowerCase().replace(/[^a-z0-9]+/g, "_").replace(/^_+|_+$/g, "");
-  const safe = cleaned === "" || /^[0-9]/.test(cleaned) ? `x_${cleaned}` : cleaned;
-  if (safe.length <= max)
-    return safe;
-  const digest = createHash("sha1").update(slug).digest("hex").slice(0, 6);
-  return `${safe.slice(0, max - digest.length - 1)}_${digest}`;
-}
-function driveVars(identity) {
-  return {
-    slug: identity.slug,
-    branch: identity.branch,
-    id: identifierSafe(identity.slug)
-  };
-}
-function renderTemplate(value, vars) {
-  const unknown2 = [];
-  const out = value.replace(PLACEHOLDER_RE, (match, name) => {
-    const replacement = vars[name];
-    if (replacement === undefined) {
-      if (!unknown2.includes(name))
-        unknown2.push(name);
-      return match;
-    }
-    return replacement;
-  });
-  return { value: out, unknown: unknown2 };
-}
-function parseDriveEnv(raw, identity) {
-  const vars = {};
-  const unknown2 = [];
-  if (!raw?.trim())
-    return { vars, unknown: unknown2 };
-  const substitutions = driveVars(identity);
-  for (const line of raw.split(/\r?\n/)) {
-    const trimmed = line.trim();
-    if (trimmed === "" || trimmed.startsWith("#"))
-      continue;
-    const eq5 = trimmed.indexOf("=");
-    if (eq5 <= 0)
-      continue;
-    const key = trimmed.slice(0, eq5).trim().replace(/^export\s+/, "");
-    if (key === "")
-      continue;
-    const rendered = renderTemplate(unquote(trimmed.slice(eq5 + 1).trim()), substitutions);
-    vars[key] = rendered.value;
-    for (const name of rendered.unknown)
-      if (!unknown2.includes(name))
-        unknown2.push(name);
-  }
-  return { vars, unknown: unknown2 };
-}
-function unquote(value) {
-  if (value.length < 2)
-    return value;
-  const first = value[0];
-  if ((first === '"' || first === "'") && value.endsWith(first))
-    return value.slice(1, -1);
-  return value;
-}
-function driveProcessEnv(overrides, base = process.env) {
-  return { ...base, ...overrides };
-}
-function describeDriveEnv(vars) {
-  const keys = Object.keys(vars);
-  return `drive environment: ${keys.join(", ")}`;
-}
-var MAX_ID_LENGTH = 40, PLACEHOLDER_RE;
-var init_drive_env = __esm(() => {
-  PLACEHOLDER_RE = /\{\{\s*([a-zA-Z0-9_]+)\s*\}\}/g;
-});
-
-// src/services/git.ts
-import { existsSync as existsSync6, mkdirSync as mkdirSync2, mkdtempSync, realpathSync, rmSync } from "fs";
-import { tmpdir } from "os";
-import { dirname as dirname2, join as join6, resolve as resolve5 } from "path";
-import { simpleGit } from "simple-git";
-function migrationPaths(paths) {
-  return paths.filter((p) => MIGRATION_DIR_RE.test(p) || DRIZZLE_SQL_RE.test(p));
-}
-function featureBranch(slug) {
-  return `feature/${slug}`;
-}
-function git(repoPath) {
-  return simpleGit(repoPath);
+function git(repoPath) {
+  return simpleGit(repoPath);
 }
 function errMsg(e) {
   return e instanceof Error ? e.message : String(e);
 }
 function canon(p) {
-  let abs = resolve5(p);
+  let abs = resolve4(p);
   try {
     abs = realpathSync.native(abs);
   } catch {}
   return process.platform === "win32" ? abs.replace(/\\/g, "/").toLowerCase() : abs;
 }
 async function assertRepo(repoPath) {
-  if (!existsSync6(repoPath)) {
+  if (!existsSync5(repoPath)) {
     throw new InvalidInputError(`path does not exist: ${repoPath}`);
   }
   let isRepo = false;
@@ -2410,7 +2118,10 @@ async function ensureTalkWorktree(project, feature) {
   await ensureBranchExists(g, branch, feature.baseBranch ?? project.mainBranch);
   if (await worktreeIsValid(g, worktreePath, branch))
     return worktreePath;
-  mkdirSync2(dirname2(worktreePath), { recursive: true });
+  return addWorktree(g, worktreePath, branch, "talk worktree");
+}
+async function addWorktree(g, worktreePath, branch, label) {
+  mkdirSync2(dirname(worktreePath), { recursive: true });
   try {
     await g.raw(["worktree", "add", worktreePath, branch]);
     return worktreePath;
@@ -2422,22 +2133,56 @@ async function ensureTalkWorktree(project, feature) {
       await g.raw(["worktree", "add", worktreePath, branch]);
       return worktreePath;
     } catch (e) {
-      throw new InvalidInputError(`could not create talk worktree at ${worktreePath}: ${errMsg(e)}`);
+      throw new InvalidInputError(`could not create ${label} at ${worktreePath}: ${errMsg(e)}`);
     }
   }
 }
-async function ensureBranchExists(g, branch, from) {
-  const branches = await g.branchLocal();
-  if (!branches.all.includes(branch)) {
-    await g.raw(["branch", branch, from]);
+async function ensureProjectWorktree(project) {
+  const worktreePath = worktreeDir(project.id, PROJECT_WORKTREE_SLUG);
+  const g = git(project.repoPath);
+  const base = project.mainBranch;
+  const leftover = await branchCommitsAhead(project.repoPath, base, PROJECT_BRANCH);
+  if (leftover.length > 0) {
+    await mergeTempBranch(project.repoPath, base, PROJECT_BRANCH);
+  }
+  const stillAhead = await branchCommitsAhead(project.repoPath, base, PROJECT_BRANCH);
+  if (stillAhead.length === 0) {
+    await deleteBranchDetachingWorktrees(g, project.repoPath, PROJECT_BRANCH);
+    await g.raw(["branch", PROJECT_BRANCH, base]);
   }
+  if (await worktreeIsValid(g, worktreePath, PROJECT_BRANCH))
+    return worktreePath;
+  if (existsSync5(worktreePath) && (await registeredWorktrees(g)).has(canon(worktreePath))) {
+    if (await checkoutInWorktree(worktreePath, PROJECT_BRANCH))
+      return worktreePath;
+  }
+  return addWorktree(g, worktreePath, PROJECT_BRANCH, "project worktree");
 }
-async function worktreeIsValid(g, worktreePath, branch) {
-  if (!existsSync6(worktreePath))
-    return false;
-  const registered = await registeredWorktrees(g);
-  if (!registered.has(canon(worktreePath)))
-    return false;
+async function checkoutInWorktree(worktreePath, branch) {
+  const gw = git(worktreePath);
+  try {
+    await gw.raw(["checkout", branch]);
+    return true;
+  } catch {}
+  try {
+    await gw.raw(["checkout", "--force", branch]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+async function ensureBranchExists(g, branch, from) {
+  const branches = await g.branchLocal();
+  if (!branches.all.includes(branch)) {
+    await g.raw(["branch", branch, from]);
+  }
+}
+async function worktreeIsValid(g, worktreePath, branch) {
+  if (!existsSync5(worktreePath))
+    return false;
+  const registered = await registeredWorktrees(g);
+  if (!registered.has(canon(worktreePath)))
+    return false;
   try {
     const head = (await git(worktreePath).revparse(["--abbrev-ref", "HEAD"])).trim();
     return head === branch;
@@ -2479,7 +2224,7 @@ async function worktreesOnBranch(g, branch, mainRepoPath) {
   return (await listWorktrees(g)).filter((e) => e.branch === branch && canon(e.path) !== main).map((e) => e.path);
 }
 async function detachWorktree(path) {
-  if (!existsSync6(path))
+  if (!existsSync5(path))
     return false;
   const g = git(path);
   let head;
@@ -2494,7 +2239,7 @@ async function detachWorktree(path) {
   return true;
 }
 async function reattachWorktree(path, branch) {
-  if (!existsSync6(path))
+  if (!existsSync5(path))
     return;
   try {
     await git(path).checkout(branch);
@@ -2525,21 +2270,21 @@ function ticketBranchName(slug, ticketSeq, unique) {
   return `${TICKET_BRANCH_PREFIX}${tempBranchSlugSegment(slug)}/${ticketSeq}-${unique}`;
 }
 function burnWorktreePath(repoPath, branch) {
-  return join6(repoPath, ".sandcastle", "worktrees", branch.replace(/\//g, "-"));
+  return join5(repoPath, ".sandcastle", "worktrees", branch.replace(/\//g, "-"));
 }
 async function cleanupBurnWorktree(repoPath, branch, opts = {}) {
   const path = burnWorktreePath(repoPath, branch);
   const attempts = Math.max(1, opts.attempts ?? 3);
   const delayMs = opts.delayMs ?? 750;
   const g = git(repoPath);
-  for (let attempt = 1;attempt <= attempts && existsSync6(path); attempt++) {
+  for (let attempt = 1;attempt <= attempts && existsSync5(path); attempt++) {
     try {
       await g.raw(["worktree", "remove", "--force", path]);
     } catch {}
-    if (existsSync6(path) && attempt < attempts)
+    if (existsSync5(path) && attempt < attempts)
       await sleep(delayMs);
   }
-  if (existsSync6(path)) {
+  if (existsSync5(path)) {
     try {
       rmSync(path, { recursive: true, force: true });
     } catch {}
@@ -2547,7 +2292,7 @@ async function cleanupBurnWorktree(repoPath, branch, opts = {}) {
   try {
     await g.raw(["worktree", "prune"]);
   } catch {}
-  return !existsSync6(path);
+  return !existsSync5(path);
 }
 function sleep(ms) {
   return new Promise((done) => setTimeout(done, ms));
@@ -2684,11 +2429,11 @@ async function mergeTempBranch(repoPath, featureBranchName, tempBranch) {
 async function mergeInDisposableWorktree(g, featureBranchName, tempBranch) {
   let dir;
   try {
-    dir = mkdtempSync(join6(tmpdir(), "rc-land-"));
+    dir = mkdtempSync(join5(tmpdir(), "rc-land-"));
   } catch (e) {
     return { ok: false, error: errMsg(e) };
   }
-  const wt = join6(dir, "wt");
+  const wt = join5(dir, "wt");
   try {
     await g.raw(["worktree", "add", wt, featureBranchName]);
     const gw = git(wt);
@@ -2727,6 +2472,19 @@ async function deleteBranchDetachingWorktrees(g, repoPath, branch) {
     return false;
   }
 }
+async function landProjectBranch(project) {
+  const ahead = await branchCommitsAhead(project.repoPath, project.mainBranch, PROJECT_BRANCH);
+  if (ahead.length === 0)
+    return null;
+  const res = await mergeTempBranch(project.repoPath, project.mainBranch, PROJECT_BRANCH);
+  return {
+    commits: ahead.length,
+    landed: res.ok,
+    ...res.conflict ? { conflict: true } : {},
+    ...res.files ? { files: res.files } : {},
+    ...res.error ? { error: res.error } : {}
+  };
+}
 function tempBranchPrefix(name) {
   return TEMP_BRANCH_PREFIXES.find((p) => name.startsWith(p));
 }
@@ -2782,7 +2540,7 @@ async function removeTalkWorktree(repoPath, worktreePath) {
   try {
     await g.raw(["worktree", "prune"]);
   } catch {}
-  if (existsSync6(worktreePath)) {
+  if (existsSync5(worktreePath)) {
     throw new InvalidInputError(`could not remove talk worktree at ${worktreePath} \u2014 a file may be locked; ` + "close anything using it and retry the delete");
   }
 }
@@ -2809,7 +2567,7 @@ async function deleteFeatureBranches(repoPath, slug) {
   return { deleted, kept };
 }
 async function commitDocs(worktreePath, message) {
-  if (!existsSync6(resolve5(worktreePath, DOCS_PATHSPEC)))
+  if (!existsSync5(resolve4(worktreePath, DOCS_PATHSPEC)))
     return;
   const g = git(worktreePath);
   await g.add([DOCS_PATHSPEC]);
@@ -3034,42 +2792,400 @@ async function mergeFeature(project, feature) {
     throw e instanceof Error ? e : new Error(errMsg(e));
   }
 }
-async function restoreBranch(g, previous, target) {
-  if (previous === target || previous === "HEAD" || !previous)
-    return;
-  try {
-    await g.checkout(previous);
-  } catch {}
-}
-async function conflictedFiles(g) {
-  try {
-    const out = (await g.raw(["diff", "--name-only", "--diff-filter=U"])).trim();
-    return out ? out.split(`
-`).map((s) => s.trim()).filter(Boolean) : [];
-  } catch {
-    return [];
+async function restoreBranch(g, previous, target) {
+  if (previous === target || previous === "HEAD" || !previous)
+    return;
+  try {
+    await g.checkout(previous);
+  } catch {}
+}
+async function conflictedFiles(g) {
+  try {
+    const out = (await g.raw(["diff", "--name-only", "--diff-filter=U"])).trim();
+    return out ? out.split(`
+`).map((s) => s.trim()).filter(Boolean) : [];
+  } catch {
+    return [];
+  }
+}
+async function mergeInProgress(g) {
+  try {
+    await g.raw(["rev-parse", "--verify", "--quiet", "MERGE_HEAD"]);
+    return true;
+  } catch {
+    return false;
+  }
+}
+var DOCS_PATHSPEC = "docs/features", MIGRATION_DIR_RE, DRIZZLE_SQL_RE, DENY_DIRTY = "Working tree has uncommitted changes \u2014 commit or stash first", DENY_ACTIVE = "A test drive is already active \u2014 stop it first", DENY_ACTIVE_RUN = "Feature has an active run \u2014 wait for it to finish", DENY_NONE_ACTIVE = "No test drive is active", RESEARCH_BRANCH_PREFIX = "runcastle/research/", TICKET_BRANCH_PREFIX = "runcastle/ticket/", PREP_BRANCH_PREFIX = "runcastle/prep/", PROJECT_BRANCH = "runcastle/project", TEMP_BRANCH_PREFIXES, TEMP_BRANCH_SLUG_MAX = 16, testDriveState;
+var init_git = __esm(() => {
+  init_paths();
+  init_errors();
+  init_dev_pane();
+  init_drive_hooks();
+  init_drive_env();
+  init_events();
+  init_repo();
+  MIGRATION_DIR_RE = /(^|\/)(migrations|migrate)\//i;
+  DRIZZLE_SQL_RE = /(^|\/)drizzle\/.*\.sql$/i;
+  TEMP_BRANCH_PREFIXES = [RESEARCH_BRANCH_PREFIX, TICKET_BRANCH_PREFIX];
+});
+
+// src/launcher/sessions.ts
+import { and as and4, desc as desc3, eq as eq4, inArray, isNotNull, sql as sql2 } from "drizzle-orm";
+function createSessionRow(ctx, input) {
+  const row = ctx.db.insert(sessions).values({
+    id: newId("sess"),
+    featureId: input.featureId ?? null,
+    projectId: input.projectId ?? null,
+    lap: input.featureId ? getFeatureRow(ctx, input.featureId).lap : 1,
+    kind: input.kind,
+    ccSessionId: null,
+    transcriptPath: null,
+    status: "launching",
+    worktreePath: input.worktreePath
+  }).returning().get();
+  return rowToSession(row);
+}
+function getSessionRow(ctx, id) {
+  const row = ctx.db.select().from(sessions).where(eq4(sessions.id, id)).get();
+  return row ? rowToSession(row) : null;
+}
+function activeSessionsForFeature(ctx, featureId) {
+  return ctx.db.select().from(sessions).where(and4(eq4(sessions.featureId, featureId), inArray(sessions.status, ["launching", "live"]))).all().map(rowToSession);
+}
+function markSessionLive(ctx, id, input = {}) {
+  const existing = getSessionRow(ctx, id);
+  if (!existing)
+    return null;
+  ctx.db.update(sessions).set({
+    status: "live",
+    ccSessionId: input.ccSessionId ?? existing.ccSessionId ?? null,
+    transcriptPath: input.transcriptPath ?? existing.transcriptPath ?? null
+  }).where(eq4(sessions.id, id)).run();
+  const firstTimeLive = existing.status !== "live";
+  if (firstTimeLive) {
+    promoteLastSession(ctx, id);
+    scheduleKickoff(ctx, existing);
+  }
+  return getSessionRow(ctx, id);
+}
+function lapKickoff(lap) {
+  return `Proceed with your task: invoke the /runcastle:revisit skill for LAP ${lap} REVIEW ITERATION. ` + `Call get_feature_context, then read this feature's test-notes.md (the "## Lap ${lap - 1}" ` + 'section \u2014 what the last drive surfaced) and the "## Later laps" section of its spec.md. ' + "EITHER MAY NOT EXIST YET; that is normal, not an error \u2014 say so and carry on from what I " + "tell you. Interview me about what the test drive taught: what was wrong, what was missing, " + "what I want next. Write what we settle on into decisions.md and amend spec.md for this lap " + '(pruning anything you promote out of "## Later laps"), then call emit_tickets for this ' + `lap's work. Finish in THIS session: complete_phase through ideation \u2192 spec \u2192 tickets, then ` + "tell me to review the cards and click Burn.";
+}
+function kickoffLineFor(kind, override) {
+  return override ?? KICKOFF_LINES[kind];
+}
+function resumeKickoffLine(kind) {
+  return RESUME_KICKOFF_PREFIX + KICKOFF_LINES[kind];
+}
+function setKickoffOverride(sessionId, line) {
+  pendingKickoffOverrides.set(sessionId, line);
+}
+function writeKickoffSequence(line, io, submitDelayMs = KICKOFF_SUBMIT_DELAY_MS) {
+  if (!io.alive())
+    return;
+  io.write(line);
+  const submit = setTimeout(() => {
+    try {
+      if (!io.alive())
+        return;
+      io.write("\r");
+      io.onSubmitted?.();
+    } catch {}
+  }, submitDelayMs);
+  submit.unref?.();
+}
+function stopTimers(d) {
+  for (const t of d.timers)
+    clearTimeout(t);
+  d.timers.clear();
+}
+function forgetKickoff(sessionId) {
+  const d = deliveries.get(sessionId);
+  if (d)
+    stopTimers(d);
+  deliveries.delete(sessionId);
+  pendingKickoffOverrides.delete(sessionId);
+}
+function ptyIo(sessionId) {
+  return {
+    write: (data) => ptyRegistry().get(sessionId)?.pty.write(data),
+    alive: () => {
+      const entry = ptyRegistry().get(sessionId);
+      return !!entry && !entry.exited;
+    }
+  };
+}
+function track(d, timer) {
+  timer.unref?.();
+  d.timers.add(timer);
+}
+function attemptKickoff(ctx, session, d, delayMs, clearFirst = false) {
+  track(d, setTimeout(() => {
+    if (d.settled)
+      return;
+    const io = ptyIo(session.id);
+    if (!io.alive()) {
+      d.settled = true;
+      return;
+    }
+    d.attempts += 1;
+    const attempt = d.attempts;
+    try {
+      if (clearFirst)
+        io.write(CLEAR_INPUT);
+      writeKickoffSequence(d.line, {
+        write: io.write,
+        alive: io.alive,
+        onSubmitted: () => emitForSession(ctx, session, {
+          type: "session.kickoff",
+          message: attempt === 1 ? `${session.kind} session kicked off automatically` : `${session.kind} kickoff re-sent (attempt ${attempt}) \u2014 the first was never acknowledged`,
+          data: { sessionId: session.id, kind: session.kind, attempt }
+        })
+      });
+    } catch {}
+    armConfirmation(ctx, session, d);
+  }, delayMs));
+}
+function armConfirmation(ctx, session, d) {
+  track(d, setTimeout(() => {
+    if (d.settled || d.confirmed)
+      return;
+    if (d.attempts < KICKOFF_MAX_ATTEMPTS && ptyIo(session.id).alive()) {
+      attemptKickoff(ctx, session, d, 0, true);
+      return;
+    }
+    settleUndelivered(ctx, session, d, "unacknowledged");
+  }, KICKOFF_CONFIRM_MS));
+}
+function settleUndelivered(ctx, session, d, reason) {
+  d.settled = true;
+  stopTimers(d);
+  emitForSession(ctx, session, {
+    type: "session.kickoff_undelivered",
+    message: reason === "superseded" ? `the ${session.kind} briefing was never delivered \u2014 you typed first, so runcastle stopped injecting it` : `the ${session.kind} briefing was typed ${d.attempts}\xD7 but Claude Code never acknowledged it \u2014 send it again from the session strip`,
+    data: { sessionId: session.id, kind: session.kind, reason, attempts: d.attempts, line: d.line }
+  });
+}
+function noteKickoffPrompt(ctx, sessionId, prompt) {
+  const d = deliveries.get(sessionId);
+  if (!d || d.confirmed)
+    return;
+  const session = getSessionRow(ctx, sessionId);
+  if (!session)
+    return;
+  if (promptMatchesKickoff(d.line, prompt)) {
+    d.confirmed = true;
+    d.settled = true;
+    stopTimers(d);
+    return;
+  }
+  if (d.settled)
+    return;
+  settleUndelivered(ctx, session, d, "superseded");
+}
+function promptMatchesKickoff(line, prompt) {
+  if (!prompt)
+    return false;
+  const norm = (s) => s.replace(/\s+/g, " ").trim().toLowerCase();
+  const want = norm(line);
+  const got = norm(prompt);
+  if (!want || !got)
+    return false;
+  return got.includes(want.slice(0, MATCH_PREFIX));
+}
+function resendKickoff(ctx, sessionId) {
+  const session = getSessionRow(ctx, sessionId);
+  if (!session)
+    throw new Error(`unknown session ${sessionId}`);
+  if (session.status === "ended")
+    throw new Error("that session has ended \u2014 open a new terminal");
+  if (!ptyIo(sessionId).alive())
+    throw new Error("the terminal for that session is no longer running");
+  const existing = deliveries.get(sessionId);
+  const d = existing ?? {
+    line: kickoffLineFor(session.kind, pendingKickoffOverrides.get(sessionId)),
+    attempts: 0,
+    confirmed: false,
+    settled: false,
+    timers: new Set
+  };
+  stopTimers(d);
+  d.attempts = 0;
+  d.confirmed = false;
+  d.settled = false;
+  deliveries.set(sessionId, d);
+  attemptKickoff(ctx, session, d, 0, true);
+  return { line: d.line };
+}
+function armSessionReadyWatchdog(ctx, session) {
+  const timer = setTimeout(() => {
+    const row = getSessionRow(ctx, session.id);
+    if (!row || row.status !== "launching")
+      return;
+    if (!ptyIo(session.id).alive())
+      return;
+    emitForSession(ctx, session, {
+      type: "session.not_ready",
+      message: `the ${session.kind} terminal is open but Claude Code has not reported ready \u2014 check it for a prompt or dialog waiting on you, then send the briefing`,
+      data: { sessionId: session.id, kind: session.kind }
+    });
+  }, SESSION_READY_TIMEOUT_MS);
+  timer.unref?.();
+}
+function scheduleKickoff(ctx, session) {
+  const line = kickoffLineFor(session.kind, pendingKickoffOverrides.get(session.id));
+  pendingKickoffOverrides.delete(session.id);
+  const existing = deliveries.get(session.id);
+  if (existing)
+    stopTimers(existing);
+  const d = { line, attempts: 0, confirmed: false, settled: false, timers: new Set };
+  deliveries.set(session.id, d);
+  attemptKickoff(ctx, session, d, KICKOFF_DELAY_MS);
+}
+function landProjectSession(ctx, session) {
+  if (session.kind !== "project" || !session.projectId)
+    return;
+  if (landedProjectSessions.has(session.id))
+    return;
+  landedProjectSessions.add(session.id);
+  const project = getProjectById(ctx, session.projectId);
+  if (!project)
+    return;
+  const kept = `they are kept on ${PROJECT_BRANCH} and retried at the next launch`;
+  const report = (type, message, data = {}) => {
+    emitProject(ctx, project.id, {
+      type,
+      message,
+      data: { sessionId: session.id, branch: PROJECT_BRANCH, ...data }
+    });
+  };
+  landProjectBranch(project).then((res) => {
+    if (!res)
+      return;
+    if (res.landed) {
+      report("project.landed", `landed ${res.commits} commit(s) from the project session onto ${project.mainBranch}`, { commits: res.commits });
+    } else if (res.conflict) {
+      report("project.land_conflict", `the project session's ${res.commits} commit(s) conflict with ${project.mainBranch} \u2014 nothing was overwritten; ${kept}`, { commits: res.commits, files: res.files ?? [] });
+    } else {
+      report("project.land_failed", `could not land the project session's ${res.commits} commit(s) onto ${project.mainBranch}: ${res.error ?? "unknown error"} \u2014 ${kept}`, { commits: res.commits, error: res.error ?? null });
+    }
+  }).catch((e) => {
+    report("project.land_failed", `could not land the project session's work onto ${project.mainBranch}: ${e instanceof Error ? e.message : String(e)} \u2014 ${kept}`, { error: e instanceof Error ? e.message : String(e) });
+  });
+}
+function markSessionEnded(ctx, id) {
+  const existing = getSessionRow(ctx, id);
+  if (!existing)
+    return null;
+  forgetKickoff(id);
+  ctx.db.update(sessions).set({ status: "ended" }).where(eq4(sessions.id, id)).run();
+  return getSessionRow(ctx, id);
+}
+function mostRecentResumableSession(ctx, featureId, kind) {
+  const row = ctx.db.select().from(sessions).where(and4(eq4(sessions.featureId, featureId), eq4(sessions.status, "ended"), isNotNull(sessions.ccSessionId), ...kind ? [eq4(sessions.kind, kind)] : [])).orderBy(desc3(sql2`rowid`)).limit(1).get();
+  return row ? rowToSession(row) : null;
+}
+function activeProjectSession(ctx, projectId, kind) {
+  const row = ctx.db.select().from(sessions).where(and4(eq4(sessions.projectId, projectId), eq4(sessions.kind, kind), inArray(sessions.status, ["launching", "live"]))).orderBy(desc3(sql2`rowid`)).limit(1).get();
+  return row ? rowToSession(row) : null;
+}
+function mostRecentResumableProjectSession(ctx, projectId, kind) {
+  const row = ctx.db.select().from(sessions).where(and4(eq4(sessions.projectId, projectId), eq4(sessions.kind, kind), eq4(sessions.status, "ended"), isNotNull(sessions.ccSessionId))).orderBy(desc3(sql2`rowid`)).limit(1).get();
+  return row ? rowToSession(row) : null;
+}
+function mostRecentLiveSession(ctx) {
+  const row = ctx.db.select().from(sessions).where(eq4(sessions.status, "live")).orderBy(desc3(sql2`rowid`)).limit(1).get();
+  return row ? rowToSession(row) : null;
+}
+var KICKOFF_DELAY_MS = 1500, KICKOFF_SUBMIT_DELAY_MS = 350, KICKOFF_CONFIRM_MS = 12000, KICKOFF_MAX_ATTEMPTS = 3, CLEAR_INPUT = "\x15", SESSION_READY_TIMEOUT_MS = 25000, CONVERGE_KICKOFF_LINE, KICKOFF_LINES, RESUME_KICKOFF_PREFIX, pendingKickoffOverrides, deliveries, MATCH_PREFIX = 40, landedProjectSessions;
+var init_sessions = __esm(() => {
+  init_src();
+  init_schema();
+  init_registry();
+  init_events();
+  init_git();
+  init_waypoints();
+  init_repo();
+  CONVERGE_KICKOFF_LINE = "Proceed with your task: invoke /runcastle:converge and drive spec then tickets " + "from map.md + decisions.md, per your system prompt.";
+  KICKOFF_LINES = {
+    ideation: "Proceed with your task: invoke the /runcastle:ideate skill and drive the ideation session.",
+    qa: "Proceed with your task: invoke the /runcastle:qa skill and answer questions from the " + "docs and code \u2014 do not advance phases or emit tickets.",
+    waypoint: "Proceed with your task: invoke the /runcastle:waypoint skill and work your assigned " + "waypoint to a resolution.",
+    converge: CONVERGE_KICKOFF_LINE,
+    revisit: "Proceed with your task: invoke the /runcastle:revisit skill and work through what the " + "human brings up.",
+    prepare: "Proceed with your task: work through the unestablished preparation fields with the human. " + "Start by telling them which fields are still open and what you need from them for each; " + "ask before running anything that touches their database or services.",
+    project: "Proceed with your task: invoke the /runcastle:project skill and drive the project session."
+  };
+  RESUME_KICKOFF_PREFIX = "We are picking this conversation back up \u2014 runcastle restarted and closed the terminal, " + "but this conversation is intact. Do NOT start over: tell me in one or two lines where we " + "left off and what is next, then carry on. Your original instruction was: ";
+  pendingKickoffOverrides = new Map;
+  deliveries = new Map;
+  landedProjectSessions = new Set;
+});
+
+// src/launcher/reconcile.ts
+import { inArray as inArray2 } from "drizzle-orm";
+function reconcileStaleSessions(ctx) {
+  const stale = ctx.db.select().from(sessions).where(inArray2(sessions.status, ["launching", "live"])).all().map(rowToSession);
+  const reconciled = [];
+  for (const session of stale) {
+    const entry = ptyRegistry().get(session.id);
+    if (entry && !entry.exited)
+      continue;
+    markSessionEnded(ctx, session.id);
+    const released = releaseForSession(ctx, session.id);
+    emitForSession(ctx, session, {
+      type: "session.reconciled",
+      message: `session marked ended at boot \u2014 the server restarted while it was ${session.status}`,
+      data: {
+        sessionId: session.id,
+        previousStatus: session.status,
+        releasedWaypointIds: released.map((w) => w.id)
+      }
+    });
+    reconciled.push(session);
+  }
+  return reconciled;
+}
+var init_reconcile = __esm(() => {
+  init_schema();
+  init_registry();
+  init_events();
+  init_repo();
+  init_waypoints();
+  init_sessions();
+});
+
+// src/launcher/skills-root.ts
+import { existsSync as existsSync6 } from "fs";
+import { dirname as dirname2, join as join6, resolve as resolve5 } from "path";
+function resolveSkillsRoot(fromDir) {
+  const override = process.env[SKILLS_DIR_ENV];
+  if (override) {
+    const root = resolve5(override);
+    if (existsSync6(join6(root, SKILLS_MARKER)))
+      return root;
+    throw new Error(`${SKILLS_DIR_ENV}=${override} is not a runcastle skills root (missing ${SKILLS_MARKER})`);
   }
-}
-async function mergeInProgress(g) {
-  try {
-    await g.raw(["rev-parse", "--verify", "--quiet", "MERGE_HEAD"]);
-    return true;
-  } catch {
-    return false;
+  const searched = [];
+  let dir = fromDir;
+  for (let i = 0;i < 8; i += 1) {
+    const candidate = join6(dir, "packages", "skills");
+    searched.push(candidate);
+    if (existsSync6(join6(candidate, SKILLS_MARKER)))
+      return candidate;
+    const parent = dirname2(dir);
+    if (parent === dir)
+      break;
+    dir = parent;
   }
+  throw new Error(`runcastle skills root not found; searched:
+  ${searched.join(`
+  `)}`);
 }
-var DOCS_PATHSPEC = "docs/features", MIGRATION_DIR_RE, DRIZZLE_SQL_RE, DENY_DIRTY = "Working tree has uncommitted changes \u2014 commit or stash first", DENY_ACTIVE = "A test drive is already active \u2014 stop it first", DENY_ACTIVE_RUN = "Feature has an active run \u2014 wait for it to finish", DENY_NONE_ACTIVE = "No test drive is active", RESEARCH_BRANCH_PREFIX = "runcastle/research/", TICKET_BRANCH_PREFIX = "runcastle/ticket/", PREP_BRANCH_PREFIX = "runcastle/prep/", TEMP_BRANCH_PREFIXES, TEMP_BRANCH_SLUG_MAX = 16, testDriveState;
-var init_git = __esm(() => {
-  init_paths();
-  init_errors();
-  init_dev_pane();
-  init_drive_hooks();
-  init_drive_env();
-  init_events();
-  init_repo();
-  MIGRATION_DIR_RE = /(^|\/)(migrations|migrate)\//i;
-  DRIZZLE_SQL_RE = /(^|\/)drizzle\/.*\.sql$/i;
-  TEMP_BRANCH_PREFIXES = [RESEARCH_BRANCH_PREFIX, TICKET_BRANCH_PREFIX];
+var SKILLS_DIR_ENV = "RUNCASTLE_SKILLS_DIR", SKILLS_MARKER;
+var init_skills_root = __esm(() => {
+  SKILLS_MARKER = join6("packs", "runcastle");
 });
 
 // src/services/agent-stream.ts
@@ -4699,7 +4815,7 @@ var init_findings = __esm(() => {
 });
 
 // src/services/prep.ts
-import { and as and6, desc as desc3, eq as eq6 } from "drizzle-orm";
+import { and as and6, desc as desc4, eq as eq6 } from "drizzle-orm";
 function isPreparing(projectId) {
   return controllers.has(projectId);
 }
@@ -4821,7 +4937,7 @@ function truncate(value, max = 120) {
   return oneLine.length > max ? `${oneLine.slice(0, max - 1)}\u2026` : oneLine;
 }
 function latestPrep(ctx, projectId) {
-  const row = ctx.db.select().from(projectPreps).where(eq6(projectPreps.projectId, projectId)).orderBy(desc3(projectPreps.startedAt)).get();
+  const row = ctx.db.select().from(projectPreps).where(eq6(projectPreps.projectId, projectId)).orderBy(desc4(projectPreps.startedAt)).get();
   if (!row)
     return null;
   return {
@@ -4835,7 +4951,7 @@ function latestPrep(ctx, projectId) {
   };
 }
 function latestPrepNotes(ctx, projectId) {
-  const row = ctx.db.select({ data: events.data }).from(events).where(and6(eq6(events.projectId, projectId), eq6(events.type, "prep.notes"))).orderBy(desc3(events.id)).get();
+  const row = ctx.db.select({ data: events.data }).from(events).where(and6(eq6(events.projectId, projectId), eq6(events.type, "prep.notes"))).orderBy(desc4(events.id)).get();
   const notes = row?.data?.notes;
   return typeof notes === "string" && notes.trim() !== "" ? notes : undefined;
 }
@@ -4905,6 +5021,7 @@ function rowToTicket(row) {
     acceptanceCriteria: row.acceptanceCriteria,
     seams: row.seams,
     blockedBy: row.blockedBy,
+    lap: row.lap,
     status: row.status,
     commits: row.commits,
     error: row.error ?? undefined,
@@ -4927,6 +5044,7 @@ function listByFeature2(ctx, featureId) {
 function storeTickets(ctx, featureId, inputs) {
   if (inputs.length === 0)
     return [];
+  const { lap } = getFeatureRow(ctx, featureId);
   const existing = ctx.db.select({ seq: tickets.seq }).from(tickets).where(eq7(tickets.featureId, featureId)).all();
   const startSeq = existing.reduce((max, r) => Math.max(max, r.seq), 0) + 1;
   const resolved = resolveBlocking(inputs, startSeq);
@@ -4940,6 +5058,7 @@ function storeTickets(ctx, featureId, inputs) {
     acceptanceCriteria: t.acceptanceCriteria,
     seams: t.seams,
     blockedBy: resolved[i].blockedBy,
+    lap,
     status: "pending",
     commits: [],
     error: null,
@@ -5047,6 +5166,7 @@ var init_tickets = __esm(() => {
   init_schema();
   init_errors();
   init_events();
+  init_repo();
   MUTABLE_STATUSES = new Set(["pending", "failed"]);
 });
 
@@ -5070,7 +5190,7 @@ function checkGate(ctx, check, feature) {
     case "spec-file-exists":
       return fileGate(ctx, feature, "spec.md", "write the spec (spec.md) before breaking into tickets");
     case "tickets-approved": {
-      const count = listByFeature2(ctx, feature.id).filter((t) => t.status !== "cancelled").length;
+      const count = listByFeature2(ctx, feature.id).filter((t) => t.lap === feature.lap && t.status !== "cancelled").length;
       return count >= 1 ? { satisfied: true } : { satisfied: false, reason: "no tickets to burn" };
     }
     case "all-tickets-terminal": {
@@ -5128,14 +5248,16 @@ var init_gates = __esm(() => {
 // src/services/knowledge.ts
 import { existsSync as existsSync11, mkdirSync as mkdirSync5, readFileSync as readFileSync5, readdirSync as readdirSync3, writeFileSync } from "fs";
 import { join as join10, relative, resolve as resolve6, sep } from "path";
-function scaffoldDocs(ctx, feature) {
+function scaffoldDocs(ctx, feature, opts = {}) {
   const project = projectForFeature(ctx, feature);
   const dir = featureDocsDir(project, feature);
   mkdirSync5(dir, { recursive: true });
   const briefPath = featureDocPath(project, feature, "brief.md");
   if (!existsSync11(briefPath)) {
+    const override = opts.brief?.trim();
     const created = new Date().toISOString();
-    const brief = [
+    const brief = override ? `${override}
+` : [
       `# ${feature.title}`,
       "",
       feature.oneLiner,
@@ -5177,6 +5299,36 @@ function mapDocBody(feature, seed) {
   return lines.join(`
 `);
 }
+function readCharter(repoRoot) {
+  const path = join10(repoRoot, CHARTER_FILE);
+  if (!existsSync11(path))
+    return;
+  try {
+    return readFileSync5(path, "utf8");
+  } catch {
+    return;
+  }
+}
+function listLiveAdrs(repoRoot) {
+  const dir = join10(repoRoot, ADR_DIR_REL);
+  if (!existsSync11(dir))
+    return [];
+  const docs = [];
+  for (const entry of readdirSync3(dir, { withFileTypes: true })) {
+    if (!entry.isFile() || !entry.name.endsWith(".md"))
+      continue;
+    let content;
+    try {
+      content = readFileSync5(join10(dir, entry.name), "utf8");
+    } catch {
+      continue;
+    }
+    if (SUPERSEDED_RE.test(content))
+      continue;
+    docs.push({ relPath: `${ADR_DIR_REL}/${entry.name}`, content });
+  }
+  return docs.sort((a, b) => a.relPath.localeCompare(b.relPath));
+}
 function listDocs(ctx, feature) {
   const project = projectForFeature(ctx, feature);
   const dir = featureDocsDir(project, feature);
@@ -5207,7 +5359,7 @@ function readTitle(path, fallback) {
     return fallback;
   }
 }
-var MAP_SECTIONS;
+var MAP_SECTIONS, CHARTER_FILE = "CONTEXT.md", ADR_DIR_REL = "docs/adr", SUPERSEDED_RE;
 var init_knowledge = __esm(() => {
   init_errors();
   init_events();
@@ -5219,6 +5371,7 @@ var init_knowledge = __esm(() => {
     "Not yet specified",
     "Out of scope"
   ];
+  SUPERSEDED_RE = /superseded by ADR-\d+/i;
 });
 
 // src/pty/end-session.ts
@@ -5229,6 +5382,7 @@ function endSession(ctx, sessionId) {
   const session = markSessionEnded(ctx, sessionId);
   if (session) {
     releaseForSession(ctx, sessionId);
+    landProjectSession(ctx, session);
     emitForSession(ctx, session, {
       type: "session.ended",
       message: "session ended by user",
@@ -5590,7 +5744,7 @@ var init_runner = __esm(() => {
 });
 
 // src/services/features.ts
-import { desc as desc4, eq as eq9 } from "drizzle-orm";
+import { desc as desc5, eq as eq9 } from "drizzle-orm";
 import { rmSync as rmSync2 } from "fs";
 async function createFeature(ctx, input) {
   const project = requireProjectById(ctx, input.projectId);
@@ -5605,6 +5759,7 @@ async function createFeature(ctx, input) {
     title: input.title,
     oneLiner: input.oneLiner,
     mapped: false,
+    lap: 1,
     phase: "ideation",
     branch,
     baseBranch,
@@ -5618,7 +5773,67 @@ async function createFeature(ctx, input) {
     message: branchReady ? `feature.created (${branch} \u2190 ${baseBranch})` : "feature.created (branch pending)",
     data: { slug, branch, baseBranch, branchReady }
   });
-  scaffoldDocs(ctx, feature);
+  scaffoldDocs(ctx, feature, { brief: input.brief });
+  if (branchReady) {
+    try {
+      await commitDocs(project.repoPath, `runcastle: scaffold ${slug} docs`);
+    } catch {}
+  }
+  return feature;
+}
+async function quickChange(ctx, input) {
+  const project = requireProjectById(ctx, input.projectId);
+  const title = input.title.trim();
+  const prose = input.prose.trim();
+  if (!title)
+    throw new InvalidInputError("a quick change needs a title");
+  if (!prose)
+    throw new InvalidInputError("a quick change needs a sentence describing the change");
+  const slug = uniqueSlug(ctx, project.id, title);
+  const branch = `feature/${slug}`;
+  const requestedBase = input.baseBranch?.trim() || project.mainBranch;
+  const { branchReady, baseBranch } = await ensureFeatureBranch(project, slug, requestedBase);
+  const inserted = ctx.db.insert(features).values({
+    id: newId("feat"),
+    projectId: project.id,
+    slug,
+    title,
+    oneLiner: prose.split(`
+`)[0].trim(),
+    mapped: false,
+    lap: 1,
+    phase: "implementation",
+    branch,
+    baseBranch,
+    status: "active",
+    createdAt: Date.now()
+  }).returning().get();
+  const feature = rowToFeature(inserted);
+  emit(ctx, feature.id, {
+    type: "feature.created",
+    message: branchReady ? `feature.created (${branch} \u2190 ${baseBranch})` : "feature.created (branch pending)",
+    data: { slug, branch, baseBranch, branchReady }
+  });
+  scaffoldDocs(ctx, feature, { brief: `# ${title}
+
+${prose}
+` });
+  const [ticket] = storeTickets(ctx, feature.id, [
+    {
+      title,
+      goal: prose,
+      context: prose,
+      acceptanceCriteria: [prose],
+      seams: [],
+      blockedBy: []
+    }
+  ]);
+  emit(ctx, feature.id, {
+    type: "feature.quick_change",
+    message: `quick change \u2014 born at implementation on lap 1 with one ticket (#${ticket.seq}); no grill session, no spec.md`,
+    ticketId: ticket.id,
+    data: { slug, ticketSeq: ticket.seq, phase: "implementation" }
+  });
   if (branchReady) {
     try {
       await commitDocs(project.repoPath, `runcastle: scaffold ${slug} docs`);
@@ -5653,7 +5868,7 @@ function getFeatureFull(ctx, id) {
   };
 }
 function list(ctx, projectId) {
-  const rows = ctx.db.select().from(features).where(eq9(features.projectId, projectId)).orderBy(desc4(features.createdAt)).all();
+  const rows = ctx.db.select().from(features).where(eq9(features.projectId, projectId)).orderBy(desc5(features.createdAt)).all();
   return rows.map((row) => {
     const feature = rowToFeature(row);
     const tickets2 = listByFeature2(ctx, feature.id);
@@ -5689,7 +5904,8 @@ async function burn(ctx, featureId, opts = {}) {
   const feature = getFeatureRow(ctx, featureId);
   const running = hasActiveRun(ctx, featureId);
   let tickets2 = listByFeature2(ctx, featureId);
-  const pending = tickets2.filter((t) => t.status !== "done" && t.status !== "failed" && t.status !== "cancelled");
+  const lapTickets = tickets2.filter((t) => t.lap === feature.lap);
+  const pending = lapTickets.filter((t) => t.status !== "done" && t.status !== "failed" && t.status !== "cancelled");
   const restarting = feature.phase === "implementation" && !running;
   const iterating = feature.phase === "review" && !running && pending.length >= 1;
   if (feature.phase !== "tickets" && !restarting && !iterating) {
@@ -5702,8 +5918,8 @@ async function burn(ctx, featureId, opts = {}) {
       why = `feature must be in the tickets phase to burn (currently ${feature.phase})`;
     throw new GateError(why);
   }
-  if (tickets2.filter((t) => t.status !== "cancelled").length < 1) {
-    throw new GateError(tickets2.length > 0 ? "no burnable tickets \u2014 every ticket is cancelled" : "no tickets to burn");
+  if (lapTickets.filter((t) => t.status !== "cancelled").length < 1) {
+    throw new GateError(lapTickets.length > 0 ? "no burnable tickets \u2014 every ticket is cancelled" : "no tickets to burn");
   }
   if (restarting) {
     sweepOrphanedBurning(ctx, featureId, "orphaned \u2014 the previous run died while it was burning");
@@ -5727,6 +5943,22 @@ async function burn(ctx, featureId, opts = {}) {
   });
   return { runId };
 }
+function rethink(ctx, featureId) {
+  const feature = getFeatureRow(ctx, featureId);
+  if (feature.phase !== RETHINK_LOOP_BACK.from) {
+    throw new GateError(`feature must be in the review phase to rethink (currently ${feature.phase})`);
+  }
+  if (hasActiveRun(ctx, featureId)) {
+    throw new GateError("a run is burning this feature \u2014 cancel or wait for it before rethinking");
+  }
+  const live = activeSessionsForFeature(ctx, featureId);
+  if (live.length > 0) {
+    throw new GateError(`a ${live[0].kind} session is already live for ${feature.slug} \u2014 only one terminal per feature; end or resume it first`);
+  }
+  const lap = feature.lap + 1;
+  ctx.db.update(features).set({ lap }).where(eq9(features.id, featureId)).run();
+  return setPhase(ctx, featureId, RETHINK_LOOP_BACK.to, "lap.started", `rethink \u2014 lap ${lap}`);
+}
 async function retryTicket(ctx, ticketId, opts = {}) {
   const ticket = getTicket(ctx, ticketId);
   const feature = getFeatureRow(ctx, ticket.featureId);
@@ -5908,6 +6140,7 @@ var init_features = __esm(() => {
   init_git();
   init_knowledge();
   init_repo();
+  init_sessions();
   init_end_session();
   init_tickets();
   init_waypoints();
@@ -5937,7 +6170,8 @@ function resolveSession(ctx, sessionId) {
 }
 function requireFeatureId(session) {
   if (!session.featureId) {
-    throw new GateError(`this tool needs a feature, and a ${session.kind} session is project-scoped. ` + "Use record_finding to store what you establish about the project.");
+    const instead = session.kind === "project" ? "Your tools are create_feature, get_project_context, get_work_record and record_event \u2014 " + "to work an existing feature, tell the human to open its terminal." : "Use record_finding to store what you establish about the project.";
+    throw new GateError(`this tool belongs to a feature, and a ${session.kind} session is project-scoped. ${instead}`);
   }
   return session.featureId;
 }
@@ -5953,6 +6187,7 @@ function toolGetFeatureContext(ctx, session) {
   const context = {
     feature,
     phase: feature.phase,
+    lap: feature.lap,
     docs,
     tickets: listByFeature2(ctx, feature.id)
   };
@@ -5963,7 +6198,8 @@ function toolGetFeatureContext(ctx, session) {
   }
   return context;
 }
-function toolResolveWaypoint(ctx, _session, input) {
+function toolResolveWaypoint(ctx, session, input) {
+  requireFeatureId(session);
   resolve3(ctx, input.id, input.disposition, input.summary);
   return { ok: true };
 }
@@ -5973,8 +6209,9 @@ function toolEmitTickets(ctx, session, input) {
   return { stored: stored.length, ids: stored.map((t) => t.id) };
 }
 function requireOwnTicket(ctx, session, ticketId) {
+  const featureId = requireFeatureId(session);
   const ticket = getTicket(ctx, ticketId);
-  if (ticket.featureId !== requireFeatureId(session)) {
+  if (ticket.featureId !== featureId) {
     throw new GateError(`ticket ${ticketId} does not belong to this session's feature`);
   }
   return ticket;
@@ -6000,11 +6237,14 @@ function toolEmitWaypoints(ctx, session, input) {
   return { stored: stored.length, ids: stored.map((w) => w.id) };
 }
 function toolRecordEvent(ctx, session, input) {
-  emit(ctx, requireFeatureId(session), {
+  const event = emitForSession(ctx, session, {
     type: input.type,
     message: input.message,
     data: { source: "mcp" }
   });
+  if (!event) {
+    throw new GateError(`session ${session.id} belongs to neither a feature nor a project \u2014 nothing to record against`);
+  }
   return { ok: true };
 }
 function toolCompletePhase(ctx, session, input) {
@@ -6046,7 +6286,7 @@ async function commitDocsCheckpoint(ctx, session, message) {
 }
 function requireProject(ctx, session) {
   if (!session.projectId) {
-    throw new GateError(`record_finding is for a project-scoped preparation session; this is a ${session.kind} session.`);
+    throw new GateError(`this tool belongs to a project-scoped session; this is a ${session.kind} session on a ` + "feature. Use get_feature_context and the pipeline tools for feature work.");
   }
   const project = getProjectById(ctx, session.projectId);
   if (!project)
@@ -6077,6 +6317,85 @@ function toolRecordFinding(ctx, session, input) {
   });
   return { ok: true, key: input.key, source };
 }
+async function toolCreateFeature(ctx, session, input) {
+  const project = requireProject(ctx, session);
+  const feature = input.ticket ? await quickChange(ctx, {
+    projectId: project.id,
+    title: input.title,
+    prose: input.ticket.prose,
+    baseBranch: input.baseBranch
+  }) : await createFeature(ctx, {
+    projectId: project.id,
+    title: input.title,
+    oneLiner: input.oneLiner,
+    baseBranch: input.baseBranch,
+    brief: input.brief
+  });
+  return {
+    id: feature.id,
+    slug: feature.slug,
+    branch: feature.branch,
+    phase: feature.phase
+  };
+}
+function toolGetProjectContext(ctx, session) {
+  const project = requireProject(ctx, session);
+  const charter = readCharter(session.worktreePath);
+  return {
+    project,
+    ...charter !== undefined ? { charter } : {},
+    adrs: listLiveAdrs(session.worktreePath),
+    featureIndex: list(ctx, project.id).map(featureIndexLine)
+  };
+}
+function featureIndexLine(feature) {
+  if (feature.status === "shipped") {
+    return `${feature.slug} \u2014 ${feature.oneLiner} [shipped] ${featureDocsRel(feature.slug)}/`;
+  }
+  return `${feature.title} [${feature.status === "archived" ? "archived" : "in flight"}]`;
+}
+function toolGetWorkRecord(ctx, session, input) {
+  const project = requireProject(ctx, session);
+  const slug = input.featureSlug?.trim();
+  const seam = input.seam?.trim().toLowerCase();
+  if (!slug && !seam) {
+    throw new InvalidInputError("get_work_record needs a featureSlug or a seam to look up");
+  }
+  const records = [];
+  for (const feature of list(ctx, project.id)) {
+    if (slug && feature.slug !== slug)
+      continue;
+    let tickets2 = listByFeature2(ctx, feature.id);
+    if (seam) {
+      tickets2 = tickets2.filter((t) => t.seams.some((s) => s.toLowerCase().includes(seam)));
+      if (tickets2.length === 0)
+        continue;
+    }
+    const shippedAt = latestEventTs(ctx, feature.id, "feature.shipped");
+    records.push({
+      slug: feature.slug,
+      title: feature.title,
+      status: feature.status,
+      ...shippedAt !== undefined ? { shippedAt } : {},
+      runs: listRunsByFeature(ctx, feature.id).map((r) => ({
+        workflow: r.workflow,
+        status: r.status,
+        startedAt: r.startedAt,
+        ...r.endedAt !== undefined ? { endedAt: r.endedAt } : {},
+        ...r.summary !== undefined ? { summary: r.summary } : {}
+      })),
+      tickets: tickets2.map((t) => ({
+        seq: t.seq,
+        title: t.title,
+        status: t.status,
+        seams: t.seams,
+        commits: t.commits,
+        ...t.error !== undefined ? { error: t.error } : {}
+      }))
+    });
+  }
+  return { features: records };
+}
 function ok(result) {
   return { content: [{ type: "text", text: JSON.stringify(result) }] };
 }
@@ -6113,6 +6432,42 @@ function buildMcpServer() {
       return noSession();
     return ok(toolRecordFinding(rs.ctx, rs.session, args));
   });
+  server.registerTool("create_feature", {
+    title: "Create a feature",
+    description: "Create a feature from the project session \u2014 the end of intake. Pass `brief` with the " + "reasoning you just worked out with the human (why this feature exists, what it must NOT " + "swallow): it becomes brief.md verbatim, and without it that reasoning is lost. Pass " + "`ticket: { prose }` for a quick change \u2014 work too small to deserve a grill \u2014 which " + "creates the feature at the implementation phase with that one ticket, and whose brief.md " + "is the prose itself (so `brief` is unused there). This does NOT open " + "a terminal on what it creates; the new card in the rail is the feedback, and the human " + "decides what to work on next.",
+    inputSchema: {
+      title: z4.string().min(1),
+      oneLiner: z4.string(),
+      baseBranch: z4.string().optional(),
+      brief: z4.string().optional(),
+      ticket: z4.object({ prose: z4.string().min(1) }).optional()
+    }
+  }, async (args, extra) => {
+    const rs = await resolveCtxSession(extra);
+    if (!rs)
+      return noSession();
+    return ok(await toolCreateFeature(rs.ctx, rs.session, args));
+  });
+  server.registerTool("get_project_context", {
+    title: "Get project context",
+    description: "The project as it stands: the project row, the charter (CONTEXT.md) in full, every live " + "ADR in full (superseded ones are omitted), and a one-line index of every feature \u2014 " + "shipped ones with their one-liner and docs path, in-flight ones by title only. Read a " + "shipped feature's own docs with your ordinary file tools; the index says where they are.",
+    inputSchema: {}
+  }, async (_args, extra) => {
+    const rs = await resolveCtxSession(extra);
+    if (!rs)
+      return noSession();
+    return ok(toolGetProjectContext(rs.ctx, rs.session));
+  });
+  server.registerTool("get_work_record", {
+    title: "Get work record",
+    description: "What features actually DID \u2014 facts only: per feature its status, ship date, run " + "summaries and tickets as { seq, title, status, seams, commits, error? }. Never a " + "ticket's goal or acceptance criteria: those are intent from before the code existed. " + 'Query by `featureSlug` ("what did X do?") or by `seam` ("who has touched this area, and ' + 'what happened?") \u2014 the seam match is a case-insensitive substring, because seams are ' + "free prose that differs between features. At least one argument is required.",
+    inputSchema: { featureSlug: z4.string().optional(), seam: z4.string().optional() }
+  }, async (args, extra) => {
+    const rs = await resolveCtxSession(extra);
+    if (!rs)
+      return noSession();
+    return ok(toolGetWorkRecord(rs.ctx, rs.session, args));
+  });
   server.registerTool("get_feature_context", {
     title: "Get feature context",
     description: "Full context for the current feature: the feature row, its phase, all docs/features/<slug>/*.md contents, and its tickets.",
@@ -6204,7 +6559,7 @@ function buildMcpServer() {
   });
   server.registerTool("record_event", {
     title: "Record event",
-    description: "Add a note to the feature timeline (decisions recorded, spec saved, milestones).",
+    description: "Add a note to the timeline (decisions recorded, spec saved, milestones) \u2014 the feature's " + "timeline from a feature session, the project's from a project-scoped one.",
     inputSchema: { type: z4.string(), message: z4.string() }
   }, async (args, extra) => {
     const rs = await resolveCtxSession(extra);
@@ -6231,6 +6586,7 @@ function buildMcpServer() {
 var mcp, server_default;
 var init_server = __esm(() => {
   init_src();
+  init_paths();
   init_errors();
   init_sessions();
   init_features();
@@ -6930,14 +7286,72 @@ function renderPreparePrompt(brief) {
   ].join(`
 `);
 }
-function renderSettings(hookClient) {
+function renderProjectPrompt(brief) {
+  const { project, branch, worktreePath } = brief;
+  return [
+    `# runcastle \u2014 ${project.name} (project session)`,
+    "",
+    "This is the **project session**: a conversation that belongs to the project, not to",
+    "any one feature. There is no phase to advance and no gate to cross here.",
+    "",
+    "## What this session is for",
+    "- **Intake and decomposition** \u2014 the job no other surface can do. Take whatever the",
+    "  human brings, grill it until it resolves into N features, and create them with",
+    "  `create_feature`. A feature born here carries a real brief: the reasoning you just",
+    "  worked out, not a restated one-liner.",
+    '- **Portfolio Q&A** \u2014 "have we already decided X?", "did we ever build Y?" \u2014 the same',
+    "  lookup intake needs anyway to avoid creating a duplicate feature.",
+    "- **Routing** \u2014 an incoming thing is one of exactly five destinations: a new feature,",
+    "  a quick change, an existing feature's revisit, a Rethink lap on something in",
+    "  review, or nothing. Say which, and why.",
+    "- **Curation, advisory only** \u2014 you may report that two in-flight features are on a",
+    "  collision course or that an ADR looks stale. You do NOT fix either. Every fix routes",
+    "  back through a feature, through promotion at merge, or through the charter.",
+    "- **The charter (`CONTEXT.md`)** \u2014 you are the only session in runcastle allowed to",
+    "  write it. Create it lazily: when there is first something to write, not before.",
+    "",
+    "## Where you are working \u2014 and where your writes go",
+    `- Working directory: \`${worktreePath}\` \u2014 a runcastle-owned worktree, NOT the human's`,
+    `  checkout at \`${project.repoPath}\`.`,
+    `- Branch: \`${branch}\`, cut from \`${project.mainBranch}\` when this session launched.`,
+    `- **Your commits land on \`${project.mainBranch}\` when this terminal closes**, arriving`,
+    "  in the human's checkout the way a `git pull` does. Write real code and real docs \u2014",
+    "  there is no sandbox here \u2014 and commit everything you write before you finish.",
+    "  A session that edits without committing leaves a dirty tree, which is exactly what",
+    "  blocks a test drive and jams the next merge. Land what you wrote; leave it clean.",
+    "",
+    "## runcastle MCP tools",
+    "Four, and none of the feature pipeline's \u2014 a session with no feature has no business",
+    "advancing one through a gate:",
+    "- `create_feature({ title, oneLiner, baseBranch?, brief?, ticket? })` \u2014 the point of",
+    "  this session. It does NOT open a terminal on what it creates; the new card appearing",
+    "  in the rail is the feedback, and the human decides what to work on next.",
+    "- `get_project_context()` \u2014 the project, its charter, its live ADRs, and a one-line",
+    "  index of every feature.",
+    "- `get_work_record({ featureSlug? | seam? })` \u2014 what features actually did: tickets by",
+    "  status, seams, commits, errors. Facts, never intent.",
+    "- `record_event({ type, message })` \u2014 drop a note on the project timeline.",
+    "",
+    "Every merged feature's docs are already on disk in this worktree \u2014 read them with your",
+    "ordinary file tools. The index says where.",
+    "",
+    "## Your task",
+    "Invoke the `/runcastle:project` skill and drive the project session.",
+    ""
+  ].join(`
+`);
+}
+function sessionBashAllowRules(kind) {
+  return kind === "project" ? SESSION_BASH_READ_RULES : SESSION_BASH_ALLOW_RULES;
+}
+function renderSettings(hookClient, kind) {
   const cmd = (event) => ({
     type: "command",
     command: `bun run "${hookClient}" ${event}`,
     timeout: event === "user-prompt" ? 5 : 10
   });
   return {
-    permissions: { allow: [...RUNCASTLE_MCP_ALLOW_RULES, ...SESSION_BASH_ALLOW_RULES] },
+    permissions: { allow: [...RUNCASTLE_MCP_ALLOW_RULES, ...sessionBashAllowRules(kind)] },
     hooks: {
       SessionStart: SESSION_START_SOURCES.map((source) => ({
         matcher: source,
@@ -6960,21 +7374,21 @@ function renderMcpConfig(session, config2) {
   };
 }
 async function writeSessionArtifacts(input) {
-  const { session, feature, config: config2, waypoint, prepare } = input;
+  const { session, feature, config: config2, waypoint, prepare, projectBrief } = input;
   const dir = sessionDir(session.id);
   mkdirSync7(dir, { recursive: true });
   const systemPromptPath = join13(dir, "system-prompt.md");
   const settingsPath = join13(dir, "settings.json");
   const mcpConfigPath = join13(dir, "mcp.json");
-  const systemPrompt = feature ? renderSystemPrompt(feature, session.kind, waypoint) : prepare ? renderPreparePrompt(prepare) : (() => {
-    throw new Error(`session ${session.id} has neither a feature nor a preparation brief`);
+  const systemPrompt = feature ? renderSystemPrompt(feature, session.kind, waypoint) : prepare ? renderPreparePrompt(prepare) : projectBrief ? renderProjectPrompt(projectBrief) : (() => {
+    throw new Error(`session ${session.id} has no feature and no project-session brief`);
   })();
   writeFileSync2(systemPromptPath, systemPrompt, "utf8");
-  writeFileSync2(settingsPath, JSON.stringify(renderSettings(hookClientPath()), null, 2), "utf8");
+  writeFileSync2(settingsPath, JSON.stringify(renderSettings(hookClientPath(), session.kind), null, 2), "utf8");
   writeFileSync2(mcpConfigPath, JSON.stringify(renderMcpConfig(session, config2), null, 2), "utf8");
   return { systemPromptPath, settingsPath, mcpConfigPath };
 }
-var RUNCASTLE_MCP_ALLOW_RULES, SESSION_BASH_ALLOW_RULES, SESSION_START_SOURCES;
+var RUNCASTLE_MCP_ALLOW_RULES, SESSION_BASH_READ_RULES, SESSION_BASH_WRITE_RULES, SESSION_BASH_ALLOW_RULES, SESSION_START_SOURCES;
 var init_artifacts = __esm(() => {
   init_paths();
   init_asset_paths();
@@ -6988,18 +7402,27 @@ var init_artifacts = __esm(() => {
     "mcp__runcastle__escalate_to_map",
     "mcp__runcastle__emit_waypoints",
     "mcp__runcastle__resolve_waypoint",
-    "mcp__runcastle__record_finding"
+    "mcp__runcastle__record_finding",
+    "mcp__runcastle__create_feature",
+    "mcp__runcastle__get_project_context",
+    "mcp__runcastle__get_work_record"
   ];
-  SESSION_BASH_ALLOW_RULES = [
+  SESSION_BASH_READ_RULES = [
     "Bash(git status:*)",
     "Bash(git rev-parse:*)",
     "Bash(git log:*)",
     "Bash(git diff:*)",
-    "Bash(git add:*)",
-    "Bash(git commit:*)",
     "Bash(git branch:*)",
     "Bash(git show:*)"
   ];
+  SESSION_BASH_WRITE_RULES = [
+    "Bash(git add:*)",
+    "Bash(git commit:*)"
+  ];
+  SESSION_BASH_ALLOW_RULES = [
+    ...SESSION_BASH_READ_RULES,
+    ...SESSION_BASH_WRITE_RULES
+  ];
   SESSION_START_SOURCES = ["startup", "resume", "clear", "compact", "fork"];
 });
 
@@ -7283,6 +7706,69 @@ async function launchPrepareSession(ctx, input, opts = {}) {
   spawnEmbeddedPty(ctx, undefined, session, project.repoPath, serverUrl, buildClaudeArgs(buildInput), { resumeSessionId });
   return { sessionId: session.id };
 }
+async function launchProjectSession(ctx, input, opts = {}) {
+  const project = requireProjectById(ctx, input.projectId);
+  const live = activeProjectSession(ctx, project.id, "project");
+  if (live) {
+    throw new GateError(`a project session is already open for ${project.name} \u2014 resume or end it first`);
+  }
+  const worktreePath = await ensureProjectWorktree(project);
+  const session = createSessionRow(ctx, {
+    projectId: project.id,
+    kind: "project",
+    worktreePath
+  });
+  const resumeSessionId = mostRecentResumableProjectSession(ctx, project.id, "project")?.ccSessionId;
+  emitProject(ctx, project.id, {
+    type: "session.launching",
+    message: "launching project session",
+    data: { sessionId: session.id, kind: "project", worktreePath, branch: PROJECT_BRANCH }
+  });
+  if (resumeSessionId) {
+    emitProject(ctx, project.id, {
+      type: "session.resumed",
+      message: "resuming the previous project conversation",
+      data: { sessionId: session.id, resumeSessionId }
+    });
+  }
+  const artifacts = await writeSessionArtifacts({
+    session,
+    project,
+    config: ctx.config,
+    projectBrief: { project, branch: PROJECT_BRANCH, worktreePath }
+  });
+  const serverUrl = serverUrlFor(ctx.config);
+  const buildInput = {
+    sessionId: session.id,
+    serverUrl,
+    featureTitle: project.name,
+    worktreePath,
+    pluginDir: resolvePluginDir(),
+    settingsPath: artifacts.settingsPath,
+    mcpConfigPath: artifacts.mcpConfigPath,
+    systemPromptPath: artifacts.systemPromptPath,
+    permissionMode: "default",
+    model: resolveModel("project", ctx.config, project),
+    resumeSessionId,
+    strictMcp: ctx.config.sessionMcp === "runcastleOnly"
+  };
+  if (opts.spawn === false) {
+    emitProject(ctx, project.id, {
+      type: "session.launched",
+      message: "project session prepared (terminal spawn skipped)",
+      data: {
+        sessionId: session.id,
+        command: ["claude", ...buildClaudeArgs(buildInput)].join(" "),
+        spawned: false
+      }
+    });
+    return { sessionId: session.id };
+  }
+  spawnEmbeddedPty(ctx, undefined, session, worktreePath, serverUrl, buildClaudeArgs(buildInput), {
+    resumeSessionId
+  });
+  return { sessionId: session.id };
+}
 async function buildPrepareBrief(ctx, project) {
   const findings = await listFindings(ctx, project);
   const notes = latestPrepNotes(ctx, project.id);
@@ -7368,6 +7854,7 @@ function handlePtyExit(ctx, feature, session, meta, exitCode) {
   const diedBeforeLive = getSessionRow(ctx, session.id)?.status === "launching";
   markSessionEnded(ctx, session.id);
   releaseForSession(ctx, session.id);
+  landProjectSession(ctx, session);
   if (diedBeforeLive && meta.resumeSessionId) {
     const label = meta.waypoint ? `waypoint ${meta.waypoint.seq} (${meta.waypoint.title})` : session.kind;
     emitForSession(ctx, session, {
@@ -7461,6 +7948,7 @@ var gateId, featureRouter;
 var init_feature = __esm(() => {
   init_src();
   init_launcher();
+  init_sessions();
   init_events();
   init_features();
   init_gates();
@@ -7475,6 +7963,12 @@ var init_feature = __esm(() => {
       oneLiner: z7.string(),
       baseBranch: z7.string().optional()
     })).mutation(({ ctx, input }) => createFeature(ctx, input)),
+    quickChange: publicProcedure.input(z7.object({
+      projectId: z7.string(),
+      title: z7.string().min(1),
+      prose: z7.string().min(1),
+      baseBranch: z7.string().optional()
+    })).mutation(({ ctx, input }) => quickChange(ctx, input)),
     list: publicProcedure.input(z7.object({ projectId: z7.string() })).query(({ ctx, input }) => list(ctx, input.projectId)),
     get: publicProcedure.input(z7.object({ id: z7.string() })).query(({ ctx, input }) => getFeatureFull(ctx, input.id)),
     launchSession: publicProcedure.input(z7.object({
@@ -7484,6 +7978,14 @@ var init_feature = __esm(() => {
     })).mutation(({ ctx, input }) => launchSession(ctx, input)),
     workWaypoint: publicProcedure.input(z7.object({ featureId: z7.string(), waypointId: z7.string(), endLive: z7.boolean().optional() })).mutation(({ ctx, input }) => workWaypoint(ctx, input)),
     converge: publicProcedure.input(z7.object({ featureId: z7.string(), overrideReason: z7.string().min(1).optional() })).mutation(({ ctx, input }) => converge(ctx, { featureId: input.featureId, overrideReason: input.overrideReason })),
+    rethink: publicProcedure.input(z7.object({ featureId: z7.string() })).mutation(({ ctx, input }) => {
+      const feature = rethink(ctx, input.featureId);
+      return launchSession(ctx, {
+        featureId: input.featureId,
+        kind: "revisit",
+        kickoffLine: lapKickoff(feature.lap)
+      });
+    }),
     resendKickoff: publicProcedure.input(z7.object({ sessionId: z7.string() })).mutation(({ ctx, input }) => resendKickoff(ctx, input.sessionId)),
     endSession: publicProcedure.input(z7.object({ sessionId: z7.string() })).mutation(({ ctx, input }) => endSession(ctx, input.sessionId)),
     advance: publicProcedure.input(z7.object({ featureId: z7.string() })).mutation(({ ctx, input }) => advance(ctx, input.featureId)),
@@ -7809,6 +8311,8 @@ var init_project = __esm(() => {
     }),
     talkToPrep: publicProcedure.input(z8.object({ projectId: z8.string() })).mutation(({ ctx, input }) => launchPrepareSession(ctx, { projectId: input.projectId })),
     prepSession: publicProcedure.input(z8.object({ projectId: z8.string() })).query(({ ctx, input }) => activeProjectSession(ctx, input.projectId, "prepare")),
+    talkToProject: publicProcedure.input(z8.object({ projectId: z8.string() })).mutation(({ ctx, input }) => launchProjectSession(ctx, { projectId: input.projectId })),
+    projectSession: publicProcedure.input(z8.object({ projectId: z8.string() })).query(({ ctx, input }) => activeProjectSession(ctx, input.projectId, "project")),
     cancelPrepare: publicProcedure.input(z8.object({ projectId: z8.string() })).mutation(({ input }) => {
       cancelPrep(input.projectId);
       return { ok: true };
@@ -7901,26 +8405,26 @@ function projectOverrides(ctx, projectId) {
     driveEnv: row?.driveEnv ?? null
   };
 }
-function resolveField(desc5, layers) {
+function resolveField(desc6, layers) {
   const scoped = layers.overrides !== null;
-  const scope = scoped && desc5.projectColumn ? "project" : "global";
-  const base = { key: desc5.key, restartRequired: desc5.restartRequired, scope };
-  if (desc5.envVar) {
-    const raw = layers.env[desc5.envVar];
+  const scope = scoped && desc6.projectColumn ? "project" : "global";
+  const base = { key: desc6.key, restartRequired: desc6.restartRequired, scope };
+  if (desc6.envVar) {
+    const raw = layers.env[desc6.envVar];
     if (raw !== undefined && raw !== "") {
-      return { ...base, value: desc5.parseEnv(raw), source: "env", editable: false };
+      return { ...base, value: desc6.parseEnv(raw), source: "env", editable: false };
     }
   }
-  if (layers.overrides && desc5.projectColumn) {
-    const ov = layers.overrides[desc5.projectColumn];
+  if (layers.overrides && desc6.projectColumn) {
+    const ov = layers.overrides[desc6.projectColumn];
     if (ov !== null && ov !== "") {
       return { ...base, value: ov, source: "project", editable: true };
     }
   }
-  if (desc5.configKey && Object.prototype.hasOwnProperty.call(layers.fileRaw, desc5.configKey)) {
-    return { ...base, value: layers.fileRaw[desc5.configKey], source: "file", editable: true };
+  if (desc6.configKey && Object.prototype.hasOwnProperty.call(layers.fileRaw, desc6.configKey)) {
+    return { ...base, value: layers.fileRaw[desc6.configKey], source: "file", editable: true };
   }
-  const value = desc5.configKey ? DEFAULTS[desc5.configKey] ?? null : null;
+  const value = desc6.configKey ? DEFAULTS[desc6.configKey] ?? null : null;
   return { ...base, value, source: "default", editable: true };
 }
 function getSettings(ctx, projectId, io = {}) {
@@ -7937,56 +8441,56 @@ function updateSettings(ctx, input, io = {}) {
   if (input.key.startsWith("stepModels.")) {
     return updateStepModel(ctx, input, configFile, io);
   }
-  const desc5 = DESCRIPTORS.find((d) => d.key === input.key);
-  if (!desc5)
+  const desc6 = DESCRIPTORS.find((d) => d.key === input.key);
+  if (!desc6)
     throw new InvalidInputError(`unknown setting: ${input.key}`);
-  if (desc5.envVar) {
-    const raw = env[desc5.envVar];
+  if (desc6.envVar) {
+    const raw = env[desc6.envVar];
     if (raw !== undefined && raw !== "") {
-      throw new InvalidInputError(`${desc5.key} is set by environment variable ${desc5.envVar}; unset it to edit`);
+      throw new InvalidInputError(`${desc6.key} is set by environment variable ${desc6.envVar}; unset it to edit`);
     }
   }
-  const toProject = input.projectId !== undefined && desc5.projectColumn !== undefined;
+  const toProject = input.projectId !== undefined && desc6.projectColumn !== undefined;
   if (input.value === null) {
     if (!toProject)
-      throw new InvalidInputError(`${desc5.key} cannot be cleared`);
+      throw new InvalidInputError(`${desc6.key} cannot be cleared`);
     const project = requireProjectById(ctx, input.projectId);
-    ctx.db.update(projects).set({ [desc5.projectColumn]: null }).where(eq12(projects.id, project.id)).run();
-    recordHuman(ctx, project.id, desc5.key, null);
+    ctx.db.update(projects).set({ [desc6.projectColumn]: null }).where(eq12(projects.id, project.id)).run();
+    recordHuman(ctx, project.id, desc6.key, null);
     emitProject(ctx, project.id, {
       type: "settings.updated",
-      message: `${desc5.key} override cleared`,
-      data: { key: desc5.key, scope: "project", value: null }
+      message: `${desc6.key} override cleared`,
+      data: { key: desc6.key, scope: "project", value: null }
     });
-    return field(getSettings(ctx, input.projectId, io), desc5.key);
+    return field(getSettings(ctx, input.projectId, io), desc6.key);
   }
-  const parsed = desc5.valueSchema.safeParse(input.value);
+  const parsed = desc6.valueSchema.safeParse(input.value);
   if (!parsed.success) {
-    throw new InvalidInputError(`invalid value for ${desc5.key}: ${parsed.error.issues[0]?.message}`);
+    throw new InvalidInputError(`invalid value for ${desc6.key}: ${parsed.error.issues[0]?.message}`);
   }
   const value = parsed.data;
   if (toProject) {
     const project = requireProjectById(ctx, input.projectId);
-    ctx.db.update(projects).set({ [desc5.projectColumn]: String(value) }).where(eq12(projects.id, project.id)).run();
-    recordHuman(ctx, project.id, desc5.key, String(value));
+    ctx.db.update(projects).set({ [desc6.projectColumn]: String(value) }).where(eq12(projects.id, project.id)).run();
+    recordHuman(ctx, project.id, desc6.key, String(value));
     emitProject(ctx, project.id, {
       type: "settings.updated",
-      message: `${desc5.key} override set to ${String(value)}`,
-      data: { key: desc5.key, scope: "project", value }
+      message: `${desc6.key} override set to ${String(value)}`,
+      data: { key: desc6.key, scope: "project", value }
     });
-    return field(getSettings(ctx, input.projectId, io), desc5.key);
+    return field(getSettings(ctx, input.projectId, io), desc6.key);
   }
-  if (!desc5.configKey) {
-    throw new InvalidInputError(`${desc5.key} is a per-project setting; provide a projectId`);
+  if (!desc6.configKey) {
+    throw new InvalidInputError(`${desc6.key} is a per-project setting; provide a projectId`);
   }
-  writeGlobal(configFile, desc5.configKey, value);
-  ctx.config[desc5.configKey] = value;
+  writeGlobal(configFile, desc6.configKey, value);
+  ctx.config[desc6.configKey] = value;
   emitProject(ctx, GLOBAL_EVENT_KEY, {
     type: "settings.updated",
-    message: `${desc5.key} set to ${String(value)}`,
-    data: { key: desc5.key, scope: "global", value }
+    message: `${desc6.key} set to ${String(value)}`,
+    data: { key: desc6.key, scope: "global", value }
   });
-  return field(getSettings(ctx, input.projectId, io), desc5.key);
+  return field(getSettings(ctx, input.projectId, io), desc6.key);
 }
 function writeGlobal(configFile, configKey, value) {
   const raw = readRawConfig(configFile);
@@ -8764,7 +9268,17 @@ var init_ticket = __esm(() => {
       }
       return { stopped: false, swept: false };
     }),
-    cancel: publicProcedure.input(z13.object({ ticketId: z13.string(), reason: z13.string().optional() })).mutation(({ ctx, input }) => cancelTicket(ctx, input.ticketId, input.reason))
+    cancel: publicProcedure.input(z13.object({ ticketId: z13.string(), reason: z13.string().optional() })).mutation(({ ctx, input }) => cancelTicket(ctx, input.ticketId, input.reason)),
+    edit: publicProcedure.input(z13.object({
+      ticketId: z13.string(),
+      title: z13.string().min(1).optional(),
+      goal: z13.string().min(1).optional(),
+      context: z13.string().optional(),
+      acceptanceCriteria: z13.array(z13.string().min(1)).optional()
+    })).mutation(({ ctx, input }) => {
+      const { ticketId, ...patch } = input;
+      return editTicket(ctx, ticketId, patch);
+    })
   });
 });