very-happy-cli 0.2.196 → 0.2.198

package/dist/{apiMachine-CxmiSa2-.cjs → apiMachine-BjhCXg6C.cjs}

@@ -2,46 +2,46 @@
 
 var socket_ioClient = require('socket.io-client');
 var webPanels = require('./webPanels-FCgFKvVe.cjs');
-var logger = require('./logger-HQ9yDb8R.cjs');
-var lidState = require('./lidState-VZ1j_QYw.cjs');
-var mirrorProtocol = require('./mirrorProtocol-Cv2otcvM.cjs');
-var configuration = require('./configuration-CWRKSOyj.cjs');
+var logger = require('./logger-BrAF4iuT.cjs');
+var reconnectGate = require('./reconnectGate-BpePVLPu.cjs');
+var mirrorProtocol = require('./mirrorProtocol-CNF1eHsm.cjs');
+var configuration = require('./configuration-DfRs3WLd.cjs');
 var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-CEV9KUsq.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-6iKpECuR.cjs');
 var promises = require('node:fs/promises');
 var path = require('node:path');
 var os = require('node:os');
 var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
 var node_child_process = require('node:child_process');
-var persistence = require('./persistence-BiyvEYaR.cjs');
+var persistence = require('./persistence-DGfEdbA5.cjs');
 var fileStore = require('./fileStore-7qhnbs6N.cjs');
-var index = require('./index-D9Hidq-g.cjs');
-var accountService = require('./accountService-DL6xhVUa.cjs');
+var index = require('./index-BknTkVnR.cjs');
+var accountService = require('./accountService-BWUjgHl0.cjs');
 var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-BqPZjTpo.cjs');
+var time = require('./time-Cv4hbCLT.cjs');
 var pty = require('node-pty');
-var terminals = require('./terminals-B_bfC9c2.cjs');
-var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
-var index$1 = require('./index-CQZg9jKx.cjs');
+var terminals = require('./terminals-dK3Lrjfp.cjs');
+var tmuxSocket = require('./tmuxSocket-Dg11Olx0.cjs');
+var index$1 = require('./index-DCfEzudP.cjs');
 var node_crypto = require('node:crypto');
 var node_fs = require('node:fs');
 var axios = require('axios');
 var projectPath = require('./projectPath-C3ioB4Bu.cjs');
 var ids = require('./ids-B6ZC0HGt.cjs');
 var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
-var localHappyAgentAuth = require('./localHappyAgentAuth-oxhpgJOb.cjs');
+var localHappyAgentAuth = require('./localHappyAgentAuth-B6xdH-Fr.cjs');
 var path$1 = require('./path-B7zW-WwE.cjs');
 var oneShotPrompts = require('./oneShotPrompts-CL0dip9C.cjs');
-var claudeSessionFork = require('./claudeSessionFork-OffWLYgd.cjs');
-var codexAppServerClient = require('./codexAppServerClient-C-UwVMUN.cjs');
+var claudeSessionFork = require('./claudeSessionFork-CDTbQmYi.cjs');
+var codexAppServerClient = require('./codexAppServerClient--K-ILfqM.cjs');
 var codexThreadFork = require('./codexThreadFork-C6ZmcT2z.cjs');
-var rateLimitWindows = require('./rateLimitWindows-U4fc1-_6.cjs');
+var rateLimitWindows = require('./rateLimitWindows-DiiGHS9r.cjs');
 require('chalk');
 require('node:util');
 require('os');
 require('child_process');
-require('./package-Dn7zZkY1.cjs');
+require('./package-CStJrLG3.cjs');
 require('util');
 require('fs/promises');
 require('crypto');
@@ -49,9 +49,9 @@ require('path');
 require('cross-spawn');
 require('zod');
 require('@paralleldrive/cuid2');
