ctxr-cli 0.32.0 → 0.34.0

package/dist/core/session/remote.js

@@ -0,0 +1,102 @@
+import { runRemoteGit } from '../forge/credentials.js';
+import { removeWorktree } from '../git/worktree.js';
+/** A push or forge call that did not succeed; everything before it stays in place, so the same call can be retried. */
+export class SessionRemoteError extends Error {
+    step;
+    detail;
+    constructor(step, detail) {
+        super(`${step === 'push' ? 'push' : 'pull request'} failed: ${detail}`);
+        this.step = step;
+        this.detail = detail;
+        this.name = 'SessionRemoteError';
+    }
+}
+export function firstLines(text, count = 6) {
+    return text.trim().split('\n').slice(0, count).join('\n');
+}
+/** What the forge says about the pull requests for `branch`: the open one, else merged, else closed, else none. */
+export async function pullStateFor(forge, branch) {
+    const pulls = await forge.pullsForHead(branch);
+    const open = pulls.find((p) => p.state === 'open');
+    if (open !== undefined)
+        return { kind: 'open', pull: open };
+    if (pulls.some((p) => p.merged))
+        return { kind: 'merged' };
+    if (pulls.length > 0)
+        return { kind: 'closed-unmerged' };
+    return { kind: 'none' };
+}
+/** The remote branch's tip, or null when the remote has no such branch. Throws when the remote cannot be read at all. */
+export async function remoteTip(deps, cwd, branch) {
+    const listed = await runRemoteGit(deps.git, deps.credentials, deps.env, ['ls-remote', 'origin', `refs/heads/${branch}`], { cwd, allowFailure: true });
+    if (listed.exitCode !== 0)
+        throw new SessionRemoteError('push', firstLines(listed.stderr, 2));
+    const sha = listed.stdout.split(/\s/)[0] ?? '';
+    return sha === '' ? null : sha;
+}
+async function isAncestor(git, cwd, ancestor, descendant) {
+    return (await git.run(['merge-base', '--is-ancestor', ancestor, descendant], { cwd, allowFailure: true })).exitCode === 0;
+}
+/**
+ * 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 async function pushSession(deps, session) {
+    const tip = (await deps.git.run(['rev-parse', 'HEAD'], { cwd: session.path })).stdout.trim();
+    const remote = await remoteTip(deps, session.path, session.branch);
+    if (remote === tip)
+        return 'up-to-date';
+    const args = ['push', '--quiet', 'origin', `HEAD:refs/heads/${session.branch}`];
+    let outcome = 'pushed';
+    if (remote !== null && !(await isAncestor(deps.git, session.path, remote, tip))) {
+        const seen = await deps.git.run(['rev-parse', '--verify', '--quiet', `refs/remotes/origin/${session.branch}`], { cwd: session.path, allowFailure: true });
+        const expected = seen.exitCode === 0 ? seen.stdout.trim() : '';
+        if (expected !== remote) {
+            throw new SessionRemoteError('push', `the remote branch "${session.branch}" is at ${remote.slice(0, 7)}, which this session has not seen; fetch it and rebase before pushing`);
+        }
+        args.splice(2, 0, `--force-with-lease=refs/heads/${session.branch}:${expected}`);
+        outcome = 'pushed-with-lease';
+    }
+    const pushed = await runRemoteGit(deps.git, deps.credentials, deps.env, args, { cwd: session.path, allowFailure: true });
+    if (pushed.exitCode !== 0)
+        throw new SessionRemoteError('push', firstLines(pushed.stderr, 2));
+    // Recorded as seen, so a later leased push leases on what this clone itself pushed.
+    await deps.git.run(['update-ref', `refs/remotes/origin/${session.branch}`, tip], { cwd: session.path, allowFailure: true });
+    return outcome;
+}
+/**
+ * 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 async function publishSession(deps, session, pull, opts = {}) {
+    const push = await pushSession(deps, session);
+    let state;
+    try {
+        state = await pullStateFor(deps.forge, session.branch);
+        if (state.kind === 'open') {
+            const open = state.pull;
+            if (opts.update !== true || (open.title === pull.title && open.body === pull.body))
+                return { pull: open, push, pullRequest: 'found' };
+            return { pull: await deps.forge.updatePull(open.number, { title: pull.title, body: pull.body }), push, pullRequest: 'updated' };
+        }
+        return { pull: await deps.forge.createPull({ head: session.branch, base: deps.config.git.default_branch, title: pull.title, body: pull.body }), push, pullRequest: 'created' };
+    }
+    catch (err) {
+        throw new SessionRemoteError('pull_request', err instanceof Error ? firstLines(err.message, 2) : String(err));
+    }
+}
+/** Removes a session: its worktree and its local branch. The remote branch and any pull request are left as they are. */
+export async function removeSession(git, canonicalRoot, session) {
+    await removeWorktree(git, canonicalRoot, session.path);
+    await git.run(['branch', '-D', session.branch], { cwd: canonicalRoot, allowFailure: true });
+}
+//# sourceMappingURL=remote.js.map

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

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

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

