ctxr-cli 0.33.0 → 0.34.0

package/dist/core/second-opinion/prompts.js

@@ -0,0 +1,65 @@
+import { SecondOpinionUsageError } from '../errors.js';
+import { packagedTemplate, substituteBlock } from '../templates.js';
+/**
+ * run-the-second-opinion-from-the-cli D4: the critic contract, the persona
+ * mandates, the lens roster and the poll scaffolds are package templates
+ * under `templates/second-opinion/`, reviewable as markdown. This module only
+ * assembles them; it carries no prompt prose of its own.
+ */
+const template = (name) => packagedTemplate('second-opinion', name);
+export function critiquePrompt(role, plan) {
+    return `${template('critic-contract').trimEnd()}\n\n---\n${template(`personas/${role}`).trimEnd()}\n\nPLAN:\n${plan}\n`;
+}
+/** The built-in lenses, by name, from the roster's `- **name** — description` lines. */
+export function lensRoster() {
+    const roster = new Map();
+    for (const m of template('lenses').matchAll(/^- \*\*([a-z-]+)\*\* — (.+)$/gm))
+        roster.set(m[1], m[2].trim());
+    return roster;
+}
+const INLINE_LENS = /^[^:,]{1,40}:/;
+/**
+ * Splits `--lens` into one string per lens. Lenses are comma-separated, but an inline description may itself
+ * contain commas: a fragment starts a NEW lens only when it is exactly a roster name or begins `Name:`;
+ * any other fragment continues the lens before it. So `minimalist,House taste:blunt, anti-slogan` is two
+ * lenses, and a description must not contain a colon (that would read as the start of another lens).
+ */
+export function splitLenses(spec, roster) {
+    const lenses = [];
+    for (const fragment of spec.split(',').map((f) => f.trim()).filter(Boolean)) {
+        const startsLens = roster.has(fragment.toLowerCase()) || INLINE_LENS.test(fragment);
+        if (startsLens || lenses.length === 0)
+            lenses.push(fragment);
+        else
+            lenses[lenses.length - 1] += `, ${fragment}`;
+    }
+    return lenses;
+}
+/** One `- name — description` line per lens; refuses an unknown lens and a count outside two to three. */
+export function lensLines(spec) {
+    const roster = lensRoster();
+    const described = [];
+    for (const s of splitLenses(spec, roster)) {
+        const known = roster.get(s.toLowerCase());
+        if (known !== undefined)
+            described.push(`- ${s.toLowerCase()} — ${known}`);
+        else if (INLINE_LENS.test(s)) {
+            const [name, ...rest] = s.split(':');
+            described.push(`- ${name.trim()} — ${rest.join(':').trim()}`);
+        }
+        else {
+            throw new SecondOpinionUsageError(`unknown lens "${s}" (known: ${[...roster.keys()].join(', ')}; or pass "Name:description")`);
+        }
+    }
+    if (described.length < 2 || described.length > 3)
+        throw new SecondOpinionUsageError('--lens takes two or three lenses; keep them orthogonal');
+    return described;
+}
+export function pollPrompt(question, opts) {
+    if (opts.lens) {
+        const withLenses = substituteBlock(template('taste-panel'), '__LENSES__', lensLines(opts.lens));
+        return `${substituteBlock(withLenses, '__QUESTION__', question.split('\n'))}\n`;
+    }
+    return opts.wrap ? `${question}\n\n${template('poll-answer')}` : question;
+}
+//# sourceMappingURL=prompts.js.map

package/dist/core/second-opinion/prompts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"prompts.js","sourceRoot":"","sources":["../../../src/core/second-opinion/prompts.ts"],"names":[],"mappings":"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"}

package/dist/core/session/commit.d.ts

