commandmate 0.46.1 → 0.47.2

package/dist/server/locales/en/worktree.json

@@ -562,6 +562,7 @@
         "reasonDismissablePanel": "This screen only closes. Press Esc here, with it in view below.",
         "reasonUnclassified": "Chat can't tell what this screen is. It is shown as-is below, so you can drive it with the keys here.",
         "reasonPromptUnreadable": "Waiting for an answer, and the options couldn't be read. Read the screen below and answer with a number or y/n.",
+        "reasonTrustConfirmation": "Terminal action needed (trust confirmation). The agent will not continue until you answer whether to trust this folder, and Auto-Yes does not answer this screen. Send the arrows and Enter from here, with the screen below in view, or answer it in the terminal.",
         "openTerminal": "Open terminal",
         "jumpToLatest": "Jump to latest",
         "jumpToLatestGenerating": "Jump to latest (still responding)",
@@ -1169,6 +1170,9 @@
         "opencodeToolbarLabel": "opencode model keys",
         "opencodeCaption": "Model"
     },
+    "trustConfirmation": {
+        "notice": "Terminal action needed (trust confirmation). The agent will not continue until you answer whether to trust this folder, and Auto-Yes does not answer this screen. Pick with the arrows and press Enter, or answer it in the terminal."
+    },
     "newFileDialog": {
         "title": "New File",
         "fileNameLabel": "File name",

package/dist/server/locales/ja/worktree.json

@@ -562,6 +562,7 @@
         "reasonDismissablePanel": "閉じるだけの画面です。下の画面を見ながら、ここで Esc を押せます。",
         "reasonUnclassified": "チャットでは種類を判別できない画面です。下にそのまま表示しているので、ここでキーを送って操作できます。",
         "reasonPromptUnreadable": "応答待ちですが選択肢を読み取れませんでした。下の画面を見て、番号か y／n で答えられます。",
+        "reasonTrustConfirmation": "端末で操作が必要です（信頼の確認）。このフォルダを信頼するかを答えるまで、エージェントは先へ進みません。Auto-Yes もこの確認には答えません。下の画面を見ながら、ここで矢印と決定キーを送るか、端末で答えてください。",
         "openTerminal": "ターミナルで確認",
         "jumpToLatest": "新着へ",
         "jumpToLatestGenerating": "新着へ（応答中）",
@@ -1169,6 +1170,9 @@
         "opencodeToolbarLabel": "opencode のモデルキー",
         "opencodeCaption": "モデル"
     },
