@viewportai/daemon 0.2.0 → 0.2.1

package/README.md

@@ -17,7 +17,7 @@ Runtime supervision and orchestration layer for AI coding agents.
 ## One Command Install
 
 ```bash
-curl -fsSL https://raw.githubusercontent.com/viewportai/daemon/main/scripts/install.sh | bash
+curl -fsSL https://raw.githubusercontent.com/viewportai/viewport/main/packages/daemon/scripts/install.sh | bash
 ```
 
 This installs `@viewportai/daemon` globally, then runs `vpd setup`.
@@ -34,6 +34,8 @@ Local development link mode:
 ./scripts/install-dev.sh --link --yes --no-service --no-prereqs --no-hooks
 ```
 
+Link mode is for active daemon development when you want the repo checkout to become the global `vpd` binary. For release-confidence validation, prefer the tarball path through `npm run verify:install`.
+
 Local uninstall/reinstall:
 
 ```bash
@@ -123,13 +125,13 @@ npm run check
 # manual verification test (no service or package installs)
 VIEWPORT_HOME="$(mktemp -d)" vpd setup --yes --no-service --no-prereqs --no-hooks
 
-# full local environment verification (isolated home + dedicated listen target)
+# full local environment verification (temporary config dir + dedicated listen target)
 npm run verify:env
 
 # include OS service checks (launchd/systemd)
 npm run verify:env:service
 
-# package/install verification from local tarball in isolated prefix
+# package/install verification from local tarball in a temporary npm prefix
 npm run verify:install
 
 # one-command verification gate
@@ -144,14 +146,24 @@ npm run verify:linux:ci
 1. Semantic commits (`feat:`, `fix:`, `refactor:`, `test:`, `docs:`, `chore:`).
 2. One logical change per commit.
 3. Changes to protocol or runtime behavior require matching tests.
+4. Branch names use semantic prefixes with concise kebab-case descriptions (`feat/...`, `fix/...`, `docs/...`).
+5. PR titles use semantic commit format with an optional scope (`feat(runtime): ...`, `fix(daemon): ...`).
+6. Do not use roadmap labels or temporary agent labels in branches or PR titles.
 
 ## Release
 
 This package publishes as `@viewportai/daemon`.
 
-1. Merge semantic commits to `main`.
-2. CI must pass.
-3. Release workflow computes version (`feat` => minor, `fix` => patch, `BREAKING CHANGE` => major), tags, and publishes to npm using `NPM_TOKEN`.
+Package release mechanics are maintainer-owned. Feature PRs should stay focused on code, tests, and docs unless the PR is explicitly intended to cut a package release.
+
+When a release is intentionally being prepared, use the repo's current publish workflow from `main` and validate the built CLI before shipping.
+
+Runtime config follows one simple rule:
+
+- global defaults live in `~/.viewport/config.json`
+- the nearest project `.viewport/config.json` can override selected daemon targets like server or relay
+- `vpd doctor` will tell you whether that override was chosen explicitly or simply because it was the nearest ancestor config
+- environment variables and CLI flags are temporary overrides, not the normal runtime model
 
 See [docs/releasing.md](./docs/releasing.md) for setup and operations.
 See [docs/testing.md](./docs/testing.md) and [docs/developer-workflows.md](./docs/developer-workflows.md) for local validation workflows.

package/bin/vpd.js

@@ -1,3 +1,2 @@
 #!/usr/bin/env node
-
 import '../dist/index.js';

package/dist/adapters/claude-message-normalizer.d.ts

