ctxr-cli 0.33.0 → 0.35.0

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"}

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":"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"}

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

@@ -0,0 +1,46 @@
+import type { StoreConfig } from '../../config/schema.js';
+import type { GitRunner } from '../git/exec.js';
+/**
+ * write-lifecycle spec (*session start*): a new session worktree off a freshly
+ * fetched default branch, shared by `ctxr session start` and the MCP surface's
+ * `session_start` and `capture` (serve-the-session-lifecycle-to-chat-apps D3),
+ * so the two surfaces name, place and refuse a session identically. Each
+ * surface brings its own fetch: the CLI's plain `git fetch`, the server's
+ * through its forge credential.
+ */
+export interface StartDeps {
+    git: GitRunner;
+    config: StoreConfig;
+    /** Fetches the default branch into `origin/<default>`; false when there is no remote or it cannot be reached. */
+    fetch(cwd: string): Promise<boolean>;
+    now(): Date;
+    /**
+     * Whether a generated branch name is already taken, when the caller can say
+     * (the server, whose captures can start twice in one second): a taken name
+     * is stepped past one second at a time. Omitted, the first name is used and
+     * git refuses a collision.
+     */
+    branchTaken?(branch: string): Promise<boolean>;
+}
+export interface StartedSession {
+    /** The worktree's directory name: what the other session commands take. */
+    name: string;
+    worktree: string;
+    branch: string;
+    startPoint: string;
+    fetched: boolean;
+    /** The normalized label this session was named with, or null when none was given. */
+    label: string | null;
+}
+/**
+ * approve-sessions-across-stores: a session joined to one in the store that
+ * mounts this one takes its branch and worktree name from that session, never
+ * from a label or the clock. Only `ctxr session start --joins` passes it; the
+ * MCP surface keeps no mounts.
+ */
+export interface JoinedName {
+    branch: string;
+    worktreeName: string;
+}
+export declare function startSession(deps: StartDeps, storeRoot: string, label?: string, joined?: JoinedName): Promise<StartedSession>;
+//# sourceMappingURL=start.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../../src/core/session/start.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAE1D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIhD;;;;;;;GAOG;AACH,MAAM,WAAW,SAAS;IACxB,GAAG,EAAE,SAAS,CAAC;IACf,MAAM,EAAE,WAAW,CAAC;IACpB,iHAAiH;IACjH,KAAK,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IACrC,GAAG,IAAI,IAAI,CAAC;IACZ;;;;;OAKG;IACH,WAAW,CAAC,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;CAChD;AAED,MAAM,WAAW,cAAc;IAC7B,2EAA2E;IAC3E,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,EAAE,OAAO,CAAC;IACjB,qFAAqF;IACrF,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;CACtB;AAED;;;;;GAKG;AACH,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,UAAU,GAAG,OAAO,CAAC,cAAc,CAAC,CA0BnI"}

package/dist/core/session/start.js

@@ -0,0 +1,33 @@
+import path from 'node:path';
+import { SessionLabelUnusableError, SessionNameExistsError, SessionWorktreeRefusedError } from '../errors.js';
+import { addWorktree } from '../git/worktree.js';
+import { findSessionWorktreeByLabel, generateSessionBranchName, sessionLabelSlug, worktreePathFor } from '../session.js';
+export async function startSession(deps, storeRoot, label, joined) {
+    // Ahead of the fetch, so a label that can never work costs no network round trip and leaves nothing behind.
+    let labelSlug = null;
+    if (label !== undefined) {
+        labelSlug = sessionLabelSlug(label);
+        if (labelSlug === '')
+            throw new SessionLabelUnusableError(label);
+        // A label identifies at most one session at a time, checked against the sessions on disk (name-the-session-at-start D4).
+        const existing = await findSessionWorktreeByLabel(storeRoot, deps.config, labelSlug);
+        if (existing !== null)
+            throw new SessionNameExistsError(labelSlug, existing);
+    }
+    const defaultBranch = deps.config.git.default_branch;
+    const fetched = await deps.fetch(storeRoot);
+    // The local branch both with no remote at all and with a remote that lacks the branch: honest, expected states.
+    const startPoint = fetched ? `origin/${defaultBranch}` : defaultBranch;
+    let branch = joined?.branch ?? generateSessionBranchName(deps.config, deps.now(), labelSlug ?? undefined);
+    if (joined === undefined && deps.branchTaken !== undefined) {
+        for (let step = 1; step <= 60 && (await deps.branchTaken(branch)); step += 1) {
+            branch = generateSessionBranchName(deps.config, new Date(deps.now().getTime() + step * 1000), labelSlug ?? undefined);
+        }
+    }
+    const worktree = joined === undefined ? worktreePathFor({ root: storeRoot, config: deps.config }, branch) : path.join(storeRoot, deps.config.session.worktrees_path, joined.worktreeName);
+    const added = await addWorktree(deps.git, storeRoot, worktree, branch, startPoint, { allowFailure: true });
+    if (added.exitCode !== 0)
+        throw new SessionWorktreeRefusedError(branch, worktree, added.stderr);
+    return { name: path.basename(worktree), worktree, branch, startPoint, fetched, label: labelSlug };
+}
+//# sourceMappingURL=start.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"start.js","sourceRoot":"","sources":["../../../src/core/session/start.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B,OAAO,EAAE,yBAAyB,EAAE,sBAAsB,EAAE,2BAA2B,EAAE,MAAM,cAAc,CAAC;AAE9G,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,0BAA0B,EAAE,yBAAyB,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AA+CzH,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,IAAe,EAAE,SAAiB,EAAE,KAAc,EAAE,MAAmB;IACxG,4GAA4G;IAC5G,IAAI,SAAS,GAAkB,IAAI,CAAC;IACpC,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,SAAS,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACpC,IAAI,SAAS,KAAK,EAAE;YAAE,MAAM,IAAI,yBAAyB,CAAC,KAAK,CAAC,CAAC;QACjE,yHAAyH;QACzH,MAAM,QAAQ,GAAG,MAAM,0BAA0B,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;QACrF,IAAI,QAAQ,KAAK,IAAI;YAAE,MAAM,IAAI,sBAAsB,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IAC/E,CAAC;IAED,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,cAAc,CAAC;IACrD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IAC5C,gHAAgH;IAChH,MAAM,UAAU,GAAG,OAAO,CAAC,CAAC,CAAC,UAAU,aAAa,EAAE,CAAC,CAAC,CAAC,aAAa,CAAC;IAEvE,IAAI,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EAAE,SAAS,IAAI,SAAS,CAAC,CAAC;IAC1G,IAAI,MAAM,KAAK,SAAS,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS,EAAE,CAAC;QAC3D,KAAK,IAAI,IAAI,GAAG,CAAC,EAAE,IAAI,IAAI,EAAE,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,IAAI,IAAI,CAAC,EAAE,CAAC;YAC7E,MAAM,GAAG,yBAAyB,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,GAAG,IAAI,GAAG,IAAI,CAAC,EAAE,SAAS,IAAI,SAAS,CAAC,CAAC;QACxH,CAAC;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAC1L,MAAM,KAAK,GAAG,MAAM,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC;IAC3G,IAAI,KAAK,CAAC,QAAQ,KAAK,CAAC;QAAE,MAAM,IAAI,2BAA2B,CAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAChG,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC;AACpG,CAAC"}