commandmate 0.41.1 → 0.42.1

package/dist/server/src/lib/cli-tools/legacy-session-adoption.js

@@ -0,0 +1,19 @@
+"use strict";
+/**
+ * Gateway re-export for legacy session adoption (Issue #2866).
+ *
+ * `adoptLegacySessions` lives in `src/lib/session/`, which may not import
+ * `src/lib/tmux/**` directly (Issue #1922, `.eslintrc.json`
+ * `no-restricted-imports`). The CLITool layer is a sanctioned gateway, so the
+ * one session listing and the adoption table it needs are reached through here
+ * — the same arrangement as `session-ownership.ts` (Issue #2865).
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.registerLegacyAlias = exports.lookupLegacyAlias = exports.dropLegacyAliasByLegacyName = exports.clearLegacyAliasesForTests = exports.listSessions = void 0;
+var tmux_1 = require("../tmux/tmux");
+Object.defineProperty(exports, "listSessions", { enumerable: true, get: function () { return tmux_1.listSessions; } });
+var legacy_session_alias_1 = require("../tmux/legacy-session-alias");
+Object.defineProperty(exports, "clearLegacyAliasesForTests", { enumerable: true, get: function () { return legacy_session_alias_1.clearLegacyAliasesForTests; } });
+Object.defineProperty(exports, "dropLegacyAliasByLegacyName", { enumerable: true, get: function () { return legacy_session_alias_1.dropLegacyAliasByLegacyName; } });
+Object.defineProperty(exports, "lookupLegacyAlias", { enumerable: true, get: function () { return legacy_session_alias_1.lookupLegacyAlias; } });
+Object.defineProperty(exports, "registerLegacyAlias", { enumerable: true, get: function () { return legacy_session_alias_1.registerLegacyAlias; } });

package/dist/server/src/lib/cli-tools/opencode.js

@@ -255,7 +255,7 @@ class OpenCodeTool extends base_1.BaseCLITool {
             // 200 wide, reconnected ones are 80" ships without anyone noticing —
             // a reconnect would silently hand the detectors a geometry the creation
             // path had been moved away from.
-            await this.reconcileExistingSession(sessionName, {
+            await this.reconcileExistingSession(sessionName, worktreePath, {
                 windowWidth: resolveOpencodePaneWidthChecked(),
                 windowHeight: tmux_pane_config_1.OPENCODE_PANE_HEIGHT,
             });

package/dist/server/src/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/server/src/lib/cli-tools/session-namespace.js

@@ -0,0 +1,55 @@
+"use strict";
+/**
+ * The tmux session-name namespace of this server (Issue #2866).
+ *
+ * Two CommandMate servers with different databases resolve the same
+ * `mcbd-{cli}-{worktreeId}` whenever their worktree directories share a name,
+ * because worktree IDs are derived from the directory name. Each server
+ * therefore mints a random namespace once, keeps it in `app_settings`
+ * (`tmux_session_namespace`), and puts it into every session name it creates:
+ * `mcbd-{ns}-{cli}-{worktreeId}[-{suffix}]` (`session-name.ts`).
+ *
+ * Initialized once at server startup, before the startup session reconcile.
+ * Until then — and in the CLI, in tests, or when initialization failed — the
+ * namespace is unset and names keep the legacy form.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.initSessionNamespace = initSessionNamespace;
+exports.getSessionNamespace = getSessionNamespace;
+exports.resetSessionNamespaceForTests = resetSessionNamespaceForTests;
+const crypto_1 = require("crypto");
+const app_settings_db_1 = require("../../lib/db/app-settings-db");
+const logger_1 = require("../../lib/logger");
+const session_name_1 = require("./session-name");
+const logger = (0, logger_1.createLogger)('session-namespace');
+/**
+ * Read the namespace from the DB, minting and saving one when it is absent or
+ * ill-formed, and make it the namespace every later session name uses.
+ *
+ * @param db - The server's database
+ * @returns The namespace now in effect
+ * @throws when the DB cannot be written; the namespace then stays unset
+ */
+function initSessionNamespace(db) {
+    const stored = (0, app_settings_db_1.getTmuxSessionNamespace)(db);
+    if (stored !== null && session_name_1.SESSION_NAMESPACE_PATTERN.test(stored)) {
+        (0, session_name_1.setActiveSessionNamespace)(stored);
+        return stored;
+    }
+    const namespace = (0, crypto_1.randomBytes)(4).toString('hex');
+    if (stored !== null) {
+        logger.warn('session-namespace:invalid-stored-value', { stored, replacement: namespace });
+    }
+    (0, app_settings_db_1.setTmuxSessionNamespace)(db, namespace);
+    (0, session_name_1.setActiveSessionNamespace)(namespace);
+    logger.info('session-namespace:initialized', { namespace, minted: true });
+    return namespace;
+}
+/** The namespace in effect, or null when not initialized. */
+function getSessionNamespace() {
+    return (0, session_name_1.getActiveSessionNamespace)();
+}
+/** Test-only: back to "not initialized". */
+function resetSessionNamespaceForTests() {
+    (0, session_name_1.setActiveSessionNamespace)(null);
+}

