lody 0.51.0 → 0.52.1

package/dist/index.js

@@ -36822,7 +36822,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
     return client;
   }
   const name = "lody";
-  const version$4 = "0.51.0";
+  const version$4 = "0.52.1";
   const description$1 = "Lody Agent CLI tool for managing remote command execution";
   const type$2 = "module";
   const main$3 = "dist/index.js";
@@ -36865,7 +36865,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
     "node": ">=18.0.0"
   };
   const optionalDependencies = {
-    "acp-extension-claude": "0.31.1",
+    "acp-extension-claude": "0.34.1",
     "acp-extension-codex": "0.14.3"
   };
   const devDependencies = {
@@ -37076,7 +37076,7 @@ Mongoose Error Code: ${error2.code}` : ""}`
   const runtimeEnv = getRuntimeEnv();
   const environment$1 = "production";
   const dsn = "https://080f9de535ff335a1a0440d0e385f796@o4510491299086336.ingest.us.sentry.io/4510559045681152";
-  const postHogHost = process.env.LODY_POSTHOG_HOST ?? "https://us.i.posthog.com";
+  const postHogHost = process.env.LODY_POSTHOG_HOST ?? "https://m.lody.ai";
   const postHogKey = process.env.LODY_POSTHOG_KEY ?? "phc_LFS5i5WIwg4irAhrG5oJR04iYPhReVZ3DdFZOKqCkjG";
   const tracesSampleRate = Number(process.env.SENTRY_TRACES_SAMPLE_RATE) || 0.2;
   const profilesSampleRate = Number(process.env.SENTRY_PROFILES_SAMPLE_RATE) || 0.1;
@@ -77781,6 +77781,9 @@ Task description:
     }
     return void 0;
   };
+  function getLocalProjectHistoryProviderKey(provider2) {
+    return `${provider2.cliType}:${provider2.agentType}`;
+  }
   const DEFAULT_BASE_BRANCH = "main";
   function getTrimmedBranch(value) {
     if (typeof value !== "string") {
@@ -78662,10 +78665,10 @@ Task description:
     localProjectId: LocalProjectIdSchema,
     branchName: string$2()
   }).strict();
-  const LocalProjectHistoryProviderSchema = _enum$1([
-    "codex",
-    "claude"
-  ]);
+  const LocalProjectHistoryProviderSchema = object$1({
+    cliType: AgentConfigCliTypeSchema,
+    agentType: string$2().trim().min(1)
+  }).strict();
   const LocalProjectSyncHistoryRequestSchema = object$1({
     type: literal("local-project/sync-history"),
     machineId: MachineIdSchema,
@@ -82556,8 +82559,8 @@ Task description:
   function createUserEntry(args2) {
     const inputConfig = {
       prompt: args2.text,
-      cliType: "builtin",
-      agentType: args2.agentType,
+      cliType: args2.provider.cliType,
+      agentType: args2.provider.agentType,
       ...{}
     };
     return {
@@ -82582,7 +82585,7 @@ Task description:
     const now2 = options.now ?? defaultNow;
     const createId = options.createId ?? defaultCreateId;
     const mode2 = options.mode;
-    const agentType = options.agentType ?? "codex";
+    const provider2 = options.provider;
     let history = [];
     let lastWasUserChunk = false;
     let droppedNotifications = 0;
@@ -82604,7 +82607,7 @@ Task description:
             text,
             timestamp: now2(),
             userId: options.userId,
-            agentType,
+            provider: provider2,
             mode: mode2
           }));
         }
@@ -85473,13 +85476,14 @@ ${tailedOutput}` : null;
   };
   function withSlowOperationWarning(promise, logger2, operationName, sessionId, intervalMs = 1e4) {
     let completed = false;
-    let elapsedMs = 0;
+    const startMs = Date.now();
     const interval2 = setInterval(() => {
-      elapsedMs += intervalMs;
       if (!completed) {
+        const elapsedMs = Date.now() - startMs;
         logger2.debug(`[${sessionId}] Operation "${operationName}" is still pending after ${Math.round(elapsedMs / 1e3)}s - possible hang`);
       }
     }, intervalMs);
+    interval2.unref?.();
     return promise.finally(() => {
       completed = true;
       clearInterval(interval2);
@@ -98394,11 +98398,13 @@ stream:${scope2.streamId}`;
     machineId = null;
     machineKey = null;
     sessionKeys = /* @__PURE__ */ new Map();
