commandmate 0.41.1 → 0.42.0

package/dist/lib/cli-tools/session-name.d.ts

@@ -15,15 +15,56 @@
  * `import('@/lib/ws-server')` の 458ms のうち 234ms を占めていた。
  *
  * 規則そのものは 1 箇所に保つ — `BaseCLITool.getSessionName()` はこの関数へ委譲する。
+ *
+ * ## Issue #2866: 名前空間（ns）
+ *
+ * worktree ID はディレクトリ名から作られるので、DB が別の 2 台のサーバでも
+ * `mcbd-{cli}-{worktreeId}` が重なる。サーバ起動時に `initSessionNamespace()`
+ * （`session-namespace.ts`）が ns（16 進 8 桁）を決めると、以後の名前は
+ * `mcbd-{ns}-{cli}-{worktreeId}[-{suffix}]` になる。ns 未設定（CLI・テスト・
+ * 初期化失敗時）は従来形式のまま。ns はどの CLI ツール ID とも一致しないので、
+ * `mcbd-` の直後の区切りで新旧を見分けられる（{@link parseSessionName}）。
+ *
+ * このモジュールは CLI バンドル（`tsconfig.cli.json` は paths なし）にも入るので、
+ * `@/` を使わず、DB にも触らない。ns の保持だけをここで行い、DB からの読み書きは
+ * `session-namespace.ts` が受け持つ。
  */
 import { type CLIToolType } from './types';
+/** Shape of a session-name namespace: 8 lowercase hex digits (Issue #2866). */
+export declare const SESSION_NAMESPACE_PATTERN: RegExp;
+declare global {
+    var __cmTmuxSessionNamespace: string | null | undefined;
+}
+/**
+ * The namespace this process names its sessions with, or null (legacy names).
+ *
+ * @internal Read through `getSessionNamespace()` in `session-namespace.ts`.
+ * Kept on `globalThis` because the custom server sets it at startup while the
+ * Next route bundles — a separate module graph (Issue #2223) — read it.
+ */
+export declare function getActiveSessionNamespace(): string | null;
+/**
+ * @internal Set by `initSessionNamespace()` / reset by tests only.
+ */
+export declare function setActiveSessionNamespace(namespace: string | null): void;
+/**
+ * The session name in the given namespace, ignoring legacy adoptions
+ * (Issue #2866). `namespace === null` is the legacy form.
+ *
+ * @throws Error if the resulting session name is invalid
+ */
+export declare function resolveNamespacedSessionName(namespace: string | null, cliToolId: CLIToolType, worktreeId: string, instanceId?: string): string;
 /**
  * Resolve the tmux session name for a (worktree, CLI tool, instance) triple.
  *
- * Format (Issue #868):
- * - Primary instance (`instanceId` omitted or `=== cliToolId`):
- *   `mcbd-{cli_tool_id}-{worktree_id}` — the backward-compatible anchor
- * - Additional instance: `mcbd-{cli_tool_id}-{worktree_id}-{suffix}`
+ * Format (Issue #868, #2866):
+ * - namespace set: `mcbd-{ns}-{cli_tool_id}-{worktree_id}[-{suffix}]` — unless a
+ *   legacy session was adopted for that name (`adoptLegacySessions`), in which
+ *   case the adopted legacy name is returned
+ * - namespace unset: `mcbd-{cli_tool_id}-{worktree_id}[-{suffix}]`
+ *
+ * The primary instance (`instanceId` omitted or `=== cliToolId`) carries no
+ * suffix.
  *
  * T2.3 (MF4-001): the result is validated to keep shell metacharacters out of
  * the tmux command line.
@@ -36,9 +77,36 @@ import { type CLIToolType } from './types';
  *
  * @example
  * ```typescript
+ * // namespace unset
  * resolveSessionName('claude', 'wt-1');            // 'mcbd-claude-wt-1'
  * resolveSessionName('claude', 'wt-1', 'claude-2'); // 'mcbd-claude-wt-1-2'
+ * // namespace '0a1b2c3d'
+ * resolveSessionName('claude', 'wt-1');            // 'mcbd-0a1b2c3d-claude-wt-1'
  * ```
  */
 export declare function resolveSessionName(cliToolId: CLIToolType, worktreeId: string, instanceId?: string): string;