package/dist/server/src/lib/cli-tools/session-ownership.js

@@ -0,0 +1,21 @@
+"use strict";
+/**
+ * Gateway re-export of the tmux session-ownership check (Issue #2865).
+ *
+ * Routes, pollers and the WebSocket server may not import `src/lib/tmux/**`
+ * directly (Issue #1922, `.eslintrc.json` `no-restricted-imports`); the
+ * CLITool layer is one of the sanctioned gateways, so the ownership check is
+ * reached through here. The implementation lives in
+ * `src/lib/tmux/session-ownership.ts`.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ownedSessionNameSet = exports.isSessionPathOwnedBy = exports.foreignSessionErrorBody = exports.createCachedOwnershipMatcher = exports.checkSessionOwnership = exports.assertSessionNotForeign = exports.ForeignSessionError = exports.FOREIGN_SESSION_ERROR_CODE = void 0;
+var session_ownership_1 = require("../tmux/session-ownership");
+Object.defineProperty(exports, "FOREIGN_SESSION_ERROR_CODE", { enumerable: true, get: function () { return session_ownership_1.FOREIGN_SESSION_ERROR_CODE; } });
+Object.defineProperty(exports, "ForeignSessionError", { enumerable: true, get: function () { return session_ownership_1.ForeignSessionError; } });
+Object.defineProperty(exports, "assertSessionNotForeign", { enumerable: true, get: function () { return session_ownership_1.assertSessionNotForeign; } });
+Object.defineProperty(exports, "checkSessionOwnership", { enumerable: true, get: function () { return session_ownership_1.checkSessionOwnership; } });
+Object.defineProperty(exports, "createCachedOwnershipMatcher", { enumerable: true, get: function () { return session_ownership_1.createCachedOwnershipMatcher; } });
+Object.defineProperty(exports, "foreignSessionErrorBody", { enumerable: true, get: function () { return session_ownership_1.foreignSessionErrorBody; } });
+Object.defineProperty(exports, "isSessionPathOwnedBy", { enumerable: true, get: function () { return session_ownership_1.isSessionPathOwnedBy; } });
+Object.defineProperty(exports, "ownedSessionNameSet", { enumerable: true, get: function () { return session_ownership_1.ownedSessionNameSet; } });

package/dist/server/src/lib/cli-tools/vibe-local.js

@@ -63,7 +63,7 @@ class VibeLocalTool extends base_1.BaseCLITool {
         const sessionName = this.getSessionName(worktreeId, instanceId);
         const exists = await (0, tmux_1.hasSession)(sessionName);
         if (exists) {
-            await this.reconcileExistingSession(sessionName);
+            await this.reconcileExistingSession(sessionName, worktreePath);
             // Issue #2070: this branch used to return unconditionally. A tmux session
             // outlives the agent that was launched into it — a quit, a self-update, a
             // crash — and the launch was then skipped for a pane holding nothing but a

package/dist/server/src/lib/cli-tools/worktree-session-ownership.js

@@ -0,0 +1,28 @@
+"use strict";
+/**
+ * Session ownership by worktree id (Issue #2865).
+ *
+ * For callers that hold only a worktree id — the Auto-Yes poller and
+ * `sendUserMessage` (timer / relay sends) — and would
+ * otherwise have to reach into the DB and the tmux gateway separately. Kept out
+ * of `session-ownership.ts` so the plain ownership check does not drag the DB
+ * layer into every module that imports it.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkWorktreeSessionOwnership = checkWorktreeSessionOwnership;
+const db_instance_1 = require("../db/db-instance");
+const worktree_db_1 = require("../db/worktree-db");
+const session_ownership_1 = require("../tmux/session-ownership");
+/**
+ * Ownership of `sessionName` against the worktree row `worktreeId`. `null` when
+ * the row does not exist — the caller cannot vouch for the session and must not
+ * drive it.
+ *
+ * @param db - The handle to read the row from; defaults to the server's
+ */
+async function checkWorktreeSessionOwnership(worktreeId, sessionName, db = (0, db_instance_1.getDbInstance)()) {
+    const worktree = (0, worktree_db_1.getWorktreeById)(db, worktreeId);
+    if (!worktree)
+        return null;
+    return (0, session_ownership_1.checkSessionOwnership)(sessionName, worktree.path);
+}