@@ -0,0 +1,24 @@
+import type { SessionMessage } from '../core/types.js';
+/**
+ * Minimal shape of SDK messages we need to handle.
+ * The actual SDK has 22+ message types; this boundary intentionally accepts the
+ * loose SDK surface and emits the daemon's typed SessionMessage events.
+ */
+export interface SDKRawMessage {
+    type: string;
+    subtype?: string;
+    [key: string]: any;
+}
+export interface AssistantNormalizationResult {
+    messages: SessionMessage[];
+    poisonedHistoryDetected: boolean;
+}
+export declare function normalizeSystemMessage(msg: SDKRawMessage, now: number, sessionId: string): SessionMessage[] | null;
+export declare function normalizeAssistantMessage(msg: SDKRawMessage, now: number): AssistantNormalizationResult | null;
+export declare function normalizeUserMessage(msg: SDKRawMessage, now: number): SessionMessage[] | null;
+export declare function extractToolResultText(block: SDKRawMessage): string;
+export declare function normalizeStreamEvent(msg: SDKRawMessage, now: number): SessionMessage[] | null;
+export declare function normalizeToolProgressMessage(msg: SDKRawMessage, now: number): SessionMessage[];
+export declare function isPoisonedHistoryApiError(text: string): boolean;
+export declare function resultErrorDetail(msg: SDKRawMessage): string | undefined;
+//# sourceMappingURL=claude-message-normalizer.d.ts.map

package/dist/adapters/claude-message-normalizer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-message-normalizer.d.ts","sourceRoot":"","sources":["../../src/adapters/claude-message-normalizer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD;;;;GAIG;AACH,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC;CACpB;AAED,MAAM,WAAW,4BAA4B;IAC3C,QAAQ,EAAE,cAAc,EAAE,CAAC;IAC3B,uBAAuB,EAAE,OAAO,CAAC;CAClC;AAED,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,EACX,SAAS,EAAE,MAAM,GAChB,cAAc,EAAE,GAAG,IAAI,CAyBzB;AAED,wBAAgB,yBAAyB,CACvC,GAAG,EAAE,aAAa,EAClB,GAAG,EAAE,MAAM,GACV,4BAA4B,GAAG,IAAI,CA2CrC;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,GAAG,IAAI,CAsB7F;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,CAclE;AAED,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,GAAG,IAAI,CA0C7F;AAED,wBAAgB,4BAA4B,CAAC,GAAG,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,cAAc,EAAE,CAW9F;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAM/D;AAED,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAsBxE"}

package/dist/adapters/claude-message-normalizer.js

