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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adhdev/daemon-core",
-  "version": "0.9.76-rc.50",
+  "version": "0.9.76-rc.51",
   "description": "ADHDev daemon core — CDP, IDE detection, providers, command execution",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/commands/chat-commands.ts

@@ -22,6 +22,7 @@ import type { SessionTransport } from '../shared-types.js';
 
 const RECENT_SEND_WINDOW_MS = 1200;
 export const READ_CHAT_PROVIDER_EVAL_TIMEOUT_MS = 25_000;
+const HERMES_CLI_STARTING_SEND_SETTLE_MS = 2_000;
 const recentSendByTarget = new Map<string, number>();
 
 interface ApprovalSelectableInstance extends ProviderInstance {
@@ -101,6 +102,19 @@ function getSendChatInputEnvelope(args: any): InputEnvelope {
     return normalizeInputEnvelope(args?.input ? { input: args.input } : args);
 }
 
+function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function waitOnceForFreshHermesCliStart(adapter: CliAdapter, log: (msg: string) => void): Promise<void> {
+    if (adapter.cliType !== 'hermes-cli') return;
+    const status = typeof adapter.getStatus === 'function' ? adapter.getStatus()?.status : undefined;
+    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: CommandHelpers, args: any): string | undefined {
     const explicit = typeof args?.historySessionId === 'string' ? args.historySessionId.trim() : '';
     if (explicit) return explicit;
@@ -1120,6 +1134,7 @@ export async function handleSendChat(h: CommandHelpers, args: any): Promise<Comm
             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: any) {

package/src/providers/cli-provider-instance.ts

@@ -1032,8 +1032,11 @@ export class CliProviderInstance implements ProviderInstance {
                 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;
+                // Many provider-owned CLI transcripts (including Hermes CLI in debug bundles)
+                // do not carry timestamps on parsed messages. In that case there is no safe
+                // clock basis for interleaving timestamped runtime/system messages into the
+                // provider transcript, so preserve parsed order and append runtime entries by
+                // their insertion index instead of moving them ahead of the whole transcript.
                 return a.index - b.index;
             })
             .map((entry) => entry.message));