adhdev 0.8.24 → 0.8.25

package/dist/index.js

@@ -4510,6 +4510,56 @@ var init_builders = __esm({
   }
 });
 
+// ../../oss/packages/daemon-core/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
+      });
+    }
+  }
+}
+var init_reconcile = __esm({
+  "../../oss/packages/daemon-core/src/sessions/reconcile.ts"() {
+    "use strict";
+  }
+});
+
 // ../../oss/packages/daemon-core/src/commands/chat-commands.ts
 function getCurrentProviderType(h, fallback = "") {
   return h.currentSession?.providerType || h.currentProviderType || fallback;
@@ -6166,6 +6216,7 @@ var init_handler = __esm({
     init_devtools();
     init_builders();
     init_chat_history();
+    init_reconcile();
     init_logger();
     init_chat_commands();
     init_cdp_commands();
@@ -6300,17 +6351,27 @@ var init_handler = __esm({
         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);
@@ -6357,6 +6418,33 @@ var init_handler = __esm({
         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"];
@@ -32415,6 +32503,7 @@ var init_poller = __esm({
   "../../oss/packages/daemon-core/src/agent-stream/poller.ts"() {
     "use strict";
     init_setup();
+    init_reconcile();
     init_logger();
     AgentStreamPoller = class {
       deps;
@@ -32454,6 +32543,7 @@ var init_poller = __esm({
           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}`);
@@ -47268,7 +47358,7 @@ var init_adhdev_daemon = __esm({
     import_ws3 = require("ws");
     import_chalk2 = __toESM(require("chalk"));
     init_version();
-    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.24" });
+    pkgVersion = resolvePackageVersion({ injectedVersion: "0.8.25" });
     DANGEROUS_PATTERNS = [
       /\brm\s+(-[a-z]*f|-[a-z]*r|--force|--recursive)/i,
       /\bsudo\b/i,