@adhdev/daemon-core 0.9.82-rc.143 → 0.9.82-rc.145

package/src/ipc/local-ipc-server.ts

@@ -0,0 +1,278 @@
+/**
+ * LocalIpcServer — generic HTTP + WebSocket IPC endpoint for daemon processes.
+ *
+ * Both daemon-cloud and daemon-standalone need a local IPC surface so
+ * external tools — the `adhdev mcp --mode ipc` MCP server and anything
+ * else that wants to issue commands without going through the cloud
+ * Worker — can connect over `ws://127.0.0.1:<port>/ipc`.
+ *
+ * Until now the implementation lived only in daemon-cloud. Standalone
+ * sessions therefore couldn't host MCP mesh tools — codex/claude config
+ * pointing at `--mode ipc` got `Cannot reach ipc daemon`. This module
+ * moves the transport into daemon-core so both daemons can mount it.
+ *
+ * The transport itself is daemon-agnostic. Cloud-specific behaviors
+ * (mesh relay, mandatory update gates) are injected via the caller's
+ * `handleCommand` hook; the IPC layer just frames/unframes JSON and
+ * routes messages.
+ */
+
+import { createServer, type IncomingMessage, type Server as HttpServer } from 'http';
+import { WebSocketServer, WebSocket } from 'ws';
+import { LOG } from '../logging/logger.js';
+import { DAEMON_WS_PATH } from '../ipc-protocol.js';
+
+/** Parameters passed to `handleCommand` for each incoming ext:command frame. */
+export interface IpcCommandContext {
+    /** The raw `command` field from the message — caller decides routing. */
+    command: string;
+    /** Args provided by the client; may have been normalized by the caller. */
+    args: Record<string, unknown>;
+    /** Stable id correlating the request and the eventual ext:command_result. */
+    requestId: string;
+    /** The connected WebSocket — only needed if the caller wants to send extra events. */
+    ws: WebSocket;
+}
+
+/** Result reported back to the client. `result` is optional context for success. */
+export interface IpcCommandResult {
+    success: boolean;
+    result?: unknown;
+    error?: string;
+    /**
+     * Additional fields the caller wants merged into the response payload
+     * (e.g. the cloud daemon's mandatory-update-block fields). Reserved.
+     */
+    extra?: Record<string, unknown>;
+}
+
+/** Status payload returned from GET / on the IPC HTTP port. */
+export interface IpcStatusPayload {
+    ok: true;
+    pid: number;
+    wsPath: string;
+    port: number;
+    /** Arbitrary daemon-specific summary. Cloud daemon includes mesh state, etc. */
+    status: Record<string, unknown> | null;
+}
+
+export interface LocalIpcServerOptions {
+    /** TCP port to listen on. 19222 is the conventional default. */
+    port: number;
+    /** Build the GET / status payload. Called on every health probe. */
+    buildStatusPayload: () => Record<string, unknown> | null;
+    /** Build the welcome message sent to a freshly-connected client. */
+    buildWelcomePayload: () => Record<string, unknown>;
+    /** Handle a single ext:command frame. Caller decides routing and returns the result. */
+    handleCommand: (ctx: IpcCommandContext) => Promise<IpcCommandResult>;
+    /** Optional notification when a new client connects (lets daemon track them for broadcasts). */
+    onClientConnected?: (ws: WebSocket) => void;
+    /** Optional notification when a client disconnects. */
+    onClientDisconnected?: (ws: WebSocket) => void;
+    /** Optional logger label (defaults to "IPC"). */
+    logCategory?: string;
+}
+
+/**
+ * Returned controller for stopping the server and broadcasting to clients.
+ * Stored by the daemon and torn down at shutdown.
+ */
+export interface LocalIpcServerHandle {
+    /** True once `listen()` succeeded. */
+    isListening(): boolean;
+    /** Push a message to every connected client. */
+    broadcast(type: string, payload: unknown): void;
+    /** Close all client sockets + the HTTP server. */
+    close(): Promise<void>;
+}
+
+/**
+ * Build a JSON HTTP response describing the IPC endpoint. Exposed so caller
+ * code (and tests) can build the same shape without spinning a real server.
+ */
+export function buildIpcStatusHttpResponse(
+    method: string | undefined,
+    url: string | undefined,
+    payload: IpcStatusPayload,
+): { statusCode: number; body: Record<string, unknown> } {
+    if (method && method.toUpperCase() !== 'GET') {
+        return { statusCode: 405, body: { ok: false, error: 'method not allowed' } };
+    }
+    // `/health` is the probe path used by the MCP IpcTransport ping —
+    // mirror cloud daemon behavior so `adhdev mcp --mode ipc` recognizes
+    // us as a live IPC host. `/` and `/status` return the same shape.
+    if (url && url !== '/' && url !== '/status' && url !== '/health') {
+        return { statusCode: 404, body: { ok: false, error: 'not found' } };
+    }
+    return { statusCode: 200, body: payload as unknown as Record<string, unknown> };
+}
+
+/**
+ * Start the local IPC server. Returns a handle the caller can use to broadcast
+ * events and tear down at shutdown.
+ */
+export async function startLocalIpcServer(opts: LocalIpcServerOptions): Promise<LocalIpcServerHandle> {
+    const logCategory = opts.logCategory || 'IPC';
+    const clients = new Set<WebSocket>();
+    let httpServer: HttpServer | null = null;
+    let wss: WebSocketServer | null = null;
+    let listening = false;
+
+    httpServer = createServer((req, res) => {
+        const payload: IpcStatusPayload = {
+            ok: true,
+            pid: process.pid,
+            wsPath: DAEMON_WS_PATH,
+            port: opts.port,
+            status: opts.buildStatusPayload(),
+        };
+        const response = buildIpcStatusHttpResponse(req.method, req.url, payload);
+        const body = JSON.stringify(response.body);
+        res.writeHead(response.statusCode, {
+            'Content-Type': 'application/json',
+            'Content-Length': Buffer.byteLength(body),
+            'Connection': 'close',
+        });
+        res.end(body);
+    });
+
+    wss = new WebSocketServer({ noServer: true });
+    wss.on('connection', (ws) => handleConnection(ws));
+
+    httpServer.on('upgrade', (req: IncomingMessage, socket, head) => {
+        const wsUrl = new URL(req.url || '/', `http://${req.headers.host || '127.0.0.1'}`);
+        if (wsUrl.pathname !== DAEMON_WS_PATH) {
+            socket.write('HTTP/1.1 404 Not Found\r\n\r\n');
+            socket.destroy();
+            return;
+        }
+        wss!.handleUpgrade(req, socket, head, (ws) => {
+            wss!.emit('connection', ws, req);
+        });
+    });
+
+    function handleConnection(ws: WebSocket): void {
+        clients.add(ws);
+        sendWelcome(ws);
+        opts.onClientConnected?.(ws);
+
+        ws.on('message', (raw) => {
+            void handleMessage(ws, raw.toString());
+        });
+        ws.on('close', () => {
+            clients.delete(ws);
+            opts.onClientDisconnected?.(ws);
+        });
+        ws.on('error', () => {
+            clients.delete(ws);
+            opts.onClientDisconnected?.(ws);
+        });
+    }
+
+    function sendWelcome(ws: WebSocket): void {
+        try {
+            ws.send(JSON.stringify({
+                type: 'daemon:welcome',
+                payload: opts.buildWelcomePayload(),
+            }));
+        } catch (error: any) {
+            LOG.warn(logCategory, `Failed to send welcome: ${error?.message || error}`);
+        }
+    }
+
+    async function handleMessage(ws: WebSocket, raw: string): Promise<void> {
+        let msg: any;
+        try { msg = JSON.parse(raw); } catch { return; }
+        if (!msg || typeof msg !== 'object') return;
+
+        // Re-issue welcome on client request (used by reconnecting MCP servers).
+        if (msg.type === 'ext:register') {
+            sendWelcome(ws);
+            return;
+        }
+        if (msg.type !== 'ext:command') return;
+
+        const payload = msg.payload && typeof msg.payload === 'object' ? msg.payload : {};
+        const command = typeof payload.command === 'string' ? payload.command : '';
+        const args = payload.args && typeof payload.args === 'object'
+            ? payload.args as Record<string, unknown>
+            : {};
+        const requestId = typeof payload.requestId === 'string'
+            ? payload.requestId
+            : typeof payload.messageId === 'string'
+                ? payload.messageId
+                : `ipc-${Date.now()}`;
+
+        if (!command) {
+            ws.send(JSON.stringify({
+                type: 'ext:command_result',
+                payload: { requestId, success: false, error: 'command required' },
+            }));
+            return;
+        }
+
+        try {
+            const result = await opts.handleCommand({ command, args, requestId, ws });
+            ws.send(JSON.stringify({
+                type: 'ext:command_result',
+                payload: {
+                    requestId,
+                    success: result.success,
+                    result: result.result,
+                    error: result.error,
+                    ...(result.extra || {}),
+                },
+            }));
+        } catch (error: any) {
+            ws.send(JSON.stringify({
+                type: 'ext:command_result',
+                payload: {
+                    requestId,
+                    success: false,
+                    error: error?.message || String(error),
+                },
+            }));
+        }
+    }
+
+    await new Promise<void>((resolve, reject) => {
+        const onError = (error: Error) => {
+            httpServer?.off('listening', onListening);
+            reject(error);
+        };
+        const onListening = () => {
+            httpServer?.off('error', onError);
+            listening = true;
+            resolve();
+        };
+        httpServer!.once('error', onError);
+        httpServer!.once('listening', onListening);
+        httpServer!.listen(opts.port, '127.0.0.1');
+    });
+
+    LOG.info(logCategory, `Local IPC listening on ws://127.0.0.1:${opts.port}${DAEMON_WS_PATH}`);
+
+    return {
+        isListening: () => listening,
+        broadcast(type, payload) {
+            const message = JSON.stringify({ type, payload });
+            for (const client of clients) {
+                if (client.readyState !== WebSocket.OPEN) continue;
+                try { client.send(message); } catch { /* drop silently */ }
+            }
+        },
+        async close() {
+            for (const client of clients) {
+                try { client.close(); } catch { /* ignore */ }
+            }
+            clients.clear();
+            await new Promise<void>((resolve) => {
+                if (!httpServer) { resolve(); return; }
+                httpServer.close(() => resolve());
+            });
+            httpServer = null;
+            wss = null;
+            listening = false;
+        },
+    };
+}

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