@@ -0,0 +1,41 @@
+import type { StoreConfig } from '../../config/schema.js';
+import type { GitRunner } from '../git/exec.js';
+/**
+ * bring-the-session-lifecycle-into-the-cli D3: a session argument is the
+ * worktree's directory name, as `ctxr session list` prints it. The session
+ * commands act only on a linked worktree directly under the canonical clone's
+ * configured worktrees path, checked out on a branch — the guard #31 found
+ * missing from `abandon` (D1, point 4), applied to every session command.
+ */
+export interface SessionRef {
+    /** The worktree's directory name. */
+    name: string;
+    /** The worktree's top level. */
+    path: string;
+    branch: string;
+    /** The store root inside the worktree: `path` plus the store's prefix in its repository. */
+    storeRoot: string;
+    /** The canonical clone's top level — the repository's main worktree. */
+    canonical: string;
+}
+/**
+ * Resolves `arg` — a directory name, or a path when it carries a separator — to
+ * a session, or with no `arg` the session containing `cwd`. Refused with the
+ * usage code for anything that is not a session: the canonical clone, a
+ * worktree outside the worktrees path, a detached checkout, a name no worktree
+ * carries.
+ */
+export declare function resolveSession(git: GitRunner, storeRoot: string, config: StoreConfig, arg: string | undefined, cwd: string): Promise<SessionRef>;
+/** Whether `cwd`'s checkout is partway through a rebase. */
+export declare function rebaseInProgress(git: GitRunner, cwd: string): Promise<boolean>;
+export interface WorkingChange {
+    /** Relative to the worktree's top level. */
+    path: string;
+    /** git's two-letter short status (`M `, ` M`, `??`, `UU`, …). */
+    status: string;
+}
+/** The worktree's uncommitted changes, untracked files included, as `git status --short` lists them. */
+export declare function workingChanges(git: GitRunner, cwd: string): Promise<WorkingChange[]>;
+/** The number of commits HEAD carries that `base` lacks. */
+export declare function commitsAhead(git: GitRunner, cwd: string, base: string): Promise<number>;
+//# sourceMappingURL=resolve.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../../src/core/session/resolve.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAG1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD;;;;;;GAMG;AACH,MAAM,WAAW,UAAU;IACzB,qCAAqC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,4FAA4F;IAC5F,SAAS,EAAE,MAAM,CAAC;IAClB,wEAAwE;IACxE,SAAS,EAAE,MAAM,CAAC;CACnB;AAUD;;;;;;GAMG;AACH,wBAAsB,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,GAAG,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CA2CtJ;AAYD,4DAA4D;AAC5D,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAMpF;AAED,MAAM,WAAW,aAAa;IAC5B,4CAA4C;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,iEAAiE;IACjE,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,wGAAwG;AACxG,wBAAsB,cAAc,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAa1F;AAED,4DAA4D;AAC5D,wBAAsB,YAAY,CAAC,GAAG,EAAE,SAAS,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAG7F"}

package/dist/core/session/resolve.js