@@ -0,0 +1,29 @@
+import type { GitResult, GitRunner } from '../git/exec.js';
+/**
+ * bring-the-session-lifecycle-into-the-cli D4: one commit call for both
+ * surfaces. Locally it commits as the clone's own git identity, exactly as a
+ * hand-run `git commit` does. The MCP surface passes an author override (the
+ * member's verified email) with a trailer naming them, and the recording
+ * login as committer when the host has no identity of its own — the same
+ * fallback `ctxr land` uses. The store's hooks run either way.
+ */
+export interface CommitOptions {
+    message: string;
+    /** The commit's author, in place of the clone's identity. */
+    author?: {
+        name: string;
+        email: string;
+    };
+    /** A trailer paragraph, e.g. `Edited-by: <email>`. */
+    trailer?: {
+        key: string;
+        value: string;
+    };
+    /** The committer when neither git config nor the environment names one; omitted, git decides. */
+    fallbackCommitter?: string;
+}
+/** The committer: the host's git identity when it has one, else the given login's noreply address. */
+export declare function committerEnv(git: GitRunner, cwd: string, env: Readonly<Record<string, string | undefined>>, login: string): Promise<Record<string, string>>;
+/** Commits what is staged in `cwd`. Resolves with git's result; the caller decides what a refusal means on its surface. */
+export declare function commitStaged(git: GitRunner, cwd: string, env: Readonly<Record<string, string | undefined>>, opts: CommitOptions): Promise<GitResult>;
+//# sourceMappingURL=commit.d.ts.map

package/dist/core/session/commit.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit.d.ts","sourceRoot":"","sources":["../../../src/core/session/commit.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAE3D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,6DAA6D;IAC7D,MAAM,CAAC,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,sDAAsD;IACtD,OAAO,CAAC,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IACzC,iGAAiG;IACjG,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,sGAAsG;AACtG,wBAAsB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAKjK;AAED,2HAA2H;AAC3H,wBAAsB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC,CAQ1J"}

package/dist/core/session/commit.js

@@ -0,0 +1,22 @@
+/** The committer: the host's git identity when it has one, else the given login's noreply address. */
+export async function committerEnv(git, cwd, env, login) {
+    const email = (await git.run(['config', '--get', 'user.email'], { cwd, allowFailure: true })).stdout.trim();
+    if (email !== '' || env.GIT_COMMITTER_EMAIL || env.EMAIL)
+        return {};
+    const address = `${login.replace(/\[bot\]$/, '')}@users.noreply.github.com`;
+    return { GIT_COMMITTER_NAME: login, GIT_COMMITTER_EMAIL: address };
+}
+/** Commits what is staged in `cwd`. Resolves with git's result; the caller decides what a refusal means on its surface. */
+export async function commitStaged(git, cwd, env, opts) {
+    const identity = {};
+    if (opts.fallbackCommitter !== undefined)
+        Object.assign(identity, await committerEnv(git, cwd, env, opts.fallbackCommitter));
+    if (opts.author !== undefined)
+        Object.assign(identity, { GIT_AUTHOR_NAME: opts.author.name, GIT_AUTHOR_EMAIL: opts.author.email });
+    const args = ['commit', '--quiet', '-m', opts.message];
+    if (opts.trailer !== undefined)
+        args.push('-m', `${opts.trailer.key}: ${opts.trailer.value}`);
+    const overridden = Object.keys(identity).length > 0;
+    return git.run(args, { cwd, allowFailure: true, ...(overridden ? { env: { ...env, ...identity } } : {}) });
+}
+//# sourceMappingURL=commit.js.map

package/dist/core/session/commit.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"commit.js","sourceRoot":"","sources":["../../../src/core/session/commit.ts"],"names":[],"mappings":"AAoBA,sGAAsG;AACtG,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAc,EAAE,GAAW,EAAE,GAAiD,EAAE,KAAa;IAC9H,MAAM,KAAK,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC5G,IAAI,KAAK,KAAK,EAAE,IAAI,GAAG,CAAC,mBAAmB,IAAI,GAAG,CAAC,KAAK;QAAE,OAAO,EAAE,CAAC;IACpE,MAAM,OAAO,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,2BAA2B,CAAC;IAC5E,OAAO,EAAE,kBAAkB,EAAE,KAAK,EAAE,mBAAmB,EAAE,OAAO,EAAE,CAAC;AACrE,CAAC;AAED,2HAA2H;AAC3H,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAc,EAAE,GAAW,EAAE,GAAiD,EAAE,IAAmB;IACpI,MAAM,QAAQ,GAA2B,EAAE,CAAC;IAC5C,IAAI,IAAI,CAAC,iBAAiB,KAAK,SAAS;QAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC7H,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,eAAe,EAAE,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,gBAAgB,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;IACnI,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,IAAI,IAAI,CAAC,OAAO,KAAK,SAAS;QAAE,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,KAAK,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC,CAAC;IAC9F,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;IACpD,OAAO,GAAG,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,GAAG,GAAG,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;AAC7G,CAAC"}