package/dist/server/src/lib/db/app-settings-db.js

@@ -16,6 +16,8 @@ exports.setDefaultSelectedAgents = setDefaultSelectedAgents;
 exports.clearDefaultSelectedAgents = clearDefaultSelectedAgents;
 exports.getDefaultSurfaceMode = getDefaultSurfaceMode;
 exports.setDefaultSurfaceMode = setDefaultSurfaceMode;
+exports.getTmuxSessionNamespace = getTmuxSessionNamespace;
+exports.setTmuxSessionNamespace = setTmuxSessionNamespace;
 const selected_agents_validator_1 = require("../../lib/selected-agents-validator");
 const ui_state_1 = require("../../types/ui-state");
 // ============================================================================
@@ -45,6 +47,14 @@ const KEY_DEFAULT_SELECTED_AGENTS = 'default_selected_agents';
  * reaches an install that never chose.
  */
 const KEY_DEFAULT_SURFACE_MODE = 'default_surface_mode';
+/**
+ * Storage key for this server's tmux session-name namespace (Issue #2866).
+ *
+ * 8 lowercase hex digits, minted once at first startup. Validated by
+ * `initSessionNamespace()` rather than here: an ill-formed row has to be seen
+ * (and warned about) before it is replaced, not silently read as "unset".
+ */
+const KEY_TMUX_SESSION_NAMESPACE = 'tmux_session_namespace';
 /** How many recently used directories to remember (Issue #1517) */
 exports.RECENT_BROWSE_PATHS_LIMIT = 5;
 // ============================================================================