@@ -0,0 +1,109 @@
+import { readFile, realpath, stat } from 'node:fs/promises';
+import path from 'node:path';
+import { SessionRefusedError } from '../errors.js';
+import { ExitCode } from '../exit-codes.js';
+import { listWorktrees } from '../git/worktree.js';
+import { storePrefix } from '../graph/tree.js';
+async function real(p) {
+    try {
+        return await realpath(p);
+    }
+    catch {
+        return path.resolve(p);
+    }
+}
+/**
+ * Resolves `arg` — a directory name, or a path when it carries a separator — to
+ * a session, or with no `arg` the session containing `cwd`. Refused with the
+ * usage code for anything that is not a session: the canonical clone, a
+ * worktree outside the worktrees path, a detached checkout, a name no worktree
+ * carries.
+ */
+export async function resolveSession(git, storeRoot, config, arg, cwd) {
+    const worktrees = await listWorktrees(git, storeRoot);
+    const canonical = worktrees[0]?.path ?? storeRoot;
+    const prefix = await storePrefix(git, storeRoot);
+    const worktreesDir = await real(path.join(canonical, prefix, config.session.worktrees_path));
+    let target;
+    if (arg === undefined) {
+        const top = await git.run(['rev-parse', '--show-toplevel'], { cwd, allowFailure: true });
+        target = top.stdout.trim();
+        if (top.exitCode !== 0 || target === '' || (await real(target)) === (await real(canonical))) {
+            throw new SessionRefusedError(ExitCode.Usage, 'not_in_session', `"${cwd}" is not inside a session worktree; name the session, as \`ctxr session list\` prints it.`, { cwd });
+        }
+    }
+    else if (arg.includes('/') || arg.includes(path.sep) || arg === '.' || arg === '..') {
+        target = path.resolve(cwd, arg);
+    }
+    else {
+        const named = worktrees.find((w) => path.basename(w.path) === arg);
+        if (named === undefined) {
+            throw new SessionRefusedError(ExitCode.Usage, 'not_found', `No session worktree is named "${arg}"; \`ctxr session list\` names them.`, { session: arg }, arg);
+        }
+        target = named.path;
+    }
+    const realTarget = await real(target);
+    const worktree = await (async () => {
+        for (const w of worktrees)
+            if ((await real(w.path)) === realTarget)
+                return w;
+        return undefined;
+    })();
+    const shown = arg ?? target;
+    if (worktree === undefined || (await stat(realTarget).catch(() => null)) === null) {
+        throw new SessionRefusedError(ExitCode.Usage, 'not_a_session', `"${shown}" is not a worktree of this store's repository.`, { session: shown }, shown);
+    }
+    if (worktree === worktrees[0]) {
+        throw new SessionRefusedError(ExitCode.Usage, 'not_a_session', `"${shown}" is the canonical clone, not a session.`, { session: shown, worktree: worktree.path }, shown);
+    }
+    if (path.dirname(realTarget) !== worktreesDir) {
+        throw new SessionRefusedError(ExitCode.Usage, 'not_a_session', `"${shown}" is not under the configured worktrees path (${config.session.worktrees_path}), so it is not a session.`, { session: shown, worktree: worktree.path }, shown);
+    }
+    const branch = worktree.branch ?? (await rebasingBranch(git, worktree.path));
+    if (branch === null) {
+        throw new SessionRefusedError(ExitCode.Usage, 'not_a_session', `"${shown}" is not checked out on a branch, so it is not a session.`, { session: shown, worktree: worktree.path }, shown);
+    }
+    return { name: path.basename(worktree.path), path: worktree.path, branch, storeRoot: path.join(worktree.path, prefix), canonical };
+}
+/** The branch a rebase in progress will move, which git lists as a detached checkout until the rebase ends; null when none is. */
+async function rebasingBranch(git, cwd) {
+    for (const name of ['rebase-merge', 'rebase-apply']) {
+        const gitPath = (await git.run(['rev-parse', '--git-path', `${name}/head-name`], { cwd, allowFailure: true })).stdout.trim();
+        const headName = await readFile(path.resolve(cwd, gitPath), 'utf8').catch(() => null);
+        if (headName !== null && headName.startsWith('refs/heads/'))
+            return headName.trim().slice('refs/heads/'.length);
+    }
+    return null;
+}
+/** Whether `cwd`'s checkout is partway through a rebase. */
+export async function rebaseInProgress(git, cwd) {
+    for (const name of ['rebase-merge', 'rebase-apply']) {
+        const gitPath = (await git.run(['rev-parse', '--git-path', name], { cwd })).stdout.trim();
+        if ((await stat(path.resolve(cwd, gitPath)).catch(() => null)) !== null)
+            return true;
+    }
+    return false;
+}
+/** The worktree's uncommitted changes, untracked files included, as `git status --short` lists them. */
+export async function workingChanges(git, cwd) {
+    const { stdout } = await git.run(['status', '--porcelain=v1', '-z', '--untracked-files=all'], { cwd });
+    const fields = stdout.split('\0');
+    const changes = [];
+    for (let i = 0; i < fields.length; i++) {
+        const field = fields[i];
+        if (field.length < 4)
+            continue;
+        const status = field.slice(0, 2);
+        changes.push({ path: field.slice(3), status });
+        // A rename or copy is followed by its source path, which is not a change of its own.
+        if (status.startsWith('R') || status.startsWith('C'))
+            i += 1;
+    }
+    return changes;
+}
+/** The number of commits HEAD carries that `base` lacks. */
+export async function commitsAhead(git, cwd, base) {
+    const counted = await git.run(['rev-list', '--count', `${base}..HEAD`], { cwd, allowFailure: true });
+    return counted.exitCode === 0 ? Number.parseInt(counted.stdout.trim(), 10) || 0 : 0;
+}
+//# sourceMappingURL=resolve.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/core/session/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC5D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,kBAAkB,CAAC;AAE5C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAqB/C,KAAK,UAAU,IAAI,CAAC,CAAS;IAC3B,IAAI,CAAC;QACH,OAAO,MAAM,QAAQ,CAAC,CAAC,CAAC,CAAC;IAC3B,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACzB,CAAC;AACH,CAAC;AAED;;;;;;GAMG;AACH,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAc,EAAE,SAAiB,EAAE,MAAmB,EAAE,GAAuB,EAAE,GAAW;IAC/H,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACtD,MAAM,SAAS,GAAG,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,SAAS,CAAC;IAClD,MAAM,MAAM,GAAG,MAAM,WAAW,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;IACjD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC;IAE7F,IAAI,MAAc,CAAC;IACnB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;QACzF,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC3B,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,IAAI,MAAM,KAAK,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;YAC5F,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,GAAG,2FAA2F,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;QAC/K,CAAC;IACH,CAAC;SAAM,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,GAAG,KAAK,GAAG,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;QACtF,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;IAClC,CAAC;SAAM,CAAC;QACN,MAAM,KAAK,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,GAAG,CAAC,CAAC;QACnE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,EAAE,iCAAiC,GAAG,sCAAsC,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,GAAG,CAAC,CAAC;QAChK,CAAC;QACD,MAAM,GAAG,KAAK,CAAC,IAAI,CAAC;IACtB,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;IACtC,MAAM,QAAQ,GAAG,MAAM,CAAC,KAAK,IAAI,EAAE;QACjC,KAAK,MAAM,CAAC,IAAI,SAAS;YAAE,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,UAAU;gBAAE,OAAO,CAAC,CAAC;QAC7E,OAAO,SAAS,CAAC;IACnB,CAAC,CAAC,EAAE,CAAC;IACL,MAAM,KAAK,GAAG,GAAG,IAAI,MAAM,CAAC;IAC5B,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC;QAClF,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,KAAK,iDAAiD,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,EAAE,KAAK,CAAC,CAAC;IACxJ,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC;QAC9B,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,KAAK,0CAA0C,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1K,CAAC;IACD,IAAI,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,YAAY,EAAE,CAAC;QAC9C,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,KAAK,iDAAiD,MAAM,CAAC,OAAO,CAAC,cAAc,4BAA4B,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAC1O,CAAC;IACD,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,IAAI,CAAC,MAAM,cAAc,CAAC,GAAG,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC;IAC7E,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QACpB,MAAM,IAAI,mBAAmB,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,EAAE,IAAI,KAAK,2DAA2D,EAAE,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,CAAC;IAC3L,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,SAAS,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,SAAS,EAAE,CAAC;AACrI,CAAC;AAED,kIAAkI;AAClI,KAAK,UAAU,cAAc,CAAC,GAAc,EAAE,GAAW;IACvD,KAAK,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,GAAG,IAAI,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC7H,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC;QACtF,IAAI,QAAQ,KAAK,IAAI,IAAI,QAAQ,CAAC,UAAU,CAAC,aAAa,CAAC;YAAE,OAAO,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAClH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,4DAA4D;AAC5D,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAc,EAAE,GAAW;IAChE,KAAK,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE,cAAc,CAAC,EAAE,CAAC;QACpD,MAAM,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,WAAW,EAAE,YAAY,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;QAC1F,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC;IACvF,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AASD,wGAAwG;AACxG,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAc,EAAE,GAAW;IAC9D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,gBAAgB,EAAE,IAAI,EAAE,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IACvG,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAClC,MAAM,OAAO,GAAoB,EAAE,CAAC;IACpC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACvC,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,CAAE,CAAC;QACzB,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC;YAAE,SAAS;QAC/B,MAAM,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QACjC,OAAO,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;QAC/C,qFAAqF;QACrF,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,CAAC,IAAI,CAAC,CAAC;IAC/D,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,4DAA4D;AAC5D,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,GAAc,EAAE,GAAW,EAAE,IAAY;IAC1E,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,QAAQ,CAAC,EAAE,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IACrG,OAAO,OAAO,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtF,CAAC"}

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