package/dist/core/session/discard.d.ts

@@ -0,0 +1,24 @@
+import { type RemoteDeps } from './remote.js';
+import { type SessionRef } from './resolve.js';
+/**
+ * write-lifecycle spec (*`ctxr session discard` removes only a session, and
+ * only clean unless forced*): #31's `abandon` could force-remove any worktree
+ * (bring-the-session-lifecycle-into-the-cli D1, point 4). `resolveSession`
+ * has already refused anything that is not a session; this refuses, without
+ * `--force`, a session whose removal would lose work — uncommitted changes, or
+ * commits its remote branch lacks — and closes a pull request only when asked.
+ */
+export interface DiscardResult {
+    session: string;
+    worktree: string;
+    branch: string;
+    removed: boolean;
+    forced: boolean;
+    /** The pull request `--close-pull-request` closed; null when none was asked for or none was open. */
+    closed_pull_request: number | null;
+}
+export declare function discardSession(deps: RemoteDeps, session: SessionRef, opts?: {
+    force?: boolean;
+    closePullRequest?: boolean;
+}): Promise<DiscardResult>;
+//# sourceMappingURL=discard.d.ts.map

package/dist/core/session/discard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"discard.d.ts","sourceRoot":"","sources":["../../../src/core/session/discard.ts"],"names":[],"mappings":"AAIA,OAAO,EAAgD,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC5F,OAAO,EAAkB,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/D;;;;;;;GAOG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;IACjB,MAAM,EAAE,OAAO,CAAC;IAChB,qGAAqG;IACrG,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;CACpC;AAiCD,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,GAAE;IAAE,KAAK,CAAC,EAAE,OAAO,CAAC;IAAC,gBAAgB,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAqC9J"}

package/dist/core/session/discard.js

@@ -0,0 +1,68 @@
+import { baseRef, forgeRead } from '../approval/sessions.js';
+import { SessionRefusedError } from '../errors.js';
+import { ExitCode } from '../exit-codes.js';
+import { ForgeRequestError } from '../forge/github.js';
+import { removeSession, remoteTip, SessionRemoteError } from './remote.js';
+import { workingChanges } from './resolve.js';
+/**
+ * The session's commits that are on no remote ref: not on its remote branch,
+ * nor any other this clone has fetched. A session whose pull request was
+ * squash-merged and whose branch was then deleted carries commits on no
+ * remote ref, so a merged pull request at exactly this head counts as published.
+ */
+async function unpublishedCommits(deps, session) {
+    const run = (args) => deps.git.run(args, { cwd: session.path, allowFailure: true });
+    const tip = (await run(['rev-parse', 'HEAD'])).stdout.trim();
+    let remote = null;
+    try {
+        remote = await remoteTip(deps, session.path, session.branch);
+    }
+    catch (err) {
+        if (!(err instanceof SessionRemoteError))
+            throw err;
+    }
+    if (remote === tip)
+        return 0;
+    const exclude = remote !== null && (await run(['cat-file', '-e', `${remote}^{commit}`])).exitCode === 0 ? [`^${remote}`] : [];
+    // The default branch itself never counts: a session's base is already on it.
+    const base = await baseRef(deps.git, session.path, deps.config.git.default_branch);
+    const counted = await run(['rev-list', '--count', 'HEAD', ...exclude, `^${base}`, '--not', '--remotes=origin']);
+    const count = counted.exitCode === 0 ? Number.parseInt(counted.stdout.trim(), 10) || 0 : 0;
+    if (count === 0)
+        return 0;
+    try {
+        const pulls = await deps.forge.pullsForHead(session.branch);
+        if (pulls.some((p) => p.merged && p.headSha === tip))
+            return 0;
+    }
+    catch (err) {
+        if (!(err instanceof ForgeRequestError))
+            throw err;
+    }
+    return count;
+}
+export async function discardSession(deps, session, opts = {}) {
+    const force = opts.force === true;
+    if (!force) {
+        const dirty = await workingChanges(deps.git, session.path);
+        if (dirty.length > 0) {
+            throw new SessionRefusedError(ExitCode.CheckFailed, 'discard_uncommitted', `"${session.name}" has uncommitted changes (${dirty.map((c) => c.path).join(', ')}); discarding it would destroy them. Pass --force to discard them anyway.`, { session: session.name, paths: dirty.map((c) => c.path) }, session.name);
+        }
+        const unpublished = await unpublishedCommits(deps, session);
+        if (unpublished > 0) {
+            throw new SessionRefusedError(ExitCode.CheckFailed, 'discard_unpushed', `"${session.name}" carries ${unpublished} commit(s) its remote branch lacks; discarding it would destroy them. Pass --force to discard them anyway.`, { session: session.name, commits: unpublished }, session.name);
+        }
+    }
+    let closed = null;
+    if (opts.closePullRequest === true) {
+        // Before anything is removed, so a forge that cannot be reached leaves the session as it was.
+        const open = (await forgeRead(() => deps.forge.pullsForHead(session.branch))).find((p) => p.state === 'open');
+        if (open !== undefined) {
+            await forgeRead(() => deps.forge.updatePull(open.number, { state: 'closed' }));
+            closed = open.number;
+        }
+    }
+    await removeSession(deps.git, session.canonical, session);
+    return { session: session.name, worktree: session.path, branch: session.branch, removed: true, forced: force, closed_pull_request: closed };
+}
+//# sourceMappingURL=discard.js.map