+    "trustConfirmation": {
+        "notice": "端末で操作が必要です（信頼の確認）。このフォルダを信頼するかを答えるまで、エージェントは先へ進みません。Auto-Yes もこの確認には答えません。矢印で選んで決定キーを押すか、端末で答えてください。"
+    },
     "newFileDialog": {
         "title": "新規ファイル",
         "fileNameLabel": "ファイル名",

package/dist/server/server.js

@@ -72,6 +72,7 @@ const worktrees_1 = require("./src/lib/git/worktrees");
 const db_instance_1 = require("./src/lib/db/db-instance");
 const response_poller_1 = require("./src/lib/polling/response-poller");
 const auto_yes_lifecycle_1 = require("./src/lib/auto-yes-lifecycle");
+const auto_yes_shutdown_record_1 = require("./src/lib/auto-yes-shutdown-record");
 const schedule_manager_1 = require("./src/lib/schedule-manager");
 const timer_manager_1 = require("./src/lib/timer-manager");
 const resource_cleanup_1 = require("./src/lib/resource-cleanup");
@@ -595,6 +596,17 @@ app.prepare().then(() => {
             console.error('Error initializing worktrees:', error);
         }
     }
+    // Issue #3730: say which Auto-Yes grants the previous process's graceful
+    // shutdown released — each still in-period one becomes a DISABLED state with
+    // `stopReason: 'server-restart'`; no grant is restored and no poller starts.
+    // Here, synchronously, before EITHER listener opens: the first request on the
+    // local or the remote door already sees the notices, and no enable / disable
+    // a request makes can be overwritten by a seed that lands after it. Before
+    // `initializeWorktrees()` too, so the ID reconcile there moves the notices
+    // with every other Auto-Yes state, and the orphan sweep drops the ones whose
+    // worktree is gone. Never throws; a missing, unreadable or broken record
+    // leaves every grant off with no reason.
+    (0, auto_yes_shutdown_record_1.restoreAutoYesShutdownRecord)();
     // H3 fix: Pass hostname to listen() so CM_BIND is respected.
     // Note: http.Server.listen(port, hostname, callback) does not pass err to callback;
     // listen errors emit an 'error' event instead.
@@ -825,9 +837,16 @@ app.prepare().then(() => {
         }
         // Stop polling first
         (0, response_poller_1.stopAllPolling)();
+        // Issue #3730: write down which Auto-Yes grants this shutdown releases, so
+        // the next start can say "released by a server restart" instead of nothing.
+        // First, because it also closes the door: an enable that returns from its
+        // await after this is refused. Only an explanation is kept — the next
+        // process starts every grant OFF, as before. Never throws; a failure costs
+        // the explanation, not the shutdown. SIGKILL / a crash never gets here.
+        (0, auto_yes_shutdown_record_1.recordAutoYesShutdown)();
         // Issue #138: Stop all auto-yes pollers. Issue #3184: the `server-shutdown`
         // row of the Auto-Yes lifecycle table — the state itself is in memory and
-        // goes with the process; nothing is persisted for the next start.
+        // goes with the process (only the explanation above outlives it).
         (0, auto_yes_lifecycle_1.releaseAutoYes)('server-shutdown', { scope: 'all' });
         // Issue #294: Stop all scheduled executions (SIGKILL fire-and-forget)
         (0, schedule_manager_1.stopAllSchedules)();

package/dist/server/src/config/auto-yes-config.js

@@ -15,6 +15,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MAX_STOP_PATTERN_LENGTH = exports.AUTO_STOP_ERROR_THRESHOLD = exports.AUTO_YES_COUNTDOWN_INTERVAL_MS = exports.FULL_CAPTURE_LINES = exports.REDUCED_CAPTURE_LINES = exports.THINKING_POLLING_INTERVAL_MS = exports.DURATION_LABELS = exports.DEFAULT_AUTO_YES_DURATION = exports.ALLOWED_DURATIONS = void 0;
 exports.isAllowedDuration = isAllowedDuration;
+exports.isReleasedByRestart = isReleasedByRestart;
 exports.validateStopPattern = validateStopPattern;
 exports.executeRegexWithTimeout = executeRegexWithTimeout;
 exports.formatTimeRemaining = formatTimeRemaining;
@@ -60,6 +61,16 @@ exports.AUTO_YES_COUNTDOWN_INTERVAL_MS = 1000;
 // =============================================================================
 /** Number of consecutive errors before auto-stopping auto-yes (Issue #499 Item 5) */
 exports.AUTO_STOP_ERROR_THRESHOLD = 20;
+/**
+ * Whether one instance's Auto-Yes reads "off, released by the last server
+ * restart" (Issue #3730): disabled, with `stopReason: 'server-restart'`.
+ * Shared by every surface that labels a toggle, so they cannot disagree.
+ *
+ * @param entry - The instance's state as a surface holds it, if any
+ */
+function isReleasedByRestart(entry) {
+    return entry?.enabled !== true && entry?.stopReason === 'server-restart';
+}
 // =============================================================================
 // Stop Pattern Validation (Issue #314)
 // =============================================================================

package/dist/server/src/lib/auto-yes-lifecycle.js

@@ -37,10 +37,11 @@
  * @module lib/auto-yes-lifecycle
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AUTO_YES_LIFECYCLE = void 0;
+exports.AUTO_YES_LIFECYCLE_POLLER_STOP_REASON = exports.AUTO_YES_LIFECYCLE = void 0;
 exports.stopAutoYesPollersFor = stopAutoYesPollersFor;
 exports.applyAutoYesStateRule = applyAutoYesStateRule;
 exports.releaseAutoYes = releaseAutoYes;
+const auto_yes_poller_stop_reason_1 = require("./polling/auto-yes-poller-stop-reason");
 const auto_yes_manager_1 = require("./polling/auto-yes-manager");
 /**
  * The table (design §8.2).
@@ -48,7 +49,11 @@ const auto_yes_manager_1 = require("./polling/auto-yes-manager");
  * `session-killed` is #3182's decision as #3188 shipped it: disable with no
  * reason (no new reason was added), for the instance only. `server-shutdown`
  * deliberately does not persist anything: the state lives in memory, and a
- * restarted server starting with every grant off is the safe side.
+ * restarted server starting with every grant off is the safe side. Issue #3730
+ * keeps that: `server.ts` writes down only which grants the shutdown released
+ * (`lib/auto-yes-shutdown-record`), so the next start can show them as off with
+ * `stopReason: 'server-restart'`. That record is the server's step, not this
+ * row's — the row, `releaseAutoYes` and `stopAllAutoYesPolling` write nothing.
  *
  * `consecutive-errors` is for real capture failures only: a session that
  * exists but cannot be read. A session that does not exist (not started yet,
@@ -64,14 +69,35 @@ exports.AUTO_YES_LIFECYCLE = {
     'consecutive-errors': { state: 'disable', stopReason: 'consecutive_errors', poller: 'stop' },
     'server-shutdown': { state: 'none', poller: 'stop' },
 };
+/**
+ * What `poller:stopped` logs for each event (Issue #3730): the event's own
+ * name, except `server-shutdown`, which keeps the `shutdown` that log has
+ * always carried. Beside the table rather than a column of it, because a poller
+ * reason is a log word, not a decision about the grant.
+ */
+exports.AUTO_YES_LIFECYCLE_POLLER_STOP_REASON = {
+    'session-killed': 'session-killed',
+    'instance-removed': 'instance-removed',
+    'worktree-deleted': 'worktree-deleted',
+    'orphan-swept': 'orphan-swept',
+    'consecutive-errors': 'consecutive-errors',
+    'server-shutdown': 'shutdown',
+};
 /**
  * Stop the pollers the event's target names (the poller half of the table).
  * Separate from {@link applyAutoYesStateRule} so a caller that reports the two
  * failures apart (`session-cleanup`) can keep doing so.
+ *
+ * Issue #3730: the event rides to `poller:stopped` as its reason through
+ * {@link withPollerStopReason} rather than as an argument — the calls below
+ * keep the exact arguments the barrel's mocks pin.
  */
 function stopAutoYesPollersFor(event, target) {
     if (exports.AUTO_YES_LIFECYCLE[event].poller !== 'stop')
         return;
+    (0, auto_yes_poller_stop_reason_1.withPollerStopReason)(exports.AUTO_YES_LIFECYCLE_POLLER_STOP_REASON[event], () => stopTargetPollers(target));
+}
+function stopTargetPollers(target) {
     switch (target.scope) {
         case 'instance':
             (0, auto_yes_manager_1.stopAutoYesPolling)((0, auto_yes_manager_1.buildCompositeKey)(target.worktreeId, target.cliToolId, target.instanceId));