@@ -0,0 +1,47 @@
+import type { StoreConfig } from '../../config/schema.js';
+import { type ForgeCredentials } from '../forge/credentials.js';
+import type { GitRunner } from '../git/exec.js';
+import { type SessionRef, type WorkingChange } from './resolve.js';
+/**
+ * write-lifecycle spec (*`ctxr session status` re-scans a session*): the
+ * re-scan the submit and lifecycle skills ran as six git commands, in one
+ * call both surfaces share (bring-the-session-lifecycle-into-the-cli D3).
+ */
+export interface SessionStatus {
+    session: string;
+    worktree: string;
+    branch: string;
+    head: string;
+    /** What "ahead" is measured against: `origin/<default>` when this clone has it, else the local default branch. */
+    base: string;
+    /** Whether the default branch was fetched first; false offline or with no remote. */
+    fetched: boolean;
+    uncommitted: WorkingChange[];
+    diff_stat: {
+        committed: string;
+        uncommitted: string;
+    };
+    ahead: number;
+    commits: {
+        sha: string;
+        subject: string;
+    }[];
+    rebase_in_progress: boolean;
+    /** `--diff` only: the unified diff of uncommitted work, untracked files included. */
+    diff: string | null;
+}
+export interface StatusDeps {
+    git: GitRunner;
+    config: StoreConfig;
+    env: Readonly<Record<string, string | undefined>>;
+    /** Fetches the default branch first when given; the re-scan then measures against what the remote has now. */
+    credentials?: ForgeCredentials;
+}
+/** Fetches the default branch into its remote-tracking ref; false when there is no remote or it cannot be reached. */
+export declare function fetchDefaultBranch(deps: StatusDeps & {
+    credentials: ForgeCredentials;
+}, cwd: string): Promise<boolean>;
+export declare function sessionStatus(deps: StatusDeps, session: SessionRef, opts?: {
+    diff?: boolean;
+}): Promise<SessionStatus>;
+//# sourceMappingURL=status.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"status.d.ts","sourceRoot":"","sources":["../../../src/core/session/status.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,EAAgB,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,OAAO,EAAkD,KAAK,UAAU,EAAE,KAAK,aAAa,EAAE,MAAM,cAAc,CAAC;AAEnH;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,kHAAkH;IAClH,IAAI,EAAE,MAAM,CAAC;IACb,qFAAqF;IACrF,OAAO,EAAE,OAAO,CAAC;IACjB,WAAW,EAAE,aAAa,EAAE,CAAC;IAC7B,SAAS,EAAE;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IACtD,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAC5C,kBAAkB,EAAE,OAAO,CAAC;IAC5B,qFAAqF;IACrF,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,GAAG,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC,CAAC;IAClD,8GAA8G;IAC9G,WAAW,CAAC,EAAE,gBAAgB,CAAC;CAChC;AAED,sHAAsH;AACtH,wBAAsB,kBAAkB,CAAC,IAAI,EAAE,UAAU,GAAG;IAAE,WAAW,EAAE,gBAAgB,CAAA;CAAE,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAK5H;AAOD,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,IAAI,GAAE;IAAE,IAAI,CAAC,EAAE,OAAO,CAAA;CAAO,GAAG,OAAO,CAAC,aAAa,CAAC,CAsChI"}