package/dist/core/session/discard.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"discard.js","sourceRoot":"","sources":["../../../src/core/session/discard.ts"],"names":[],"mappings":"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"}

package/dist/core/session/list.d.ts

@@ -0,0 +1,48 @@
+import type { StoreConfig } from '../../config/schema.js';
+import type { ReviewStateName } from '../approval/decision.js';
+import { type ForgeClient } from '../forge/github.js';
+import type { GitRunner } from '../git/exec.js';
+/**
+ * write-lifecycle spec (*`ctxr session list` reports each session's state*):
+ * each session's branch, worktree, head, uncommitted state and commits ahead,
+ * all read locally. With `review`, each one's open pull request and, when the
+ * store declares change approval, the decision `ctxr review list` reports for
+ * it. The forge stays behind the option so a plain list never waits on the
+ * network; an unreachable forge reads `unknown`, because the list is an
+ * inventory, not a check (bring-the-session-lifecycle-into-the-cli D3,
+ * revision 1).
+ */
+export interface SessionListEntry {
+    /** The worktree's directory name: what the other session commands take. */
+    name: string;
+    branch: string;
+    worktree: string;
+    head: string;
+    uncommitted: boolean;
+    ahead: number;
+    /** `review` only: the open pull request, null when none is open. */
+    pull_request?: {
+        number: number | null;
+        state: 'open' | 'unknown';
+        url: string | null;
+    } | null;
+    /** `review` with change approval declared: the decision on the open pull request. */
+    review?: {
+        state: ReviewStateName | 'unknown';
+        comment: string | null;
+    } | null;
+}
+export interface ListReview {
+    forge: ForgeClient;
+    /** `change_approval.recording_login`; null when the store declares no change approval. */
+    recordingLogin: string | null;
+}
+export interface SessionList {
+    sessions: SessionListEntry[];
+    /** `review` only: whether the forge answered. */
+    forge_reachable?: boolean;
+}
+export declare function listSessions(git: GitRunner, storeRoot: string, config: StoreConfig, opts?: {
+    review?: ListReview;
+}): Promise<SessionList>;
+//# sourceMappingURL=list.d.ts.map

package/dist/core/session/list.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.d.ts","sourceRoot":"","sources":["../../../src/core/session/list.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE/D,OAAO,EAAqB,KAAK,WAAW,EAAoB,MAAM,oBAAoB,CAAC;AAC3F,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD;;;;;;;;;GASG;AACH,MAAM,WAAW,gBAAgB;IAC/B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,OAAO,CAAC;IACrB,KAAK,EAAE,MAAM,CAAC;IACd,oEAAoE;IACpE,YAAY,CAAC,EAAE;QAAE,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;QAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAC/F,qFAAqF;IACrF,MAAM,CAAC,EAAE;QAAE,KAAK,EAAE,eAAe,GAAG,SAAS,CAAC;QAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;CAChF;AAED,MAAM,WAAW,UAAU;IACzB,KAAK,EAAE,WAAW,CAAC;IACnB,0FAA0F;IAC1F,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;CAC/B;AAED,MAAM,WAAW,WAAW;IAC1B,QAAQ,EAAE,gBAAgB,EAAE,CAAC;IAC7B,iDAAiD;IACjD,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAWD,wBAAsB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,UAAU,CAAA;CAAO,GAAG,OAAO,CAAC,WAAW,CAAC,CA0CnJ"}

