@adhdev/daemon-core 0.9.76-rc.50 → 0.9.76-rc.52

package/dist/index.js

@@ -11914,6 +11914,7 @@ function buildSessionModalDeliverySignature(payload) {
 // src/commands/chat-commands.ts
 var RECENT_SEND_WINDOW_MS = 1200;
 var READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25e3;
+var HERMES_CLI_STARTING_SEND_SETTLE_MS = 2e3;
 var recentSendByTarget = /* @__PURE__ */ new Map();
 function getCurrentProviderType(h, fallback = "") {
   return h.currentSession?.providerType || h.currentProviderType || fallback;
@@ -11966,6 +11967,16 @@ function buildSendInputSignature(input) {
 function getSendChatInputEnvelope(args) {
   return normalizeInputEnvelope(args?.input ? { input: args.input } : args);
 }
+function sleep(ms) {
+  return new Promise((resolve16) => setTimeout(resolve16, ms));
+}
+async function waitOnceForFreshHermesCliStart(adapter, log) {
+  if (adapter.cliType !== "hermes-cli") return;
+  const status = typeof adapter.getStatus === "function" ? adapter.getStatus()?.status : void 0;
+  if (status !== "starting") return;
+  log(`Hermes CLI is still starting; waiting ${HERMES_CLI_STARTING_SEND_SETTLE_MS}ms before first send`);
+  await sleep(HERMES_CLI_STARTING_SEND_SETTLE_MS);
+}
 function getHistorySessionId(h, args) {
   const explicit = typeof args?.historySessionId === "string" ? args.historySessionId.trim() : "";
   if (explicit) return explicit;
@@ -12825,6 +12836,7 @@ async function handleSendChat(h, args) {
       try {
         assertTextOnlyInput(provider, input);
         if (!text) return { success: false, error: "text required for PTY send" };
+        await waitOnceForFreshHermesCliStart(adapter, _log);
         await adapter.sendMessage(text);
         return _logSendSuccess(`${transport}-adapter`, adapter.cliType);
       } catch (e) {
@@ -15752,8 +15764,6 @@ ${effect.notification.body || ""}`.trim();
       const aTime = getTime(a.message);
       const bTime = getTime(b.message);
       if (aTime && bTime && aTime !== bTime) return aTime - bTime;
-      if (aTime && !bTime && a.source === "runtime" && b.source === "parsed") return -1;
-      if (!aTime && bTime && a.source === "parsed" && b.source === "runtime") return 1;
       return a.index - b.index;
     }).map((entry) => entry.message));
   }
@@ -26106,7 +26116,7 @@ function getCliTargetBundle(ctx, type, instanceId) {
   if (!adapter) return null;
   return { target, instance, adapter };
 }
-function sleep(ms) {
+function sleep2(ms) {
   return new Promise((resolve16) => setTimeout(resolve16, ms));
 }
 async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
@@ -26123,7 +26133,7 @@ async function waitForCliReady(ctx, type, instanceId, timeoutMs) {
         return bundle;
       }
     }
-    await sleep(100);
+    await sleep2(100);
   }
   return getCliTargetBundle(ctx, type, instanceId);
 }
@@ -26179,7 +26189,7 @@ async function runCliExerciseInternal(ctx, body) {
         const message = String(lastLaunchError.message || "");
         const retryable = /ECONNREFUSED|session-host|Session host/i.test(message);
         if (!retryable || attempt === 2) break;
-        await sleep(1e3);
+        await sleep2(1e3);
       }
     }
     if (!launched) {
@@ -26242,16 +26252,16 @@ async function runCliExerciseInternal(ctx, body) {
     const modal = debug?.activeModal || trace?.activeModal || null;
     noteStatus(status);
     if (resolveActiveModalIfNeeded(status, modal)) {
-      await sleep(150);
+      await sleep2(150);
       continue;
     }
     const startupParseGate = !!debug?.startupParseGate;
     if (status === "idle" && !startupParseGate) break;
-    await sleep(150);
+    await sleep2(150);
   }
   ctx.instanceManager.sendEvent(bundle.target.instanceId, "send_message", { text });
   while (Date.now() - startAt < Math.max(1e3, timeoutMs)) {
-    await sleep(150);
+    await sleep2(150);
     bundle = getCliTargetBundle(ctx, type, bundle.target.instanceId);
     if (!bundle) {
       throw new Error("CLI instance disappeared during exercise");
@@ -30139,29 +30149,58 @@ function resolveSessionHostAppName(options = {}) {
 var import_session_host_core4 = require("@adhdev/session-host-core");
 var STARTUP_TIMEOUT_MS = DEFAULT_SESSION_HOST_READY_TIMEOUT_MS;
 var STARTUP_POLL_MS = 200;
-async function canConnect(endpoint) {
+var SessionHostCompatibilityError = class extends Error {
+  constructor(message) {
+    super(message);
+    this.name = "SessionHostCompatibilityError";
+  }
+};
+function getMissingRequestTypes(diagnostics, requiredRequestTypes) {
+  const supported = new Set(diagnostics?.supportedRequestTypes || []);
+  return requiredRequestTypes.filter((requestType) => !supported.has(requestType));
+}
+async function assertRequiredRequestTypes(client, requiredRequestTypes) {
+  if (requiredRequestTypes.length === 0) return;
+  const response = await client.request({
+    type: "get_host_diagnostics",
+    payload: { includeSessions: false }
+  });
+  const missing = getMissingRequestTypes(response.success ? response.result : void 0, requiredRequestTypes);
+  if (missing.length > 0) {
+    const detail = response.success ? "" : ` (${response.error || "capability probe failed"})`;
+    throw new SessionHostCompatibilityError(
+      `Session host does not support required request types: ${missing.join(", ")}${detail}`
+    );
+  }
+}
+async function canConnect(endpoint, requiredRequestTypes = []) {
   const client = new import_session_host_core4.SessionHostClient({ endpoint });
   try {
     await client.connect();
-    await client.close();
+    await assertRequiredRequestTypes(client, requiredRequestTypes);
     return true;
-  } catch {
+  } catch (error) {
+    if (error instanceof SessionHostCompatibilityError) throw error;
     return false;
+  } finally {
+    await client.close().catch(() => {
+    });
   }
 }
-async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS) {
+async function waitForReady(endpoint, timeoutMs = STARTUP_TIMEOUT_MS, requiredRequestTypes = []) {
   const deadline = Date.now() + timeoutMs;
   while (Date.now() < deadline) {
-    if (await canConnect(endpoint)) return;
+    if (await canConnect(endpoint, requiredRequestTypes)) return;
     await new Promise((resolve16) => setTimeout(resolve16, STARTUP_POLL_MS));
   }
   throw new Error(`Session host did not become ready within ${timeoutMs}ms`);
 }
 async function ensureSessionHostReady(options) {
   const endpoint = (0, import_session_host_core4.getDefaultSessionHostEndpoint)(options.appName || "adhdev");
-  if (await canConnect(endpoint)) return endpoint;
+  const requiredRequestTypes = options.requiredRequestTypes || [];
+  if (await canConnect(endpoint, requiredRequestTypes)) return endpoint;
   options.spawnHost();
-  await waitForReady(endpoint, options.timeoutMs);
+  await waitForReady(endpoint, options.timeoutMs, requiredRequestTypes);
   return endpoint;
 }
 async function listHostedCliRuntimes(endpoint) {