@@ -0,0 +1,192 @@
+import { toToolCallDetail } from '../core/types.js';
+export function normalizeSystemMessage(msg, now, sessionId) {
+    switch (msg.subtype) {
+        case 'init':
+            return [
+                {
+                    type: 'system_status',
+                    status: 'initialized',
+                    sessionId: msg.session_id ?? sessionId,
+                    timestamp: now,
+                },
+            ];
+        case 'status':
+            return [
+                {
+                    type: 'system_status',
+                    status: msg.status ?? 'unknown',
+                    sessionId,
+                    timestamp: now,
+                },
+            ];
+        default:
+            return null;
+    }
+}
+export function normalizeAssistantMessage(msg, now) {
+    if (msg.isReplay)
+        return null;
+    const betaMessage = msg.message;
+    if (!betaMessage?.content)
+        return null;
+    const messages = [];
+    let poisonedHistoryDetected = false;
+    for (const block of betaMessage.content) {
+        if (block.type === 'text') {
+            const text = typeof block.text === 'string' ? block.text : '';
+            if (text.length === 0)
+                continue;
+            messages.push({
+                type: 'agent_message',
+                text,
+                messageId: msg.uuid ?? `msg-${now}`,
+                timestamp: now,
+            });
+            poisonedHistoryDetected ||= isPoisonedHistoryApiError(text);
+        }
+        else if (block.type === 'thinking') {
+            messages.push({
+                type: 'agent_thought_chunk',
+                text: block.thinking ?? '',
+                messageId: msg.uuid ?? `thought-${now}`,
+                timestamp: now,
+            });
+        }
+        else if (block.type === 'tool_use') {
+            const input = block.input;
+            messages.push({
+                type: 'tool_call',
+                toolCallId: block.id,
+                toolName: block.name,
+                title: block.name,
+                input,
+                detail: toToolCallDetail(block.name, input),
+                status: 'in_progress',
+                timestamp: now,
+            });
+        }
+    }
+    return messages.length > 0 ? { messages, poisonedHistoryDetected } : null;
+}
+export function normalizeUserMessage(msg, now) {
+    if (msg.isReplay)
+        return null;
+    const messages = [];
+    const content = msg.message?.content;
+    if (Array.isArray(content)) {
+        for (const block of content) {
+            if (block.type === 'tool_result') {
+                const output = extractToolResultText(block);
+                messages.push({
+                    type: 'tool_call_update',
+                    toolCallId: block.tool_use_id ?? 'unknown',
+                    status: block.is_error ? 'error' : 'completed',
+                    output,
+                    timestamp: now,
+                });
+            }
+        }
+    }
+    return messages.length > 0 ? messages : null;
+}
+export function extractToolResultText(block) {
+    const content = block.content;
+    if (typeof content === 'string')
+        return content;
+    if (Array.isArray(content)) {
+        return content
+            .map((c) => {
+            if (c.type === 'text')
+                return c.text ?? '';
+            if (c.type === 'image')
+                return '[image]';
+            return '';
+        })
+            .filter(Boolean)
+            .join('\n');
+    }
+    return '';
+}
+export function normalizeStreamEvent(msg, now) {
+    const event = msg.event;
+    if (!event)
+        return null;
+    if (event.type === 'content_block_delta' && event.delta?.type === 'text_delta') {
+        return [
+            {
+                type: 'agent_message_chunk',
+                text: event.delta.text,
+                messageId: msg.uuid ?? `chunk-${now}`,
+                timestamp: now,
+            },
+        ];
+    }
+    if (event.type === 'content_block_delta' && event.delta?.type === 'thinking_delta') {
+        return [
+            {
+                type: 'agent_thought_chunk',
+                text: event.delta.thinking ?? '',
+                messageId: msg.uuid ?? `thought-${now}`,
+                timestamp: now,
+            },
+        ];
+    }
+    if (event.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
+        return [
+            {
+                type: 'tool_call',
+                toolCallId: event.content_block.id,
+                toolName: event.content_block.name,
+                title: event.content_block.name,
+                input: {},
+                detail: toToolCallDetail(event.content_block.name, {}),
+                status: 'in_progress',
+                timestamp: now,
+            },
+        ];
+    }
+    return null;
+}
+export function normalizeToolProgressMessage(msg, now) {
+    return [
+        {
+            type: 'tool_call_update',
+            toolCallId: msg.tool_use_id ?? 'unknown',
+            toolName: msg.tool_name,
+            status: 'completed',
+            title: `Progress: ${msg.elapsed_time_seconds}s`,
+            timestamp: now,
+        },
+    ];
+}
+export function isPoisonedHistoryApiError(text) {
+    const normalized = text.toLowerCase();
+    return (normalized.includes('messages: text content blocks must be non-empty') ||
+        normalized.includes('cache_control cannot be set for empty text blocks'));
+}
+export function resultErrorDetail(msg) {
+    if (Array.isArray(msg.errors) && msg.errors.length > 0) {
+        const first = msg.errors[0];
+        if (typeof first === 'string' && first.trim().length > 0) {
+            return first.trim();
+        }
+    }
+    if (typeof msg.result === 'string' && msg.result.trim().length > 0) {
+        return msg.result.trim();
+    }
+    if (typeof msg.error === 'string' && msg.error.trim().length > 0) {
+        return msg.error.trim();
+    }
+    if (msg.error && typeof msg.error === 'object') {
+        try {
+            const serialized = JSON.stringify(msg.error);
+            if (serialized.length > 0)
+                return serialized;
+        }
+        catch {
+            // ignore serialization errors
+        }
+    }
+    return undefined;
+}
+//# sourceMappingURL=claude-message-normalizer.js.map

package/dist/adapters/claude-message-normalizer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"claude-message-normalizer.js","sourceRoot":"","sources":["../../src/adapters/claude-message-normalizer.ts"],"names":[],"mappings":"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"}

package/dist/adapters/claude.d.ts