@@ -508,6 +508,21 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     getState(): ProviderState {
+        // TODO(phase5-sandbox): JS override scripts (detectStatus, parseApproval,
+        // parseSession) are currently invoked by CliScriptRunner.invoke() via direct
+        // function calls — the scripts run in the daemon process with full Node.js
+        // access and no resource limits.
+        //
+        // When Phase 5 lands, CliScriptRunner should route these calls through a
+        // SandboxedScriptRunner (see providers/sdk/v1/sandbox/script-runner.ts) so
+        // that each call gets a fresh isolated-vm context with a 50 ms CPU limit and
+        // a 32 MB memory cap.  The execution path to change is:
+        //   CliScriptRunner.invoke() → SandboxedScriptRunner.run(scriptSource, context)
+        //
+        // This getState() call-site is NOT where the change goes — the wiring belongs
+        // in cli-script-runner.ts (CliScriptRunner.detectStatus / parseApproval /
+        // parseSession), with provider-loader.ts updated to store script source strings
+        // alongside the loaded function references for extended-legacy providers.
         const adapterStatus = this.adapter.getStatus();
         let parsedStatus: any = null;
         let parseErrorMessage: string | undefined;
@@ -1677,7 +1692,7 @@ export class CliProviderInstance implements ProviderInstance {
 
     private syncCanonicalSavedHistoryIfNeeded(): boolean {
         if (!this.providerSessionId) return false;
-        const canonicalHistory = this.provider.canonicalHistory;
+        const canonicalHistory = this.provider.nativeHistory;
         if (!canonicalHistory) return false;
 
         if (isNativeSourceCanonicalHistory(canonicalHistory)) {
@@ -1739,9 +1754,9 @@ export class CliProviderInstance implements ProviderInstance {
     private restorePersistedHistoryFromCurrentSession(): void {
         if (!this.providerSessionId) return;
         this.syncCanonicalSavedHistoryIfNeeded();
-        const restoredHistory = isNativeSourceCanonicalHistory(this.provider.canonicalHistory)
+        const restoredHistory = isNativeSourceCanonicalHistory(this.provider.nativeHistory)
             ? readProviderChatHistory(this.type, {
-                canonicalHistory: this.provider.canonicalHistory,
+                canonicalHistory: this.provider.nativeHistory,
                 historySessionId: this.providerSessionId,
                 workspace: this.workingDir,
                 offset: 0,

package/src/providers/contracts.ts

@@ -480,6 +480,14 @@ export interface ProviderModule {
   extensionIdPattern_flags?: string;
   compatibility?: ProviderCompatibilityEntry[];
   defaultScriptDir?: string;
+  /**
+   * v1 declarative tui block (spinner/settledPrompt/modal/dispatchOrder/etc).
+   * When present, the daemon's CliScriptRunner builds canonical
+   * (input → verdict) functions from this and injects them into provider
+   * scripts as `sdk.declarativeDetectStatus` and `sdk.declarativeParseApproval`.
+   * v0 / verified-tier providers can omit this entirely.
+   */
+  tui?: Record<string, unknown>;
   /**
    * Scripts that can run at the IDE main-page level (not just inside the extension webview session frame).
    * Default: ['listModes', 'setMode', 'listModels', 'setModel'].
@@ -533,8 +541,16 @@ export interface ProviderModule {
   /** History behavior config — controls message filtering and collapse during replay */
   historyBehavior?: ProviderHistoryBehavior;
   /**
-   * Canonical history sync config — for providers that maintain native history files.
-   * When set, daemon syncs from native format into ADHDev JSONL store on each tick.
+   * Native history config — for providers that maintain native history files.
+   * When set, daemon reads/lists provider-native transcripts directly. This is
+   * the canonical v1 field name; the legacy `canonicalHistory` field name is
+   * still accepted by the loader and aliased onto this field at load time.
+   */
+  nativeHistory?: NativeHistoryConfig;
+  /**
+   * @deprecated Legacy v0 alias for {@link ProviderModule.nativeHistory}.
+   * Loader populates this from `nativeHistory` so existing internal readers
+   * keep working during the transition. Remove after one release.
    */
   canonicalHistory?: ProviderCanonicalHistoryConfig;
   /**
@@ -680,7 +696,7 @@ export interface ProviderHistoryBehavior {
  * daemon-core. They let each provider own native transcript file discovery and
  * parsing while daemon-core only validates/pages the normalized result.
  */
-export interface ProviderCanonicalHistoryScriptsConfig {
+export interface NativeHistoryScriptsConfig {
   /** Reads one native session. Default: 'readNativeHistory'. */
   readSession?: string;
   /** Lists native sessions with summary metadata. Default: 'listNativeHistory'. */
@@ -688,13 +704,19 @@ export interface ProviderCanonicalHistoryScriptsConfig {
 }
 
 /**
- * Canonical history sync config — for providers that maintain their own native history files.
+ * @deprecated Use {@link NativeHistoryScriptsConfig}. Retained as an alias for
+ * one release so external consumers that referenced the old name keep compiling.
+ */
+export type ProviderCanonicalHistoryScriptsConfig = NativeHistoryScriptsConfig;
+
+/**
+ * Native history config — for providers that maintain their own native history files.
  *
  * Preferred mode is provider-owned scripts via `scripts`. `format` is now an
  * opaque provider label retained for diagnostics/backward compatibility; daemon
  * live paths must not branch on provider-specific format values.
  */
-export interface ProviderCanonicalHistoryConfig {
+export interface NativeHistoryConfig {
   /** Opaque provider-owned history format label. */
   format?: string;
   /** Optional native history glob/template for diagnostics only. */
@@ -723,6 +745,12 @@ export interface ProviderCanonicalHistoryConfig {
   contractVersion?: import('./transcript-v2.js').ChatContractVersion;
 }
 
+/**
+ * @deprecated Use {@link NativeHistoryConfig}. Retained as an alias for one
+ * release so external consumers that referenced the old name keep compiling.
+ */
+export type ProviderCanonicalHistoryConfig = NativeHistoryConfig;
+
 /**
  * Auto-implement spawn config — controls how the provider is spawned for autonomous AI-driven
  * provider script implementation (dev-auto-implement.ts).