package/dist/core/session/list.js

@@ -0,0 +1,55 @@
+import { baseRef, reviewStateOf, sessionWorktrees } from '../approval/sessions.js';
+import { ForgeRequestError } from '../forge/github.js';
+import { commitsAhead, workingChanges } from './resolve.js';
+async function forgeOr(call) {
+    try {
+        return await call();
+    }
+    catch (err) {
+        if (err instanceof ForgeRequestError)
+            return 'unknown';
+        throw err;
+    }
+}
+export async function listSessions(git, storeRoot, config, opts = {}) {
+    const worktrees = await sessionWorktrees(git, storeRoot, config);
+    const base = await baseRef(git, storeRoot, config.git.default_branch);
+    const sessions = await Promise.all(worktrees.map(async (w) => ({
+        name: w.name,
+        branch: w.branch,
+        worktree: w.path,
+        head: (await git.run(['rev-parse', 'HEAD'], { cwd: w.path, allowFailure: true })).stdout.trim(),
+        uncommitted: (await workingChanges(git, w.path)).length > 0,
+        ahead: await commitsAhead(git, w.path, base),
+    })));
+    if (opts.review === undefined)
+        return { sessions };
+    const { forge, recordingLogin } = opts.review;
+    const open = await forgeOr(() => forge.openPulls());
+    let reachable = open !== 'unknown';
+    await Promise.all(sessions.map(async (entry) => {
+        if (open === 'unknown') {
+            entry.pull_request = { number: null, state: 'unknown', url: null };
+            if (recordingLogin !== null)
+                entry.review = { state: 'unknown', comment: null };
+            return;
+        }
+        const pull = open.find((p) => p.headRef === entry.branch);
+        entry.pull_request = pull === undefined ? null : { number: pull.number, state: 'open', url: pull.url };
+        if (recordingLogin === null)
+            return;
+        if (pull === undefined) {
+            entry.review = null;
+            return;
+        }
+        const review = await forgeOr(() => reviewStateOf(git, entry.worktree, base, forge, recordingLogin, pull));
+        if (review === 'unknown') {
+            reachable = false;
+            entry.review = { state: 'unknown', comment: null };
+            return;
+        }
+        entry.review = { state: review.state, comment: review.state === 'changes-requested' ? (review.decision?.comment ?? null) : null };
+    }));
+    return { sessions, forge_reachable: reachable };
+}
+//# sourceMappingURL=list.js.map

package/dist/core/session/list.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/core/session/list.ts"],"names":[],"mappings":"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"}

package/dist/core/session/rebase.d.ts

@@ -0,0 +1,34 @@
+import type { ForgeCredentials } from '../forge/credentials.js';
+import { type SessionRef } from './resolve.js';
+import { type StatusDeps } from './status.js';
+/**
+ * write-lifecycle spec (*`ctxr session rebase` brings a session onto the
+ * default branch*): the conflict playbook's mechanics. The judgment — reading
+ * both sides and writing a version that keeps both meanings — stays the
+ * agent's; this fetches, rebases, reports each conflict with both sides, and
+ * stages and continues once the agent has resolved them
+ * (bring-the-session-lifecycle-into-the-cli D3).
+ */
+export interface Conflict {
+    /** Relative to the worktree's top level. */
+    path: string;
+    /** The default branch's version, with the session's commits applied so far; null when that side deleted the file. */
+    default_branch: string | null;
+    /** The version in the session commit being replayed; null when it deleted the file. */
+    session: string | null;
+}
+export type RebaseOutcome = 'rebased' | 'up-to-date' | 'conflict' | 'aborted';
+export interface RebaseResult {
+    session: string;
+    branch: string;
+    onto: string;
+    fetched: boolean;
+    outcome: RebaseOutcome;
+    head: string;
+    conflicts: Conflict[];
+}
+export type RebaseMode = 'start' | 'continue' | 'abort';
+export declare function rebaseSession(deps: StatusDeps & {
+    credentials: ForgeCredentials;
+}, session: SessionRef, mode: RebaseMode): Promise<RebaseResult>;
+//# sourceMappingURL=rebase.d.ts.map

