commandmate 0.25.0 → 0.26.1

package/dist/server/src/lib/hooks/sources/codex/hooks-config.js

@@ -63,7 +63,7 @@ exports.buildCodexPermissionHookCommand = buildCodexPermissionHookCommand;
 exports.buildCodexHookSettings = buildCodexHookSettings;
 exports.mergeCodexHookSettings = mergeCodexHookSettings;
 exports.writeCodexHookSettings = writeCodexHookSettings;
-exports.buildCodexLaunchCommand = buildCodexLaunchCommand;
+exports.buildCodexLaunchPlan = buildCodexLaunchPlan;
 const fs_1 = require("fs");
 const os_1 = require("os");
 const path_1 = require("path");
@@ -396,7 +396,7 @@ function writeCodexHookSettings(options = {}) {
     return settingsPath;
 }
 /**
- * The command that starts codex for one instance.
+ * The plan that starts codex for one instance.
  *
  * Never throws: hooks are an enhancement to a session that has to start anyway,
  * so anything that goes wrong here returns the bare executable — which is
@@ -409,32 +409,40 @@ function writeCodexHookSettings(options = {}) {
  * own (#1757 §5.1.7 found no `CLAUDE_PROJECT_DIR` equivalent). What is left is
  * the environment of the process CommandMate starts, which a hook inherits.
  *
+ * Since Issue #1846 they are returned as {@link AgentLaunchPlan.env} rather than
+ * written onto the front of the command. The bytes a pane receives are
+ * unchanged — `renderAgentLaunchCommand` re-emits them in declaration order —
+ * but the assignments are now data the launcher applies, which is what let the
+ * other three sources that had written the same prefix by hand stop writing it.
+ *
  * @param executablePath - Resolved codex CLI path or bare command name
  * @param target - The instance being started
- * @returns `<assignments> <codex>`, or `executablePath` unchanged when
- *   injection is off, the ids are unusable, or the file could not be written
+ * @returns The command and its environment, or the bare executable with an
+ *   empty environment when injection is off, the ids are unusable, or the file
+ *   could not be written
  */
