@adhdev/daemon-core 0.8.24 → 0.8.25

package/dist/index.js

@@ -6809,6 +6809,51 @@ function buildSessionEntries(allStates, cdpManagers) {
   return sessions;
 }
 
+// src/sessions/reconcile.ts
+function upsertSessionTarget(sessionRegistry, target) {
+  const existing = sessionRegistry.get(target.sessionId);
+  if (existing && existing.parentSessionId === target.parentSessionId && existing.providerType === target.providerType && existing.transport === target.transport && existing.cdpManagerKey === target.cdpManagerKey && existing.instanceKey === target.instanceKey) {
+    return;
+  }
+  sessionRegistry.register(target);
+}
+function reconcileIdeRuntimeSessions(instanceManager, sessionRegistry) {
+  if (!instanceManager || !sessionRegistry) return;
+  for (const instanceKey of instanceManager.listInstanceIds()) {
+    if (!instanceKey.startsWith("ide:")) continue;
+    const ideInstance = instanceManager.getInstance(instanceKey);
+    if (!ideInstance || ideInstance.category !== "ide" || typeof ideInstance.getInstanceId !== "function") {
+      continue;
+    }
+    const managerKey = instanceKey.slice(4);
+    const ideType = typeof ideInstance.type === "string" && ideInstance.type.trim() ? ideInstance.type.trim() : managerKey.split("_")[0];
+    const parentSessionId = ideInstance.getInstanceId();
+    if (!parentSessionId) continue;
+    upsertSessionTarget(sessionRegistry, {
+      sessionId: parentSessionId,
+      parentSessionId: null,
+      providerType: ideType,
+      transport: "cdp-page",
+      cdpManagerKey: managerKey,
+      instanceKey
+    });
+    const extensions = ideInstance.getExtensionInstances?.() || [];
+    for (const ext of extensions) {
+      const extType = typeof ext?.type === "string" ? ext.type.trim() : "";
+      const extSessionId = ext?.getInstanceId?.();
+      if (!extType || !extSessionId) continue;
+      upsertSessionTarget(sessionRegistry, {
+        sessionId: extSessionId,
+        parentSessionId,
+        providerType: extType,
+        transport: "cdp-webview",
+        cdpManagerKey: managerKey,
+        instanceKey
+      });
+    }
+  }
+}
+
 // src/commands/handler.ts
 init_logger();
 
@@ -8566,17 +8611,27 @@ var DaemonCommandHandler = class {
     return key.split("_")[0];
   }
   resolveRoute(args) {
-    const session = this._ctx.sessionRegistry?.get(args?.targetSessionId);
-    const managerKey = this.extractIdeType(args);
-    const providerType = args?.agentType || args?.providerType || session?.providerType || this.inferProviderType(managerKey);
-    return { session, managerKey, providerType };
+    const targetSessionId = typeof args?.targetSessionId === "string" ? args.targetSessionId.trim() : "";
+    let session = targetSessionId ? this._ctx.sessionRegistry?.get(targetSessionId) : void 0;
+    if (targetSessionId && !session) {
+      reconcileIdeRuntimeSessions(this._ctx.instanceManager, this._ctx.sessionRegistry);
+      session = this._ctx.sessionRegistry?.get(targetSessionId);
+    }
+    const sessionLookupFailed = !!targetSessionId && !session;
+    const managerKey = this.extractIdeType(args, sessionLookupFailed);
+    let providerType;
+    if (!sessionLookupFailed) {
+      providerType = session?.providerType || args?.agentType || args?.providerType || this.inferProviderType(managerKey);
+    }
+    return { session, managerKey, providerType, sessionLookupFailed };
   }
   /** Extract CDP scope key from target session or explicit ideType */
-  extractIdeType(args) {
+  extractIdeType(args, sessionLookupFailed = false) {
     if (args?.targetSessionId) {
       const target = this._ctx.sessionRegistry?.get(args.targetSessionId);
       if (target?.cdpManagerKey) return target.cdpManagerKey;
       if (this._ctx.cdpManagers.has(args.targetSessionId)) return args.targetSessionId;
+      if (sessionLookupFailed) return void 0;
     }
     if (args?.ideType) {
       const target = this._ctx.sessionRegistry?.get(args.ideType);
@@ -8623,6 +8678,33 @@ var DaemonCommandHandler = class {
     this._currentRoute = this.resolveRoute(args);
     const startedAt = Date.now();
     this.logCommandStart(cmd, args);
+    const sessionScopedCommands = /* @__PURE__ */ new Set([
+      "read_chat",
+      "send_chat",
+      "list_chats",
+      "new_chat",
+      "switch_chat",
+      "set_mode",
+      "change_model",
+      "set_thought_level",
+      "resolve_action",
+      "focus_session",
+      "pty_input",
+      "pty_resize",
+      "invoke_provider_script",
+      "list_extension_models",
+      "set_extension_model",
+      "list_extension_modes",
+      "set_extension_mode"
+    ]);
+    if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd)) {
+      const result2 = {
+        success: false,
+        error: `Live session not found for targetSessionId: ${String(args?.targetSessionId || "").trim() || "unknown"}`
+      };
+      this.logCommandEnd(cmd, result2, startedAt);
+      return result2;
+    }
     let result;
     if (!this._currentRoute.session && !this._currentRoute.managerKey && !this._currentRoute.providerType) {
       const cdpCommands = ["send_chat", "read_chat", "list_chats", "new_chat", "switch_chat", "set_mode", "change_model", "set_thought_level", "resolve_action"];
@@ -14005,6 +14087,7 @@ var AgentStreamPoller = class {
       sessionRegistry
     } = this.deps;
     if (!agentStreamManager || cdpManagers.size === 0) return;
+    reconcileIdeRuntimeSessions(instanceManager, sessionRegistry);
     for (const [ideType, cdp] of cdpManagers) {
       registerExtensionProviders(providerLoader, cdp, ideType);
       const ideInstance = instanceManager.getInstance(`ide:${ideType}`);