package/dist/core/session/rebase.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.d.ts","sourceRoot":"","sources":["../../../src/core/session/rebase.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,OAAO,EAAoC,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AACjF,OAAO,EAAsB,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAElE;;;;;;;GAOG;AACH,MAAM,WAAW,QAAQ;IACvB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,qHAAqH;IACrH,cAAc,EAAE,MAAM,GAAG,IAAI,CAAC;IAC9B,uFAAuF;IACvF,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;CACxB;AAED,MAAM,MAAM,aAAa,GAAG,SAAS,GAAG,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAE9E,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,aAAa,CAAC;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,QAAQ,EAAE,CAAC;CACvB;AAED,MAAM,MAAM,UAAU,GAAG,OAAO,GAAG,UAAU,GAAG,OAAO,CAAC;AA0BxD,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG;IAAE,WAAW,EAAE,gBAAgB,CAAA;CAAE,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,GAAG,OAAO,CAAC,YAAY,CAAC,CAsDtJ"}

package/dist/core/session/rebase.js

@@ -0,0 +1,87 @@
+import { readFile } from 'node:fs/promises';
+import path from 'node:path';
+import { baseRef } from '../approval/sessions.js';
+import { SessionRefusedError } from '../errors.js';
+import { ExitCode } from '../exit-codes.js';
+import { rebaseInProgress, workingChanges } from './resolve.js';
+import { fetchDefaultBranch } from './status.js';
+const MARKER = /^(<{7}|>{7})( |$)/m;
+async function stageContent(git, cwd, stage, file) {
+    const shown = await git.run(['show', `:${stage}:${file}`], { cwd, allowFailure: true });
+    return shown.exitCode === 0 ? shown.stdout : null;
+}
+async function conflictedPaths(git, cwd) {
+    const { stdout } = await git.run(['diff', '--name-only', '--diff-filter=U', '-z'], { cwd, allowFailure: true });
+    return stdout.split('\0').filter((p) => p !== '');
+}
+async function conflicts(git, cwd) {
+    const found = [];
+    for (const file of await conflictedPaths(git, cwd)) {
+        found.push({ path: file, default_branch: await stageContent(git, cwd, 2, file), session: await stageContent(git, cwd, 3, file) });
+    }
+    return found;
+}
+async function head(git, cwd) {
+    return (await git.run(['rev-parse', 'HEAD'], { cwd })).stdout.trim();
+}
+export async function rebaseSession(deps, session, mode) {
+    const { git } = deps;
+    const cwd = session.path;
+    const inProgress = await rebaseInProgress(git, cwd);
+    const result = async (outcome, onto, fetched) => ({
+        session: session.name,
+        branch: session.branch,
+        onto,
+        fetched,
+        outcome,
+        head: await head(git, cwd),
+        conflicts: outcome === 'conflict' ? await conflicts(git, cwd) : [],
+    });
+    const onto = await baseRef(git, cwd, deps.config.git.default_branch);
+    // A rebase replays commits, so its editor must never wait on a person.
+    const rebase = (args) => git.run(['-c', 'core.editor=true', 'rebase', ...args], { cwd, allowFailure: true, env: { ...deps.env, GIT_EDITOR: 'true' } });
+    if (mode === 'abort') {
+        if (!inProgress)
+            throw new SessionRefusedError(ExitCode.Usage, 'no_rebase', `No rebase is in progress in "${session.name}", so there is nothing to abort.`, { session: session.name });
+        await rebase(['--abort']);
+        return result('aborted', onto, false);
+    }
+    if (mode === 'continue') {
+        if (!inProgress)
+            throw new SessionRefusedError(ExitCode.Usage, 'no_rebase', `No rebase is in progress in "${session.name}", so there is nothing to continue.`, { session: session.name });
+        const unresolved = [];
+        for (const file of await conflictedPaths(git, cwd)) {
+            const working = await readFile(path.join(cwd, file), 'utf8').catch(() => null);
+            if (working !== null && MARKER.test(working))
+                unresolved.push(file);
+        }
+        if (unresolved.length > 0) {
+            throw new SessionRefusedError(ExitCode.CheckFailed, 'conflict_unresolved', `Conflict markers remain in ${unresolved.map((f) => `"${f}"`).join(', ')}; resolve them before continuing.`, { session: session.name, paths: unresolved });
+        }
+        for (const file of await conflictedPaths(git, cwd))
+            await git.run(['add', '-A', '--', file], { cwd, allowFailure: true });
+        const continued = await rebase(['--continue']);
+        if (continued.exitCode === 0)
+            return result('rebased', onto, false);
+        if (await rebaseInProgress(git, cwd))
+            return result('conflict', onto, false);
+        throw new SessionRefusedError(ExitCode.CheckFailed, 'rebase_failed', `The rebase could not continue: ${continued.stderr.trim() || continued.stdout.trim()}`, { session: session.name });
+    }
+    if (inProgress) {
+        throw new SessionRefusedError(ExitCode.Usage, 'rebase_in_progress', `A rebase is already in progress in "${session.name}"; finish it with \`ctxr session rebase ${session.name} --continue\` or undo it with \`--abort\`.`, { session: session.name });
+    }
+    const dirty = await workingChanges(git, cwd);
+    if (dirty.length > 0) {
+        throw new SessionRefusedError(ExitCode.CheckFailed, 'uncommitted_changes', `"${session.name}" has uncommitted changes (${dirty.map((c) => c.path).join(', ')}); submit or set them aside before rebasing.`, { session: session.name, paths: dirty.map((c) => c.path) });
+    }
+    const fetched = await fetchDefaultBranch(deps, cwd);
+    const base = await baseRef(git, cwd, deps.config.git.default_branch);
+    const before = await head(git, cwd);
+    const rebased = await rebase(['--quiet', base]);
+    if (rebased.exitCode === 0)
+        return result((await head(git, cwd)) === before ? 'up-to-date' : 'rebased', base, fetched);
+    if (await rebaseInProgress(git, cwd))
+        return result('conflict', base, fetched);
+    throw new SessionRefusedError(ExitCode.CheckFailed, 'rebase_failed', `The rebase could not start: ${rebased.stderr.trim() || rebased.stdout.trim()}`, { session: session.name });
+}
+//# sourceMappingURL=rebase.js.map