package/dist/core/session/status.js

@@ -0,0 +1,55 @@
+import { baseRef } from '../approval/sessions.js';
+import { runRemoteGit } from '../forge/credentials.js';
+import { hasRemote } from '../git/worktree.js';
+import { commitsAhead, rebaseInProgress, workingChanges } from './resolve.js';
+/** Fetches the default branch into its remote-tracking ref; false when there is no remote or it cannot be reached. */
+export async function fetchDefaultBranch(deps, cwd) {
+    if (!(await hasRemote(deps.git, cwd)))
+        return false;
+    const branch = deps.config.git.default_branch;
+    const fetched = await runRemoteGit(deps.git, deps.credentials, deps.env, ['fetch', '--quiet', 'origin', `+refs/heads/${branch}:refs/remotes/origin/${branch}`], { cwd, allowFailure: true });
+    return fetched.exitCode === 0;
+}
+async function untrackedDiff(git, cwd, file) {
+    // `--no-index` exits 1 when the files differ, which for a new file they always do.
+    return (await git.run(['diff', '--no-index', '--', '/dev/null', file], { cwd, allowFailure: true })).stdout;
+}
+export async function sessionStatus(deps, session, opts = {}) {
+    const run = async (args) => (await deps.git.run(args, { cwd: session.path, allowFailure: true })).stdout;
+    const fetched = deps.credentials === undefined ? false : await fetchDefaultBranch({ ...deps, credentials: deps.credentials }, session.path);
+    const base = await baseRef(deps.git, session.path, deps.config.git.default_branch);
+    const uncommitted = await workingChanges(deps.git, session.path);
+    const log = await run(['log', '--format=%H%x09%s', `${base}..HEAD`]);
+    const commits = log
+        .split('\n')
+        .filter((line) => line !== '')
+        .map((line) => {
+        const [sha, ...subject] = line.split('\t');
+        return { sha: sha, subject: subject.join('\t') };
+    });
+    let diff = null;
+    if (opts.diff === true) {
+        const parts = [await run(['diff', 'HEAD'])];
+        for (const change of uncommitted.filter((c) => c.status === '??'))
+            parts.push(await untrackedDiff(deps.git, session.path, change.path));
+        diff = parts.filter((part) => part !== '').join('');
+    }
+    return {
+        session: session.name,
+        worktree: session.path,
+        branch: session.branch,
+        head: (await run(['rev-parse', 'HEAD'])).trim(),
+        base,
+        fetched,
+        uncommitted,
+        diff_stat: {
+            committed: (await run(['diff', '--stat', `${base}...HEAD`])).replace(/\n$/, ''),
+            uncommitted: (await run(['diff', '--stat', 'HEAD'])).replace(/\n$/, ''),
+        },
+        ahead: await commitsAhead(deps.git, session.path, base),
+        commits,
+        rebase_in_progress: await rebaseInProgress(deps.git, session.path),
+        diff,
+    };
+}
+//# sourceMappingURL=status.js.map

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

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

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