@@ -200,3 +210,22 @@ function getDefaultSurfaceMode(db) {
 function setDefaultSurfaceMode(db, mode) {
     writeScalar(db, KEY_DEFAULT_SURFACE_MODE, mode);
 }
+// ============================================================================
+// tmux session namespace (Issue #2866)
+// ============================================================================
+/**
+ * Get the stored tmux session-name namespace, unvalidated.
+ *
+ * @returns The raw stored value, or null when unset
+ */
+function getTmuxSessionNamespace(db) {
+    return readScalar(db, KEY_TMUX_SESSION_NAMESPACE);
+}
+/**
+ * Save the tmux session-name namespace.
+ *
+ * @param namespace - Already-validated namespace (`^[0-9a-f]{8}$`)
+ */
+function setTmuxSessionNamespace(db, namespace) {
+    writeScalar(db, KEY_TMUX_SESSION_NAMESPACE, namespace);
+}

package/dist/server/src/lib/detection/cli-patterns.js

@@ -4,8 +4,8 @@
  * Shared between response-poller.ts and API routes
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_TRAILED_STATUS_BAR_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
-exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = void 0;
+exports.COPILOT_SEPARATOR_PATTERN = exports.COPILOT_IDLE_STATUS_PATTERN = exports.COPILOT_WORKING_STATUS_PATTERN = exports.COPILOT_THINKING_PATTERN = exports.COPILOT_PROMPT_PATTERN = exports.OPENCODE_SKIP_PATTERNS = exports.OPENCODE_SEPARATOR_PATTERN = exports.CLAUDE_SELECTION_LIST_FOOTER = exports.CLAUDE_MODEL_OVERLAY_FOOTER_PATTERN = exports.OPENCODE_SELECTION_LIST_PATTERN = exports.OPENCODE_FOOTER_STATUS_PATTERN = exports.OPENCODE_USER_ECHO_PATTERN = exports.OPENCODE_GUTTER_ROW_PATTERN = exports.OPENCODE_COMPOSER_BOTTOM_BORDER = exports.OPENCODE_PROCESSING_INDICATOR = exports.OPENCODE_PERMISSION_PATTERN = exports.OPENCODE_TURN_COMPLETE_PATTERN = exports.OPENCODE_RESPONSE_COMPLETE = exports.OPENCODE_LOADING_PATTERN = exports.OPENCODE_THINKING_PATTERN = exports.OPENCODE_PROMPT_AFTER_RESPONSE = exports.OPENCODE_IDLE_COMPOSER_PATTERN = exports.OPENCODE_PROMPT_PATTERN = exports.GEMINI_THINKING_PATTERN = exports.GEMINI_PROMPT_PATTERN = exports.MAX_PASTED_TEXT_RETRIES = exports.PASTED_TEXT_DETECT_DELAY = exports.PASTED_TEXT_PATTERN = exports.CODEX_USER_ECHO_PATTERN = exports.CODEX_TRAILED_STATUS_BAR_PATTERN = exports.CODEX_STATUS_BAR_PATTERN = exports.CODEX_PAGER_FOOTER_PATTERN = exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = exports.CODEX_PICKER_FOOTER_PATTERN = exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = exports.CODEX_APPROVAL_FOOTER_PATTERN = exports.CODEX_SELECTION_LIST_PATTERN = exports.CODEX_SEPARATOR_PATTERN = exports.CODEX_HOOKS_REVIEW_ANCHORS = exports.CODEX_DIALOG_PATTERN = exports.CODEX_TRUST_QUESTION_PATTERN = exports.CODEX_PROMPT_PATTERN = exports.CLAUDE_TRUST_DIALOG_PATTERN = exports.CLAUDE_SEPARATOR_PATTERN = exports.CLAUDE_PROMPT_PATTERN = exports.CODEX_INTERRUPT_HINT_PATTERN = exports.CODEX_THINKING_PATTERN = exports.CLAUDE_INTERRUPT_HINT_PATTERN = exports.CLAUDE_THINKING_PATTERN = exports.CLAUDE_SPINNER_CHARS = void 0;
+exports.CLAUDE_SESSION_ERROR_REGEX_PATTERNS = exports.CLAUDE_SESSION_ERROR_PATTERNS = exports.extractAnsiSequences = exports.stripAnsi = exports.COMMAND_CODE_SKIP_PATTERNS = exports.COMMAND_CODE_HOOK_NOTICE_PATTERN = exports.COMMAND_CODE_BANNER_PATTERNS = exports.COMMAND_CODE_MODE_INDICATOR_PATTERN = exports.COMMAND_CODE_COMPLETION_PATTERN = exports.COMMAND_CODE_RESPONSE_MARKER_PATTERN = exports.COMMAND_CODE_THINKING_PATTERN = exports.COMMAND_CODE_INTERRUPT_HINT_PATTERN = exports.COMMAND_CODE_SEPARATOR_PATTERN = exports.COMMAND_CODE_PROMPT_PATTERN = exports.COMMAND_CODE_SPINNER_CHARS = exports.ANTIGRAVITY_SKIP_PATTERNS = exports.ANTIGRAVITY_SURVEY_PATTERN = exports.ANTIGRAVITY_DIALOG_MAX_ROWS = exports.ANTIGRAVITY_DIALOG_BOUNDARY_PATTERN = exports.ANTIGRAVITY_SWITCH_MODEL_HEADER_PATTERN = exports.ANTIGRAVITY_NUMBERED_OPTION_PATTERN = exports.ANTIGRAVITY_NAVIGATE_FOOTER_PATTERN = exports.ANTIGRAVITY_SELECTION_LIST_PATTERN = exports.ANTIGRAVITY_SEPARATOR_PATTERN = exports.ANTIGRAVITY_THINKING_PATTERN = exports.ANTIGRAVITY_PROMPT_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_PATTERN = exports.ANTIGRAVITY_COMPOSER_MODE_BANNER_SOURCE = exports.VIBE_LOCAL_THINKING_PATTERN = exports.VIBE_LOCAL_PROMPT_PATTERN = exports.COPILOT_SKIP_PATTERNS = exports.COPILOT_FOLDER_TRUST_ANSWER_KEY = exports.COPILOT_FOLDER_TRUST_SESSION_OPTION_PATTERN = exports.COPILOT_FOLDER_TRUST_ANCHORS = exports.COPILOT_SELECTION_FOOTER_PATTERN = exports.COPILOT_BOOT_BANNER_ANCHORS = exports.COPILOT_TRANSCRIPT_CONTINUATION_PATTERN = exports.COPILOT_TOOL_ROW_PATTERN = exports.COPILOT_TOOL_VERBS = exports.COPILOT_TRANSCRIPT_DIVIDER_PATTERN = exports.COPILOT_USER_ECHO_PATTERN = exports.COPILOT_REASONING_HEADER_PATTERN = exports.COPILOT_BOX_ROW_PATTERN = void 0;
 exports.isCodexTurnActive = isCodexTurnActive;
 exports.findClaudeChromeStart = findClaudeChromeStart;
 exports.isCodexPromptReady = isCodexPromptReady;
@@ -233,6 +233,17 @@ exports.CLAUDE_TRUST_DIALOG_PATTERN = /Yes, I trust this folder/m;
  * T1.2: Improved to detect empty prompts as well
  */
 exports.CODEX_PROMPT_PATTERN = /^›\s*/m;
+/**
+ * The directory/folder trust dialog's question line, across codex builds
+ * (Issue #2884): `Do you trust the contents of this directory?` (<=0.155.1)
+ * and `Trust this folder?` (0.157.1, which dropped the "Do you trust" wording
+ * entirely -- `tests/fixtures/codex-dialogs-0157/trust.txt`). The two variants
+ * are kept as alternatives of one pattern -- rather than duplicated across
+ * {@link CODEX_DIALOG_PATTERN}, `getCodexActiveDialog` and
+ * `getCodexLifecycleDialog` -- so those three cannot drift into disagreeing
+ * about what counts as the trust dialog.
+ */
+exports.CODEX_TRUST_QUESTION_PATTERN = /Do you trust|Trust this folder\?/;
 /**
  * Codex INTERACTIVE startup dialog pattern (Issue #890)
  *
@@ -243,7 +254,7 @@ exports.CODEX_PROMPT_PATTERN = /^›\s*/m;
  * also confirm no INTERACTIVE dialog is still active. This pattern matches markers
  * that appear ONLY in interactive dialogs:
  *   - Interactive update dialog: "Skip until next version" (the option-3 label)
- *   - Trust dialog:              "Do you trust the contents of this directory?"
+ *   - Trust dialog:              {@link CODEX_TRUST_QUESTION_PATTERN}
  *   - Dialog confirm footer:     "Press enter to continue"
  *   - Numbered selection option: "› 1. ..." (leading ›, a digit, a dot)
  *
@@ -259,7 +270,7 @@ exports.CODEX_PROMPT_PATTERN = /^›\s*/m;
  *
  * No /g flag (would make .test() stateful); no nested quantifiers (ReDoS-safe).
  */
-exports.CODEX_DIALOG_PATTERN = /Skip until next version|Do you trust|Press enter to continue|^\s*›\s*\d+\.\s/m;
+exports.CODEX_DIALOG_PATTERN = new RegExp(`Skip until next version|${exports.CODEX_TRUST_QUESTION_PATTERN.source}|Press enter to continue|^\\s*›\\s*\\d+\\.\\s`, 'm');
 /**
  * Codex genuine input-prompt line (Issue #892).
  *
@@ -353,7 +364,7 @@ function getCodexActiveDialog(output) {
         (active.includes('Update') && active.includes('Skip'))) {
         return 'update';
     }
-    if (active.includes('Do you trust')) {
+    if (exports.CODEX_TRUST_QUESTION_PATTERN.test(active)) {
         return 'trust';
     }
     if (active.includes('Press enter to continue')) {
@@ -427,8 +438,6 @@ const CODEX_UPDATE_DIALOG_ANCHORS = [
     /skip until next version/i,
     /^\s*[›❯]?\s*\d+\.\s*Update now/im,
 ];
-/** The directory-trust dialog's question line. */
-const CODEX_TRUST_DIALOG_ANCHOR = /Do you trust/;
 /**
  * Classify the bottom-most ACTIVE codex lifecycle screen (Issue #1829).
  *
@@ -480,7 +489,7 @@ function getCodexLifecycleDialog(output) {
             return null;
         if (CODEX_UPDATE_DIALOG_ANCHORS.some((pattern) => pattern.test(line)))
             return 'update';
-        if (CODEX_TRUST_DIALOG_ANCHOR.test(line))
+        if (exports.CODEX_TRUST_QUESTION_PATTERN.test(line))
             return 'trust';
         // Both anchors required, so a stray "hooks" mention cannot claim the screen.
         if (line.includes(exports.CODEX_HOOKS_REVIEW_ANCHORS[1]) && text.includes(exports.CODEX_HOOKS_REVIEW_ANCHORS[0])) {
@@ -569,6 +578,35 @@ exports.CODEX_APPROVAL_FOOTER_PATTERN = /esc\s+to\s+cancel/i;
  * No /g flag (keeps .test() stateless), no nested quantifiers (ReDoS-safe).
  */
 exports.CODEX_FORM_SUBMIT_FOOTER_PATTERN = /^enter\s+to\s+submit\s*\|\s*esc\s+to\s+cancel$/im;
+/**
+ * Codex CLI 0.157 picker footer pattern (Issue #2868).
+ *
+ * codex-cli 0.157.1 retitled `/model` ("Select Model and Effort") and replaced
+ * its "Press enter to confirm or esc to go back" footer with the terse
+ * `enter select · esc back` row (measured: `tests/fixtures/codex-dialogs-0157/`).
+ * CODEX_SELECTION_LIST_PATTERN no longer matched, so branch 0.8 missed the
+ * picker and the dialog entry gate refused the answer (`prompt_no_longer_active`).
+ *
+ * Same construction as CODEX_FORM_SUBMIT_FOOTER_PATTERN: the whole measured row
+ * (`/m` + `^…$`), tested only against a trimmed single footer row — never a
+ * window — so a transcript quoting the words does not vouch for anything.
+ * CODEX_SELECTION_LIST_PATTERN is deliberately left as is (#2774 / #2841).
+ *
+ * No /g flag (keeps .test() stateless), no nested quantifiers (ReDoS-safe).
+ */
+exports.CODEX_PICKER_FOOTER_PATTERN = /^enter\s+select\s*·\s*esc\s+back$/im;
+/**
+ * Codex CLI 0.157 effort-picker footer pattern (Issue #2868).
+ *
+ * The second `/model` step ("Select Reasoning Level for …") closes with
+ * `enter default · s session · esc back` (measured:
+ * `tests/fixtures/codex-dialogs-0157/model-picker-effort.txt`). Same
+ * construction and rules as CODEX_PICKER_FOOTER_PATTERN: the whole row, tested
+ * only against a single trimmed footer row.
+ *
+ * No /g flag (keeps .test() stateless), no nested quantifiers (ReDoS-safe).
+ */
+exports.CODEX_EFFORT_PICKER_FOOTER_PATTERN = /^enter\s+default\s*·\s*s\s+session\s*·\s*esc\s+back$/im;
 /**
  * Codex CLI pager / edit-previous (transcript) mode footer pattern (Issue #1017)
  *
@@ -934,7 +972,7 @@ exports.GEMINI_THINKING_PATTERN = /[\u2800-\u28FF]|Thinking\.\.\./;
  * OpenCode TUI shows "Ask anything..." in the input area when waiting for user input.
  * Unlike Claude/Codex (which use > or ❯), OpenCode uses a text-based prompt indicator.
  */
-exports.OPENCODE_PROMPT_PATTERN = /Ask anything\.\.\./;
+exports.OPENCODE_PROMPT_PATTERN = /Ask anything(?:\.\.\.|\u2026)/;
 /**
  * OpenCode idle composer pattern (Issue #1883).
  *
@@ -963,8 +1001,11 @@ exports.OPENCODE_PROMPT_PATTERN = /Ask anything\.\.\./;
  * {@link OPENCODE_PROMPT_PATTERN} stays as it is: `response-checker` and
  * `OPENCODE_SKIP_PATTERNS` want the bare phrase wherever it lands, because they
  * are deleting the row from an extracted response, not judging a session.
+ *
+ * opencode 1.18.31 以降は見本文を U+2026（`…`）で描く。ASCII の `...` も実行ファイルに
+ * 残っているので両方を受け付ける（Issue #2915、2026-09-28 に実行ファイルから確認）。
  */
-exports.OPENCODE_IDLE_COMPOSER_PATTERN = /^[^\S\n]*[\u2502\u2503][^\S\n]*Ask anything\.\.\./m;
+exports.OPENCODE_IDLE_COMPOSER_PATTERN = /^[^\S\n]*[\u2502\u2503][^\S\n]*Ask anything(?:\.\.\.|\u2026)/m;
 /**
  * OpenCode prompt pattern after response completion (Issue #379)
  * Shows "tab agents  ctrl+p commands" in the TUI status bar after a response finishes.

package/dist/server/src/lib/detection/tools/codex/cli-patterns.js

@@ -121,10 +121,16 @@ exports.CODEX_GLYPH = '›';
  * the command approval, `/model`, `/experimental`, `/keymap` and the
  * directory-trust screen are `waiting`, and every highlighted row is the
  * one-span shape these rules key on. The rules were first read off 0.153.2.
+ *
+ * Advanced to 0.157.1 by Issue #2884: the 0.157.1 dialog screens
+ * (`codex-dialogs-0157/`) read correctly too, including the directory-trust
+ * screen once its WORDING anchor (`CODEX_TRUST_QUESTION_PATTERN` in
+ * `../../cli-patterns`) learned that build's reworded question line
+ * (`Trust this folder?`) -- see `tests/unit/lib/detection/codex-dialogs-0157.test.ts`.
  */
 exports.CODEX_DIALOG_RULES_VERIFIED_AGAINST = {
-    version: '0.155.1',
-    capturedAt: '2026-09-21',
+    version: '0.157.1',
+    capturedAt: '2026-09-27',
     paneGeometry: '200x1000',
 };
 /**

package/dist/server/src/lib/detection/tools/codex/detect.js

@@ -245,7 +245,14 @@ exports.codexStatusDetector = (0, run_detection_1.createToolStatusDetector)({
             const codexSelectionWindow = contentLines
                 .slice(Math.max(0, codexContentEnd - frame_1.STATUS_CHECK_LINE_COUNT + 1), codexContentEnd + 1)
                 .join('\n');
-            if (cli_patterns_1.CODEX_SELECTION_LIST_PATTERN.test(codexSelectionWindow)) {
+            // Issue #2868: codex 0.157's `/model` steps close with `enter select · esc
+            // back` and `enter default · s session · esc back`. Only the window's LAST
+            // non-blank row is tested against them (never the whole window), so the
+            // same words quoted in a transcript do not count.
+            const codexLastRow = contentLines[codexContentEnd].trim();
+            if (cli_patterns_1.CODEX_SELECTION_LIST_PATTERN.test(codexSelectionWindow) ||
+                cli_patterns_1.CODEX_PICKER_FOOTER_PATTERN.test(codexLastRow) ||
+                cli_patterns_1.CODEX_EFFORT_PICKER_FOOTER_PATTERN.test(codexLastRow)) {
                 const codexPromptDetection = (0, prompt_detector_1.detectPrompt)((0, cli_patterns_1.stripBoxDrawing)(frame.clean), (0, cli_patterns_1.buildDetectPromptOptions)('codex'));
                 // Issue #1628: an approval request wears the same footer as a menu but is the
                 // agent blocked on the human, so it must surface as an active prompt (exit 10

package/dist/server/src/lib/detection/tools/codex/prompt.js

@@ -96,9 +96,13 @@ function detectCodexDialog(frame, context) {
     //
     // Issue #2609: the approval form's footer is admitted as its own measured row,
     // not by widening the list pattern — an `esc to cancel` alone still vouches
-    // for nothing.
+    // for nothing. Issue #2868: 0.157's two `/model` footers (`enter select ·
+    // esc back`, then `enter default · s session · esc back`) are admitted the
+    // same way.
     if (!cli_patterns_1.CODEX_SELECTION_LIST_PATTERN.test(block.footer) &&
-        !cli_patterns_1.CODEX_FORM_SUBMIT_FOOTER_PATTERN.test(block.footer)) {
+        !cli_patterns_1.CODEX_FORM_SUBMIT_FOOTER_PATTERN.test(block.footer) &&
+        !cli_patterns_1.CODEX_PICKER_FOOTER_PATTERN.test(block.footer) &&
+        !cli_patterns_1.CODEX_EFFORT_PICKER_FOOTER_PATTERN.test(block.footer)) {
         return null;
     }
     // Issue #1160: an already-answered block still inside the window is not a

package/dist/server/src/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',
 };
 /**