-require('./claudeAccountEnv-_O3x5AJ1.cjs');
-require('./store-aa3CVNwS.cjs');
-require('./codexAccount-CYhQir50.cjs');
+require('./claudeAccountEnv-DSaFKajJ.cjs');
+require('./store-QBBJB5Ox.cjs');
+require('./codexAccount-CQ4W1Ax8.cjs');
 require('node:readline');
 require('tweetnacl');
 require('./terminalTitleSuggest-DhvRFX3H.cjs');
@@ -486,6 +486,7 @@ function planTerminalRestore(record, facts) {
       title: record.title ?? record.attachTmux,
       manual: true,
       tags: record.tags,
+      ...record.projectId ? { projectId: record.projectId } : {},
       command: terminals.attachStartupCommand(matches[0].id, facts.attachSocket),
       attachTmux: record.attachTmux,
       ...recordGeometry(record)
@@ -500,6 +501,7 @@ function planTerminalRestore(record, facts) {
     title: record.title,
     manual: record.manual === true,
     tags: record.tags,
+    ...record.projectId ? { projectId: record.projectId } : {},
     ...resumable ? { command: `claude --resume ${record.claudeSessionId}` } : {},
     ...recordGeometry(record)
   };
@@ -6052,6 +6054,7 @@ function selectAutoRestore(candidates, opts) {
       terminalId: c.id,
       ...c.tags !== void 0 ? { tags: c.tags } : {},
       ...c.manual ? { manual: true } : {},
+      ...c.projectId ? { projectId: c.projectId } : {},
       ...c.cols !== void 0 && c.rows !== void 0 ? { cols: c.cols, rows: c.rows } : {},
       cwd: c.cwd,
       title: c.title,
@@ -6101,7 +6104,7 @@ function sanitizeClosedTerminals(raw, max = CLOSED_TERMINALS_MAX) {
   const out = [];
   for (const item of raw) {
     if (!item || typeof item !== "object") continue;
-    const { id, title, cwd, mirrorSessionId, claudeSessionId, reason, closedAt, tags, manual, attachTmux } = item;
+    const { id, title, cwd, mirrorSessionId, claudeSessionId, reason, closedAt, tags, manual, attachTmux, projectId } = item;
     if (typeof id !== "string" || id.length === 0 || typeof closedAt !== "number") continue;
     if (seen.has(id)) continue;
     seen.add(id);
@@ -6116,6 +6119,7 @@ function sanitizeClosedTerminals(raw, max = CLOSED_TERMINALS_MAX) {
       ...tagList !== void 0 ? { tags: tagList } : {},
       ...manual === true ? { manual: true } : {},
       ...typeof attachTmux === "string" && attachTmux ? { attachTmux } : {},
+      ...mirrorProtocol.projectField(projectId),
       closedAt
     });
   }
@@ -6132,6 +6136,7 @@ function directTerminalItems(sessions, tmuxIds) {
       id: s.id,
       ...title ? { title } : {},
       tags: s.direct.tags ?? [],
+      projectId: s.direct.projectId ?? null,
       ...s.direct.manual ? { manual: true } : {},
       cwd: s.direct.cwd,
       createdAt: s.direct.createdAt,
@@ -6879,7 +6884,7 @@ function startupInjectionArgs(tmuxSession, command) {
   ];
 }
 function seenInfoOf(t) {
-  return { title: t.title, cwd: t.cwd, tags: t.tags, manual: t.manual, attachTmux: t.attachTmux, ...seenGeometry(t.paneCols, t.paneRows) };
+  return { title: t.title, cwd: t.cwd, tags: t.tags, manual: t.manual, attachTmux: t.attachTmux, ...t.projectId ? { projectId: t.projectId } : {}, ...seenGeometry(t.paneCols, t.paneRows) };
 }
 function seenGeometry(cols, rows) {
   return cols !== void 0 && rows !== void 0 ? { cols, rows } : {};
@@ -6899,7 +6904,9 @@ function terminalListSignature(items) {
     // list, or the web never learns the toggle became available.
     t.mirrorSessionId ?? "",
     t.attachTmux ?? "",
-    t.direct ? 1 : 0
+    t.direct ? 1 : 0,
+    // B-868: moving a terminal between projects must push at once.
+    t.projectId ?? ""
   ]);
   return JSON.stringify(canon);
 }
@@ -7751,6 +7758,7 @@ class WebTerminalManager {
         tags: info.tags,
         manual: info.manual,
         ...info.attachTmux ? { attachTmux: info.attachTmux } : {},
+        ...info.projectId ? { projectId: info.projectId } : {},
         ...seenGeometry(info.cols, info.rows),
         // Live binding first (authoritative while it exists), persisted
         // metadata as the fallback once the mirror has been torn down.
@@ -7806,6 +7814,7 @@ class WebTerminalManager {
         tags: info.tags,
         manual: info.manual,
         ...info.attachTmux ? { attachTmux: info.attachTmux } : {},
+        ...info.projectId ? { projectId: info.projectId } : {},
         ...seenGeometry(info.cols, info.rows),
         mirrorSessionId: mirror?.sessionId,
         claudeSessionId: mirror?.claudeSessionId,
@@ -7819,6 +7828,7 @@ class WebTerminalManager {
         cwd: info.cwd,
         tags: info.tags,
         manual: info.manual,
+        ...info.projectId ? { projectId: info.projectId } : {},
         ...seenGeometry(info.cols, info.rows),
         seenAt: info.seenAt,
         claudeSessionId: mirror?.claudeSessionId
@@ -8009,6 +8019,14 @@ class WebTerminalManager {
         { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env }
       );
     }
+    const projectId = tmuxSocket.validateTerminalProjectId(plan.projectId);
+    if (projectId) {
+      node_child_process.spawnSync(
+        "tmux",
+        tmuxSocket.tmuxArgs(["set-option", "-t", `=${name}:`, "@vh_project", projectId]),
+        { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env }
+      );
+    }
     if (plan.command) {
       const command = withTerminalHooks(plan.command, plan.terminalId, this.claudeVersion.current());
       for (const argv of startupInjectionArgs(name, command)) {
@@ -8022,7 +8040,7 @@ class WebTerminalManager {
    *  would care about changed (see liveSnapshotChanged). */
   persistLiveSnapshot(live, now) {
     const candidate = /* @__PURE__ */ new Map();
-    for (const [id, info] of live) candidate.set(id, { title: info.title, cwd: info.cwd, tags: info.tags, manual: info.manual, ...info.attachTmux ? { attachTmux: info.attachTmux } : {}, ...seenGeometry(info.cols, info.rows), seenAt: now });
+    for (const [id, info] of live) candidate.set(id, { title: info.title, cwd: info.cwd, tags: info.tags, manual: info.manual, ...info.attachTmux ? { attachTmux: info.attachTmux } : {}, ...info.projectId ? { projectId: info.projectId } : {}, ...seenGeometry(info.cols, info.rows), seenAt: now });
     if (!mirrorProtocol.liveSnapshotChanged(this.lastPersistedSnapshot, candidate)) return;
     this.lastPersistedSnapshot = candidate;
     saveLiveSnapshot(candidate);
@@ -8243,7 +8261,7 @@ class WebTerminalManager {
         }
       }
       if (createdNew) {
-        attachedTmux = this.injectIntoCreated(tmuxSession, attachTarget, opts.startupCommand, env);
+        attachedTmux = this.injectIntoCreated(tmuxSession, attachTarget, opts.startupCommand, env, opts.projectId);
       } else if (opts.attachTmux && !attachOnly) {
         const stored = node_child_process.spawnSync(
           "tmux",
@@ -8266,7 +8284,7 @@ class WebTerminalManager {
             { stdio: "ignore", timeout: TMUX_CREATE_TIMEOUT_MS, env }
           );
           createdNew = retry.status === 0;
-          if (createdNew) attachedTmux = this.injectIntoCreated(tmuxSession, attachTarget, opts.startupCommand, env);
+          if (createdNew) attachedTmux = this.injectIntoCreated(tmuxSession, attachTarget, opts.startupCommand, env, opts.projectId);
         }
       }
       if (!attachOnly && !createdNew) {
@@ -8345,7 +8363,8 @@ class WebTerminalManager {
         }
       }
       const created = new TerminalSession(id, { kind: "pty", pty: proc }, void 0, cols, rows);
-      created.direct = { cwd, createdAt: Date.now() };
+      const createProject = tmuxSocket.validateTerminalProjectId(opts.projectId);
+      created.direct = { cwd, createdAt: Date.now(), ...createProject ? { projectId: createProject } : {} };
       created.onTitleChange((title) => {
         if (created.direct && !created.direct.manual) created.direct.title = terminals.deriveAutoTitle(title, os.hostname(), created.direct.cwd);
       });
@@ -8393,7 +8412,14 @@ class WebTerminalManager {
    * records / restore and types the attach line; otherwise the ordinary
    * startup command runs. Returns what to echo as `attachedTmux`.
    */
-  injectIntoCreated(tmuxSession, attachTarget, startupCommand, env) {
+  injectIntoCreated(tmuxSession, attachTarget, startupCommand, env, projectId) {
+    const project = tmuxSocket.validateTerminalProjectId(projectId);
+    if (project) {
+      try {
+        node_child_process.spawnSync("tmux", tmuxSocket.tmuxArgs(["set-option", "-t", `=${tmuxSession}:`, "@vh_project", project]), { stdio: "ignore", timeout: TMUX_PROBE_TIMEOUT_MS, env });
+      } catch {
+      }
+    }
     if (attachTarget) {
       for (const a of [
         ["set-option", "-t", `=${tmuxSession}:`, "@vh_title", attachTarget.name],
@@ -8714,6 +8740,7 @@ class WebTerminalManager {
         cwd: liveDirect.direct.cwd,
         tags: liveDirect.direct.tags ?? [],
         ...liveDirect.direct.manual ? { manual: true } : {},
+        ...liveDirect.direct.projectId ? { projectId: liveDirect.direct.projectId } : {},
         reason: "closed",
         closedAt: Date.now()
       });
@@ -8757,6 +8784,7 @@ class WebTerminalManager {
         tags: info.tags,
         manual: info.manual,
         ...info.attachTmux ? { attachTmux: info.attachTmux } : {},
+        ...info.projectId ? { projectId: info.projectId } : {},
         ...seenGeometry(info.cols, info.rows),
         mirrorSessionId: this.mirrorResolver?.(terminalId) ?? mirror?.sessionId,
         claudeSessionId: mirror?.claudeSessionId,
@@ -8847,6 +8875,7 @@ class WebTerminalManager {
           title,
           // Always include [] so Web can feature-detect tag support.
           tags: s.tags,
+          projectId: s.projectId,
           cwd: s.cwd,
           createdAt: s.created,
           // tmux last-activity (epoch s) → ms; optional so old daemons
@@ -9087,6 +9116,34 @@ class WebTerminalManager {
       return false;
     }
   }
+  /** B-868: put the terminal in a Very Happy project, or take it out (null).
+   *  Only the id is stored (`@vh_project`); the web resolves it against the
+   *  account's projects. Nothing is ever injected into the terminal. */
+  setProject(terminalId, projectId) {
+    const direct = this.terminals.get(terminalId)?.direct;
+    if (!direct && !isTmuxAvailable()) return false;
+    if (!/^[a-zA-Z0-9_-]{1,64}$/.test(terminalId)) return false;
+    const valid = tmuxSocket.validateTerminalProjectId(projectId);
+    if (valid === void 0) return false;
+    if (direct) {
+      if (valid) direct.projectId = valid;
+      else delete direct.projectId;
+      this.kickListRefresh();
+      return true;
+    }
+    const target = `=vh-${terminalId}:`;
+    try {
+      const r = node_child_process.spawnSync("tmux", tmuxSocket.tmuxArgs(valid ? ["set-option", "-t", target, "@vh_project", valid] : ["set-option", "-u", "-t", target, "@vh_project"]), {
+        stdio: "ignore",
+        env: ptyEnv()
+      });
+      if (r.status !== 0) return false;
+      this.kickListRefresh();
+      return true;
+    } catch {
+      return false;
+    }
+  }
 }
 
 const UUID_RE$4 = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
@@ -10504,7 +10561,7 @@ class ApiMachineClient {
   constructor(token, machine) {
     this.token = token;
     this.machine = machine;
-    this.rpcHandlerManager = new lidState.RpcHandlerManager({
+    this.rpcHandlerManager = new reconnectGate.RpcHandlerManager({
       scopePrefix: this.machine.id,
       encryptionKey: this.machine.encryptionKey,
       encryptionVariant: this.machine.encryptionVariant,
@@ -10935,7 +10992,7 @@ class ApiMachineClient {
     this.syncResumeSessionRpcRegistration();
     this.syncRestartSessionRpcRegistration();
     this.rpcHandlerManager.registerHandler("open-terminal", async (params) => {
-      const { terminalId, cols, rows, cwd, fromSeq, encStream, startupCommand, resub, attachOnly, streamMode, attachTmux } = params || {};
+      const { terminalId, cols, rows, cwd, fromSeq, encStream, startupCommand, resub, attachOnly, streamMode, attachTmux, projectId } = params || {};
       const attach = attachTmux && typeof attachTmux === "object" && typeof attachTmux.id === "string" && typeof attachTmux.name === "string" ? { id: attachTmux.id, name: attachTmux.name } : void 0;
       const result = await this.webTerminal.open({
         terminalId,
@@ -10947,7 +11004,9 @@ class ApiMachineClient {
         resub,
         attachOnly,
         streamMode: streamMode === "lines" ? "lines" : void 0,
-        ...attach ? { attachTmux: attach } : {}
+        ...attach ? { attachTmux: attach } : {},
+        // B-868: create-only; validated inside open().
+        ...typeof projectId === "string" ? { projectId } : {}
       });
       if (encStream) {
         this.encTerminals.add(result.terminalId);
@@ -11045,6 +11104,16 @@ class ApiMachineClient {
       }
       return { type: "success" };
     });
+    this.rpcHandlerManager.registerHandler("set-terminal-project", async (params) => {
+      const { terminalId, projectId } = params || {};
+      if (typeof terminalId !== "string" || !terminalId || projectId === void 0) {
+        throw new Error("terminalId and projectId are required");
+      }
+      if (!this.webTerminal.setProject(terminalId, projectId)) {
+        throw new Error("Failed to set terminal project (invalid id, tmux unavailable, or session gone)");
+      }
+      return { type: "success" };
+    });
     this.rpcHandlerManager.registerHandler("stop-session", (params) => {
       const { sessionId } = params || {};
       if (!sessionId) {
@@ -11435,9 +11504,9 @@ class ApiMachineClient {
         }
         throw new Error("Metadata version mismatch");
       } else if (answer.result === "error") {
-        if (lidState.isRateQuotaCode(answer.error)) {
+        if (reconnectGate.isRateQuotaCode(answer.error)) {
           rateRefusals += 1;
-          await lidState.pauseForRateQuota({
+          await reconnectGate.pauseForRateQuota({
             label: "machine metadata",
             code: answer.error,
             attempt: rateRefusals,
@@ -11474,9 +11543,9 @@ class ApiMachineClient {
         }
         throw new Error("Daemon state version mismatch");
       } else if (answer.result === "error") {
-        if (lidState.isRateQuotaCode(answer.error)) {
+        if (reconnectGate.isRateQuotaCode(answer.error)) {
           rateRefusals += 1;
-          await lidState.pauseForRateQuota({
+          await reconnectGate.pauseForRateQuota({
             label: "daemon state",
             code: answer.error,
             attempt: rateRefusals,
@@ -11523,7 +11592,7 @@ class ApiMachineClient {
       reconnection: false,
       ...handover ? { autoConnect: false } : {}
     });
-    lidState.socketConnectGuard(socket, guardOptions);
+    reconnectGate.socketConnectGuard(socket, guardOptions);
     return socket;
   }
   activateControlSocket(socket, rpcAlreadyRegistered = false) {
@@ -11558,6 +11627,8 @@ class ApiMachineClient {
         codexHistory: { rpcAvailable: true, detectedAt: now },
         // B-549 capability flag: `history-search` (same restamp discipline).
         historySearch: { rpcAvailable: true, detectedAt: now },
+        // B-868 capability flag: `set-terminal-project` (same restamp discipline).
+        terminalProjects: { rpcAvailable: true, detectedAt: now },
         // B-084: closed records survive daemon restarts (persisted
         // in closed-terminals.json), so the connect snapshot ships
         // them too — not just the incremental pushes.
@@ -11658,7 +11729,7 @@ class ApiMachineClient {
           clearTimeout(timer);
           reject(error);
         });
-        lidState.connectGuarded(candidate, "release-handover", guardOptions);
+        reconnectGate.connectGuarded(candidate, "release-handover", guardOptions);
       });
       await this.rpcHandlerManager.onSocketConnectAndWait(candidate, timeoutMs);
       if (this.socket !== previous) {
@@ -11748,10 +11819,10 @@ class ApiMachineClient {
       } else {
         logger.logger.debugLargeJson(`[API MACHINE] Received RPC request via ${transport}:`, data);
       }
-      await lidState.answerSocketRequest(
+      await reconnectGate.answerSocketRequest(
         callback,
         () => this.rpcHandlerManager.handleRequest(data),
-        (drop) => logger.logger.debug(`[API MACHINE] RPC ${data?.method} via ${transport} unanswered \u2014 ${lidState.describeSocketAckDrop(drop)}`)
+        (drop) => logger.logger.debug(`[API MACHINE] RPC ${data?.method} via ${transport} unanswered \u2014 ${reconnectGate.describeSocketAckDrop(drop)}`)
       );
     });
   }
@@ -11867,23 +11938,25 @@ class ApiMachineClient {
   }
   startSmartReconnect() {
     if (this.reconnectInterval) return;
+    const gate = reconnectGate.createReconnectGate();
     this.reconnectInterval = setInterval(() => {
       if (this.socket.connected) {
         clearInterval(this.reconnectInterval);
         this.reconnectInterval = null;
         return;
       }
-      if (!lidState.shouldReconnect()) {
+      const decision = gate.decide(reconnectGate.shouldReconnect());
+      if (decision === "wait") {
         logger.logger.debug("[API MACHINE] Still not ready to reconnect");
         return;
       }
-      logger.logger.debug("[API MACHINE] Attempting reconnect");
-      lidState.connectGuarded(this.socket, "reconnect-interval", guardOptions);
+      logger.logger.debug(decision === "force" ? "[API MACHINE] Still not ready after repeated checks \u2014 forcing a reconnect attempt" : "[API MACHINE] Attempting reconnect");
+      reconnectGate.connectGuarded(this.socket, "reconnect-interval", guardOptions);
     }, 3e3);
-    if (lidState.shouldReconnect()) {
+    if (reconnectGate.shouldReconnect()) {
       logger.logger.debug("[API MACHINE] Network up + lid open \u2014 reconnecting in 1s");
       setTimeout(() => {
-        lidState.connectGuarded(this.socket, "reconnect-soon", guardOptions);
+        reconnectGate.connectGuarded(this.socket, "reconnect-soon", guardOptions);
       }, 1e3);
     }
   }