+/**
+ * The legacy (pre-#2866) session name, whatever the namespace:
+ * `mcbd-{cli_tool_id}-{worktree_id}[-{suffix}]`.
+ *
+ * @throws Error if the resulting session name is invalid
+ */
+export declare function resolveLegacySessionName(cliToolId: CLIToolType, worktreeId: string, instanceId?: string): string;
+/** A session name split into its parts (Issue #2866). */
+export interface ParsedSessionName {
+    /** The server namespace, or null for the legacy form */
+    namespace: string | null;
+    cliToolId: CLIToolType;
+    /** What follows `mcbd-[{ns}-]{cli}-`: the worktree ID and an optional suffix */
+    rest: string;
+}
+/**
+ * Split a session name of either form. The worktree ID and the instance suffix
+ * are NOT separated — worktree IDs may contain `-`, so only the caller (who
+ * knows the set of worktree IDs) can tell them apart.
+ *
+ * @returns null when the name does not start with `mcbd-`, names no known CLI
+ *   tool, or has nothing after the tool
+ */
+export declare function parseSessionName(name: string): ParsedSessionName | null;
 //# sourceMappingURL=session-name.d.ts.map

package/dist/lib/cli-tools/session-name.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session-name.d.ts","sourceRoot":"","sources":["../../../src/lib/cli-tools/session-name.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAuB,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAGhE;;;;;;;;;;;;;;;;;;;;;;GAsBG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAUR"}
+{"version":3,"file":"session-name.d.ts","sourceRoot":"","sources":["../../../src/lib/cli-tools/session-name.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA8BG;AAEH,OAAO,EAAqC,KAAK,WAAW,EAAE,MAAM,SAAS,CAAC;AAM9E,+EAA+E;AAC/E,eAAO,MAAM,yBAAyB,QAAkB,CAAC;AAOzD,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,wBAAwB,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC;CACzD;AAED;;;;;;GAMG;AACH,wBAAgB,yBAAyB,IAAI,MAAM,GAAG,IAAI,CAEzD;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAKxE;AAmBD;;;;;GAKG;AACH,wBAAgB,4BAA4B,CAC1C,SAAS,EAAE,MAAM,GAAG,IAAI,EACxB,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAGR;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,kBAAkB,CAChC,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAKR;AAED;;;;;GAKG;AACH,wBAAgB,wBAAwB,CACtC,SAAS,EAAE,WAAW,EACtB,UAAU,EAAE,MAAM,EAClB,UAAU,CAAC,EAAE,MAAM,GAClB,MAAM,CAER;AAED,yDAAyD;AACzD,MAAM,WAAW,iBAAiB;IAChC,wDAAwD;IACxD,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;IACzB,SAAS,EAAE,WAAW,CAAC;IACvB,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;;;;;GAOG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,IAAI,CAgBvE"}

package/dist/lib/cli-tools/session-name.js

@@ -16,18 +16,87 @@
  * `import('@/lib/ws-server')` の 458ms のうち 234ms を占めていた。
  *
  * 規則そのものは 1 箇所に保つ — `BaseCLITool.getSessionName()` はこの関数へ委譲する。
+ *
+ * ## Issue #2866: 名前空間（ns）
+ *
+ * worktree ID はディレクトリ名から作られるので、DB が別の 2 台のサーバでも
+ * `mcbd-{cli}-{worktreeId}` が重なる。サーバ起動時に `initSessionNamespace()`
+ * （`session-namespace.ts`）が ns（16 進 8 桁）を決めると、以後の名前は
+ * `mcbd-{ns}-{cli}-{worktreeId}[-{suffix}]` になる。ns 未設定（CLI・テスト・
+ * 初期化失敗時）は従来形式のまま。ns はどの CLI ツール ID とも一致しないので、
+ * `mcbd-` の直後の区切りで新旧を見分けられる（{@link parseSessionName}）。
+ *
+ * このモジュールは CLI バンドル（`tsconfig.cli.json` は paths なし）にも入るので、
+ * `@/` を使わず、DB にも触らない。ns の保持だけをここで行い、DB からの読み書きは
+ * `session-namespace.ts` が受け持つ。
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.SESSION_NAMESPACE_PATTERN = void 0;
+exports.getActiveSessionNamespace = getActiveSessionNamespace;
+exports.setActiveSessionNamespace = setActiveSessionNamespace;
+exports.resolveNamespacedSessionName = resolveNamespacedSessionName;
 exports.resolveSessionName = resolveSessionName;
+exports.resolveLegacySessionName = resolveLegacySessionName;
+exports.parseSessionName = parseSessionName;
 const types_1 = require("./types");
 const validation_1 = require("./validation");
+const legacy_session_alias_1 = require("../tmux/legacy-session-alias");
+const SESSION_NAME_PREFIX = 'mcbd-';
+/** Shape of a session-name namespace: 8 lowercase hex digits (Issue #2866). */
+exports.SESSION_NAMESPACE_PATTERN = /^[0-9a-f]{8}$/;
+/** CLI tool ids, longest first, so a longer id is never read as a shorter one. */
+const CLI_TOOL_IDS_LONGEST_FIRST = [...types_1.CLI_TOOL_IDS].sort((a, b) => b.length - a.length);
+/**
+ * The namespace this process names its sessions with, or null (legacy names).
+ *
+ * @internal Read through `getSessionNamespace()` in `session-namespace.ts`.
+ * Kept on `globalThis` because the custom server sets it at startup while the
+ * Next route bundles — a separate module graph (Issue #2223) — read it.
+ */
+function getActiveSessionNamespace() {
+    return globalThis.__cmTmuxSessionNamespace ?? null;
+}
+/**
+ * @internal Set by `initSessionNamespace()` / reset by tests only.
+ */
+function setActiveSessionNamespace(namespace) {
+    if (namespace !== null && !exports.SESSION_NAMESPACE_PATTERN.test(namespace)) {
+        throw new Error(`Invalid session namespace: ${namespace}`);
+    }
+    globalThis.__cmTmuxSessionNamespace = namespace;
+}
+function buildSessionName(head, cliToolId, worktreeId, instanceId) {
+    const base = `${head}${cliToolId}-${worktreeId}`;
+    if (!instanceId || instanceId === cliToolId) {
+        (0, validation_1.validateSessionName)(base);
+        return base;
+    }
+    const suffix = (0, types_1.deriveSessionSuffix)(instanceId, cliToolId);
+    const sessionName = suffix ? `${base}-${suffix}` : base;
+    (0, validation_1.validateSessionName)(sessionName);
+    return sessionName;
+}
+/**
+ * The session name in the given namespace, ignoring legacy adoptions
+ * (Issue #2866). `namespace === null` is the legacy form.
+ *
+ * @throws Error if the resulting session name is invalid
+ */
+function resolveNamespacedSessionName(namespace, cliToolId, worktreeId, instanceId) {
+    const head = namespace === null ? SESSION_NAME_PREFIX : `${SESSION_NAME_PREFIX}${namespace}-`;
+    return buildSessionName(head, cliToolId, worktreeId, instanceId);
+}
 /**
  * Resolve the tmux session name for a (worktree, CLI tool, instance) triple.
  *
- * Format (Issue #868):
- * - Primary instance (`instanceId` omitted or `=== cliToolId`):
- *   `mcbd-{cli_tool_id}-{worktree_id}` — the backward-compatible anchor
- * - Additional instance: `mcbd-{cli_tool_id}-{worktree_id}-{suffix}`
+ * Format (Issue #868, #2866):
+ * - namespace set: `mcbd-{ns}-{cli_tool_id}-{worktree_id}[-{suffix}]` — unless a
+ *   legacy session was adopted for that name (`adoptLegacySessions`), in which
+ *   case the adopted legacy name is returned
+ * - namespace unset: `mcbd-{cli_tool_id}-{worktree_id}[-{suffix}]`
+ *
+ * The primary instance (`instanceId` omitted or `=== cliToolId`) carries no
+ * suffix.
  *
  * T2.3 (MF4-001): the result is validated to keep shell metacharacters out of
  * the tmux command line.
@@ -40,18 +109,52 @@ const validation_1 = require("./validation");
  *
  * @example
  * ```typescript
+ * // namespace unset
  * resolveSessionName('claude', 'wt-1');            // 'mcbd-claude-wt-1'
  * resolveSessionName('claude', 'wt-1', 'claude-2'); // 'mcbd-claude-wt-1-2'
+ * // namespace '0a1b2c3d'
+ * resolveSessionName('claude', 'wt-1');            // 'mcbd-0a1b2c3d-claude-wt-1'
  * ```
  */
 function resolveSessionName(cliToolId, worktreeId, instanceId) {
-    const base = `mcbd-${cliToolId}-${worktreeId}`;
-    if (!instanceId || instanceId === cliToolId) {
-        (0, validation_1.validateSessionName)(base);
-        return base;
+    const namespace = getActiveSessionNamespace();
+    const name = resolveNamespacedSessionName(namespace, cliToolId, worktreeId, instanceId);
+    if (namespace === null)
+        return name;
+    return (0, legacy_session_alias_1.lookupLegacyAlias)(name) ?? name;
+}
+/**
+ * The legacy (pre-#2866) session name, whatever the namespace:
+ * `mcbd-{cli_tool_id}-{worktree_id}[-{suffix}]`.
+ *
+ * @throws Error if the resulting session name is invalid
+ */
+function resolveLegacySessionName(cliToolId, worktreeId, instanceId) {
+    return resolveNamespacedSessionName(null, cliToolId, worktreeId, instanceId);
+}
+/**
+ * Split a session name of either form. The worktree ID and the instance suffix
+ * are NOT separated — worktree IDs may contain `-`, so only the caller (who
+ * knows the set of worktree IDs) can tell them apart.
+ *
+ * @returns null when the name does not start with `mcbd-`, names no known CLI
+ *   tool, or has nothing after the tool
+ */
+function parseSessionName(name) {
+    if (!name.startsWith(SESSION_NAME_PREFIX))
+        return null;
+    let body = name.slice(SESSION_NAME_PREFIX.length);
+    let namespace = null;
+    const dash = body.indexOf('-');
+    if (dash > 0 && exports.SESSION_NAMESPACE_PATTERN.test(body.slice(0, dash))) {
+        namespace = body.slice(0, dash);
+        body = body.slice(dash + 1);
     }
-    const suffix = (0, types_1.deriveSessionSuffix)(instanceId, cliToolId);
-    const sessionName = suffix ? `${base}-${suffix}` : base;
-    (0, validation_1.validateSessionName)(sessionName);
-    return sessionName;
+    const cliToolId = CLI_TOOL_IDS_LONGEST_FIRST.find((id) => body.startsWith(`${id}-`));
+    if (!cliToolId)
+        return null;
+    const rest = body.slice(cliToolId.length + 1);
+    if (rest === '')
+        return null;
+    return { namespace, cliToolId, rest };
 }

package/dist/lib/detection/tools/verified-against.d.ts

@@ -57,10 +57,19 @@ export declare const CLAUDE_VERIFIED_AGAINST: {
  * verdict. **The stamp moved to 0.155.1 because every 0.155.1 frame now reads
  * correctly** (`codex-thread-title-bar-2818.test.ts`,
  * `codex-dialogs-0155-2808.test.ts`).
+ *
+ * ## Advanced to 0.157.1 by Issue #2868
+ *
+ * 0.157.1 reworded the `/model` picker's footer to `enter select · esc back`, so
+ * the picker read `prompt_detected` and `/prompt-response` refused its answers.
+ * #2868 ran the #2842 probe (`tests/fixtures/codex-dialogs-0157/`, 2026-09-27):
+ * of the six standard screens only `model-picker.txt` failed, and it reads
+ * `codex_selection_list` again via `CODEX_PICKER_FOOTER_PATTERN`
+ * (`codex-dialogs-0157.test.ts`).
  */
 export declare const CODEX_VERIFIED_AGAINST: {
-    readonly version: "0.155.1";
-    readonly capturedAt: "2026-09-21";
+    readonly version: "0.157.1";
+    readonly capturedAt: "2026-09-27";
     readonly paneGeometry: "200x1000";
 };
 /**

package/dist/lib/detection/tools/verified-against.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verified-against.d.ts","sourceRoot":"","sources":["../../../../src/lib/detection/tools/verified-against.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,iEAAiE;AACjE,eAAO,MAAM,uBAAuB;;;;CAI1B,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;GA2BG;AACH,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,wBAAwB;;;;CAI3B,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB;;;;CAI5B,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,4BAA4B;;;;CAI/B,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6EG;AACH,eAAO,MAAM,6BAA6B;;;;CAIhC,CAAC;AAEX;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B;;;;CAI9B,CAAC;AAEX,iFAAiF;AACjF,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CASpF,CAAC"}
+{"version":3,"file":"verified-against.d.ts","sourceRoot":"","sources":["../../../../src/lib/detection/tools/verified-against.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AAEH,iEAAiE;AACjE,eAAO,MAAM,uBAAuB;;;;CAI1B,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAoCG;AACH,eAAO,MAAM,sBAAsB;;;;CAIzB,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,wBAAwB;;;;CAI3B,CAAC;AAEX;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,yBAAyB;;;;CAI5B,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;GA0BG;AACH,eAAO,MAAM,4BAA4B;;;;CAI/B,CAAC;AAEX;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6EG;AACH,eAAO,MAAM,6BAA6B;;;;CAIhC,CAAC;AAEX;;;;;;;GAOG;AACH,eAAO,MAAM,2BAA2B;;;;CAI9B,CAAC;AAEX,iFAAiF;AACjF,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;CAC/B;AAED;;;;;;GAMG;AACH,eAAO,MAAM,yBAAyB,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CASpF,CAAC"}

package/dist/lib/detection/tools/verified-against.js

@@ -60,10 +60,19 @@ exports.CLAUDE_VERIFIED_AGAINST = {
  * verdict. **The stamp moved to 0.155.1 because every 0.155.1 frame now reads
  * correctly** (`codex-thread-title-bar-2818.test.ts`,
  * `codex-dialogs-0155-2808.test.ts`).
+ *
+ * ## Advanced to 0.157.1 by Issue #2868
+ *
+ * 0.157.1 reworded the `/model` picker's footer to `enter select · esc back`, so
+ * the picker read `prompt_detected` and `/prompt-response` refused its answers.
+ * #2868 ran the #2842 probe (`tests/fixtures/codex-dialogs-0157/`, 2026-09-27):
+ * of the six standard screens only `model-picker.txt` failed, and it reads
+ * `codex_selection_list` again via `CODEX_PICKER_FOOTER_PATTERN`
+ * (`codex-dialogs-0157.test.ts`).
  */
 exports.CODEX_VERIFIED_AGAINST = {
-    version: '0.155.1',
-    capturedAt: '2026-09-21',
+    version: '0.157.1',
+    capturedAt: '2026-09-27',
     paneGeometry: '200x1000',
 };
 /**

package/dist/lib/session/tmux-session-surface.d.ts

@@ -2,9 +2,9 @@
  * The tmux "surface" CommandMate publishes on its own sessions (Issue #2317).
  *
  * Everything here is a pure argument builder or a pure predicate — no
- * `child_process`, no `@/` path alias, and one constants import. Three
- * constraints put it here rather than under `lib/tmux/`, and all three are
- * load-bearing:
+ * `child_process`, no `@/` path alias, one constants import and the pure
+ * session-name parser. Three constraints put it here rather than under
+ * `lib/tmux/`, and all three are load-bearing:
  *
  * 1. **`tsconfig.cli.json` sets `"paths": {}`.** The CLI bundle resolves nothing
  *    through `@/…`, so a module the `attach` command needs may only reach the
@@ -200,8 +200,9 @@ export declare function isLiveAttachSupported(cliToolId: string): boolean;
 /**
  * Whether a tmux session's NAME says it runs a tool `--live` supports.
  *
- * The session name is `mcbd-<tool>-<worktree>` and no supported tool id is a
- * prefix of another, so this is exact rather than a guess. It exists because
+ * The session name is `mcbd-[<ns>-]<tool>-<worktree>` and `parseSessionName`
+ * reads the tool out of either form (Issue #2866), so this is exact rather
+ * than a guess. It exists because
  * the two callers that need the answer — the attach hook script's installer and
  * the response poller — hold a session name and nothing else: a hook fires with
  * tmux formats, and the poller must not pay a tmux round-trip to ask about a
@@ -219,8 +220,9 @@ export declare function isLiveAttachEligibleSession(sessionName: string): boolea
  * else. `attach` prints its hint for exactly these.
  *
  * Deliberately a local list rather than an import of `usesAlternateScreen()`:
- * this module must stay free of `lib/cli-tools`, whose graph the CLI bundle
- * cannot afford (see the module docblock). The two are pinned to each other by
+ * this module must stay free of `lib/cli-tools` beyond the pure
+ * `session-name.ts`, whose tool graph the CLI bundle cannot afford (see the
+ * module docblock). The two are pinned to each other by
  * `tests/unit/tmux/session-surface-2317.test.ts`, so a tool moving in or out of
  * the alternate screen breaks a test rather than silently dropping the hint.
  */

package/dist/lib/session/tmux-session-surface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tmux-session-surface.d.ts","sourceRoot":"","sources":["../../../src/lib/session/tmux-session-surface.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"tmux-session-surface.d.ts","sourceRoot":"","sources":["../../../src/lib/session/tmux-session-surface.ts"],"names":[],"mappings":"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"}

package/dist/lib/session/tmux-session-surface.js

@@ -3,9 +3,9 @@
  * The tmux "surface" CommandMate publishes on its own sessions (Issue #2317).
  *
  * Everything here is a pure argument builder or a pure predicate — no
- * `child_process`, no `@/` path alias, and one constants import. Three
- * constraints put it here rather than under `lib/tmux/`, and all three are
- * load-bearing:
+ * `child_process`, no `@/` path alias, one constants import and the pure
+ * session-name parser. Three constraints put it here rather than under
+ * `lib/tmux/`, and all three are load-bearing:
  *
  * 1. **`tsconfig.cli.json` sets `"paths": {}`.** The CLI bundle resolves nothing
  *    through `@/…`, so a module the `attach` command needs may only reach the
@@ -67,6 +67,10 @@ exports.buildRemoveAutoPopupHookArgs = buildRemoveAutoPopupHookArgs;
 exports.buildDelegateGeometryCommands = buildDelegateGeometryCommands;
 exports.buildRestoreGeometryCommands = buildRestoreGeometryCommands;
 const tmux_pane_config_1 = require("../../config/tmux-pane-config");
+// Relative on purpose (constraint 1 above). `session-name.ts` is already part of
+// the CLI bundle (`commands/attach.ts` imports it) and reaches nothing through
+// `@/…`, so it costs the bundle nothing new (Issue #2866).
+const session_name_1 = require("../cli-tools/session-name");
 /**
  * Session-name prefix every CommandMate tmux session carries.
  *
@@ -308,8 +312,9 @@ function isLiveAttachSupported(cliToolId) {
 /**
  * Whether a tmux session's NAME says it runs a tool `--live` supports.
  *
- * The session name is `mcbd-<tool>-<worktree>` and no supported tool id is a
- * prefix of another, so this is exact rather than a guess. It exists because
+ * The session name is `mcbd-[<ns>-]<tool>-<worktree>` and `parseSessionName`
+ * reads the tool out of either form (Issue #2866), so this is exact rather
+ * than a guess. It exists because
  * the two callers that need the answer — the attach hook script's installer and
  * the response poller — hold a session name and nothing else: a hook fires with
  * tmux formats, and the poller must not pay a tmux round-trip to ask about a
@@ -320,7 +325,8 @@ function isLiveAttachSupported(cliToolId) {
 function isLiveAttachEligibleSession(sessionName) {
     if (!isCommandMateSession(sessionName))
         return false;
-    return exports.LIVE_ATTACH_TOOLS.some((tool) => sessionName.startsWith(`${exports.MCBD_SESSION_PREFIX}${tool}-`));
+    const cliToolId = (0, session_name_1.parseSessionName)(sessionName)?.cliToolId;
+    return cliToolId !== undefined && exports.LIVE_ATTACH_TOOLS.includes(cliToolId);
 }
 /**
  * CLI tools that paint their transcript in the terminal's alternate screen.
@@ -331,8 +337,9 @@ function isLiveAttachEligibleSession(sessionName) {
  * else. `attach` prints its hint for exactly these.
  *
  * Deliberately a local list rather than an import of `usesAlternateScreen()`:
- * this module must stay free of `lib/cli-tools`, whose graph the CLI bundle
- * cannot afford (see the module docblock). The two are pinned to each other by
+ * this module must stay free of `lib/cli-tools` beyond the pure
+ * `session-name.ts`, whose tool graph the CLI bundle cannot afford (see the
+ * module docblock). The two are pinned to each other by
  * `tests/unit/tmux/session-surface-2317.test.ts`, so a tool moving in or out of
  * the alternate screen breaks a test rather than silently dropping the hint.
  */

package/dist/lib/tmux/legacy-session-alias.d.ts

@@ -0,0 +1,43 @@
+/**
+ * Legacy tmux session adoption table (Issue #2866).
+ *
+ * Once the server has a session-name namespace, a session is named
+ * `mcbd-{ns}-{cli}-{worktreeId}[-{suffix}]`. Sessions the same server started
+ * before that (`mcbd-{cli}-{worktreeId}[-{suffix}]`) are NOT renamed — a rename
+ * would lose them for an older CommandMate running beside this one, or after a
+ * downgrade. Instead `adoptLegacySessions` records "the new-format name X is
+ * served by the legacy session Y", and `resolveSessionName` returns Y for X
+ * while the entry lives.
+ *
+ * An entry is dropped when its legacy session is killed or found gone
+ * (`tmux.ts` `killSession` / `hasSession`), so the next start uses the
+ * new-format name.
+ *
+ * Pure (no `@/` alias, no child_process): `cli-tools/session-name.ts` reads it,
+ * and that module is part of the CLI bundle (`tsconfig.cli.json` has no paths).
+ *
+ * Kept on `globalThis` rather than in module scope: under `next start` this
+ * module is evaluated once in the custom server's graph and again in each Next
+ * route bundle (see `tui-accumulator.ts`, Issue #2223), and the table is filled
+ * by the server at startup but read by the routes.
+ */
+declare global {
+    var __cmLegacySessionAliases: Map<string, string> | undefined;
+}
+/**
+ * Serve the new-format session name `newName` with the existing legacy session
+ * `legacyName`.
+ */
+export declare function registerLegacyAlias(newName: string, legacyName: string): void;
+/** The legacy session name adopted for `newName`, if any. */
+export declare function lookupLegacyAlias(newName: string): string | undefined;
+/**
+ * Forget every adoption served by the legacy session `legacyName`. A no-op for
+ * a name that is not an adopted legacy session.
+ *
+ * @returns true when an entry was removed
+ */
+export declare function dropLegacyAliasByLegacyName(legacyName: string): boolean;
+/** Test-only: forget every adoption. */
+export declare function clearLegacyAliasesForTests(): void;
+//# sourceMappingURL=legacy-session-alias.d.ts.map

package/dist/lib/tmux/legacy-session-alias.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"legacy-session-alias.d.ts","sourceRoot":"","sources":["../../../src/lib/tmux/legacy-session-alias.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,OAAO,CAAC,MAAM,CAAC;IAEb,IAAI,wBAAwB,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,CAAC;CAC/D;AAMD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,IAAI,CAE7E;AAED,6DAA6D;AAC7D,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErE;AAED;;;;;GAKG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAUvE;AAED,wCAAwC;AACxC,wBAAgB,0BAA0B,IAAI,IAAI,CAEjD"}

package/dist/lib/tmux/legacy-session-alias.js

@@ -0,0 +1,64 @@
+"use strict";
+/**
+ * Legacy tmux session adoption table (Issue #2866).
+ *
+ * Once the server has a session-name namespace, a session is named
+ * `mcbd-{ns}-{cli}-{worktreeId}[-{suffix}]`. Sessions the same server started
+ * before that (`mcbd-{cli}-{worktreeId}[-{suffix}]`) are NOT renamed — a rename
+ * would lose them for an older CommandMate running beside this one, or after a
+ * downgrade. Instead `adoptLegacySessions` records "the new-format name X is
+ * served by the legacy session Y", and `resolveSessionName` returns Y for X
+ * while the entry lives.
+ *
+ * An entry is dropped when its legacy session is killed or found gone
+ * (`tmux.ts` `killSession` / `hasSession`), so the next start uses the
+ * new-format name.
+ *
+ * Pure (no `@/` alias, no child_process): `cli-tools/session-name.ts` reads it,
+ * and that module is part of the CLI bundle (`tsconfig.cli.json` has no paths).
+ *
+ * Kept on `globalThis` rather than in module scope: under `next start` this
+ * module is evaluated once in the custom server's graph and again in each Next
+ * route bundle (see `tui-accumulator.ts`, Issue #2223), and the table is filled
+ * by the server at startup but read by the routes.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerLegacyAlias = registerLegacyAlias;
+exports.lookupLegacyAlias = lookupLegacyAlias;
+exports.dropLegacyAliasByLegacyName = dropLegacyAliasByLegacyName;
+exports.clearLegacyAliasesForTests = clearLegacyAliasesForTests;
+function aliases() {
+    return (globalThis.__cmLegacySessionAliases ??= new Map());
+}
+/**
+ * Serve the new-format session name `newName` with the existing legacy session
+ * `legacyName`.
+ */
+function registerLegacyAlias(newName, legacyName) {
+    aliases().set(newName, legacyName);
+}
+/** The legacy session name adopted for `newName`, if any. */
+function lookupLegacyAlias(newName) {
+    return aliases().get(newName);
+}
+/**
+ * Forget every adoption served by the legacy session `legacyName`. A no-op for
+ * a name that is not an adopted legacy session.
+ *
+ * @returns true when an entry was removed
+ */
+function dropLegacyAliasByLegacyName(legacyName) {
+    const table = aliases();
+    let dropped = false;
+    for (const [newName, legacy] of table) {
+        if (legacy === legacyName) {
+            table.delete(newName);
+            dropped = true;
+        }
+    }
+    return dropped;
+}
+/** Test-only: forget every adoption. */
+function clearLegacyAliasesForTests() {
+    aliases().clear();
+}

package/dist/lib/verification/verify-config.d.ts

@@ -87,6 +87,22 @@ export interface VerifyOptions {
      * never a pass.
      */
     requireEnvClean: boolean;
+    /**
+     * `$HOME` entry names the `env-clean` gate does not count (Issue #2890).
+     * Default `[]`; the loader always fills it, so a loaded config has the key.
+     *
+     * **Exact names, no glob, no regex.** A pattern would let one careless line
+     * (`.*`) switch the `home-entries` probe off, and the probe exists to catch
+     * exactly what an agent leaves in `$HOME`. The list is for entries that
+     * appear on their own — another tool's dotdir created by a process nobody on
+     * this task started — and it is applied when the two snapshots are compared,
+     * so it also covers baselines taken before the entry was listed here.
+     * Whatever it excused is named in the gate's report rather than dropped.
+     *
+     * Optional in the type only so a hand-built {@link VerifyConfig} fixture that
+     * predates the key keeps compiling; the parser never leaves it out.
+     */
+    envCleanIgnoreHomeEntries?: string[];
 }
 export interface VerifyConfig {
     version: 1;
@@ -170,6 +186,11 @@ export declare const MAX_GATE_MUTEX_LENGTH = 64;
  * reports the machine's luck, not the work.
  */
 export declare const MAX_RETRY_ON_FAIL = 1;
+/**
+ * Most names `options.envCleanIgnoreHomeEntries` may list (Issue #2890). A list
+ * this long is already a repository papering over a machine it should fix.
+ */
+export declare const MAX_ENV_CLEAN_IGNORE_HOME_ENTRIES = 32;
 export declare class VerifyConfigError extends Error {
     readonly issues: string[];
     constructor(issues: string[]);

package/dist/lib/verification/verify-config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"verify-config.d.ts","sourceRoot":"","sources":["../../../src/lib/verification/verify-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,0EAA0E;IAC1E,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;;;;;;OAUG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;;;;;;OAUG;IACH,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;CACxB;AAED;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAErD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAE7C,oFAAoF;AACpF,eAAO,MAAM,iBAAiB,kDAIpB,CAAC;AAEX,eAAO,MAAM,2BAA2B,6BAA6B,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,aAAa,GAAE,SAAS,UAAU,EAAO,GACxC,MAAM,EAAE,CAWV;AAED,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAM/C;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,QAA8B,CAAC;AAE3D;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,QAAsB,CAAC;AAEtD,qEAAqE;AACrE,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAYnC,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBAEd,MAAM,EAAE,MAAM,EAAE;CAK7B;AA6CD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,CAe9F;AA2OD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAYtE"}
+{"version":3,"file":"verify-config.d.ts","sourceRoot":"","sources":["../../../src/lib/verification/verify-config.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,MAAM,WAAW,UAAU;IACzB,EAAE,EAAE,MAAM,CAAC;IACX,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,MAAM,CAAC;IACnB;;;;;;;;;;;;;OAaG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB;;;;;;;;;;;;;;OAcG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,0EAA0E;IAC1E,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IACvB,qBAAqB,EAAE,OAAO,CAAC;IAC/B,eAAe,EAAE,MAAM,CAAC;IACxB;;;;;;;;;;OAUG;IACH,aAAa,EAAE,OAAO,CAAC;IACvB;;;;;;;;;;OAUG;IACH,eAAe,EAAE,OAAO,CAAC;IACzB;;;;;;;;;;;;;;OAcG;IACH,yBAAyB,CAAC,EAAE,MAAM,EAAE,CAAC;CACtC;AAED,MAAM,WAAW,YAAY;IAC3B,OAAO,EAAE,CAAC,CAAC;IACX,KAAK,EAAE,UAAU,EAAE,CAAC;IACpB,OAAO,EAAE,aAAa,CAAC;CACxB;AAED;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,kBAAkB,CAAC;AAErD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,UAAU,CAAC;AAErC;;;;;GAKG;AACH,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAE7C,oFAAoF;AACpF,eAAO,MAAM,iBAAiB,kDAIpB,CAAC;AAEX,eAAO,MAAM,2BAA2B,6BAA6B,CAAC;AAEtE;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,YAAY,EACpB,aAAa,GAAE,SAAS,UAAU,EAAO,GACxC,MAAM,EAAE,CAWV;AAED,eAAO,MAAM,mBAAmB,MAAM,CAAC;AACvC,eAAO,MAAM,0BAA0B,OAAO,CAAC;AAM/C;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,QAA8B,CAAC;AAE3D;;;;;;;;;GASG;AACH,eAAO,MAAM,kBAAkB,QAAsB,CAAC;AAEtD,qEAAqE;AACrE,eAAO,MAAM,qBAAqB,KAAK,CAAC;AAExC;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB,IAAI,CAAC;AAEnC;;;GAGG;AACH,eAAO,MAAM,iCAAiC,KAAK,CAAC;AAapD,qBAAa,iBAAkB,SAAQ,KAAK;IAC1C,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;gBAEd,MAAM,EAAE,MAAM,EAAE;CAK7B;AA6CD;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,EAAE,CAe9F;AA8RD;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,GAAG,IAAI,CAYtE"}