package/dist/core/session/rebase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"rebase.js","sourceRoot":"","sources":["../../../src/core/session/rebase.ts"],"names":[],"mappings":"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"}

package/dist/core/session/remote.d.ts

@@ -0,0 +1,80 @@
+import type { StoreConfig } from '../../config/schema.js';
+import { type ForgeCredentials } from '../forge/credentials.js';
+import type { ForgeClient, PullRequest } from '../forge/github.js';
+import type { GitRunner } from '../git/exec.js';
+/**
+ * bring-the-session-lifecycle-into-the-cli (design.md Migration Plan, step 2):
+ * the session's remote side — push, publish (push plus the pull request, found
+ * by head before one is opened) and remove — moved here from the MCP surface's
+ * `sessions.ts`, so `ctxr session submit`, `discard` and the MCP tools run one
+ * implementation. Failures are thrown as `SessionRemoteError`, naming the step,
+ * and each caller words them for its own surface.
+ */
+export interface RemoteDeps {
+    git: GitRunner;
+    config: StoreConfig;
+    credentials: ForgeCredentials;
+    forge: ForgeClient;
+    env: Readonly<Record<string, string | undefined>>;
+}
+/** The worktree and branch a remote step acts on. */
+export interface SessionTarget {
+    path: string;
+    branch: string;
+}
+export type PullState = {
+    kind: 'open';
+    pull: PullRequest;
+} | {
+    kind: 'merged';
+} | {
+    kind: 'closed-unmerged';
+} | {
+    kind: 'none';
+};
+export type RemoteStep = 'push' | 'pull_request';
+/** A push or forge call that did not succeed; everything before it stays in place, so the same call can be retried. */
+export declare class SessionRemoteError extends Error {
+    readonly step: RemoteStep;
+    readonly detail: string;
+    constructor(step: RemoteStep, detail: string);
+}
+export declare function firstLines(text: string, count?: number): string;
+/** What the forge says about the pull requests for `branch`: the open one, else merged, else closed, else none. */
+export declare function pullStateFor(forge: ForgeClient, branch: string): Promise<PullState>;
+/** The remote branch's tip, or null when the remote has no such branch. Throws when the remote cannot be read at all. */
+export declare function remoteTip(deps: RemoteDeps, cwd: string, branch: string): Promise<string | null>;
+export type PushOutcome = 'up-to-date' | 'pushed' | 'pushed-with-lease';
+/**
+ * Pushes the session's HEAD to its branch when the remote lacks it. Read
+ * first, so a retry after a push whose response was lost pushes nothing. A
+ * fast-forward is a plain push. A rewritten history (after `ctxr session
+ * rebase`) is pushed with a lease on the remote-tracking ref this clone last
+ * saw — never on the tip just read, which would overwrite a push made by
+ * someone else since (bring-the-session-lifecycle-into-the-cli D3).
+ */
+export declare function pushSession(deps: RemoteDeps, session: SessionTarget): Promise<PushOutcome>;
+export interface PublishResult {
+    pull: PullRequest;
+    push: PushOutcome;
+    /** `created` when this call opened it, `updated` when it rewrote an open one's title or body, else `found`. */
+    pullRequest: 'created' | 'updated' | 'found';
+}
+/**
+ * Publishes whatever the session holds that the forge does not: its branch,
+ * pushed when the remote lacks the local tip, and a pull request, found by
+ * head before one is opened. Idempotent, so a retry after any partial failure
+ * converges on exactly one pull request (serve-the-store-over-mcp D9, D13).
+ * With `update`, an open pull request whose title or body differs is rewritten
+ * to the given ones — how a resubmitted session answers requested changes on
+ * the same pull request (bring-the-session-lifecycle-into-the-cli D3).
+ */
+export declare function publishSession(deps: RemoteDeps, session: SessionTarget, pull: {
+    title: string;
+    body: string;
+}, opts?: {
+    update?: boolean;
+}): Promise<PublishResult>;
+/** Removes a session: its worktree and its local branch. The remote branch and any pull request are left as they are. */
+export declare function removeSession(git: GitRunner, canonicalRoot: string, session: SessionTarget): Promise<void>;
+//# sourceMappingURL=remote.d.ts.map

