@adhdev/daemon-core 0.7.29 → 0.7.31

package/dist/index.d.mts

@@ -663,7 +663,6 @@ interface SessionRuntimeTarget {
     sessionId: string;
     parentSessionId: string | null;
     providerType: string;
-    providerCategory: 'ide' | 'extension' | 'cli' | 'acp';
     transport: SessionTransport;
     cdpManagerKey?: string;
     adapterKey?: string;

package/dist/index.d.ts

@@ -663,7 +663,6 @@ interface SessionRuntimeTarget {
     sessionId: string;
     parentSessionId: string | null;
     providerType: string;
-    providerCategory: 'ide' | 'extension' | 'cli' | 'acp';
     transport: SessionTransport;
     cdpManagerKey?: string;
     adapterKey?: string;

package/dist/index.js

@@ -778,21 +778,39 @@ var init_xterm_backend = __esm({
 
 // src/cli-adapters/terminal-screen.ts
 function createTerminalBackend(options, preference) {
+  const ghosttyAvailable = isGhosttyVtBackendAvailable();
   if (preference === "ghostty-vt") {
-    return new GhosttyVtTerminalBackend(options);
-  }
-  if (preference === "auto" && isGhosttyVtBackendAvailable()) {
-    return new GhosttyVtTerminalBackend(options);
-  }
-  return new XtermTerminalBackend(options);
+    const backend2 = new GhosttyVtTerminalBackend(options);
+    logTerminalBackendSelection(preference, ghosttyAvailable, backend2.kind);
+    return backend2;
+  }
+  if (preference === "auto" && ghosttyAvailable) {
+    const backend2 = new GhosttyVtTerminalBackend(options);
+    logTerminalBackendSelection(preference, ghosttyAvailable, backend2.kind);
+    return backend2;
+  }
+  const backend = new XtermTerminalBackend(options);
+  logTerminalBackendSelection(preference, ghosttyAvailable, backend.kind);
+  return backend;
+}
+function logTerminalBackendSelection(preference, ghosttyAvailable, backendKind) {
+  const key = `${preference}:${ghosttyAvailable}:${backendKind}`;
+  if (loggedTerminalBackends.has(key)) return;
+  loggedTerminalBackends.add(key);
+  LOG.info(
+    "Terminal",
+    `[terminal-screen] backend=${backendKind} preference=${preference} ghosttyAvailable=${ghosttyAvailable}`
+  );
 }
-var DEFAULT_SCROLLBACK, TerminalScreen;
+var DEFAULT_SCROLLBACK, loggedTerminalBackends, TerminalScreen;
 var init_terminal_screen = __esm({
   "src/cli-adapters/terminal-screen.ts"() {
     "use strict";
+    init_logger();
     init_ghostty_vt_backend();
     init_xterm_backend();
     DEFAULT_SCROLLBACK = 2e3;
+    loggedTerminalBackends = /* @__PURE__ */ new Set();
     TerminalScreen = class {
       backendKind;
       rows;
@@ -4491,7 +4509,6 @@ async function setupIdeInstance(ctx, opts) {
     sessionId: ideInstance.getInstanceId(),
     parentSessionId: null,
     providerType: ideType,
-    providerCategory: "ide",
     transport: "cdp-page",
     cdpManagerKey: managerKey,
     instanceKey: `ide:${managerKey}`
@@ -4506,7 +4523,6 @@ async function setupIdeInstance(ctx, opts) {
       sessionId: ext.getInstanceId(),
       parentSessionId: ideInstance.getInstanceId(),
       providerType: ext.type,
-      providerCategory: "extension",
       transport: "cdp-webview",
       cdpManagerKey: managerKey,
       instanceKey: `ide:${managerKey}`
@@ -5082,9 +5098,31 @@ function getCurrentManagerKey(h) {
 function getTargetedCliAdapter(h, args, providerType) {
   return h.getCliAdapter(args?.targetSessionId || providerType || h.currentSession?.providerType || h.currentManagerKey);
 }
+function getTargetTransport(h, provider) {
+  if (h.currentSession?.transport) return h.currentSession.transport;
+  switch (provider?.category) {
+    case "cli":
+      return "pty";
+    case "acp":
+      return "acp";
+    case "extension":
+      return "cdp-webview";
+    case "ide":
+      return "cdp-page";
+    default:
+      return null;
+  }
+}
+function isCliLikeTransport(transport) {
+  return transport === "pty" || transport === "acp";
+}
+function isExtensionTransport(transport) {
+  return transport === "cdp-webview";
+}
 function buildRecentSendKey(h, args, provider, text) {
+  const transport = getTargetTransport(h, provider) || "unknown";
   const target = args?.targetSessionId || args?.agentType || h.currentSession?.providerType || h.currentProviderType || h.currentManagerKey || "unknown";
-  return `${provider?.category || "unknown"}:${target}:${text.trim()}`;
+  return `${transport}:${target}:${text.trim()}`;
 }
 function isRecentDuplicateSend(key) {
   const now = Date.now();
@@ -5110,25 +5148,25 @@ async function handleChatHistory(h, args) {
 }
 async function handleReadChat(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const _log = (msg) => LOG.debug("Command", `[read_chat] ${msg}`);
-  if (provider?.category === "cli" || provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (isCliLikeTransport(transport)) {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
-      _log(`${provider.category} adapter: ${adapter.cliType}`);
+      _log(`${transport} adapter: ${adapter.cliType}`);
       const status = adapter.getStatus?.();
       if (status) {
         return {
           success: true,
           messages: status.messages || [],
           status: status.status,
-          activeModal: status.activeModal,
-          terminalHistory: status.terminalHistory || ""
+          activeModal: status.activeModal
         };
       }
     }
-    return { success: false, error: `${provider.category} adapter not found` };
+    return { success: false, error: `${transport} adapter not found` };
   }
-  if (provider?.category === "extension") {
+  if (isExtensionTransport(transport)) {
     try {
       const evalResult = await h.evaluateProviderScript("readChat", void 0, 5e4);
       if (evalResult?.result) {
@@ -5142,7 +5180,7 @@ async function handleReadChat(h, args) {
         if (parsed && typeof parsed === "object") {
           _log(`Extension OK: ${parsed.messages?.length || 0} msgs`);
           h.historyWriter.appendNewMessages(
-            provider.type || "unknown_extension",
+            provider?.type || "unknown_extension",
             parsed.messages || [],
             parsed.title,
             args?.targetSessionId
@@ -5158,7 +5196,7 @@ async function handleReadChat(h, args) {
       const parentSessionId = h.currentSession?.parentSessionId;
       if (cdp2 && parentSessionId) {
         const stream = await h.agentStream.collectActiveSession(cdp2, parentSessionId);
-        if (stream?.agentType !== provider.type) {
+        if (stream?.agentType !== provider?.type) {
           return { success: true, messages: [], status: "idle" };
         }
         if (stream) {
@@ -5238,6 +5276,7 @@ async function handleSendChat(h, args) {
   if (!text) return { success: false, error: "text required" };
   const _log = (msg) => LOG.debug("Command", `[send_chat] ${msg}`);
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const dedupeKey = buildRecentSendKey(h, args, provider, text);
   const _logSendSuccess = (method, targetAgent) => {
     h.historyWriter.appendNewMessages(
@@ -5253,20 +5292,20 @@ async function handleSendChat(h, args) {
     _log(`Suppressed duplicate send for ${dedupeKey}`);
     return { success: true, sent: false, deduplicated: true };
   }
-  if (provider?.category === "cli" || provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (isCliLikeTransport(transport)) {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
-      _log(`${provider.category} adapter: ${adapter.cliType}`);
+      _log(`${transport} adapter: ${adapter.cliType}`);
       try {
         await adapter.sendMessage(text);
-        return _logSendSuccess(`${provider.category}-adapter`, adapter.cliType);
+        return _logSendSuccess(`${transport}-adapter`, adapter.cliType);
       } catch (e) {
-        return { success: false, error: `${provider.category} send failed: ${e.message}` };
+        return { success: false, error: `${transport} send failed: ${e.message}` };
       }
     }
   }
-  if (provider?.category === "extension") {
-    _log(`Extension: ${provider.type}`);
+  if (isExtensionTransport(transport)) {
+    _log(`Extension: ${provider?.type || "unknown_extension"}`);
     try {
       const evalResult = await h.evaluateProviderScript("sendMessage", { MESSAGE: text }, 3e4);
       if (evalResult?.result) {
@@ -5296,7 +5335,7 @@ async function handleSendChat(h, args) {
         return _logSendSuccess("agent-stream");
       }
     }
-    return { success: false, error: `Extension '${provider.type}' send failed` };
+    return { success: false, error: `Extension '${provider?.type || "unknown_extension"}' send failed` };
   }
   const targetCdp = h.getCdp();
   if (!targetCdp?.isConnected) {
@@ -5422,7 +5461,8 @@ async function handleSendChat(h, args) {
 }
 async function handleListChats(h, args) {
   const provider = h.getProvider(args?.agentType);
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  const transport = getTargetTransport(h, provider);
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     try {
       const chats = await h.agentStream.listSessionChats(h.getCdp(), h.currentSession.sessionId);
       LOG.info("Command", `[list_chats] Extension: ${chats.length} chats`);
@@ -5474,8 +5514,9 @@ async function handleListChats(h, args) {
 }
 async function handleNewChat(h, args) {
   const provider = h.getProvider(args?.agentType);
-  if (provider?.category === "cli") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  const transport = getTargetTransport(h, provider);
+  if (transport === "pty") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (!adapter) return { success: false, error: "CLI adapter not running" };
     if (typeof adapter.clearHistory === "function") {
       adapter.clearHistory();
@@ -5483,7 +5524,7 @@ async function handleNewChat(h, args) {
     }
     return { success: false, error: "new_chat not supported by this CLI provider" };
   }
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     const ok = await h.agentStream.newSession(h.getCdp(), h.currentSession.sessionId);
     return { success: ok };
   }
@@ -5508,11 +5549,12 @@ async function handleNewChat(h, args) {
 }
 async function handleSwitchChat(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const managerKey = getCurrentManagerKey(h);
   const sessionId = args?.sessionId || args?.id || args?.chatId;
   if (!sessionId) return { success: false, error: "sessionId required" };
   LOG.info("Command", `[switch_chat] sessionId=${sessionId}, manager=${managerKey}`);
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     const ok = await h.agentStream.switchConversation(h.getCdp(), h.currentSession.sessionId, sessionId);
     return { success: ok, result: ok ? "switched" : "failed" };
   }
@@ -5602,9 +5644,10 @@ async function handleSwitchChat(h, args) {
 }
 async function handleSetMode(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const mode = args?.mode || "agent";
-  if (provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (transport === "acp") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (adapter) {
       const acpInstance = adapter._acpInstance;
       if (acpInstance && typeof acpInstance.onEvent === "function") {
@@ -5657,10 +5700,11 @@ async function handleSetMode(h, args) {
 }
 async function handleChangeModel(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const model = args?.model;
-  LOG.info("Command", `[change_model] model=${model} provider=${provider?.type} category=${provider?.category} manager=${getCurrentManagerKey(h)} providerType=${getCurrentProviderType(h)}`);
-  if (provider?.category === "acp") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  LOG.info("Command", `[change_model] model=${model} provider=${provider?.type} transport=${transport} manager=${getCurrentManagerKey(h)} providerType=${getCurrentProviderType(h)}`);
+  if (transport === "acp") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     LOG.info("Command", `[change_model] ACP adapter found: ${!!adapter}, type=${adapter?.cliType}, hasAcpInstance=${!!adapter?._acpInstance}`);
     if (adapter) {
       const acpInstance = adapter._acpInstance;
@@ -5718,15 +5762,16 @@ async function handleSetThoughtLevel(h, args) {
   const value = args?.value;
   if (!configId || !value) return { success: false, error: "configId and value required" };
   const provider = h.getProvider(args?.agentType);
-  if (!provider || provider.category !== "acp") {
+  const transport = getTargetTransport(h, provider);
+  if (transport !== "acp") {
     return { success: false, error: "set_thought_level only for ACP providers" };
   }
-  const adapter = getTargetedCliAdapter(h, args, provider.type);
+  const adapter = getTargetedCliAdapter(h, args, provider?.type);
   const acpInstance = adapter?._acpInstance;
   if (!acpInstance) return { success: false, error: "ACP instance not found" };
   try {
     await acpInstance.setConfigOption(configId, value);
-    LOG.info("Command", `[set_thought_level] ${configId}=${value} for ${provider.type}`);
+    LOG.info("Command", `[set_thought_level] ${configId}=${value} for ${provider?.type || "unknown_acp"}`);
     return { success: true, configId, value };
   } catch (e) {
     return { success: false, error: e?.message };
@@ -5734,11 +5779,12 @@ async function handleSetThoughtLevel(h, args) {
 }
 async function handleResolveAction(h, args) {
   const provider = h.getProvider(args?.agentType);
+  const transport = getTargetTransport(h, provider);
   const action = args?.action || "approve";
   const button = args?.button || args?.buttonText || (action === "approve" ? "Accept" : action === "reject" ? "Reject" : "Accept");
   LOG.info("Command", `[resolveAction] action=${action} button="${button}" provider=${provider?.type}`);
-  if (provider?.category === "cli") {
-    const adapter = getTargetedCliAdapter(h, args, provider.type);
+  if (transport === "pty") {
+    const adapter = getTargetedCliAdapter(h, args, provider?.type);
     if (!adapter) return { success: false, error: "CLI adapter not running" };
     if (args?.data && typeof adapter.resolveAction === "function") {
       try {
@@ -5779,7 +5825,7 @@ async function handleResolveAction(h, args) {
     LOG.info("Command", `[resolveAction] CLI PTY \u2192 buttonIndex=${buttonIndex} "${buttons[buttonIndex] ?? "?"}"`);
     return { success: true, buttonIndex, button: buttons[buttonIndex] ?? button };
   }
-  if (provider?.category === "extension" && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
+  if (isExtensionTransport(transport) && h.agentStream && h.getCdp() && h.currentSession?.sessionId) {
     const ok = await h.agentStream.resolveSessionAction(h.getCdp(), h.currentSession.sessionId, action);
     return { success: ok };
   }
@@ -10190,7 +10236,6 @@ var DaemonCliManager = class {
         sessionId: cliInstance.instanceId,
         parentSessionId: null,
         providerType: normalizedType,
-        providerCategory: "cli",
         transport: "pty",
         adapterKey: key,
         instanceKey: key
@@ -10240,7 +10285,6 @@ ${installInfo}`
         sessionId,
         parentSessionId: null,
         providerType: normalizedType,
-        providerCategory: "acp",
         transport: "acp",
         adapterKey: key,
         instanceKey: key
@@ -10752,12 +10796,12 @@ var DaemonAgentStreamManager = class {
     this.logFn(`[AgentStream] Active session (${parentSessionId}): ${sessionId || "none"}`);
   }
   resolveSessionIdForTarget(parentSessionId, agentType) {
-    const child = (this.sessionRegistry?.listChildren(parentSessionId) || []).find((entry) => entry.providerCategory === "extension" && entry.providerType === agentType);
+    const child = (this.sessionRegistry?.listChildren(parentSessionId) || []).find((entry) => entry.transport === "cdp-webview" && entry.providerType === agentType);
     return child?.sessionId || null;
   }
   async connectManagedSession(cdp, parentSessionId, runtimeSessionId) {
     const target = this.getSessionTarget(runtimeSessionId);
-    if (!target || target.providerCategory !== "extension") return null;
+    if (!target || target.transport !== "cdp-webview") return null;
     const adapter = this.adaptersByType.get(target.providerType);
     if (!adapter) return null;
     const targets = await cdp.discoverAgentWebviews();
@@ -11042,7 +11086,6 @@ var AgentStreamPoller = class {
                   sessionId: extInstance.getInstanceId(),
                   parentSessionId,
                   providerType: extType,
-                  providerCategory: "extension",
                   transport: "cdp-webview",
                   cdpManagerKey: ideType,
                   instanceKey: `ide:${ideType}`
@@ -11258,7 +11301,6 @@ var ProviderInstanceManager = class {
           providerType,
           instanceId: state.instanceId,
           targetSessionId: state.instanceId,
-          providerCategory: state.category,
           workspaceName: state.workspace || void 0,
           ...extra
         });