very-happy-cli 0.2.177 → 0.2.179

package/dist/{AcpSessionManager-DykjzBM4.mjs → AcpSessionManager-d2-rKWWa.mjs}

@@ -1,5 +1,5 @@
 import { createId } from '@paralleldrive/cuid2';
-import { s as streamKeyOf, c as createEnvelope } from './index-DMy3OCBe.mjs';
+import { s as streamKeyOf, d as createEnvelope } from './index-DPOa4NhL.mjs';
 
 function turnOptions(turnId, time) {
   return turnId ? { turn: turnId, time } : { time };
@@ -22,6 +22,26 @@ function toolCallEndResult(result) {
     ...record.truncated === true ? { truncated: true } : {}
   };
 }
+function piSubagentLabel(args) {
+  if (args.piTool !== "subagent") return null;
+  const raw = args.rawInput && typeof args.rawInput === "object" ? args.rawInput : {};
+  const clip = (text) => {
+    const flat = text.replace(/\s+/g, " ").trim();
+    return flat.length > 120 ? `${flat.slice(0, 119)}\u2026` : flat;
+  };
+  const agent = typeof raw.agent === "string" ? raw.agent : void 0;
+  if (typeof raw.task === "string" && raw.task.trim()) return { description: clip(raw.task), ...agent ? { subagentType: agent } : {} };
+  if (Array.isArray(raw.tasks)) return { description: `${raw.tasks.length} parallel task${raw.tasks.length === 1 ? "" : "s"}`, ...agent ? { subagentType: agent } : {} };
+  if (Array.isArray(raw.chain)) return { description: `chain of ${raw.chain.length} step${raw.chain.length === 1 ? "" : "s"}` };
+  return { description: agent ? `${agent} sub-agent` : "sub-agent", ...agent ? { subagentType: agent } : {} };
+}
+function subagentStopStatus(result) {
+  if (!result || typeof result !== "object" || Array.isArray(result)) return "completed";
+  const record = result;
+  if (record.status === "cancelled" || record.status === "canceled") return "stopped";
+  if (record.error !== void 0 || record.status === "failed" || typeof record.exitCode === "number" && record.exitCode !== 0) return "failed";
+  return "completed";
+}
 function parseThinkingPayload(payload) {
   if (typeof payload === "string") {
     return { text: payload, streaming: false };
@@ -35,6 +55,8 @@ function parseThinkingPayload(payload) {
 }
 class AcpSessionManager {
   currentTurnId = null;
+  /** B-632 ③: ACP call id → sub-agent id of a running pi `subagent` call. */
+  subagentByCall = /* @__PURE__ */ new Map();
   acpCallToSessionCall = /* @__PURE__ */ new Map();
   stream;
   /** Monotonic clock: max(lastTime + 1, Date.now()) */
@@ -132,10 +154,13 @@ class AcpSessionManager {
       return flushed;
     }
     const turnId = this.currentTurnId;
+    const stops = [...this.subagentByCall.values()].map((subagent) => createEnvelope("agent", { t: "stop", status: status === "completed" ? "completed" : "stopped" }, { turn: turnId, time: this.nextTime(), subagent }));
+    this.subagentByCall.clear();
     this.currentTurnId = null;
     this.acpCallToSessionCall.clear();
     return [
       ...flushed,
+      ...stops,
       createEnvelope("agent", { t: "turn-end", status }, { turn: turnId, time: this.nextTime() })
     ];
   }
@@ -170,6 +195,10 @@ class AcpSessionManager {
     if (msg.type === "tool-call") {
       const flushed = this.flush();
       const call = this.ensureSessionCallId(msg.callId);
+      const label = piSubagentLabel(msg.args ?? {});
+      const subagent = label ? this.subagentByCall.get(msg.callId) ?? createId() : void 0;
+      const started = subagent !== void 0 && !this.subagentByCall.has(msg.callId);
+      if (subagent) this.subagentByCall.set(msg.callId, subagent);
       return [
         ...flushed,
         createEnvelope("agent", {
@@ -178,17 +207,22 @@ class AcpSessionManager {
           name: msg.toolName,
           title: buildToolTitle(msg.toolName),
           description: buildToolDescription(msg.toolName),
-          args: msg.args
-        }, turnOptions(this.currentTurnId, this.nextTime()))
+          // The web links the call row to the sub-agent card by this id (as for Claude's Agent).
+          args: subagent ? { ...msg.args, sessionSubagent: subagent } : msg.args
+        }, turnOptions(this.currentTurnId, this.nextTime())),
+        ...started && label ? [createEnvelope("agent", { t: "start", ...label }, { ...turnOptions(this.currentTurnId, this.nextTime()), subagent })] : []
       ];
     }
     if (msg.type === "tool-result") {
       const flushed = this.flush();
       const call = this.ensureSessionCallId(msg.callId);
       const result = toolCallEndResult(msg.result);
+      const subagent = this.subagentByCall.get(msg.callId);
+      if (subagent) this.subagentByCall.delete(msg.callId);
       return [
         ...flushed,
-        createEnvelope("agent", { t: "tool-call-end", call, ...result ? { result } : {} }, turnOptions(this.currentTurnId, this.nextTime()))
+        createEnvelope("agent", { t: "tool-call-end", call, ...result ? { result } : {} }, turnOptions(this.currentTurnId, this.nextTime())),
+        ...subagent ? [createEnvelope("agent", { t: "stop", status: subagentStopStatus(msg.result) }, { ...turnOptions(this.currentTurnId, this.nextTime()), subagent })] : []
       ];
     }
     return [];

package/dist/{BasePermissionHandler-DR6nxuEn.cjs → BasePermissionHandler-CH3zuEkA.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var logger = require('./logger-LvwVeATU.cjs');
+var logger = require('./logger-C1GWx3gi.cjs');
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();
@@ -32,7 +32,10 @@ class BasePermissionHandler {
           return;
         }
         this.pendingRequests.delete(response.id);
-        const result = response.approved ? { decision: response.decision === "approved_for_session" ? "approved_for_session" : "approved" } : { decision: response.decision === "denied" ? "denied" : "abort" };
+        const result = response.approved ? {
+          decision: response.decision === "approved_for_session" ? "approved_for_session" : "approved",
+          ...response.updatedInput && typeof response.updatedInput === "object" ? { updatedInput: response.updatedInput } : {}
+        } : { decision: response.decision === "denied" ? "denied" : "abort" };
         pending.resolve(result);
         this.session.updateAgentState((currentState) => {
           const request = currentState.requests?.[response.id];

package/dist/{BasePermissionHandler-hdY7kTqX.mjs → BasePermissionHandler-DdZBYIR4.mjs}

@@ -1,4 +1,4 @@
-import { l as logger } from './logger-13cBr_ew.mjs';
+import { l as logger } from './logger-BtVhHnD8.mjs';
 
 class BasePermissionHandler {
   pendingRequests = /* @__PURE__ */ new Map();
@@ -30,7 +30,10 @@ class BasePermissionHandler {
           return;
         }
         this.pendingRequests.delete(response.id);
-        const result = response.approved ? { decision: response.decision === "approved_for_session" ? "approved_for_session" : "approved" } : { decision: response.decision === "denied" ? "denied" : "abort" };
+        const result = response.approved ? {
+          decision: response.decision === "approved_for_session" ? "approved_for_session" : "approved",
+          ...response.updatedInput && typeof response.updatedInput === "object" ? { updatedInput: response.updatedInput } : {}
+        } : { decision: response.decision === "denied" ? "denied" : "abort" };
         pending.resolve(result);
         this.session.updateAgentState((currentState) => {
           const request = currentState.requests?.[response.id];

package/dist/acpSessionResume-DTGmAPLt.mjs

@@ -0,0 +1,67 @@
+import { mkdirSync, renameSync, existsSync, unlinkSync } from 'node:fs';
+import { join } from 'node:path';
+import { w as writePrivateFileSync, c as configuration } from './configuration-WMi4idBB.mjs';
+
+const SESSION_MODE_DIR = "session-modes";
+const ACP_PERMISSION_MODES = ["default", "acceptEdits", "plan", "bypassPermissions"];
+function normalizeAcpPermissionMode(value) {
+  if (typeof value !== "string") return null;
+  if (value === "yolo") return "bypassPermissions";
+  return ACP_PERMISSION_MODES.includes(value) ? value : null;
+}
+function sessionModeFilePath(happySessionId, dir = join(configuration.happyHomeDir, SESSION_MODE_DIR)) {
+  return join(dir, `${happySessionId}.json`);
+}
+function sessionModeFilePayload(permissionMode, now = Date.now()) {
+  return { permissionMode, updatedAt: now };
+}
+function writeSessionModeFile(happySessionId, permissionMode, opts = {}) {
+  const path = sessionModeFilePath(happySessionId, opts.dir);
+  mkdirSync(join(path, ".."), { recursive: true, mode: 448 });
+  const payload = sessionModeFilePayload(permissionMode, opts.now);
+  const tmp = `${path}.${process.pid}.tmp`;
+  writePrivateFileSync(tmp, JSON.stringify(payload));
+  renameSync(tmp, path);
+  return payload;
+}
+function removeSessionModeFile(happySessionId, dir) {
+  const path = sessionModeFilePath(happySessionId, dir);
+  if (existsSync(path)) unlinkSync(path);
+}
+
+function readAcpReconnectEnv(env) {
+  const sessionId = env.HAPPY_RECONNECT_SESSION_ID;
+  const encryptionKey = env.HAPPY_RECONNECT_ENCRYPTION_KEY;
+  const variant = env.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
+  if (!sessionId || !encryptionKey || variant !== "legacy" && variant !== "dataKey") return null;
+  const int = (value) => {
+    const n = parseInt(value || "0", 10);
+    return Number.isFinite(n) && n >= 0 ? n : 0;
+  };
+  return {
+    sessionId,
+    encryptionKey,
+    encryptionVariant: variant,
+    seq: int(env.HAPPY_RECONNECT_SEQ),
+    metadataVersion: int(env.HAPPY_RECONNECT_METADATA_VERSION),
+    agentStateVersion: int(env.HAPPY_RECONNECT_AGENT_STATE_VERSION)
+  };
+}
+function piRestartNotice(agentName, cause, started) {
+  const head = cause === "agent-exit" ? `${agentName} was restarted after its process exited` : `${agentName} was started again`;
+  if (started.resumed === "loaded") return `${head} and reopened the earlier conversation.`;
+  if (started.resumed === "fresh") {
+    const why = started.loadFailure ? ` (${oneLine(started.loadFailure)})` : "";
+    return `${head} but could not reopen the earlier conversation${why}; it does not remember it (the transcript here is kept).`;
+  }
+  return `${head}; it does not remember the earlier conversation (the transcript here is kept).`;
+}
+function oneLine(text) {
+  const flat = text.replace(/\s+/g, " ").trim();
+  return flat.length > 160 ? `${flat.slice(0, 157)}\u2026` : flat;
+}
+function sanitizeAgentSessionId(value) {
+  return typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(value) ? value : null;
+}
+
+export { removeSessionModeFile as a, normalizeAcpPermissionMode as n, piRestartNotice as p, readAcpReconnectEnv as r, sanitizeAgentSessionId as s, writeSessionModeFile as w };

package/dist/acpSessionResume-oiCBnAVA.cjs

@@ -0,0 +1,74 @@
+'use strict';
+
+var node_fs = require('node:fs');
+var path = require('node:path');
+var configuration = require('./configuration-CMHZnp6G.cjs');
+
+const SESSION_MODE_DIR = "session-modes";
+const ACP_PERMISSION_MODES = ["default", "acceptEdits", "plan", "bypassPermissions"];
+function normalizeAcpPermissionMode(value) {
+  if (typeof value !== "string") return null;
+  if (value === "yolo") return "bypassPermissions";
+  return ACP_PERMISSION_MODES.includes(value) ? value : null;
+}
+function sessionModeFilePath(happySessionId, dir = path.join(configuration.configuration.happyHomeDir, SESSION_MODE_DIR)) {
+  return path.join(dir, `${happySessionId}.json`);
+}
+function sessionModeFilePayload(permissionMode, now = Date.now()) {
+  return { permissionMode, updatedAt: now };
+}
+function writeSessionModeFile(happySessionId, permissionMode, opts = {}) {
+  const path$1 = sessionModeFilePath(happySessionId, opts.dir);
+  node_fs.mkdirSync(path.join(path$1, ".."), { recursive: true, mode: 448 });
+  const payload = sessionModeFilePayload(permissionMode, opts.now);
+  const tmp = `${path$1}.${process.pid}.tmp`;
+  configuration.writePrivateFileSync(tmp, JSON.stringify(payload));
+  node_fs.renameSync(tmp, path$1);
+  return payload;
+}
+function removeSessionModeFile(happySessionId, dir) {
+  const path = sessionModeFilePath(happySessionId, dir);
+  if (node_fs.existsSync(path)) node_fs.unlinkSync(path);
+}
+
+function readAcpReconnectEnv(env) {
+  const sessionId = env.HAPPY_RECONNECT_SESSION_ID;
+  const encryptionKey = env.HAPPY_RECONNECT_ENCRYPTION_KEY;
+  const variant = env.HAPPY_RECONNECT_ENCRYPTION_VARIANT;
+  if (!sessionId || !encryptionKey || variant !== "legacy" && variant !== "dataKey") return null;
+  const int = (value) => {
+    const n = parseInt(value || "0", 10);
+    return Number.isFinite(n) && n >= 0 ? n : 0;
+  };
+  return {
+    sessionId,
+    encryptionKey,
+    encryptionVariant: variant,
+    seq: int(env.HAPPY_RECONNECT_SEQ),
+    metadataVersion: int(env.HAPPY_RECONNECT_METADATA_VERSION),
+    agentStateVersion: int(env.HAPPY_RECONNECT_AGENT_STATE_VERSION)
+  };
+}
+function piRestartNotice(agentName, cause, started) {
+  const head = cause === "agent-exit" ? `${agentName} was restarted after its process exited` : `${agentName} was started again`;
+  if (started.resumed === "loaded") return `${head} and reopened the earlier conversation.`;
+  if (started.resumed === "fresh") {
+    const why = started.loadFailure ? ` (${oneLine(started.loadFailure)})` : "";
+    return `${head} but could not reopen the earlier conversation${why}; it does not remember it (the transcript here is kept).`;
+  }
+  return `${head}; it does not remember the earlier conversation (the transcript here is kept).`;
+}
+function oneLine(text) {
+  const flat = text.replace(/\s+/g, " ").trim();
+  return flat.length > 160 ? `${flat.slice(0, 157)}\u2026` : flat;
+}
+function sanitizeAgentSessionId(value) {
+  return typeof value === "string" && /^[A-Za-z0-9][A-Za-z0-9._:-]{0,127}$/.test(value) ? value : null;
+}
+
+exports.normalizeAcpPermissionMode = normalizeAcpPermissionMode;
+exports.piRestartNotice = piRestartNotice;
+exports.readAcpReconnectEnv = readAcpReconnectEnv;
+exports.removeSessionModeFile = removeSessionModeFile;
+exports.sanitizeAgentSessionId = sanitizeAgentSessionId;
+exports.writeSessionModeFile = writeSessionModeFile;

package/dist/{agentHome-BdTXEUPe.cjs → agentHome-BWcz8mz0.cjs}

@@ -2,16 +2,16 @@
 
 var chalk = require('chalk');
 var os = require('node:os');
-var persistence = require('./persistence-DXbKOHxl.cjs');
+var persistence = require('./persistence-BegE7NPa.cjs');
 require('node:fs');
-require('./logger-LvwVeATU.cjs');
+require('./logger-C1GWx3gi.cjs');
 var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
 require('node:fs/promises');
-require('./configuration-DZPy0T9Z.cjs');
+require('./configuration-CMHZnp6G.cjs');
 require('node:path');
-require('./package-Ch9WGDV_.cjs');
+require('./package-SgqTYsjn.cjs');
 require('zod');
-require('./authRelay-BdYkC1Po.cjs');
+require('./authRelay-Dy1qU9td.cjs');
 require('node:crypto');
 require('tweetnacl');
 require('node:util');

package/dist/{agentHome-GRN2VfHv.mjs → agentHome-CghLvL_1.mjs}

@@ -1,15 +1,15 @@
 import chalk from 'chalk';
 import { homedir } from 'node:os';
-import { r as readSettings, u as updateSettings } from './persistence-C_tYtOqK.mjs';
+import { r as readSettings, u as updateSettings } from './persistence-Cr-wutZ4.mjs';
 import 'node:fs';
-import './logger-13cBr_ew.mjs';
+import './logger-BtVhHnD8.mjs';
 import { d as describeAgentHome, p as probeLoginShellEnv, r as resolveAgentHomes, e as expandHomePath, A as AGENT_HOME_ENV_NAMES } from './loginShellEnv-Dw8M7tkI.mjs';
 import 'node:fs/promises';
-import './configuration-D55F0t16.mjs';
+import './configuration-WMi4idBB.mjs';
 import 'node:path';
-import './package-CjlsAaRe.mjs';
+import './package-BPPebGQF.mjs';
 import 'zod';
-import './authRelay-DSAvg1uv.mjs';
+import './authRelay-DhQhkBvX.mjs';
 import 'node:crypto';
 import 'tweetnacl';
 import 'node:util';

package/dist/{api-BWX10o97.cjs → api-Cmjfr8Z7.cjs}

@@ -1,23 +1,22 @@
 'use strict';
 
 var axios = require('axios');
-var logger = require('./logger-LvwVeATU.cjs');
-var lidState = require('./lidState-DxbK0qfu.cjs');
+var logger = require('./logger-C1GWx3gi.cjs');
+var lidState = require('./lidState-Dv2wwFTj.cjs');
 var node_events = require('node:events');
 var socket_ioClient = require('socket.io-client');
-var attachmentLimits = require('./attachmentLimits-DtFqqiwR.cjs');
-var authRelay = require('./authRelay-BdYkC1Po.cjs');
+var pushNotifications = require('./pushNotifications-DaLQUyi0.cjs');
+var authRelay = require('./authRelay-Dy1qU9td.cjs');
 var limits = require('./limits-C-a7gr04.cjs');
-var time = require('./time-Dg5tVB8S.cjs');
-var configuration = require('./configuration-DZPy0T9Z.cjs');
+var time = require('./time-CrwIMHta.cjs');
+var configuration = require('./configuration-CMHZnp6G.cjs');
 var node_crypto = require('node:crypto');
-var index = require('./index-De8L5lFK.cjs');
-var registerCommonHandlers = require('./registerCommonHandlers-60VuTkdg.cjs');
+var index = require('./index-C6O2vVjm.cjs');
+var registerCommonHandlers = require('./registerCommonHandlers-Cj084Sg7.cjs');
 var cuid2 = require('@paralleldrive/cuid2');
-var sync = require('./sync-C7sxoUYG.cjs');
+var sync = require('./sync-D23jbqVa.cjs');
 var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
-var controlClient = require('./controlClient-SX8gSza2.cjs');
-var contentLogMetadata = require('./contentLogMetadata-ZSFk_NjQ.cjs');
+var controlClient = require('./controlClient-C-5qCt8W.cjs');
 var chalk = require('chalk');
 
 async function hmac_sha512(key, data) {
@@ -1176,8 +1175,8 @@ class ApiSessionClient extends node_events.EventEmitter {
    */
   pendingDownloads = [];
   rpcHandlerManager;
-  agentStateLock = new attachmentLimits.AsyncLock();
-  metadataLock = new attachmentLimits.AsyncLock();
+  agentStateLock = new pushNotifications.AsyncLock();
+  metadataLock = new pushNotifications.AsyncLock();
   encryptionKey;
   encryptionVariant;
   reconnectInterval = null;
@@ -1502,8 +1501,8 @@ class ApiSessionClient extends node_events.EventEmitter {
       responseType: "arraybuffer",
       timeout: 6e4,
       maxRedirects: 5,
-      maxContentLength: attachmentLimits.MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES,
-      maxBodyLength: attachmentLimits.MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES
+      maxContentLength: pushNotifications.MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES,
+      maxBodyLength: pushNotifications.MAX_CHAT_ATTACHMENT_ENCRYPTED_BYTES
     });
     return new Uint8Array(response.data);
   }
@@ -1600,7 +1599,7 @@ class ApiSessionClient extends node_events.EventEmitter {
     this.noteActivity();
     if (sourceLocalId) this.promptQueueDrain?.onInbound(sourceLocalId);
     const messageWithSource = sourceLocalId && typeof message === "object" && message !== null ? { ...message, localKey: message.localKey ?? sourceLocalId } : message;
-    const userResult = attachmentLimits.UserMessageSchema.safeParse(messageWithSource);
+    const userResult = pushNotifications.UserMessageSchema.safeParse(messageWithSource);
     if (userResult.success) {
       if (this.pendingMessageCallback) {
         this.pendingMessageCallback(userResult.data);
@@ -1609,7 +1608,7 @@ class ApiSessionClient extends node_events.EventEmitter {
       }
       return;
     }
-    const fileResult = attachmentLimits.FileEventMessageSchema.safeParse(message);
+    const fileResult = pushNotifications.FileEventMessageSchema.safeParse(message);
     if (fileResult.success) {
       logger.logger.debug(`[API] Received file event: ${fileResult.data.content.data.ev.name} (ref: ${fileResult.data.content.data.ev.ref})`);
       if (this.pendingFileEventCallback) {
@@ -1958,6 +1957,17 @@ class ApiSessionClient extends node_events.EventEmitter {
    * own line, so a launcher sends the matching session event only when this
    * says the turn-end did not carry it).
    */
+  /**
+   * B-495: close the turn a fork backfill left open. History, not a live
+   * turn end — so no `turn-ended` tap (board analyzer, completion hooks).
+   */
+  closeReplayedClaudeTurn() {
+    const mapped = closeClaudeTurnWithStatus(this.claudeSessionProtocolState, "completed");
+    this.claudeSessionProtocolState.currentTurnId = mapped.currentTurnId;
+    for (const envelope of mapped.envelopes) {
+      this.sendSessionProtocolMessage(envelope);
+    }
+  }
   closeClaudeSessionTurn(status = "completed", meta) {
     this.emit("turn-ended", status);
     const mapped = closeClaudeTurnWithStatus(this.claudeSessionProtocolState, status, meta);
@@ -2437,248 +2447,6 @@ class ApiSessionClient extends node_events.EventEmitter {
   }
 }
 
-function getSessionTitle(metadata) {
-  const summaryText = metadata?.summary?.text?.trim();
-  if (summaryText) {
-    return summaryText;
-  }
-  const path = metadata?.path?.trim();
-  if (!path) {
-    return "Session";
-  }
-  const segments = path.split(/[\\/]/).filter(Boolean);
-  return segments[segments.length - 1] || "Session";
-}
-function getSessionNotificationUrl(data) {
-  const sessionId = data?.sessionId;
-  if (typeof sessionId !== "string") {
-    return null;
-  }
-  const trimmedSessionId = sessionId.trim();
-  if (!trimmedSessionId) {
-    return null;
-  }
-  return `/session/${encodeURIComponent(trimmedSessionId)}`;
-}
-function getSessionNotificationTitle(kind) {
-  switch (kind) {
-    case "done":
-      return "It's ready!";
-    case "permission":
-      return "Permission request";
-    case "question":
-      return "Clarification needed";
-  }
-}
-function getSessionNotificationBody(metadata) {
-  return getSessionTitle(metadata);
-}
-function getSessionNotificationCopy(kind, metadata) {
-  return {
-    title: getSessionNotificationTitle(kind),
-    body: getSessionNotificationBody(metadata)
-  };
-}
-class PushNotificationClient {
-  token;
-  baseUrl;
-  expoLoad = null;
-  constructor(token, baseUrl = "https://api.cluster-fluster.com") {
-    this.token = token;
-    this.baseUrl = baseUrl;
-  }
-  loadExpo() {
-    if (!this.expoLoad) {
-      const load = import('expo-server-sdk').then(({ Expo }) => ({ Expo, expo: new Expo() }));
-      load.catch(() => {
-        if (this.expoLoad === load) this.expoLoad = null;
-      });
-      this.expoLoad = load;
-    }
-    return this.expoLoad;
-  }
-  /**
-   * Fetch all push tokens for the authenticated user.
-   * Retries up to 3 times with exponential backoff on transient errors.
-   */
-  async fetchPushTokens() {
-    const maxAttempts = 3;
-    for (let attempt = 1; attempt <= maxAttempts; attempt++) {
-      try {
-        const response = await axios.get(
-          `${this.baseUrl}/v1/push-tokens`,
-          {
-            headers: {
-              "Authorization": `Bearer ${this.token}`,
-              "Content-Type": "application/json",
-              "X-Happy-Client": `cli-daemon/${configuration.configuration.currentCliVersion}`
-            }
-          }
-        );
-        logger.logger.debug(`Fetched ${response.data.tokens.length} push tokens`);
-        response.data.tokens.forEach((token, index) => {
-          logger.logger.debug(`[PUSH] Token ${index + 1}: id=${token.id}, created=${new Date(token.createdAt).toISOString()}, updated=${new Date(token.updatedAt).toISOString()}`);
-        });
-        return response.data.tokens;
-      } catch (error) {
-        logger.logger.debug(`[PUSH] [ERROR] Failed to fetch push tokens (attempt ${attempt}/${maxAttempts}):`, error);
-        if (attempt < maxAttempts) {
-          const delay = 1e3 * Math.pow(2, attempt - 1);
-          await new Promise((resolve) => setTimeout(resolve, delay));
-        }
-      }
-    }
-    logger.logger.debug("[PUSH] [ERROR] All push token fetch attempts failed");
-    return [];
-  }
-  /**
-   * Send push notification via Expo Push API with retry
-   * @param messages - Array of push messages to send
-   */
-  async sendPushNotifications(messages) {
-    logger.logger.debug(`Sending ${messages.length} push notifications`);
-    const { Expo, expo } = await this.loadExpo();
-    const validMessages = messages.filter((message) => {
-      if (Array.isArray(message.to)) {
-        return message.to.every((token) => Expo.isExpoPushToken(token));
-      }
-      return Expo.isExpoPushToken(message.to);
-    });
-    if (validMessages.length === 0) {
-      logger.logger.debug("No valid Expo push tokens found");
-      return;
-    }
-    const chunks = expo.chunkPushNotifications(validMessages);
-    for (const chunk of chunks) {
-      const startTime = Date.now();
-      const timeout = 3e5;
-      let attempt = 0;
-      while (true) {
-        try {
-          const ticketChunk = await expo.sendPushNotificationsAsync(chunk);
-          const errors = ticketChunk.filter((ticket) => ticket.status === "error");
-          if (errors.length > 0) {
-            const errorDetails = errors.map((e) => ({ message: e.message, details: e.details }));
-            logger.logger.debug("[PUSH] Some notifications failed:", errorDetails);
-          }
-          if (errors.length === ticketChunk.length) {
-            throw new Error("All push notifications in chunk failed");
-          }
-          break;
-        } catch (error) {
-          const elapsed = Date.now() - startTime;
-          if (elapsed >= timeout) {
-            logger.logger.debug("[PUSH] Timeout reached after 5 minutes, giving up on chunk");
-            break;
-          }
-          attempt++;
-          const delay = Math.min(1e3 * Math.pow(2, attempt), 3e4);
-          const remainingTime = timeout - elapsed;
-          const waitTime = Math.min(delay, remainingTime);
-          if (waitTime > 0) {
-            logger.logger.debug(`[PUSH] Retrying in ${waitTime}ms (attempt ${attempt})`);
-            await new Promise((resolve) => setTimeout(resolve, waitTime));
-          }
-        }
-      }
-    }
-    logger.logger.debug(`Push notifications sent successfully`);
-  }
-  /**
-   * Send a push notification to all registered devices for the user
-   * @param title - Notification title
-   * @param body - Notification body
-   * @param data - Additional data to send with the notification
-   */
-  sendToAllDevices(title, body, data) {
-    logger.logger.debug("[PUSH] sendToAllDevices called:", {
-      title: contentLogMetadata.contentLogMetadata(title),
-      body: contentLogMetadata.contentLogMetadata(body),
-      dataKeyCount: data ? Object.keys(data).length : 0
-    });
-    (async () => {
-      try {
-        logger.logger.debug("[PUSH] Fetching push tokens...");
-        const tokens = await this.fetchPushTokens();
-        logger.logger.debug(`[PUSH] Fetched ${tokens.length} push tokens`);
-        tokens.forEach((token, index) => {
-          logger.logger.debug(`[PUSH] Using token ${index + 1}: id=${token.id}`);
-        });
-        if (tokens.length === 0) {
-          logger.logger.debug("No push tokens found for user");
-          return;
-        }
-        const messages = tokens.map((token, index) => {
-          logger.logger.debug(`[PUSH] Creating message ${index + 1} for token`);
-          return {
-            to: token.token,
-            title,
-            body: body && body.length > 0 ? body : void 0,
-            data,
-            // TODO: For brutalist session artwork, attach rich media via a public HTTPS image URL.
-            // Bundled app asset paths / require(...) / local file paths will not work in push payloads.
-            // iOS also needs a Notification Service Extension to render richContent.image reliably.
-            sound: "default",
-            priority: "high"
-          };
-        });
-        logger.logger.debug(`[PUSH] Sending ${messages.length} push notifications...`);
-        await this.sendPushNotifications(messages);
-        logger.logger.debug("[PUSH] Push notifications sent successfully");
-      } catch (error) {
-        logger.logger.debug("[PUSH] Error sending to all devices:", error);
-      }
-    })();
-  }
-  /**
-   * Routes session-event pushes through the server so it can apply
-   * presence-based suppression (active desktop/web, mobile foreground).
-   * Falls back to direct Expo send only when sessionId is missing — that
-   * shouldn't happen for session notifications but guards against regressions.
-   */
-  sendSessionNotification(params) {
-    const { title, body } = getSessionNotificationCopy(params.kind, params.metadata);
-    const sessionTitle = getSessionNotificationBody(params.metadata);
-    const url = getSessionNotificationUrl(params.data);
-    const payloadData = {
-      ...params.data,
-      kind: params.kind,
-      sessionTitle,
-      ...url ? { url } : {}
-    };
-    const sessionId = typeof params.data?.sessionId === "string" ? params.data.sessionId : null;
-    if (!sessionId) {
-      logger.logger.debug("[PUSH] sendSessionNotification: missing sessionId, falling back to direct send");
-      this.sendToAllDevices(title, body, payloadData);
-      return;
-    }
-    void (async () => {
-      try {
-        await axios.post(
-          `${this.baseUrl}/v1/sessions/${encodeURIComponent(sessionId)}/push-event`,
-          {
-            kind: params.kind,
-            title,
-            body,
-            data: payloadData
-          },
-          {
-            headers: {
-              "Authorization": `Bearer ${this.token}`,
-              "Content-Type": "application/json",
-              "X-Happy-Client": `cli-daemon/${configuration.configuration.currentCliVersion}`
-            },
-            timeout: 15e3
-          }
-        );
-        logger.logger.debug(`[PUSH] sendSessionNotification dispatched via server (kind=${params.kind})`);
-      } catch (error) {
-        logger.logger.debug("[PUSH] sendSessionNotification failed:", error);
-      }
-    })();
-  }
-}
-
 function startOfflineReconnection(config) {
   let reconnected = false;
   let session = null;
@@ -2957,7 +2725,7 @@ class ApiClient {
   pushClient;
   constructor(credential) {
     this.credential = credential;
-    this.pushClient = new PushNotificationClient(credential.token, configuration.configuration.serverUrl);
+    this.pushClient = new pushNotifications.PushNotificationClient(credential.token, configuration.configuration.serverUrl);
   }
   /**
    * Create a new session or load existing one with the given tag
@@ -3173,7 +2941,7 @@ class ApiClient {
     return new ApiSessionClient(this.credential.token, session, opts);
   }
   async machineSyncClient(machine) {
-    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-BYYFGgFs.cjs'); });
+    const { ApiMachineClient } = await Promise.resolve().then(function () { return require('./apiMachine-G6OogT08.cjs'); });
     return new ApiMachineClient(this.credential.token, machine);
   }
   push() {