+    machineHeartbeatSeq = 0;
     started = false;
     stopped = false;
     start() {
       if (this.started || this.stopped) return;
       this.started = true;
+      this.options.logger.debug(`[${this.options.workspaceId}] Joining Loro presence room`);
       void this.transport.join({
         onStatusChange: (status) => {
           this.options.logger.debug(`[${this.options.workspaceId}] Loro presence room status: ${status}`);
@@ -98410,6 +98416,7 @@ stream:${scope2.streamId}`;
         }
         if (result.ok) {
           this.subscription = result.value;
+          this.options.logger.debug(`[${this.options.workspaceId}] Loro presence subscription established`);
           return;
         }
         this.options.logger.debug(`[${this.options.workspaceId}] Failed to join Loro presence room: ${formatErrorMessage(result.error)}`);
@@ -98439,6 +98446,7 @@ stream:${scope2.streamId}`;
     }
     writeMachineHeartbeat() {
       if (this.stopped || !this.machineId || !this.machineKey) return;
+      const seq2 = ++this.machineHeartbeatSeq;
       const state2 = {
         kind: "machine",
         machineId: this.machineId,
@@ -98446,6 +98454,7 @@ stream:${scope2.streamId}`;
         updatedAt: getServerNow()
       };
       this.store.set(this.machineKey, state2);
+      this.options.logger.debug(`[${this.options.workspaceId}] Loro presence machine heartbeat written (seq=${seq2} updatedAt=${state2.updatedAt})`);
     }
     setSessionPresence(args2) {
       if (this.stopped) return;
@@ -116853,6 +116862,18 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       let metaSub = null;
       const initialMetaSync = createDeferred();
       let initialMetaSyncCompleted = false;
+      let persistFlushSeq = 0;
+      const flushRepoForPersist = async (reason) => {
+        const currentRepo = repo;
+        if (!currentRepo) {
+          return;
+        }
+        const seq2 = ++persistFlushSeq;
+        const startedAt = Date.now();
+        logger2.debug(`[${workspaceId}] Loro repo flush started (reason=${reason} seq=${seq2})`);
+        await withSlowOperationWarning(currentRepo.flush(), logger2, `loro-repo.flush(${reason}, seq=${seq2})`, workspaceId);
+        logger2.debug(`[${workspaceId}] Loro repo flush completed (reason=${reason} seq=${seq2} duration=${Date.now() - startedAt}ms)`);
+      };
       const transportAdapter = new StreamsTransportAdapter({
         bucketId: LORO_STREAMS_BUCKET_ID,
         metaStreamId: getLoroMetaStreamId(workspaceId),
@@ -116866,10 +116887,10 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
           debounceMs: 5e3
         },
         onPersistDoc: async () => {
-          await repo?.flush();
+          await flushRepoForPersist("doc");
         },
         onPersistMeta: async () => {
-          await repo?.flush();
+          await flushRepoForPersist("meta");
         }
       });
       let manager = null;
@@ -117163,8 +117184,11 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       if (!this.machine) {
         return;
       }
-      await this.machine.sendHeartbeat();
+      const startedAt = Date.now();
+      this.logger.debug(`[${this.workspaceId}] Machine heartbeat writing presence and meta`);
       this.presenceRuntime?.writeMachineHeartbeat();
+      await withSlowOperationWarning(this.machine.sendHeartbeat(), this.logger, "machine.sendHeartbeat repo.upsertDocMeta(lastSeen)", this.workspaceId);
+      this.logger.debug(`[${this.workspaceId}] Machine heartbeat meta write completed (duration=${Date.now() - startedAt}ms)`);
     }
     async restoreMachineDocument(machineId) {
       const machineRoomId = getMachineRoomId(machineId);
@@ -121114,6 +121138,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     nes_reject: "nes/reject",
     nes_start: "nes/start",
     nes_suggest: "nes/suggest",
+    providers_disable: "providers/disable",
+    providers_list: "providers/list",
+    providers_set: "providers/set",
     session_cancel: "session/cancel",
     session_close: "session/close",
     session_fork: "session/fork",
@@ -121315,6 +121342,15 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     async authenticate(params) {
       return await this.connection.sendRequest(AGENT_METHODS.authenticate, params) ?? {};
     }
+    async unstable_listProviders(params) {
+      return await this.connection.sendRequest(AGENT_METHODS.providers_list, params);
+    }
+    async unstable_setProvider(params) {
+      return await this.connection.sendRequest(AGENT_METHODS.providers_set, params) ?? {};
+    }
+    async unstable_disableProvider(params) {
+      return await this.connection.sendRequest(AGENT_METHODS.providers_disable, params) ?? {};
+    }
     async unstable_logout(params) {
       return await this.connection.sendRequest(AGENT_METHODS.logout, params) ?? {};
     }
@@ -122091,7 +122127,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       this.supportsClose = !!closeCapability;
       const hasCloseMethod = typeof connection.closeSession === "function";
       this.logger.debug(`[${this.options.sessionId}] ACP capabilities (loadSession=${this.supportsLoadSession ? "yes" : "no"} loadSessionMethod=${hasLoadSessionMethod ? "yes" : "no"} resume=${this.supportsResume ? "yes" : "no"} resumeMethod=${hasResumeMethod ? "yes" : "no"} close=${this.supportsClose ? "yes" : "no"} closeMethod=${hasCloseMethod ? "yes" : "no"})`);
-      this.logger.debug(`[${this.options.sessionId}] About to start new ACP session`);
+      this.logger.debug(`[${this.options.sessionId}] About to establish ACP session`);
       const newSessionStart = performance$1.now();
       this.options.onStartupStage?.({
         type: "new_session_start"
@@ -122118,11 +122154,12 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         const loadStart = performance$1.now();
         try {
           this.logger.debug(`[${this.options.sessionId}] Attempting ACP loadSession (acpSessionId=${resumeSessionId})`);
-          const loadResponse = await withAbort(connection.loadSession({
+          const ACP_LOAD_SESSION_TIMEOUT_MS = Math.max(0, timeoutOptions.loadSessionTimeoutMs ?? timeoutOptions.newSessionTimeoutMs ?? 12e4);
+          const loadResponse = await withTimeout$2(withAbort(connection.loadSession({
             sessionId: resumeSessionId,
             cwd: workdir,
             mcpServers
-          }), startupAbort);
+          }), startupAbort), this.logger, "connection.loadSession", this.options.sessionId, ACP_LOAD_SESSION_TIMEOUT_MS);
           const loadDurationMs = performance$1.now() - loadStart;
           sessionResponse = {
             sessionId: resumeSessionId,
@@ -122143,11 +122180,12 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         const resumeStart = performance$1.now();
         try {
           this.logger.debug(`[${this.options.sessionId}] Attempting ACP resume (acpSessionId=${resumeSessionId})`);
-          const resumeResponse = await withAbort(connection.resumeSession({
+          const ACP_RESUME_SESSION_TIMEOUT_MS = Math.max(0, timeoutOptions.resumeSessionTimeoutMs ?? timeoutOptions.newSessionTimeoutMs ?? 12e4);
+          const resumeResponse = await withTimeout$2(withAbort(connection.resumeSession({
             sessionId: resumeSessionId,
             cwd: workdir,
             mcpServers
-          }), startupAbort);
+          }), startupAbort), this.logger, "connection.resumeSession", this.options.sessionId, ACP_RESUME_SESSION_TIMEOUT_MS);
           const resumeDurationMs = performance$1.now() - resumeStart;
           sessionResponse = {
             sessionId: resumeSessionId,
@@ -122413,7 +122451,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
   const BuiltinACPSetting = {
     claude: {
       packageName: "acp-extension-claude",
-      version: "0.31.1",
+      version: "0.34.1",
       binName: "acp-extension-claude"
     },
     codex: {
@@ -122904,6 +122942,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
       args: args2,
       spawnImpl: options.spawnImpl
     });
+    options.logger.debug(`[acp-startup] spawned ACP process (cliType=${options.cliType} agentType=${options.agentType} workdir=${options.workdir})`);
     const stderrStream = agentProcess.stderr;
     let stderrTail = "";
     if (stderrStream) {
@@ -122965,6 +123004,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const input2 = createStdinWritableStream(agentProcess.stdin);
     const stream2 = ndJsonStream(input2, output);
     try {
+      options.logger.debug("[acp-startup] creating ACP client");
       const started = await createAcpClient({
         stream: stream2,
         workdir: options.workdir,
@@ -122979,6 +123019,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         onRequestPermission: options.onRequestPermission,
         startupAbort: startupMonitor.abortPromise
       });
+      options.logger.debug(`[acp-startup] ACP client ready (acpSessionId=${started.acpSessionId})`);
       return {
         agentProcess,
         client: started.client,
@@ -123122,6 +123163,8 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
     const sleep2 = (ms2) => new Promise((resolve2) => setTimeout(resolve2, ms2));
     const tryGenerateWithArgs = async (extraArgs) => {
       let collectedText = "";
+      const startupStartedAt = Date.now();
+      options.logger.debug(`[title-generator] Starting isolated title ACP agent (cliType=${options.cliType} agentType=${options.agentType})`);
       const { agentProcess, client, acpSessionId } = await startLocalAcpAgent({
         cliType: options.cliType,
         agentType: options.agentType,
@@ -123147,6 +123190,7 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
         }),
         extraArgs
       });
+      options.logger.debug(`[title-generator] Isolated title ACP agent ready (acpSessionId=${acpSessionId} startupDuration=${Date.now() - startupStartedAt}ms)`);
       try {
         const prompt2 = buildTitlePrompt(options.taskPrompt);
         const configOptionValues = options.titleConfig?.configOptionValues;
@@ -123155,7 +123199,9 @@ ${this.stack.split("\n").slice(1).join("\n")}` : this.toString();
             await client?.setSessionConfigOption(acpSessionId, key2, value);
           }
         }
+        options.logger.debug(`[title-generator] Sending title prompt (acpSessionId=${acpSessionId})`);
         const response = await client?.prompt(acpSessionId, prompt2);
+        options.logger.debug(`[title-generator] Title prompt returned (acpSessionId=${acpSessionId})`);
         const deadline = Date.now() + 1e4;
         while (Date.now() < deadline && collectedText.trim() === "") {
           await sleep2(100);
@@ -126014,14 +126060,10 @@ $mem | ConvertTo-Json -Compress
   }
   function getImportedAcpSourceAcpSessionId(meta) {
     const externalHistory = meta.externalHistory;
-    const provider2 = externalHistory?.provider;
-    if (!externalHistory || provider2 !== "codex" && provider2 !== "claude") {
-      return void 0;
-    }
-    return externalHistory.sourceAcpSessionId;
+    return externalHistory?.sourceAcpSessionId;
   }
   function isImportedAcpReplayUserTurn(entry2, meta) {
-    const provider2 = meta.externalHistory?.provider;
+    const provider2 = meta.externalHistory ? getLocalProjectHistoryProviderKey(meta.externalHistory.provider) : null;
     const sourceAcpSessionId = getImportedAcpSourceAcpSessionId(meta);
     return !!provider2 && !!sourceAcpSessionId && entry2.id.startsWith(`${provider2}:${sourceAcpSessionId}:turn:`);
   }
@@ -127157,6 +127199,7 @@ $mem | ConvertTo-Json -Compress
         const resumeSource = requestedResumeSessionId ? "request" : storedResumeSessionId ? "meta" : "none";
         self2.deps.logger.debug(`[${sessionId}] Session not found in memory; restoring (project=${project?.kind === "github" ? project.repoFullName : project?.kind === "local" ? `local:${project.localProjectId}` : "none"} resume=${resumeSessionId ? "yes" : "no"} resumeSource=${resumeSource} resumeSessionId=${resumeSessionId ?? "none"})`);
         yield* self2.tryPromise(() => sessionDoc.setStatus(SessionStatusFactory.initializing("resuming")));
+        self2.deps.logger.debug(`[${sessionId}] Resuming status published; preparing session restore (resumeSource=${resumeSource} resumeSessionId=${resumeSessionId ?? "none"})`);
         const restoreConfig = {
           sessionId,
           workspaceId: message.workspaceId,
@@ -127180,11 +127223,13 @@ $mem | ConvertTo-Json -Compress
           if (resumeSessionId) {
             yield* acpReplaySuppression.acquire;
           }
+          self2.deps.logger.debug(`[${sessionId}] Session restore createSession started (resumeSessionId=${resumeSessionId ?? "none"})`);
           const restoredSession = yield* ctx.trackPendingSession(() => self2.deps.sessionManager.createSession(restoreConfig, {
             resumeSessionId
           }), {
             terminateOnCancel: true
           });
+          self2.deps.logger.debug(`[${sessionId}] Session restore createSession returned (acpSessionId=${restoredSession.acpSessionId ?? "null"})`);
           ctx.bindSession(restoredSession);
           yield* ctx.abortIfCancelled({
             terminateSession: true
@@ -127210,9 +127255,11 @@ $mem | ConvertTo-Json -Compress
               ...restoreConfig
             };
             const fallbackAttempt = gen(function* () {
+              self2.deps.logger.debug(`[${sessionId}] Fallback restore createSession started`);
               const fallbackSession = yield* ctx.trackPendingSession(() => self2.deps.sessionManager.createSession(fallbackConfig), {
                 terminateOnCancel: true
               });
+              self2.deps.logger.debug(`[${sessionId}] Fallback restore createSession returned (acpSessionId=${fallbackSession.acpSessionId ?? "null"})`);
               ctx.bindSession(fallbackSession);
               yield* ctx.abortIfCancelled({
                 terminateSession: true
@@ -128332,6 +128379,7 @@ $mem | ConvertTo-Json -Compress
     static REALTIME_WAIT_TIMEOUT_MS = 3e4;
     static REMOTE_SYNC_TIMEOUT_MS = 15e3;
     static HISTORY_SYNC_WAIT_TIMEOUT_MS = 5 * 6e4;
+    static HISTORY_SYNC_PROGRESS_LOG_MS = 3e4;
     static HISTORY_RECONNECT_JITTER_MIN_MS = 500;
     static HISTORY_RECONNECT_JITTER_MAX_MS = 1500;
     static setUnrefTimeout(callback, delayMs) {
@@ -128404,12 +128452,17 @@ $mem | ConvertTo-Json -Compress
         let reconnectAttempted = false;
         let unsubscribeMirror;
         let unsubscribeStatus;
+        let progressTimer = null;
+        const waitStartedAt = Date.now();
         const cleanup = () => {
           if (settled) {
             return;
           }
           settled = true;
           clearTimeout(timer2);
+          if (progressTimer) {
+            clearInterval(progressTimer);
+          }
           unsubscribeMirror?.();
           unsubscribeStatus?.();
         };
@@ -128464,6 +128517,13 @@ $mem | ConvertTo-Json -Compress
           this.deps.logger.warn(`[${sessionId}] User turn did not arrive in history after ${SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS / 1e3}s; entering dispatch recovery`);
           resolve2(null);
         }, SessionDispatchWatcher.HISTORY_SYNC_WAIT_TIMEOUT_MS);
+        progressTimer = setInterval(() => {
+          if (settled) {
+            return;
+          }
+          this.deps.logger.warn(`[${sessionId}] Still waiting for pending user turn history sync (elapsed=${Date.now() - waitStartedAt}ms docRoom=${sessionDoc.getDocRoomStatus() ?? "unknown"})`);
+        }, SessionDispatchWatcher.HISTORY_SYNC_PROGRESS_LOG_MS);
+        progressTimer.unref?.();
         unsubscribeMirror = sessionDoc.mirror?.subscribe(checkForTurn);
         if (!unsubscribeMirror) {
           this.deps.logger.debug(`[${sessionId}] Session mirror is unavailable during history sync wait`);
@@ -131099,27 +131159,24 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
   }
   function getProviderLabel$1(provider2) {
-    return provider2 === "claude" ? "Claude" : "Codex";
+    return getLocalProjectHistoryProviderKey(provider2);
   }
   async function createHistoryAcpConnection(args2) {
-    const setting = resolveACPSetting({
-      cliType: "builtin",
-      agentType: args2.provider
-    });
+    const setting = resolveACPSetting(args2.provider);
     const env2 = setting.exec.env ? {
       ...process.env,
       ...setting.exec.env
     } : process.env;
     const agentProcess = spawnAcpProcess({
-      cliType: "builtin",
-      agentType: args2.provider,
+      cliType: args2.provider.cliType,
+      agentType: args2.provider.agentType,
       workdir: args2.workdir,
       env: env2
     });
     agentProcess.stderr?.setEncoding("utf8");
     agentProcess.stderr?.on("data", (chunk) => {
       if (!chunk) return;
-      args2.logger.debug(`[${args2.provider}-history-sync] ACP stderr: ${chunk.slice(0, 1200)}`);
+      args2.logger.debug(`[${getProviderLabel$1(args2.provider)}-history-sync] ACP stderr: ${chunk.slice(0, 1200)}`);
     });
     if (!agentProcess.stdout || !agentProcess.stdin) {
       await terminateChildProcess(agentProcess);
@@ -131230,7 +131287,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       }), `${getProviderLabel$1(args2.provider)} ACP loadSession (${args2.acpSessionId})`);
       return collector.notifications;
     } catch (error2) {
-      throw new Error(`Failed to load ${getProviderLabel$1(args2.provider)} session ${args2.acpSessionId}: ${formatErrorMessage(error2)}`, {
+      const message = `Failed to load ${getProviderLabel$1(args2.provider)} session ${args2.acpSessionId}: ${formatErrorMessage(error2)}`;
+      throw new Error(message, {
         cause: error2
       });
     } finally {
@@ -131295,17 +131353,18 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   function materializeReplay(args2) {
     let tempId = 0;
     const nowIso = new Date(getServerNow()).toISOString();
+    const providerKey = getLocalProjectHistoryProviderKey(args2.provider);
     const replay = buildHistoryReplayImport(args2.replayNotifications, {
-      agentType: args2.provider,
+      provider: args2.provider,
       userId: args2.userId,
       now: () => nowIso,
-      createId: () => `${args2.provider}:${args2.acpSessionId}:tmp:${tempId++}`,
+      createId: () => `${providerKey}:${args2.acpSessionId}:tmp:${tempId++}`,
       mode: "imported_snapshot"
     });
     const turnHashes = replay.history.map(hashHistoryEntry);
     const history = replay.history.map((entry2, index2) => ({
       ...entry2,
-      id: `${args2.provider}:${args2.acpSessionId}:turn:${index2}:${turnHashes[index2].slice(0, 16)}`
+      id: `${providerKey}:${args2.acpSessionId}:turn:${index2}:${turnHashes[index2].slice(0, 16)}`
     }));
     return {
       history,
@@ -131391,12 +131450,13 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   }
   function buildExistingHistorySessionIndex(metas, machineId, provider2) {
     const index2 = /* @__PURE__ */ new Map();
+    const providerKey = getLocalProjectHistoryProviderKey(provider2);
     for (const entry2 of metas) {
       if (entry2.meta.machineId !== machineId) continue;
-      if (entry2.meta.cliType !== "builtin") continue;
-      if (entry2.meta.agentType !== provider2) continue;
+      if (entry2.meta.cliType !== provider2.cliType) continue;
+      if (entry2.meta.agentType !== provider2.agentType) continue;
       const acpSessionIds = /* @__PURE__ */ new Set();
-      if (entry2.meta.externalHistory?.provider === provider2) {
+      if (entry2.meta.externalHistory && getLocalProjectHistoryProviderKey(entry2.meta.externalHistory.provider) === providerKey) {
         const sourceAcpSessionId = entry2.meta.externalHistory.sourceAcpSessionId;
         if (sourceAcpSessionId) {
           acpSessionIds.add(sourceAcpSessionId);
@@ -131414,7 +131474,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     return index2;
   }
   function getProviderLabel(provider2) {
-    return provider2 === "claude" ? "Claude" : "Codex";
+    return getLocalProjectHistoryProviderKey(provider2);
   }
   function resolveSessionTitle(info, provider2) {
     const title2 = info.title?.trim();
@@ -131468,7 +131528,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   function buildExternalHistoryMeta(args2) {
     return {
       provider: args2.provider,
-      source: args2.provider === "claude" ? "local-claude-home" : "local-codex-home",
+      source: "local-acp-history",
       sourceAcpSessionId: args2.sourceAcpSessionId,
       sourceUpdatedAt: args2.sourceUpdatedAt ?? void 0,
       replayDigest: args2.materialized.replayDigest,
@@ -131482,7 +131542,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
   function buildMetadataOnlyExternalHistoryMeta(args2) {
     return {
       provider: args2.provider,
-      source: args2.provider === "claude" ? "local-claude-home" : "local-codex-home",
+      source: "local-acp-history",
       sourceAcpSessionId: args2.sourceAcpSessionId,
       sourceUpdatedAt: args2.sourceUpdatedAt ?? void 0,
       importedTurnCount: 0,
@@ -131492,15 +131552,17 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     };
   }
   class LocalProjectHistorySyncService {
-    constructor(manager, logger2, context2, provider2 = "codex") {
+    constructor(manager, logger2, context2, provider2) {
       this.manager = manager;
       this.logger = logger2;
       this.context = context2;
       this.provider = provider2;
+      this.providerKey = getLocalProjectHistoryProviderKey(provider2);
     }
     provider;
+    providerKey;
     async syncLocalProject(args2) {
-      const leaseKey = `${this.provider}:${this.context.workspaceId}:${this.context.machineId}:${args2.localProjectId}`;
+      const leaseKey = `${this.providerKey}:${this.context.workspaceId}:${this.context.machineId}:${args2.localProjectId}`;
       if (syncLeases.has(leaseKey)) {
         throw new Error(`${getProviderLabel(this.provider)} history sync is already running for this local project`);
       }
@@ -131520,7 +131582,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       });
     }
     async importLocalProjectSessions(args2) {
-      const leaseKey = `${this.provider}:${this.context.workspaceId}:${this.context.machineId}:${args2.localProjectId}`;
+      const leaseKey = `${this.providerKey}:${this.context.workspaceId}:${this.context.machineId}:${args2.localProjectId}`;
       if (syncLeases.has(leaseKey)) {
         throw new Error(`${getProviderLabel(this.provider)} history sync is already running for this local project`);
       }
@@ -131577,7 +131639,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
             acpSessionId,
             message: formatErrorMessage(error2)
           });
-          this.logger.debug(`[${this.provider}-history-sync] Failed to import ${getProviderLabel(this.provider)} session ${acpSessionId}: ${formatErrorMessage(error2)}`);
+          this.logger.debug(`[${this.providerKey}-history-sync] Failed to import ${getProviderLabel(this.provider)} session ${acpSessionId}: ${formatErrorMessage(error2)}`);
         }
       }
       const catalog = await this.writeCatalogResult({
@@ -131627,7 +131689,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
               ...previous,
               history: {
                 ...previous.history ?? {},
-                [this.provider]: {
+                [this.providerKey]: {
                   lastListedAt,
                   sessions: Object.fromEntries(sessions.map((item) => [
                     item.acpSessionId,
@@ -131653,9 +131715,9 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         userId: this.context.userId,
         status: SessionStatusFactory.idle(),
         isArchived: false,
-        origin: this.provider,
-        cliType: "builtin",
-        agentType: this.provider,
+        origin: "external-acp",
+        cliType: this.provider.cliType,
+        agentType: this.provider.agentType,
         project: args2.project,
         title: resolveSessionTitle(args2.info, this.provider),
         lastMessageAt,
@@ -131673,7 +131735,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     async refreshExistingSession(args2) {
       const externalHistory = args2.existing.meta.externalHistory;
-      if (externalHistory?.provider !== this.provider) {
+      if (!externalHistory || getLocalProjectHistoryProviderKey(externalHistory.provider) !== this.providerKey) {
         return "skipped";
       }
       if (shouldSkipBySourceUpdatedAt(args2.info, externalHistory)) {
@@ -131698,7 +131760,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       });
       if (replayDecision.reason === "digest_match") {
         await this.manager.repo.upsertDocMeta(getSessionRoomId(args2.existing.sessionId), {
-          origin: this.provider,
+          origin: "external-acp",
           externalHistory: buildExternalHistoryMeta({
             provider: this.provider,
             sourceAcpSessionId: args2.acpSessionId,
@@ -131724,7 +131786,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         await this.markConflict(args2.existing.sessionId, args2.info, materialized, appendDecision.reason);
         const synced2 = await sessionDoc.waitUntilSynced();
         if (!synced2) {
-          this.logger.debug(`[${this.provider}-history-sync] Conflict marker for ${args2.existing.sessionId} did not confirm sync before unload; clients may see the previous state until next sync.`);
+          this.logger.debug(`[${this.providerKey}-history-sync] Conflict marker for ${args2.existing.sessionId} did not confirm sync before unload; clients may see the previous state until next sync.`);
         }
         await this.manager.cleanSessionDoc(args2.existing.sessionId, {
           preserveStatus: true
@@ -131737,7 +131799,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
         ...suffix
       ]);
       await this.manager.repo.upsertDocMeta(getSessionRoomId(args2.existing.sessionId), {
-        origin: this.provider,
+        origin: "external-acp",
         lastMessageAt: resolveSourceUpdatedAtMs(args2.info, getServerNow()),
         externalHistory: buildExternalHistoryMeta({
           provider: this.provider,
@@ -131748,7 +131810,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       });
       const synced = await sessionDoc.waitUntilSynced();
       if (!synced) {
-        this.logger.debug(`[${this.provider}-history-sync] Appended history for ${args2.existing.sessionId} did not confirm sync before unload; other clients may see the previous state until next sync.`);
+        this.logger.debug(`[${this.providerKey}-history-sync] Appended history for ${args2.existing.sessionId} did not confirm sync before unload; other clients may see the previous state until next sync.`);
       }
       await this.manager.cleanSessionDoc(args2.existing.sessionId, {
         preserveStatus: true
@@ -131757,7 +131819,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     async markConflict(sessionId, info, materialized, reason) {
       await this.manager.repo.upsertDocMeta(getSessionRoomId(sessionId), {
-        origin: this.provider,
+        origin: "external-acp",
         externalHistory: buildExternalHistoryMeta({
           provider: this.provider,
           sourceAcpSessionId: info.sessionId,
@@ -132046,6 +132108,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     static CONTEXT_WINDOW_USAGE_THROTTLE_MS = 400;
     permissionRequestStartTimes = /* @__PURE__ */ new Map();
     machineHeartbeatTimer = null;
+    machineHeartbeatInFlightStartedAt = null;
+    machineHeartbeatSeq = 0;
     static MACHINE_HEARTBEAT_INTERVAL_MS = 2e4;
     evictForMemoryPressureFn = async () => ({
       availableMemoryBytes: 0,
@@ -132076,24 +132140,35 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     startMachineHeartbeat() {
       this.stopMachineHeartbeat();
       this.logger.debug(`Machine heartbeat started (${Math.round(MessageHandler.MACHINE_HEARTBEAT_INTERVAL_MS / 1e3)}s interval)`);
-      void this.workspaceDocument.sendMachineHeartbeat().then(() => {
-        this.logger.debug("Machine heartbeat sent (initial)");
-      }).catch((error2) => {
-        this.logger.debug(`Initial machine heartbeat failed: ${formatErrorMessage(error2)}`);
-      });
+      this.sendMachineHeartbeatWithDiagnostics("initial");
       this.machineHeartbeatTimer = setInterval(() => {
-        void this.workspaceDocument.sendMachineHeartbeat().then(() => {
-          this.logger.debug("Machine heartbeat sent");
-        }).catch((error2) => {
-          this.logger.debug(`Machine heartbeat failed: ${formatErrorMessage(error2)}`);
-        });
+        this.sendMachineHeartbeatWithDiagnostics("periodic");
       }, MessageHandler.MACHINE_HEARTBEAT_INTERVAL_MS);
+      this.machineHeartbeatTimer.unref?.();
+    }
+    sendMachineHeartbeatWithDiagnostics(reason) {
+      const now2 = Date.now();
+      if (this.machineHeartbeatInFlightStartedAt !== null) {
+        this.logger.warn(`Machine heartbeat skipped (reason=${reason}); previous heartbeat still pending for ${now2 - this.machineHeartbeatInFlightStartedAt}ms`);
+        return;
+      }
+      const seq2 = ++this.machineHeartbeatSeq;
+      this.machineHeartbeatInFlightStartedAt = now2;
+      this.logger.debug(`Machine heartbeat tick started (reason=${reason} seq=${seq2})`);
+      void withSlowOperationWarning(this.workspaceDocument.sendMachineHeartbeat(), this.logger, `workspaceDocument.sendMachineHeartbeat(reason=${reason}, seq=${seq2})`, this.machineId).then(() => {
+        this.logger.debug(`Machine heartbeat sent (reason=${reason} seq=${seq2} duration=${Date.now() - now2}ms)`);
+      }).catch((error2) => {
+        this.logger.debug(`Machine heartbeat failed (reason=${reason} seq=${seq2} duration=${Date.now() - now2}ms): ${formatErrorMessage(error2)}`);
+      }).finally(() => {
+        this.machineHeartbeatInFlightStartedAt = null;
+      });
     }
     stopMachineHeartbeat() {
       if (this.machineHeartbeatTimer) {
         clearInterval(this.machineHeartbeatTimer);
         this.machineHeartbeatTimer = null;
       }
+      this.machineHeartbeatInFlightStartedAt = null;
     }
     preferredBaseBranch = (process.env.LODY_BASE_BRANCH || "main").trim() || "main";
     resolveGitHubProjectBranch(meta, preferredBranch) {
@@ -134545,8 +134620,15 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       if (meta.processingUserMsgId) {
         return true;
       }
+      if (meta.lastGoalCommand) {
+        return true;
+      }
       return Boolean(meta.latestUserMsgId && meta.latestUserMsgId !== meta.lastHandledUserMsgId);
     }
+    async hasActiveGoal(sessionId) {
+      const meta = (await this.workspaceDocument.repo.getDocMeta(getSessionRoomId(sessionId)))?.meta;
+      return isSessionGoalWorking(meta?.latestGoal);
+    }
     isArchiveInFlight(sessionId) {
       return this.archiveInFlight.has(sessionId);
     }
@@ -134830,6 +134912,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     queue;
     isStopped = false;
+    static QUEUE_WAIT_WARNING_MS = 1e4;
+    static PROCESSING_WARNING_MS = 3e4;
     enqueue(message, handler) {
       if (this.isStopped) {
         this.logger.debug("MessageProcessor is stopped, ignoring new message");
@@ -134837,11 +134921,30 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       }
       const sessionId = this.extractSessionId(message);
       const queueKey = this.extractQueueKey(message);
-      this.logger.debug(`Enqueued message type=${message.type} sessionId=${sessionId || "N/A"}`);
+      const queuedAt = Date.now();
+      let started = false;
+      const waitWarning = setInterval(() => {
+        if (started) {
+          return;
+        }
+        this.logger.warn(`Message still waiting in queue type=${message.type} sessionId=${sessionId || "N/A"} queuedFor=${Date.now() - queuedAt}ms active=${this.queue.active} waiting=${this.queue.waiting}`);
+      }, MessageProcessor.QUEUE_WAIT_WARNING_MS);
+      waitWarning.unref?.();
+      this.logger.debug(`Enqueued message type=${message.type} sessionId=${sessionId || "N/A"} active=${this.queue.active} waiting=${this.queue.waiting}`);
       void this.queue.enqueue(queueKey, async () => {
         const startTime = Date.now();
+        started = true;
+        clearInterval(waitWarning);
+        let processingCompleted = false;
+        const processingWarning = setInterval(() => {
+          if (processingCompleted) {
+            return;
+          }
+          this.logger.warn(`Message still processing type=${message.type} sessionId=${sessionId || "N/A"} runningFor=${Date.now() - startTime}ms active=${this.queue.active} waiting=${this.queue.waiting}`);
+        }, MessageProcessor.PROCESSING_WARNING_MS);
+        processingWarning.unref?.();
         try {
-          this.logger.debug(`Processing message type=${message.type} sessionId=${sessionId || "N/A"}`);
+          this.logger.debug(`Processing message type=${message.type} sessionId=${sessionId || "N/A"} queueWait=${startTime - queuedAt}ms active=${this.queue.active} waiting=${this.queue.waiting}`);
           await handler(message);
           const duration2 = Date.now() - startTime;
           this.logger.debug(`Processed message type=${message.type} sessionId=${sessionId || "N/A"} duration=${duration2}ms`);
@@ -134851,6 +134954,9 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
           const err2 = error2 instanceof Error ? error2 : new Error(String(error2));
           this.logger.error(`Failed to process message type=${message.type} sessionId=${sessionId || "N/A"} duration=${duration2}ms: ${err2.message}`);
           this.emit("message:error", err2, message);
+        } finally {
+          processingCompleted = true;
+          clearInterval(processingWarning);
         }
       });
     }
@@ -135124,6 +135230,9 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       if (this.deps.hasActiveTurn(sessionId)) {
         return false;
       }
+      if (await this.deps.hasActiveGoal(sessionId)) {
+        return false;
+      }
       if (this.deps.hasPendingUpdates(sessionId)) {
         return false;
       }
@@ -135212,6 +135321,8 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
     }
     async dispatchLocalMessageForResponse(message) {
       const handler = this.requireHandler();
+      const dispatchStartedAt = Date.now();
+      this.options.logger.debug(`Local control dispatch started type=${message.type} sessionId=${"sessionId" in message ? message.sessionId : "N/A"} active=${this.messageProcessor.getActiveSessions()} waiting=${this.messageProcessor.getQueueSize()}`);
       return await new Promise((resolve2, reject) => {
         this.messageProcessor.enqueue(message, async (nextMessage) => {
           const responses = [];
@@ -135221,6 +135332,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
               return;
             }
             settled = true;
+            this.options.logger.debug(`Local control dispatch resolved type=${message.type} sessionId=${"sessionId" in message ? message.sessionId : "N/A"} duration=${Date.now() - dispatchStartedAt}ms responses=${responses.length} active=${this.messageProcessor.getActiveSessions()} waiting=${this.messageProcessor.getQueueSize()}`);
             resolve2([
               ...responses
             ]);
@@ -135230,6 +135342,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
               return;
             }
             settled = true;
+            this.options.logger.debug(`Local control dispatch rejected type=${message.type} sessionId=${"sessionId" in message ? message.sessionId : "N/A"} duration=${Date.now() - dispatchStartedAt}ms: ${error2 instanceof Error ? error2.message : String(error2)}`);
             reject(error2);
           };
           const context2 = {
@@ -135263,6 +135376,7 @@ ${escapeHtmlScriptContent(VISUAL_ANNOTATION_INSPECTOR_BROWSER_SCRIPT)}
       this.gcManager = new SessionGCManager(gcConfig, {
         getSessionLastActivity: (sessionId) => handler.getLastActivity(sessionId),
         hasActiveTurn: (sessionId) => handler.hasActiveTurn(sessionId),
+        hasActiveGoal: async (sessionId) => await handler.hasActiveGoal(sessionId),
         hasPendingUpdates: (sessionId) => handler.hasPendingUpdates(sessionId),
         hasPendingUserWork: async (sessionId) => await handler.hasPendingUserWork(sessionId),
         isArchiveInFlight: (sessionId) => handler.isArchiveInFlight(sessionId),
@@ -142396,7 +142510,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       await this.workspaceDocument.getOrCreateSessionDoc(config2.sessionId);
       this.logger.debug(`[${config2.sessionId}] Session will enter create inner`);
       const createInnerStart = performance$1.now();
-      const session = await this.createSessionInner(config2);
+      const session = await withSlowOperationWarning(this.createSessionInner(config2), this.logger, "session.createSessionInner", config2.sessionId);
       session.ghTokenInjected = ghTokenInjected;
       const createInnerDurationMs = performance$1.now() - createInnerStart;
       this.logger.debug(`[${config2.sessionId}] Session create inner finished in ${Math.round(createInnerDurationMs)}ms`);
@@ -142417,7 +142531,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       this.logger.debug(`[${sessionId}] About to call session.createAgent`);
       try {
         const createAgentStart = performance$1.now();
-        acpSessionId = await session.createAgent({
+        acpSessionId = await withSlowOperationWarning(session.createAgent({
           cliType: config2.agentCliType,
           agentType: config2.agentType,
           command: setting.exec.command,
@@ -142477,7 +142591,7 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
           onCodexImageGenerationEnd: (event) => {
             this.emit("onCodexImageGenerationEnd", sessionId, event);
           }
-        });
+        }), this.logger, `session.createAgent(resume=${requestedResumeSessionId ? "yes" : "no"})`, sessionId);
         const createAgentDurationMs = performance$1.now() - createAgentStart;
         this.logger.debug(`[${sessionId}] Session createAgent finished in ${Math.round(createAgentDurationMs)}ms (acpSessionId=${acpSessionId})`);
         this.logger.debug(`[${sessionId}] createAgent returned successfully`);
@@ -144598,7 +144712,8 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
       const existing = rawExisting && typeof rawExisting === "object" ? rawExisting : {};
       const previous = existing[entry2.localProjectId];
       const nowMs = getServerNow();
-      await runtime.lody.documentManager.repo.upsertDocMeta(machineRoomId, {
+      const repo = runtime.lody.documentManager.repo;
+      await repo.upsertDocMeta(machineRoomId, {
         localProjects: {
           ...existing,
           [entry2.localProjectId]: {
@@ -144624,7 +144739,8 @@ export PATH=${toSingleQuotedShellString(ghShimBinDir)}:"$PATH"
         ...existing
       };
       delete next[localProjectId];
-      await runtime.lody.documentManager.repo.upsertDocMeta(machineRoomId, {
+      const repo = runtime.lody.documentManager.repo;
+      await repo.upsertDocMeta(machineRoomId, {
         localProjects: next
       });
     }
@@ -145118,6 +145234,23 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
       shutdown: shutdown2
     };
   }
+  function startEventLoopLagMonitor(logger2, options) {
+    const intervalMs = Math.max(100, options.intervalMs ?? 1e3);
+    const warnThresholdMs = Math.max(intervalMs, options.warnThresholdMs ?? 5e3);
+    let expectedAt = Date.now() + intervalMs;
+    const timer2 = setInterval(() => {
+      const now2 = Date.now();
+      const lagMs = now2 - expectedAt;
+      expectedAt = now2 + intervalMs;
+      if (lagMs >= warnThresholdMs) {
+        logger2.warn(`[event-loop] ${options.label} timer lag detected: fired ${Math.round(lagMs)}ms late (threshold=${warnThresholdMs}ms interval=${intervalMs}ms)`);
+      }
+    }, intervalMs);
+    timer2.unref?.();
+    return {
+      stop: () => clearInterval(timer2)
+    };
+  }
   const ELECTRON_BOOTSTRAP_ENV = "LODY_ELECTRON_BOOTSTRAP";
   const ELECTRON_SESSION_TOKEN_ENV = "LODY_ELECTRON_SESSION_TOKEN";
   const ELECTRON_SESSION_USER_ID_ENV = "LODY_ELECTRON_SESSION_USER_ID";
@@ -145345,7 +145478,13 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
       runtimeStateReporter,
       onFatalAuthFailure: (error2) => triggerFatalAuthShutdown?.(error2)
     });
-    registerProcessCleanup(() => fleet.shutdown());
+    const eventLoopLagMonitor = startEventLoopLagMonitor(logger2, {
+      label: "lody start"
+    });
+    registerProcessCleanup(async () => {
+      eventLoopLagMonitor.stop();
+      await fleet.shutdown();
+    });
     const shutdownSignals = process.platform === "win32" ? [
       "SIGINT",
       "SIGTERM",
@@ -145361,6 +145500,7 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
       logger: logger2,
       shutdown: async () => {
         unregisterProcessCleanup();
+        eventLoopLagMonitor.stop();
         await fleet.shutdown();
       },
       flushTelemetry: () => shutdownPostHog(),
@@ -145399,6 +145539,7 @@ Received ${signal}, shutting down gracefully...` : "\nShutting down gracefully..
       });
       shutdownController.unregister();
       unregisterProcessCleanup();
+      eventLoopLagMonitor.stop();
       await fleet.shutdown().catch((err2) => {
         logger2.error(`Cleanup failed: ${err2 instanceof Error ? err2.message : "Unknown error"}`);
       });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "lody",
-  "version": "0.51.0",
+  "version": "0.52.1",
   "description": "Lody Agent CLI tool for managing remote command execution",
   "type": "module",
   "main": "dist/index.js",
@@ -20,11 +20,11 @@
     "node": ">=18.0.0"
   },
   "optionalDependencies": {
-    "acp-extension-claude": "0.31.1",
+    "acp-extension-claude": "0.34.1",
     "acp-extension-codex": "0.14.3"
   },
   "devDependencies": {
-    "@agentclientprotocol/sdk": "^0.20.0",
+    "@agentclientprotocol/sdk": "^0.21.0",
     "@better-auth/api-key": "1.5.5",
     "@convex-dev/better-auth": "0.11.2",
     "@loro-dev/flock-wasm": "^0.3.3",
@@ -73,11 +73,11 @@
     "winston-transport": "^4.7.1",
     "ws": "^8.18.3",
     "zod": "^4.1.5",
-    "@lody/cli-supervisor": "0.0.1",
     "@lody/convex": "0.0.1",
     "@lody/loro-streams-rpc": "0.0.1",
     "@lody/shared": "0.0.1",
-    "loro-code": "0.0.1"
+    "loro-code": "0.0.1",
+    "@lody/cli-supervisor": "0.0.1"
   },
   "files": [
     "dist",