@@ -9,21 +9,13 @@
 import { EventEmitter } from 'node:events';
 import type { AgentAdapter, Session, SessionOptions, PermissionHandler } from '../core/interfaces.js';
 import type { SessionState } from '../core/types.js';
+import { type SDKRawMessage } from './claude-message-normalizer.js';
 /** Minimal shape of the SDK's query() return value. */
 interface SDKQuery {
     [Symbol.asyncIterator](): AsyncIterator<SDKRawMessage, void>;
     interrupt(): Promise<void>;
     close(): void;
 }
-/**
- * Minimal shape of SDK messages we need to handle.
- * The actual SDK has 22+ message types — we normalize the ones we care about.
- */
-interface SDKRawMessage {
-    type: string;
-    subtype?: string;
-    [key: string]: any;
-}
 /** SDK's canUseTool callback signature. */
 type SDKCanUseTool = (toolName: string, input: Record<string, unknown>, options: {
     signal: AbortSignal;
@@ -81,23 +73,9 @@ export declare class ClaudeSession extends EventEmitter implements Session {
      * Returns null for messages we don't care about.
      */
     private normalizeMessage;
-    private normalizeSystemMessage;
     private normalizeAssistantMessage;
-    /**
-     * Normalize SDK 'user' messages — these carry tool results.
-     *
-     * The SDK sends tool execution results as user messages with a
-     * `tool_use_result` field containing the output, and the `message.content`
-     * array contains `tool_result` blocks.
-     */
-    private normalizeUserMessage;
-    /** Extract human-readable text from a tool_result content block. */
-    private extractToolResultText;
-    private normalizeStreamEvent;
     private normalizeResultMessage;
-    private isPoisonedHistoryApiError;
     private endPoisonedHistorySession;
-    private resultErrorDetail;
     private wrapCanUseTool;
     private emitLocalUserPrompt;
     private emitSessionMessage;

package/dist/adapters/claude.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/adapters/claude.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"claude.d.ts","sourceRoot":"","sources":["../../src/adapters/claude.ts"],"names":[],"mappings":"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"}

package/dist/adapters/claude.js

@@ -7,9 +7,9 @@
  * event-based permission system.
  */
 import { EventEmitter } from 'node:events';
-import { toToolCallDetail } from '../core/types.js';
 import { logger } from '../core/logger.js';
 import { metrics } from '../core/metrics.js';
+import { normalizeAssistantMessage, normalizeStreamEvent, normalizeSystemMessage, normalizeToolProgressMessage, normalizeUserMessage, resultErrorDetail, } from './claude-message-normalizer.js';
 const log = logger.child({ module: 'claude' });
 // ---------------------------------------------------------------------------
 // ClaudeSession
@@ -225,200 +225,37 @@ export class ClaudeSession extends EventEmitter {
         const now = Date.now();
         switch (msg.type) {
             case 'system':
-                return this.normalizeSystemMessage(msg, now);
+                return normalizeSystemMessage(msg, now, this.id);
             case 'assistant':
                 return this.normalizeAssistantMessage(msg, now);
             case 'user':
-                return this.normalizeUserMessage(msg, now);
+                return normalizeUserMessage(msg, now);
             case 'stream_event':
-                return this.normalizeStreamEvent(msg, now);
+                return normalizeStreamEvent(msg, now);
             case 'result':
                 return this.normalizeResultMessage(msg, now);
             case 'tool_progress':
-                return [
-                    {
-                        type: 'tool_call_update',
-                        toolCallId: msg.tool_use_id ?? 'unknown',
-                        toolName: msg.tool_name,
-                        status: 'completed',
-                        title: `Progress: ${msg.elapsed_time_seconds}s`,
-                        timestamp: now,
-                    },
-                ];
-            default:
-                return null;
-        }
-    }
-    normalizeSystemMessage(msg, now) {
-        switch (msg.subtype) {
-            case 'init':
-                return [
-                    {
-                        type: 'system_status',
-                        status: 'initialized',
-                        sessionId: msg.session_id ?? this.id,
-                        timestamp: now,
-                    },
-                ];
-            case 'status':
-                return [
-                    {
-                        type: 'system_status',
-                        status: msg.status ?? 'unknown',
-                        sessionId: this.id,
-                        timestamp: now,
-                    },
-                ];
+                return normalizeToolProgressMessage(msg, now);
             default:
                 return null;
         }
     }
     normalizeAssistantMessage(msg, now) {
-        // Skip replay messages from session history (same as normalizeUserMessage)
-        if (msg.isReplay)
-            return null;
-        const betaMessage = msg.message;
-        if (!betaMessage?.content)
-            return null;
-        const messages = [];
-        for (const block of betaMessage.content) {
-            if (block.type === 'text') {
-                const text = typeof block.text === 'string' ? block.text : '';
-                if (text.length === 0)
-                    continue;
-                messages.push({
-                    type: 'agent_message',
-                    text,
-                    messageId: msg.uuid ?? `msg-${now}`,
-                    timestamp: now,
-                });
-                if (this.isPoisonedHistoryApiError(text) && !this.endedForPoisonedHistory) {
-                    messages.push({
-                        type: 'system_status',
-                        status: 'error: session history is corrupted (empty text block). Start a new session.',
-                        sessionId: this.id,
-                        timestamp: now,
-                    });
-                    queueMicrotask(() => {
-                        this.endPoisonedHistorySession();
-                    });
-                }
-            }
-            else if (block.type === 'thinking') {
-                messages.push({
-                    type: 'agent_thought_chunk',
-                    text: block.thinking ?? '',
-                    messageId: msg.uuid ?? `thought-${now}`,
-                    timestamp: now,
-                });
-            }
-            else if (block.type === 'tool_use') {
-                const input = block.input;
-                messages.push({
-                    type: 'tool_call',
-                    toolCallId: block.id,
-                    toolName: block.name,
-                    title: block.name,
-                    input,
-                    detail: toToolCallDetail(block.name, input),
-                    status: 'in_progress',
-                    timestamp: now,
-                });
-            }
-        }
-        return messages.length > 0 ? messages : null;
-    }
-    /**
-     * Normalize SDK 'user' messages — these carry tool results.
-     *
-     * The SDK sends tool execution results as user messages with a
-     * `tool_use_result` field containing the output, and the `message.content`
-     * array contains `tool_result` blocks.
-     */
-    normalizeUserMessage(msg, now) {
-        // Skip replay messages from session history
-        if (msg.isReplay)
-            return null;
-        const messages = [];
-        const content = msg.message?.content;
-        if (Array.isArray(content)) {
-            for (const block of content) {
-                if (block.type === 'tool_result') {
-                    const output = this.extractToolResultText(block);
-                    messages.push({
-                        type: 'tool_call_update',
-                        toolCallId: block.tool_use_id ?? 'unknown',
-                        status: block.is_error ? 'error' : 'completed',
-                        output,
-                        timestamp: now,
-                    });
-                }
-            }
-        }
-        return messages.length > 0 ? messages : null;
-    }
-    /** Extract human-readable text from a tool_result content block. */
-    extractToolResultText(block) {
-        const content = block.content;
-        if (typeof content === 'string')
-            return content;
-        if (Array.isArray(content)) {
-            return content
-                .map((c) => {
-                if (c.type === 'text')
-                    return c.text ?? '';
-                if (c.type === 'image')
-                    return '[image]';
-                return '';
-            })
-                .filter(Boolean)
-                .join('\n');
-        }
-        return '';
-    }
-    normalizeStreamEvent(msg, now) {
-        const event = msg.event;
-        if (!event)
+        const result = normalizeAssistantMessage(msg, now);
+        if (!result)
             return null;
-        // Text streaming
-        if (event.type === 'content_block_delta' && event.delta?.type === 'text_delta') {
-            return [
-                {
-                    type: 'agent_message_chunk',
-                    text: event.delta.text,
-                    messageId: msg.uuid ?? `chunk-${now}`,
-                    timestamp: now,
-                },
-            ];
-        }
-        // Thinking streaming
-        if (event.type === 'content_block_delta' && event.delta?.type === 'thinking_delta') {
-            return [
-                {
-                    type: 'agent_thought_chunk',
-                    text: event.delta.thinking ?? '',
-                    messageId: msg.uuid ?? `thought-${now}`,
-                    timestamp: now,
-                },
-            ];
-        }
-        // Tool use input streaming — track tool_use block start
-        // Note: input is empty at this point; detail will be enriched on tool_call_update
-        if (event.type === 'content_block_start' && event.content_block?.type === 'tool_use') {
-            return [
-                {
-                    type: 'tool_call',
-                    toolCallId: event.content_block.id,
-                    toolName: event.content_block.name,
-                    title: event.content_block.name,
-                    input: {},
-                    detail: toToolCallDetail(event.content_block.name, {}),
-                    status: 'in_progress',
-                    timestamp: now,
-                },
-            ];
+        if (result.poisonedHistoryDetected && !this.endedForPoisonedHistory) {
+            result.messages.push({
+                type: 'system_status',
+                status: 'error: session history is corrupted (empty text block). Start a new session.',
+                sessionId: this.id,
+                timestamp: now,
+            });
+            queueMicrotask(() => {
+                this.endPoisonedHistorySession();
+            });
         }
-        return null;
+        return result.messages;
     }
     normalizeResultMessage(msg, now) {
         const messages = [];
@@ -439,9 +276,7 @@ export class ClaudeSession extends EventEmitter {
         }
         messages.push({
             type: 'system_status',
-            status: msg.subtype === 'success'
-                ? 'completed'
-                : `error: ${this.resultErrorDetail(msg) ?? msg.subtype}`,
+            status: msg.subtype === 'success' ? 'completed' : `error: ${resultErrorDetail(msg) ?? msg.subtype}`,
             sessionId: msg.session_id ?? this.id,
             timestamp: now,
         });
@@ -455,11 +290,6 @@ export class ClaudeSession extends EventEmitter {
         }
         return messages;
     }
-    isPoisonedHistoryApiError(text) {
-        const normalized = text.toLowerCase();
-        return (normalized.includes('messages: text content blocks must be non-empty') ||
-            normalized.includes('cache_control cannot be set for empty text blocks'));
-    }
     endPoisonedHistorySession() {
         if (this.endedForPoisonedHistory)
             return;
@@ -473,31 +303,6 @@ export class ClaudeSession extends EventEmitter {
         this.setState('completed');
         this.emit('ended', 'history_poisoned');
     }
-    resultErrorDetail(msg) {
-        if (Array.isArray(msg.errors) && msg.errors.length > 0) {
-            const first = msg.errors[0];
-            if (typeof first === 'string' && first.trim().length > 0) {
-                return first.trim();
-            }
-        }
-        if (typeof msg.result === 'string' && msg.result.trim().length > 0) {
-            return msg.result.trim();
-        }
-        if (typeof msg.error === 'string' && msg.error.trim().length > 0) {
-            return msg.error.trim();
-        }
-        if (msg.error && typeof msg.error === 'object') {
-            try {
-                const serialized = JSON.stringify(msg.error);
-                if (serialized.length > 0)
-                    return serialized;
-            }
-            catch {
-                // ignore serialization errors
-            }
-        }
-        return undefined;
-    }
     wrapCanUseTool(handler) {
         return async (toolName, input, options) => {
             const context = {
@@ -608,7 +413,7 @@ export class ClaudeAdapter {
         const sessionId = crypto.randomUUID();
         log.info({ sessionId, cwd }, 'ClaudeAdapter.startSession');
         const session = new ClaudeSession(sessionId, this.queryFn, options?.canUseTool);
-        await session.start(options?.initialPrompt ?? '', cwd, options);
+        await session.start(options?.deferInitialPrompt ? '' : (options?.initialPrompt ?? ''), cwd, options);
         return session;
     }
     async resumeSession(sessionId, cwd, options) {