-function buildCodexLaunchCommand(executablePath, target, options = {}) {
+function buildCodexLaunchPlan(executablePath, target, options = {}) {
+    const bare = { command: executablePath, settingsPath: null, env: {} };
     if (!(0, hook_settings_generator_1.isHookInjectionEnabled)())
-        return executablePath;
+        return bare;
     const instanceId = target.instanceId ?? tool_id_1.CODEX_CLI_TOOL_ID;
     if (!(0, path_validator_1.isValidWorktreeId)(target.worktreeId) || !(0, types_1.isValidInstanceId)(instanceId)) {
         // Both become URL parameters the receiver re-validates; a value that would
         // be rejected there is not worth injecting.
         logger.warn('codex-hooks-invalid-correlation-key', { worktreeId: target.worktreeId });
-        return executablePath;
+        return bare;
     }
     try {
         const settingsPath = writeCodexHookSettings(options);
         if (!settingsPath)
-            return executablePath;
+            return bare;
         const port = options.port ?? (0, env_1.getServerPort)();
         const query = new URLSearchParams({
             tool: tool_id_1.CODEX_CLI_TOOL_ID,
             worktreeId: target.worktreeId,
             instanceId,
         });
-        const assignments = [
+        const env = {
             // Pin the home the file was just written to, rather than trusting the
             // agent to resolve the same one. Measured on 2026-08-13: a tmux session
             // inherits the environment of the *tmux server*, which was started long
@@ -445,21 +453,21 @@ function buildCodexLaunchCommand(executablePath, target, options = {}) {
             // wrote" and "the file codex reads" the same file by construction; in the
             // ordinary case where nothing sets it, this is the default codex would
             // have picked anyway.
-            `${exports.CODEX_HOME_ENV_VAR}=${(0, hook_settings_generator_1.shellQuote)(getCodexHome(options))}`,
-            `${exports.CODEX_TOOL_ENV_VAR}=${(0, hook_settings_generator_1.shellQuote)(tool_id_1.CODEX_CLI_TOOL_ID)}`,
-            `${exports.CODEX_WORKTREE_ID_ENV_VAR}=${(0, hook_settings_generator_1.shellQuote)(target.worktreeId)}`,
-            `${exports.CODEX_INSTANCE_ID_ENV_VAR}=${(0, hook_settings_generator_1.shellQuote)(instanceId)}`,
-            `${exports.CODEX_EVENT_URL_ENV_VAR}=${(0, hook_settings_generator_1.shellQuote)(`http://${CODEX_HOOK_HOST}:${port}${hook_settings_generator_1.AGENT_EVENT_PATH}`)}`,
-            `${exports.CODEX_PERMISSION_URL_ENV_VAR}=${(0, hook_settings_generator_1.shellQuote)(`http://${CODEX_HOOK_HOST}:${port}${hook_settings_generator_1.PERMISSION_REQUEST_PATH}?${query.toString()}`)}`,
-        ];
+            [exports.CODEX_HOME_ENV_VAR]: getCodexHome(options),
+            [exports.CODEX_TOOL_ENV_VAR]: tool_id_1.CODEX_CLI_TOOL_ID,
+            [exports.CODEX_WORKTREE_ID_ENV_VAR]: target.worktreeId,
+            [exports.CODEX_INSTANCE_ID_ENV_VAR]: instanceId,
+            [exports.CODEX_EVENT_URL_ENV_VAR]: `http://${CODEX_HOOK_HOST}:${port}${hook_settings_generator_1.AGENT_EVENT_PATH}`,
+            [exports.CODEX_PERMISSION_URL_ENV_VAR]: `http://${CODEX_HOOK_HOST}:${port}${hook_settings_generator_1.PERMISSION_REQUEST_PATH}?${query.toString()}`,
+        };
         const trust = isCodexHookTrustBypassEnabled() ? ` ${exports.CODEX_HOOK_TRUST_BYPASS_FLAG}` : '';
-        return `${assignments.join(' ')} ${(0, hook_settings_generator_1.shellQuote)(executablePath)}${trust}`;
+        return { command: `${(0, hook_settings_generator_1.shellQuote)(executablePath)}${trust}`, settingsPath, env };
     }
     catch (error) {
         logger.warn('codex-hooks-config-write-failed', {
             worktreeId: target.worktreeId,
             error: error instanceof Error ? error.message : String(error),
         });
-        return executablePath;
+        return bare;
     }
 }

package/dist/server/src/lib/hooks/sources/codex/source.js

@@ -131,13 +131,10 @@ exports.codexAgentEventSource = (0, define_source_1.definePushHookSource)({
     // S3 / S4 / S5. The whole of the config generation lives in `./hooks-config`,
     // which never throws — a session that starts without hooks is the status quo,
     // a session that fails to start is not.
-    prepareLaunch: (target, executablePath) => {
-        const command = (0, hooks_config_1.buildCodexLaunchCommand)(executablePath, target);
-        // Reported only when the command actually reflects an injection. Both
-        // `CM_AGENT_HOOKS_INJECT=0` and a file that could not be written return the
-        // bare executable, and claiming a settings file then would name a file this
-        // launch is not using.
-        const settingsPath = command === executablePath ? null : (0, hooks_config_1.getCodexHooksPath)();
-        return { command, settingsPath };
-    },
+    //
+    // Issue #1846: the six correlation variables are the plan's `env` rather than
+    // a `NAME=value ` prefix written onto `command` here. `settingsPath` now comes
+    // straight out of the builder — it used to be re-derived by comparing the
+    // command against the bare executable, which was the same fact inferred twice.
+    prepareLaunch: ({ target, executablePath }) => (0, hooks_config_1.buildCodexLaunchPlan)(executablePath, target),
 });

package/dist/server/src/lib/hooks/sources/copilot/hook-settings.js

@@ -80,7 +80,7 @@ exports.buildCopilotHookSettings = buildCopilotHookSettings;
 exports.mergeCopilotHookSettings = mergeCopilotHookSettings;
 exports.readCopilotSettings = readCopilotSettings;
 exports.writeCopilotHookSettings = writeCopilotHookSettings;
-exports.buildCopilotEnvironmentPrefix = buildCopilotEnvironmentPrefix;
+exports.buildCopilotHookEnvironment = buildCopilotHookEnvironment;
 exports.isCopilotHookInjectionEnabled = isCopilotHookInjectionEnabled;
 exports.buildCopilotLaunchCommand = buildCopilotLaunchCommand;
 const fs_1 = require("fs");
@@ -411,16 +411,25 @@ function writeCopilotHookSettings(options = {}) {
     return settingsPath;
 }
 /**
- * The environment assignments that tell a hook which instance fired it.
- *
- * A prefix on the command line rather than `tmux set-environment`: the pane is
- * created before the agent starts and the assignment then travels with the one
- * process that matters, out of reach of `sanitizeSessionEnvironment` and of
- * anything else that edits the session's environment later.
+ * The environment that tells a hook which instance fired it.
+ *
+ * Applied to the launched process rather than through `tmux set-environment`:
+ * the pane is created before the agent starts and the assignment then travels
+ * with the one process that matters, out of reach of
+ * `sanitizeSessionEnvironment` and of anything else that edits the session's
+ * environment later.
+ *
+ * Returned as a map since Issue #1846. It used to be a pre-quoted
+ * `NAME=value NAME=value` string that the caller concatenated in front of the
+ * command — the same workaround codex, gemini and antigravity had each written
+ * separately, all four assuming a shell nobody had declared. The rendering now
+ * happens once, in `../launch-command`, and the bytes are identical.
  */
-function buildCopilotEnvironmentPrefix(worktreeId, instanceId) {
-    return (`${exports.COPILOT_WORKTREE_ID_ENV}=${(0, hook_settings_generator_1.shellQuote)(worktreeId)} ` +
-        `${exports.COPILOT_INSTANCE_ID_ENV}=${(0, hook_settings_generator_1.shellQuote)(instanceId)}`);
+function buildCopilotHookEnvironment(worktreeId, instanceId) {
+    return {
+        [exports.COPILOT_WORKTREE_ID_ENV]: worktreeId,
+        [exports.COPILOT_INSTANCE_ID_ENV]: instanceId,
+    };
 }
 /**
  * Whether to inject at all.
@@ -445,7 +454,7 @@ function isCopilotHookInjectionEnabled() {
  * @param target - The instance being started
  */
 function buildCopilotLaunchCommand(executablePath, target, options = {}) {
-    const bare = { command: executablePath, settingsPath: null };
+    const bare = { command: executablePath, settingsPath: null, env: {} };
     if (!isCopilotHookInjectionEnabled())
         return bare;
     const instanceId = target.instanceId ?? tool_id_1.COPILOT_CLI_TOOL_ID;
@@ -459,8 +468,9 @@ function buildCopilotLaunchCommand(executablePath, target, options = {}) {
     try {
         const settingsPath = writeCopilotHookSettings(options);
         return {
-            command: `${buildCopilotEnvironmentPrefix(target.worktreeId, instanceId)} ${executablePath}`,
+            command: executablePath,
             settingsPath,
+            env: buildCopilotHookEnvironment(target.worktreeId, instanceId),
         };
     }
     catch (error) {

package/dist/server/src/lib/hooks/sources/copilot/source.js

@@ -206,5 +206,5 @@ exports.copilotAgentEventSource = (0, define_source_1.definePushHookSource)({
     // machine without hooks rather than to a guess.
     parseQuestion: () => null,
     encodeVerdict: encodeCopilotVerdict,
-    prepareLaunch: (target, executablePath) => (0, hook_settings_1.buildCopilotLaunchCommand)(executablePath, target),
+    prepareLaunch: ({ target, executablePath }) => (0, hook_settings_1.buildCopilotLaunchCommand)(executablePath, target),
 });

package/dist/server/src/lib/hooks/sources/define-source.js

@@ -164,10 +164,12 @@ function definePullEventSource(spec) {
             // has been open for hours and carries no reply channel.
             return { kind: 'outOfBand' };
         },
-        prepareLaunch: spec.prepareLaunch ?? ((_target, executablePath) => ({
-            command: executablePath,
-            settingsPath: null,
-        })),
+        prepareLaunch: spec.prepareLaunch ??
+            ((context) => ({
+                command: context.executablePath,
+                settingsPath: null,
+                env: {},
+            })),
         subscribe: spec.subscribe,
         decide: spec.decide,
         listPending: spec.listPending,

package/dist/server/src/lib/hooks/sources/gemini/settings-generator.js

@@ -60,6 +60,7 @@ const types_1 = require("../../../../lib/cli-tools/types");
 const hook_settings_generator_1 = require("../../../../lib/hooks/hook-settings-generator");
 const logger_1 = require("../../../../lib/logger");
 const event_mapper_1 = require("../event-mapper");
+const launch_command_1 = require("../launch-command");
 const shared_config_tree_1 = require("./shared-config-tree");
 const tool_id_1 = require("./tool-id");
 const logger = (0, logger_1.createLogger)('lib/hooks/sources/gemini/settings-generator');
@@ -278,7 +279,7 @@ function writeGeminiHookSettings(worktreePath, target) {
     }
 }
 /**
- * The command that launches gemini for one instance.
+ * The command and environment that launch gemini for one instance.
  *
  * `CM_HOOK_URL` is the whole of the instance correlation, and it is an
  * environment variable rather than a flag in the settings file for a reason the
@@ -293,23 +294,28 @@ function writeGeminiHookSettings(worktreePath, target) {
  * lands on the primary instance. That is a degradation, not a
  * misattribution.
  *
- * Never throws, and returns the executable unchanged when injection is off, so
- * `CM_AGENT_HOOKS_INJECT=0` produces the byte-identical command line this tool
- * used before #1762.
+ * Returned as a `{ command, env }` pair since Issue #1846, instead of as one
+ * string with the variable written onto the front of `gemini`. Three other
+ * sources had built the same prefix by hand; `renderAgentLaunchCommand` now
+ * writes it once, and the line a pane receives is byte-identical.
+ *
+ * Never throws, and returns the executable with an empty environment when
+ * injection is off, so `CM_AGENT_HOOKS_INJECT=0` produces the byte-identical
+ * command line this tool used before #1762.
  *
  * @param executablePath - `gemini`, or a resolved path to it
  * @param target - The instance being started
- * @returns The command line to type into the pane
+ * @returns The command to type into the pane and the environment it needs
  */
 function buildGeminiLaunchCommand(executablePath, target, options = {}) {
     if (!(0, hook_settings_generator_1.isHookInjectionEnabled)())
-        return executablePath;
+        return { command: executablePath, env: {} };
     if (!(0, types_1.isValidInstanceId)((0, hook_settings_generator_1.resolveTargetInstanceId)(target))) {
         // About to become a URL parameter the receiver re-validates; a value that
         // would be rejected there is not worth injecting.
         logger.warn('gemini-hook-invalid-instance-id', { worktreeId: target.worktreeId });
-        return executablePath;
+        return { command: executablePath, env: {} };
     }
     const url = (0, hook_settings_generator_1.buildAgentEventUrl)({ ...target, cliToolId: tool_id_1.GEMINI_CLI_TOOL_ID }, options);
-    return `CM_HOOK_URL=${(0, hook_settings_generator_1.shellQuote)(url)} ${(0, hook_settings_generator_1.shellQuote)(executablePath)}`;
+    return { command: (0, hook_settings_generator_1.shellQuote)(executablePath), env: { [launch_command_1.AGENT_EVENT_URL_ENV_VAR]: url } };
 }

package/dist/server/src/lib/hooks/sources/gemini/source.js

@@ -57,7 +57,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.geminiAgentEventSource = void 0;
-exports.injectGeminiHookSettings = injectGeminiHookSettings;
+exports.prepareGeminiLaunch = prepareGeminiLaunch;
 const types_1 = require("../../../../lib/cli-tools/types");
 const define_source_1 = require("../define-source");
 const event_mapper_1 = require("../event-mapper");
@@ -66,32 +66,40 @@ const event_vocabulary_1 = require("./event-vocabulary");
 const settings_generator_1 = require("./settings-generator");
 const tool_id_1 = require("./tool-id");
 /**
- * Write this worktree's `.gemini/settings.json`, on the session-creation path.
+ * Write this worktree's `.gemini/settings.json` and build the launch line
+ * (S3 / S4 / S5).
  *
- * **This is the one thing about gemini that {@link AgentEventSource} cannot
- * express.** `prepareLaunch` receives an {@link AgentInstanceRef}, which is
- * `(worktreeId, cliToolId, instanceId)` and carries no filesystem path — the
- * right shape for the four tools whose config is global or per-instance, and one
- * field short for the only tool whose config is per-*worktree*. Rather than
- * widen the interface for one tool, or resolve the path by pulling the database
- * into the module every receiver imports, the caller that already holds the path
- * passes it here and `prepareLaunch` builds the command line.
+ * **This used to be the one thing {@link AgentEventSource} could not express.**
+ * `prepareLaunch` took `(target, executablePath)`, gemini's config lives at
+ * `<worktree>/.gemini/settings.json`, and an `AgentInstanceRef` carries no
+ * filesystem path — so #1762 exported `injectGeminiHookSettings(worktreePath,
+ * target)` beside the source and `cli-tools/gemini.ts` called both. One of the
+ * six sources wrote its config from a different call site than the other five,
+ * and a reader of this file could not tell that the config was written at all.
  *
- * Reported rather than worked around: see the Issue #1762 entry in `CHANGELOG.md`.
+ * Issue #1846 put `worktreePath` on {@link AgentLaunchContext} instead, so the
+ * write happens here, `settingsPath` reports the file that was actually
+ * written, and the second entry point is gone.
  *
- * @param worktreePath - Absolute path of the worktree the session runs in
- * @param target - The instance being created
- * @returns The settings file written, or null when nothing was written
+ * Never throws — `writeGeminiHookSettings` swallows its own failures and answers
+ * null, and a gemini session with no hooks is the pre-#1762 status quo.
+ *
+ * @param context - The instance, its executable, and the worktree it runs in
+ * @returns The command, its environment, and the settings file when one landed
  */
-function injectGeminiHookSettings(worktreePath, target) {
+function prepareGeminiLaunch({ target, executablePath, worktreePath, }) {
     const settingsTarget = {
         worktreeId: target.worktreeId,
         instanceId: target.instanceId,
         cliToolId: tool_id_1.GEMINI_CLI_TOOL_ID,
     };
-    if (!(0, types_1.isValidInstanceId)(target.instanceId ?? tool_id_1.GEMINI_CLI_TOOL_ID))
-        return null;
-    return (0, settings_generator_1.writeGeminiHookSettings)(worktreePath, settingsTarget);
+    // Checked before the write as well as inside `buildGeminiLaunchCommand`: an
+    // id the receiver would reject is an id no settings file should name either.
+    const settingsPath = (0, types_1.isValidInstanceId)(target.instanceId ?? tool_id_1.GEMINI_CLI_TOOL_ID)
+        ? (0, settings_generator_1.writeGeminiHookSettings)(worktreePath, settingsTarget)
+        : null;
+    const { command, env } = (0, settings_generator_1.buildGeminiLaunchCommand)(executablePath, settingsTarget);
+    return { command, settingsPath, env };
 }
 /**
  * Gemini CLI as an event source.
@@ -137,15 +145,7 @@ exports.geminiAgentEventSource = (0, define_source_1.definePushHookSource)({
     // escalation would add dialogs the Policy Engine had already settled. So every
     // verdict encodes to the empty body, which the bundle reads as no opinion.
     encodeVerdict: () => ({}),
-    // The settings file is written by `injectGeminiHookSettings`, which the
-    // session module calls with the worktree path this interface cannot carry.
-    // `settingsPath` is therefore null here rather than wrong.
-    prepareLaunch: (target, executablePath) => ({
-        command: (0, settings_generator_1.buildGeminiLaunchCommand)(executablePath, {
-            worktreeId: target.worktreeId,
-            instanceId: target.instanceId,
-            cliToolId: tool_id_1.GEMINI_CLI_TOOL_ID,
-        }),
-        settingsPath: null,
-    }),
+    // Config write and command line, both from here since #1846. `CM_HOOK_URL` is
+    // the plan's `env` rather than a prefix on `command`.
+    prepareLaunch: prepareGeminiLaunch,
 });

package/dist/server/src/lib/hooks/sources/index.js

@@ -12,7 +12,7 @@
  * @module lib/hooks/sources
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPENCODE_CLI_TOOL_ID = exports.CODEX_CLI_TOOL_ID = exports.ANTIGRAVITY_CLI_TOOL_ID = exports.GEMINI_CLI_TOOL_ID = exports.COPILOT_CLI_TOOL_ID = exports.CLAUDE_CLI_TOOL_ID = exports.isAbstainSafe = exports.describeNoDecision = exports.describeAbstain = exports.resetPendingDecisions = exports.openDecisionSlot = exports.listOpenDecisions = exports.closeDecisionSlot = exports.answerPendingDecision = exports.TOOL_CALL_ID_FIELDS = exports.SESSION_ID_FIELDS = exports.extractSnakeCaseEventDetail = exports.CAMEL_CASE_HOOK_EVENT_NAMES = exports.whenNamed = exports.runEventMappers = exports.resetUnknownEventTallies = exports.readStringField = exports.readNestedString = exports.readFirstStringField = exports.isPlainObject = exports.getUnknownEventTally = exports.fromNameTable = exports.boundDetail = exports.definePushHookSource = exports.definePullEventSource = exports.unregisterAgentEventSource = exports.registerAgentEventSource = exports.listAgentEventSources = exports.hasAgentEventSource = exports.getAgentEventSource = void 0;
+exports.OPENCODE_CLI_TOOL_ID = exports.CODEX_CLI_TOOL_ID = exports.ANTIGRAVITY_CLI_TOOL_ID = exports.GEMINI_CLI_TOOL_ID = exports.COPILOT_CLI_TOOL_ID = exports.CLAUDE_CLI_TOOL_ID = exports.isAbstainSafe = exports.describeNoDecision = exports.describeAbstain = exports.resetPendingDecisions = exports.openDecisionSlot = exports.listOpenDecisions = exports.closeDecisionSlot = exports.answerPendingDecision = exports.TOOL_CALL_ID_FIELDS = exports.SESSION_ID_FIELDS = exports.extractSnakeCaseEventDetail = exports.CAMEL_CASE_HOOK_EVENT_NAMES = exports.whenNamed = exports.runEventMappers = exports.resetUnknownEventTallies = exports.readStringField = exports.readNestedString = exports.readFirstStringField = exports.isPlainObject = exports.getUnknownEventTally = exports.fromNameTable = exports.boundDetail = exports.renderAgentLaunchCommand = exports.AGENT_EVENT_URL_ENV_VAR = exports.definePushHookSource = exports.definePullEventSource = exports.unregisterAgentEventSource = exports.registerAgentEventSource = exports.listAgentEventSources = exports.hasAgentEventSource = exports.getAgentEventSource = void 0;
 var registry_1 = require("./registry");
 Object.defineProperty(exports, "getAgentEventSource", { enumerable: true, get: function () { return registry_1.getAgentEventSource; } });
 Object.defineProperty(exports, "hasAgentEventSource", { enumerable: true, get: function () { return registry_1.hasAgentEventSource; } });
@@ -22,6 +22,9 @@ Object.defineProperty(exports, "unregisterAgentEventSource", { enumerable: true,
 var define_source_1 = require("./define-source");
 Object.defineProperty(exports, "definePullEventSource", { enumerable: true, get: function () { return define_source_1.definePullEventSource; } });
 Object.defineProperty(exports, "definePushHookSource", { enumerable: true, get: function () { return define_source_1.definePushHookSource; } });
+var launch_command_1 = require("./launch-command");
+Object.defineProperty(exports, "AGENT_EVENT_URL_ENV_VAR", { enumerable: true, get: function () { return launch_command_1.AGENT_EVENT_URL_ENV_VAR; } });
+Object.defineProperty(exports, "renderAgentLaunchCommand", { enumerable: true, get: function () { return launch_command_1.renderAgentLaunchCommand; } });
 var event_mapper_1 = require("./event-mapper");
 Object.defineProperty(exports, "boundDetail", { enumerable: true, get: function () { return event_mapper_1.boundDetail; } });
 Object.defineProperty(exports, "fromNameTable", { enumerable: true, get: function () { return event_mapper_1.fromNameTable; } });

package/dist/server/src/lib/hooks/sources/launch-command.js

@@ -0,0 +1,61 @@
+"use strict";
+/**
+ * The one place an {@link AgentLaunchPlan}'s environment is applied
+ * (Issue #1846, 申し送り 2).
+ *
+ * Before this module, four of the six sources — codex, copilot, gemini,
+ * antigravity — each wrote their own `NAME=value ` prefix onto the front of
+ * `AgentLaunchPlan.command` and trusted the caller to paste the result into a
+ * shell. Four implementations, four independently written prefixes, one
+ * assumption none of them declared: that the launcher is a shell.
+ *
+ * The assumption holds today, because every one of those launchers is
+ * `sendKeys(sessionName, line, true)` typing into a tmux pane. It is still the
+ * wrong place for the knowledge:
+ *
+ *  - a source whose executable is argv rather than a shell word cannot use the
+ *    trick at all, and the seventh tool is as likely to be that as not;
+ *  - a caller that wants to log or display the command has no way to take the
+ *    assignments back off, and those values are URLs with correlation keys in
+ *    them;
+ *  - quoting is a shell property, and four copies of it is four chances to get
+ *    a worktree path with a space in it wrong.
+ *
+ * So the plan declares `env` as data and this renders it, once. A source that
+ * needs no environment declares `{}` and renders to its bare command, byte for
+ * byte what it produced before.
+ *
+ * @module lib/hooks/sources/launch-command
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AGENT_EVENT_URL_ENV_VAR = void 0;
+exports.renderAgentLaunchCommand = renderAgentLaunchCommand;
+const hook_settings_generator_1 = require("../../../lib/hooks/hook-settings-generator");
+/**
+ * The variable `scripts/hooks/cmate-agent-event.sh` reads its endpoint from.
+ *
+ * One constant since Issue #1846. codex, gemini and antigravity each carried
+ * their own `'CM_HOOK_URL'` literal, which is three places for the relay's one
+ * contract to drift — and the failure mode of a drifted name is a relay that
+ * silently falls back to its default endpoint and attributes every event to the
+ * primary instance.
+ */
+exports.AGENT_EVENT_URL_ENV_VAR = 'CM_HOOK_URL';
+/**
+ * Turn a plan into the line a shell can run.
+ *
+ * Assignments come out in declaration order — `Record` preserves insertion
+ * order for string keys — so a plan that puts `CODEX_HOME` first still renders
+ * it first, which is what keeps this a refactor rather than a change of bytes.
+ * Values are quoted; names are not, because a name that needed quoting would
+ * not be a name a shell would assign.
+ *
+ * @param plan - What the source's `prepareLaunch` returned
+ * @returns `NAME='value' … command`, or just `command` when `env` is empty
+ */
+function renderAgentLaunchCommand(plan) {
+    const assignments = Object.entries(plan.env).map(([name, value]) => `${name}=${(0, hook_settings_generator_1.shellQuote)(value)}`);
+    if (assignments.length === 0)
+        return plan.command;
+    return `${assignments.join(' ')} ${plan.command}`;
+}

package/dist/server/src/lib/hooks/sources/legacy-relay.js

@@ -76,9 +76,10 @@ function createLegacyRelaySource(cliToolId) {
         encodeVerdict: source_1.encodeClaudeVerdict,
         // CommandMate does not inject config for these tools; their `startSession`
         // in `src/lib/cli-tools/<tool>.ts` launches them bare.
-        prepareLaunch: (_target, executablePath) => ({
+        prepareLaunch: ({ executablePath }) => ({
             command: executablePath,
             settingsPath: null,
+            env: {},
         }),
     });
 }

package/dist/server/src/lib/hooks/sources/opencode/source.js

@@ -202,19 +202,22 @@ async function probeOpencodeActivity(target) {
  * because the default is the security property: the server is unauthenticated,
  * and `--mdns` (never passed) would move it to `0.0.0.0` (#1758 §5.8.3).
  */
-function prepareOpencodeLaunch(target, executablePath) {
-    if (!(0, hook_settings_generator_1.isHookInjectionEnabled)()) {
-        return { command: executablePath, settingsPath: null };
-    }
+function prepareOpencodeLaunch({ target, executablePath, }) {
+    // `env` is empty for every branch: opencode is the one source that needs no
+    // correlation variable at all, because CommandMate holds the connection and
+    // therefore already knows which instance the frames belong to (#1846).
+    const bare = { command: executablePath, settingsPath: null, env: {} };
+    if (!(0, hook_settings_generator_1.isHookInjectionEnabled)())
+        return bare;
     const port = (0, ports_1.getAssignedOpencodePort)(target);
-    if (port === null) {
-        return { command: executablePath, settingsPath: null };
-    }
+    if (port === null)
+        return bare;
     return {
         command: `${(0, hook_settings_generator_1.shellQuote)(executablePath)} --port ${port} --hostname ${client_1.OPENCODE_SERVER_HOST}`,
         // Nothing is written to disk. `configScope: 'none'` says the same thing to
         // a caller that asks the capabilities instead of the plan.
         settingsPath: null,
+        env: {},
     };
 }
 /**

package/dist/server/src/lib/polling/prompt-dedup-state.js

@@ -0,0 +1,95 @@
+"use strict";
+/**
+ * In-memory tally of prompts the content-hash dedup guard declined to save
+ * (Issue #1695).
+ *
+ * `isDuplicatePrompt` (see `prompt-dedup.ts`, Issue #565) drops a detected
+ * prompt without writing anything to the database, and until now the only trace
+ * it left was `logger.info('duplicate-prompt-skipped', …)` in the server log.
+ * From `commandmate capture --json` the outcome is indistinguishable from the
+ * detection layer never having classified the frame at all (Issue #1676): both
+ * answer "no prompt was recorded". This module keeps the skip count and the
+ * last skip time per session so `buildCurrentOutput` can publish them and an
+ * operator can tell "the guard suppressed it" from "nothing saw it".
+ *
+ * Exposure only: nothing reads this to make a decision. The guard itself keeps
+ * its own hash cache and is untouched by whether anyone reads the tally.
+ *
+ * **Cumulative, not per-turn.** The hash cache behind the guard is cleared by
+ * `stopPolling()` at the end of every polling cycle; the tally deliberately is
+ * not, because the question it answers ("has this session been dropping
+ * prompts, and how recently?") spans turns. `lastSkippedAt` is what dates the
+ * evidence — a large `skippedCount` with an hours-old `lastSkippedAt` is
+ * history, the same count with a fresh one is happening right now.
+ *
+ * Keyed like `auto-yes-suppression-state` (worktreeId / cliToolId / instanceId
+ * via `buildCompositeKey`) so the reader in `current-output-builder` can look it
+ * up with the identifiers the request already carries, rather than with the
+ * poller key, whose builder lives behind `response-poller-core`'s import graph.
+ *
+ * In-memory and not in SQLite for the same reason the suppression record is:
+ * it describes a live tmux session, and a session does not survive a server
+ * restart for the record to still be about.
+ *
+ * @module lib/polling/prompt-dedup-state
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.recordPromptDedupSkip = recordPromptDedupSkip;
+exports.getPromptDedupSkips = getPromptDedupSkips;
+exports.renamePromptDedupSkips = renamePromptDedupSkips;
+exports.clearPromptDedupSkips = clearPromptDedupSkips;
+const auto_yes_state_1 = require("../../lib/auto-yes-state");
+/** compositeKey -> running tally of suppressed prompts for that session. */
+const promptDedupSkips = globalThis.__promptDedupSkips ??
+    (globalThis.__promptDedupSkips = new Map());
+/**
+ * Count one prompt the dedup guard suppressed for `instanceId`.
+ *
+ * @param at - Epoch ms; defaults to now. Overridable so tests are deterministic.
+ */
+function recordPromptDedupSkip(worktreeId, cliToolId, instanceId, at = Date.now()) {
+    const key = (0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId);
+    const previous = promptDedupSkips.get(key);
+    promptDedupSkips.set(key, {
+        skippedCount: (previous?.skippedCount ?? 0) + 1,
+        lastSkippedAt: at,
+    });
+}
+/**
+ * @returns The tally for this session. Never null: a session the guard has
+ *   never fired for reports `{ skippedCount: 0, lastSkippedAt: null }`, so
+ *   `capture --json` prints an explicit "no prompt was suppressed" rather than
+ *   an absent key a consumer has to guess about.
+ */
+function getPromptDedupSkips(worktreeId, cliToolId, instanceId) {
+    return (promptDedupSkips.get((0, auto_yes_state_1.buildCompositeKey)(worktreeId, cliToolId, instanceId)) ?? {
+        skippedCount: 0,
+        lastSkippedAt: null,
+    });
+}
+/**
+ * Carry the tally across a worktree-ID rename (Issue #1621 Phase 3).
+ *
+ * The dedup hash caches are deliberately moved rather than dropped by
+ * `migrateResponsePollerWorktreeIds`, so the guard goes on suppressing the
+ * prompt currently on screen under the new ID. A tally left behind would then
+ * report zero skips for a session that is still skipping — the false negative
+ * this module exists to prevent, appearing at exactly the moment the record
+ * matters.
+ *
+ * No-op when the IDs match or nothing is recorded under the old one.
+ */
+function renamePromptDedupSkips(oldWorktreeId, newWorktreeId, cliToolId, instanceId) {
+    if (oldWorktreeId === newWorktreeId)
+        return;
+    const oldKey = (0, auto_yes_state_1.buildCompositeKey)(oldWorktreeId, cliToolId, instanceId);
+    const record = promptDedupSkips.get(oldKey);
+    promptDedupSkips.delete(oldKey);
+    if (record !== undefined) {
+        promptDedupSkips.set((0, auto_yes_state_1.buildCompositeKey)(newWorktreeId, cliToolId, instanceId), record);
+    }
+}
+/** Drop every recorded tally. Test seam. */
+function clearPromptDedupSkips() {
+    promptDedupSkips.clear();
+}

package/dist/server/src/lib/polling/response-checker.js

@@ -25,6 +25,7 @@ const response_cleaner_1 = require("../response-cleaner");
 const copilot_constants_1 = require("../../config/copilot-constants");
 const tui_accumulator_1 = require("../tui-accumulator");
 const prompt_dedup_1 = require("./prompt-dedup");
+const prompt_dedup_state_1 = require("./prompt-dedup-state");
 const response_dedup_1 = require("./response-dedup");
 const response_poller_core_1 = require("./response-poller-core");
 const push_1 = require("../../lib/push");
@@ -446,6 +447,11 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
             const pollerKey = (0, response_poller_core_1.getPollerKey)(worktreeId, cliToolId, instanceId);
             const normalizedForDedup = (0, prompt_dedup_1.normalizePromptForDedup)(promptContent, cliToolId);
             if ((0, prompt_dedup_1.isDuplicatePrompt)(pollerKey, normalizedForDedup)) {
+                // Issue #1695: the log line below is invisible to `commandmate capture
+                // --json`, so a suppressed prompt and a prompt the detection layer never
+                // classified (#1676) look identical from the CLI — both say "nothing was
+                // recorded". Count the skip so the payload can tell them apart.
+                (0, prompt_dedup_state_1.recordPromptDedupSkip)(worktreeId, cliToolId, instanceId);
                 logger.info('duplicate-prompt-skipped', { worktreeId, cliToolId });
                 return false;
             }
@@ -565,6 +571,12 @@ async function checkForResponse(worktreeId, cliToolId, instanceId) {
         if (!lineCountIsCursor) {
             const pollerKey = (0, response_poller_core_1.getPollerKey)(worktreeId, cliToolId, instanceId);
             if ((0, response_dedup_1.isDuplicateResponse)(pollerKey, cleanedResponse)) {
+                // Issue #1695: this branch used to drop the response silently — the
+                // prompt-side guard above has logged its skip since #565, this one
+                // logged nothing at all, so a reply that never reached History left no
+                // trace anywhere. Same action name shape as its sibling so both skips
+                // are found by one grep.
+                logger.info('duplicate-response-skipped', { worktreeId, cliToolId, instanceId: resolvedInstanceId });
                 (0, db_1.updateSessionState)(db, worktreeId, cliToolId, result.lineCount, resolvedInstanceId);
                 return false;
             }