package/dist/core/session/remote.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"remote.d.ts","sourceRoot":"","sources":["../../../src/core/session/remote.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAC1D,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,KAAK,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAGhD;;;;;;;GAOG;AAEH,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,gBAAgB,CAAC;IAC9B,KAAK,EAAE,WAAW,CAAC;IACnB,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;CACnD;AAED,qDAAqD;AACrD,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,MAAM,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,WAAW,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,QAAQ,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,iBAAiB,CAAA;CAAE,GAAG;IAAE,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC;AAElI,MAAM,MAAM,UAAU,GAAG,MAAM,GAAG,cAAc,CAAC;AAEjD,uHAAuH;AACvH,qBAAa,kBAAmB,SAAQ,KAAK;IAEzC,QAAQ,CAAC,IAAI,EAAE,UAAU;IACzB,QAAQ,CAAC,MAAM,EAAE,MAAM;IAFzB,YACW,IAAI,EAAE,UAAU,EAChB,MAAM,EAAE,MAAM,EAIxB;CACF;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,SAAI,GAAG,MAAM,CAE1D;AAED,mHAAmH;AACnH,wBAAsB,YAAY,CAAC,KAAK,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,CAAC,CAOzF;AAED,yHAAyH;AACzH,wBAAsB,SAAS,CAAC,IAAI,EAAE,UAAU,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAKrG;AAED,MAAM,MAAM,WAAW,GAAG,YAAY,GAAG,QAAQ,GAAG,mBAAmB,CAAC;AAMxE;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC,CAqBhG;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,WAAW,CAAC;IAClB,IAAI,EAAE,WAAW,CAAC;IAClB,+GAA+G;IAC/G,WAAW,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;CAC9C;AAED;;;;;;;;GAQG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,aAAa,EAAE,IAAI,EAAE;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAAE,IAAI,GAAE;IAAE,MAAM,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAc7K;AAED,yHAAyH;AACzH,wBAAsB,aAAa,CAAC,GAAG,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAGhH"}