@@ -0,0 +1,67 @@
+import { type PageUrlEntry } from '../../commands/publish-urls.js';
+import { type SessionIdentity } from '../approval/session-marker.js';
+import type { Store } from '../store.js';
+import { type CommitOptions } from './commit.js';
+import { type PushOutcome, type RemoteDeps } from './remote.js';
+import { type SessionRef } from './resolve.js';
+/**
+ * write-lifecycle spec (*`ctxr session submit` gates, commits, pushes and
+ * opens the pull request*): the mechanical steps of `ctxr-submit` in one call,
+ * shared by the CLI and the MCP surface (bring-the-session-lifecycle-into-the-cli
+ * D1–D4). The gate is the same store-scope pass `ctxr doctor` runs; the
+ * pre-commit and pre-push hooks stay the commit and default-branch gates.
+ *
+ * Each step leaves what it did in place when a later one fails, and every
+ * remote step reads before it writes, so running the same submit again
+ * finishes the job without a second commit or pull request.
+ */
+export interface SubmitInput {
+    branch: string;
+    message: string;
+    title: string;
+    /** The agent's own body: why, what changed, route, verification, follow-ups. */
+    body: string;
+}
+export type SubmitStep = 'arguments' | 'staged' | 'gate' | 'commit' | 'branch' | 'push' | 'pull_request';
+export interface SubmitSteps {
+    /** The paths in the index when the gate ran, relative to the worktree's top level. */
+    staged: string[];
+    gate: 'pass';
+    /** The new commit, or null when nothing was left to commit (a retry, or work already committed). */
+    commit: string | null;
+    branch: 'renamed' | 'kept';
+    push: PushOutcome;
+    pull_request: 'created' | 'updated' | 'found';
+}
+export interface SubmitResult {
+    session: string;
+    worktree: string;
+    branch: string;
+    /** The generated name the branch carried before this submit renamed it; null when it was kept. */
+    renamed_from: string | null;
+    head: string;
+    steps: SubmitSteps;
+    pull_request: {
+        number: number;
+        url: string;
+    };
+    /** The approval page for the session, when the store declares change approval. */
+    /** The session the pull request belongs to, as its marker names it; null when the store has no `origin` to name it by. */
+    session_identity: SessionIdentity | null;
+    approval_url: string | null;
+}
+export interface SubmitDeps extends RemoteDeps {
+    /** D4: the MCP surface's member identity; omitted, the clone's own identity commits. */
+    commit?: Omit<CommitOptions, 'message'>;
+}
+/**
+ * The Pages section, built from `ctxr publish urls`' report for the range —
+ * every value copied from it, never rebuilt from a path — or null when the
+ * report lists no page. The sentences are `templates/session/pages/`'s.
+ */
+export declare function renderPagesSection(pages: readonly PageUrlEntry[], base: string, baseUrlDeclared: boolean): string | null;
+export declare function approvalAddress(config: Store['config'], name: string): string | null;
+export declare function submitSession(deps: SubmitDeps, session: SessionRef, input: SubmitInput): Promise<SubmitResult>;
+/** `--body-file`: the body read from a file, relative to `cwd`. */
+export declare function readBodyFile(cwd: string, file: string): Promise<string>;
+//# sourceMappingURL=submit.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"submit.d.ts","sourceRoot":"","sources":["../../../src/core/session/submit.ts"],"names":[],"mappings":"AAMA,OAAO,EAAiC,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAElG,OAAO,EAA0F,KAAK,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAO7J,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAgB,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAA6D,KAAK,WAAW,EAAE,KAAK,UAAU,EAAE,MAAM,aAAa,CAAC;AAC3H,OAAO,EAAkC,KAAK,UAAU,EAAE,MAAM,cAAc,CAAC;AAE/E;;;;;;;;;;GAUG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;IACd,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,MAAM,UAAU,GAAG,WAAW,GAAG,QAAQ,GAAG,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,cAAc,CAAC;AAEzG,MAAM,WAAW,WAAW;IAC1B,sFAAsF;IACtF,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,oGAAoG;IACpG,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC;IACtB,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC;IAC3B,IAAI,EAAE,WAAW,CAAC;IAClB,YAAY,EAAE,SAAS,GAAG,SAAS,GAAG,OAAO,CAAC;CAC/C;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,kGAAkG;IAClG,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,WAAW,CAAC;IACnB,YAAY,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,GAAG,EAAE,MAAM,CAAA;KAAE,CAAC;IAC9C,kFAAkF;IAClF,0HAA0H;IAC1H,gBAAgB,EAAE,eAAe,GAAG,IAAI,CAAC;IACzC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;CAC7B;AAED,MAAM,WAAW,UAAW,SAAQ,UAAU;IAC5C,wFAAwF;IACxF,MAAM,CAAC,EAAE,IAAI,CAAC,aAAa,EAAE,SAAS,CAAC,CAAC;CACzC;AA2CD;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,SAAS,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,MAAM,GAAG,IAAI,CAexH;AA2BD,wBAAgB,eAAe,CAAC,MAAM,EAAE,KAAK,CAAC,QAAQ,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKpF;AAmCD,wBAAsB,aAAa,CAAC,IAAI,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,YAAY,CAAC,CA+GpH;AAED,mEAAmE;AACnE,wBAAsB,YAAY,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAM7E"}