@adhdev/daemon-core 0.8.52 → 0.8.54

package/src/commands/handler.ts

@@ -416,10 +416,6 @@ export class DaemonCommandHandler implements CommandHelpers {
             'pty_input',
             'pty_resize',
             'invoke_provider_script',
-            'list_extension_models',
-            'set_extension_model',
-            'list_extension_modes',
-            'set_extension_mode',
         ]);
 
         if (this._currentRoute.sessionLookupFailed && sessionScopedCommands.has(cmd)) {
@@ -511,12 +507,8 @@ export class DaemonCommandHandler implements CommandHelpers {
             case 'get_ide_extensions': return Stream.handleGetIdeExtensions(this, args);
             case 'set_ide_extension': return Stream.handleSetIdeExtension(this, args);
 
-            // ─── Extension Model / Mode Control (stream-commands.ts) ──────────
+            // ─── Provider control execution (stream-commands.ts) ──────────
             case 'invoke_provider_script': return Stream.handleProviderScript(this, args);
-            case 'list_extension_models': return Stream.handleExtensionScript(this, args, 'listModels');
-            case 'set_extension_model': return Stream.handleExtensionScript(this, args, 'setModel');
-            case 'list_extension_modes': return Stream.handleExtensionScript(this, args, 'listModes');
-            case 'set_extension_mode': return Stream.handleExtensionScript(this, args, 'setMode');
 
             // ─── Provider Auto-Fix / Clone (DevServer proxy) ──────────
             case 'provider_auto_fix': return this.proxyDevServerPost(args, 'auto-implement');

package/src/commands/stream-commands.ts

@@ -6,6 +6,12 @@
 import type { CommandResult, CommandHelpers } from './handler.js';
 import type { ProviderLoader } from '../providers/provider-loader.js';
 import type { ProviderInstance } from '../providers/provider-instance.js';
+import { getCliScriptCommand, parseCliScriptResult } from '../providers/cli-script-results.js';
+import {
+    normalizeControlInvokeResult,
+    normalizeControlListResult,
+    normalizeControlSetResult,
+} from '../providers/control-effects.js';
 import { LOG } from '../logging/logger.js';
 
 interface CliPresentationInstance extends ProviderInstance {
@@ -113,42 +119,22 @@ function normalizeProviderScriptArgs(args: any): Record<string, any> {
     return normalizedArgs;
 }
 
-function parseScriptResult(result: unknown): { success: boolean; payload: any } {
-    if (typeof result === 'string') {
-        try {
-            const parsed = JSON.parse(result);
-            if (parsed && typeof parsed === 'object' && parsed.success === false) {
-                return { success: false, payload: parsed };
-            }
-            return { success: true, payload: parsed };
-        } catch {
-            return { success: true, payload: { result } };
-        }
-    }
-    if (result && typeof result === 'object' && 'success' in result && result.success === false) {
-        return { success: false, payload: result };
+function buildControlScriptResult(scriptName: string, payload: any): Record<string, unknown> {
+    if (!payload || typeof payload !== 'object') return {};
+    if (Array.isArray(payload.options) || Array.isArray(payload.models) || Array.isArray(payload.modes)) {
+        return { controlResult: normalizeControlListResult(payload) };
     }
-    return { success: true, payload: result };
-}
-
-function getCliScriptCommand(payload: any): { type: string; text?: string } | null {
-    if (!payload || typeof payload !== 'object') return null;
 
-    if (typeof payload.sendMessage === 'string' && payload.sendMessage.trim()) {
-        return { type: 'send_message', text: payload.sendMessage.trim() };
+    const looksLikeValueMutation = /^set|^change/i.test(scriptName)
+        || payload.currentValue !== undefined
+        || payload.value !== undefined;
+    if (looksLikeValueMutation) {
+        return { controlResult: normalizeControlSetResult(payload) };
     }
-
-    const command = payload.command;
-    if (!command || typeof command !== 'object') return null;
-    if (command.type !== 'send_message' && command.type !== 'pty_write') return null;
-
-    const text = typeof command.text === 'string'
-        ? command.text.trim()
-        : typeof command.message === 'string'
-            ? command.message.trim()
-            : '';
-    if (!text) return null;
-    return { type: command.type, text };
+    if (payload.ok !== undefined || payload.success !== undefined || Array.isArray(payload.effects)) {
+        return { controlResult: normalizeControlInvokeResult(payload) };
+    }
+    return {};
 }
 
 function applyProviderPatch(h: CommandHelpers, args: any, payload: any): void {
@@ -195,7 +181,7 @@ async function executeProviderScript(h: CommandHelpers, args: any, scriptName: s
         }
         try {
             const raw = await adapter.invokeScript(actualScriptName, normalizedArgs);
-            const parsed = parseScriptResult(raw);
+            const parsed = parseCliScriptResult(raw);
             if (!parsed.success) {
                 return { success: false, ...(parsed.payload || {}) };
             }
@@ -206,7 +192,11 @@ async function executeProviderScript(h: CommandHelpers, args: any, scriptName: s
                 adapter.writeRaw(cliCommand.text + '\r');
             }
             applyProviderPatch(h, args, parsed.payload);
-            return { success: true, ...(parsed.payload && typeof parsed.payload === 'object' ? parsed.payload : { result: parsed.payload }) };
+            return {
+                success: true,
+                ...(parsed.payload && typeof parsed.payload === 'object' ? parsed.payload : { result: parsed.payload }),
+                ...buildControlScriptResult(scriptName, parsed.payload),
+            };
         } catch (e: any) {
             return { success: false, error: `Script execution failed: ${e.message}` };
         }
@@ -282,7 +272,7 @@ async function executeProviderScript(h: CommandHelpers, args: any, scriptName: s
                 if (parsed && typeof parsed === 'object' && parsed.success === false) {
                     return { success: false, ...parsed };
                 }
-                return { success: true, ...parsed };
+                return { success: true, ...parsed, ...buildControlScriptResult(scriptName, parsed) };
             } catch {
                 return { success: true, result };
             }

package/src/daemon/dev-server.ts

@@ -21,6 +21,7 @@ import * as path from 'path';
 import * as os from 'os';
 import type { ProviderLoader } from '../providers/provider-loader.js';
 import type { ProviderCategory, ProviderModule, ProviderScripts, ProviderSettingDef } from '../providers/contracts.js';
+import { validateProviderDefinition } from '../providers/provider-schema.js';
 import type { ChildProcess } from 'child_process';
 import type { DaemonCdpManager } from '../cdp/manager.js';
 import type { ProviderInstanceManager } from '../providers/provider-instance-manager.js';
@@ -773,24 +774,9 @@ export class DevServer implements DevServerContext {
     const warnings: string[] = [];
     try {
       const config = typeof content === 'string' ? JSON.parse(content) : content;
-      // Required fields
-      if (!config.type) errors.push('Missing required field: type');
-      if (!config.name) errors.push('Missing required field: name');
-      if (!config.category) errors.push('Missing required field: category');
-      else if (!['ide', 'extension', 'cli', 'acp'].includes(config.category)) errors.push(`Invalid category: ${config.category}`);
-      // Category-specific
-      if (config.category === 'ide' || config.category === 'extension') {
-        if (!config.cdpPorts || !Array.isArray(config.cdpPorts) || config.cdpPorts.length === 0)
-          warnings.push('IDE/Extension providers should have cdpPorts');
-        if (config.category === 'extension' && !config.extensionId)
-          warnings.push('Extension providers should have extensionId');
-      }
-      if (config.category === 'acp' || config.category === 'cli') {
-        if (!config.spawn) errors.push('ACP/CLI providers must have spawn config');
-        else {
-          if (!config.spawn.command) errors.push('spawn.command is required');
-        }
-      }
+      const validation = validateProviderDefinition(config);
+      errors.push(...validation.errors);
+      warnings.push(...validation.warnings);
       // Settings validation
       if (config.settings) {
         for (const [key, val] of Object.entries(config.settings)) {

package/src/index.d.ts

@@ -76,6 +76,9 @@ export type { PtyRuntimeTransport, PtyTransportFactory, PtySpawnOptions } from '
 export { SessionHostPtyTransportFactory } from './cli-adapters/session-host-transport.js';
 export type { HostedCliRuntimeDescriptor, CliTransportFactoryParams } from './commands/cli-manager.js';
 export { ensureSessionHostReady, listHostedCliRuntimes } from './session-host/runtime-support.js';
+export { getSessionHostRecoveryLabel, getSessionHostSurfaceKind, isSessionHostLiveRuntime, isSessionHostRecoverySnapshot, partitionSessionHostDiagnosticsSessions, partitionSessionHostRecords, } from './session-host/runtime-surface.js';
+export type { SessionHostSurfaceKind, SessionHostSurfaceRecordLike } from './session-host/runtime-surface.js';
+export { shouldAutoRestoreHostedSessionsOnStartup } from './session-host/startup-restore-policy.js';
 export type { SessionHostEndpoint } from '@adhdev/session-host-core';
 export { getAIExtensions, installExtensions, launchIDE, isExtensionInstalled } from './installer.js';
 export type { ExtensionInfo as InstallerExtensionInfo } from './installer.js';

package/src/index.ts

@@ -194,7 +194,8 @@ export { ProviderInstanceManager } from './providers/provider-instance-manager.j
 export { IdeProviderInstance } from './providers/ide-provider-instance.js';
 export { CliProviderInstance } from './providers/cli-provider-instance.js';
 export { AcpProviderInstance } from './providers/acp-provider-instance.js';
-export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability } from './providers/contracts.js';
+export type { ProviderModule, CdpTargetFilter, ProviderResumeCapability, InputEnvelope, InputPart, MessagePart, ControlListResult, ControlSetResult, ControlInvokeResult } from './providers/contracts.js';
+export { normalizeInputEnvelope, normalizeMessageParts, flattenMessageParts } from './providers/io-contracts.js';
 export { VersionArchive, detectAllVersions } from './providers/version-archive.js';
 export type { ProviderVersionInfo, VersionHistory } from './providers/version-archive.js';
 
@@ -214,6 +215,16 @@ export {
   resolveSessionHostAppName,
 } from './session-host/app-name.js';
 export { ensureSessionHostReady, listHostedCliRuntimes } from './session-host/runtime-support.js';
+export {
+  getSessionHostRecoveryLabel,
+  getSessionHostSurfaceKind,
+  isSessionHostLiveRuntime,
+  isSessionHostRecoverySnapshot,
+  partitionSessionHostDiagnosticsSessions,
+  partitionSessionHostRecords,
+} from './session-host/runtime-surface.js';
+export type { SessionHostSurfaceKind, SessionHostSurfaceRecordLike } from './session-host/runtime-surface.js';
+export { shouldAutoRestoreHostedSessionsOnStartup } from './session-host/startup-restore-policy.js';
 export type { SessionHostEndpoint } from '@adhdev/session-host-core';
 
 // ── Installer ──

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

@@ -15,6 +15,7 @@
  * 5. dispose() → kill process
  */
 
+import * as path from 'path';
 import { Readable, Writable } from 'stream';
 import { spawn, type ChildProcess } from 'child_process';
 import {
@@ -45,8 +46,8 @@ import {
     type ToolCallStatus,
     type SessionConfigOption,
 } from '@agentclientprotocol/sdk';
-import type { ProviderModule, ContentBlock, ToolCallInfo, ToolCallContent as TCC, ToolKind, ToolCallStatus as TCS } from './contracts.js';
-import { normalizeContent, flattenContent } from './contracts.js';
+import type { ProviderModule, ContentBlock, InputEnvelope, InputPart, ToolCallInfo, ToolCallContent as TCC, ToolKind, ToolCallStatus as TCS } from './contracts.js';
+import { normalizeContent, flattenContent, normalizeInputEnvelope } from './contracts.js';
 import type { ProviderInstance, ProviderState, AcpProviderState, ProviderErrorReason, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { StatusMonitor } from './status-monitor.js';
 import { LOG } from '../logging/logger.js';
@@ -83,6 +84,121 @@ interface AcpMode {
     description?: string;
 }
 
+interface PromptCapabilityFlags {
+    image: boolean;
+    audio: boolean;
+    embeddedContext: boolean;
+}
+
+function getPromptCapabilityFlags(agentCapabilities?: Record<string, any>): PromptCapabilityFlags {
+    const prompt = agentCapabilities?.promptCapabilities || {};
+    return {
+        image: prompt.image === true,
+        audio: prompt.audio === true,
+        embeddedContext: prompt.embeddedContext === true,
+    };
+}
+
+function getResourceNameFromUri(uri: string, fallback: string): string {
+    try {
+        if (uri.startsWith('file://')) {
+            return path.basename(new URL(uri).pathname) || fallback;
+        }
+        return path.basename(uri) || fallback;
+    } catch {
+        return fallback;
+    }
+}
+
+function inputPartToResourceLink(part: Extract<InputPart, { type: 'image' | 'audio' | 'video' | 'resource' }>, fallbackName: string): ContentBlock | null {
+    if (!part.uri) return null;
+    return {
+        type: 'resource_link',
+        uri: part.uri,
+        name: getResourceNameFromUri(part.uri, fallbackName),
+        ...(part.mimeType ? { mimeType: part.mimeType } : {}),
+    };
+}
+
+function appendPromptText(promptParts: ContentBlock[], text: string | undefined): void {
+    const normalized = typeof text === 'string' ? text.trim() : '';
+    if (!normalized) return;
+    const last = promptParts[promptParts.length - 1];
+    if (last?.type === 'text' && last.text === normalized) return;
+    promptParts.push({ type: 'text', text: normalized });
+}
+
+export function buildAcpPromptParts(input: InputEnvelope, agentCapabilities?: Record<string, any>): ContentBlock[] {
+    const caps = getPromptCapabilityFlags(agentCapabilities);
+    const promptParts: ContentBlock[] = [];
+
+    for (const part of input.parts) {
+        if (part.type === 'text') {
+            promptParts.push({ type: 'text', text: part.text });
+            continue;
+        }
+
+        if (part.type === 'image') {
+            if (caps.image && part.data) {
+                promptParts.push({
+                    type: 'image',
+                    data: part.data,
+                    mimeType: part.mimeType,
+                    ...(part.uri ? { uri: part.uri } : {}),
+                });
+                continue;
+            }
+            const fallback = inputPartToResourceLink(part, 'image');
+            if (fallback) promptParts.push(fallback);
+            appendPromptText(promptParts, part.alt || (!part.uri ? `Attached image (${part.mimeType})` : undefined));
+            continue;
+        }
+
+        if (part.type === 'audio') {
+            if (caps.audio && part.data) {
+                promptParts.push({
+                    type: 'audio',
+                    data: part.data,
+                    mimeType: part.mimeType,
+                });
+                continue;
+            }
+            const fallback = inputPartToResourceLink(part, 'audio');
+            if (fallback) promptParts.push(fallback);
+            appendPromptText(promptParts, part.transcript || (!part.uri ? `Attached audio (${part.mimeType})` : undefined));
+            continue;
+        }
+
+        if (part.type === 'resource') {
+            if (caps.embeddedContext && (part.text || part.data)) {
+                promptParts.push({
+                    type: 'resource',
+                    resource: part.text
+                        ? { uri: part.uri, text: part.text, mimeType: part.mimeType ?? null }
+                        : { uri: part.uri, blob: part.data || '', mimeType: part.mimeType ?? null },
+                });
+                continue;
+            }
+            const fallback = inputPartToResourceLink(part, part.name || 'resource');
+            if (fallback) promptParts.push(fallback);
+            appendPromptText(promptParts, part.text || (!part.uri && part.name ? part.name : undefined));
+            continue;
+        }
+
+        if (part.type === 'video') {
+            const fallback = inputPartToResourceLink(part, 'video');
+            if (fallback) promptParts.push(fallback);
+            appendPromptText(promptParts, !part.uri ? `Attached video (${part.mimeType})` : undefined);
+        }
+    }
+
+    if (!promptParts.some((part) => part.type === 'text') && input.textFallback) {
+        promptParts.unshift({ type: 'text', text: input.textFallback });
+    }
+
+    return promptParts;
+}
+
 // ─── AcpProviderInstance ───────────────────────────
 
 export class AcpProviderInstance implements ProviderInstance {
@@ -237,8 +353,10 @@ export class AcpProviderInstance implements ProviderInstance {
     }
 
     onEvent(event: string, data?: any): void {
-        if (event === 'send_message' && data?.text) {
-            this.sendPrompt(data.text).catch(e =>
+        if (event === 'send_message') {
+            const input = normalizeInputEnvelope(data)
+            const promptParts = buildAcpPromptParts(input, this.agentCapabilities)
+            this.sendPrompt(input.textFallback, promptParts.length > 0 ? promptParts : undefined).catch(e =>
                 this.log.warn(`[${this.type}] sendPrompt error: ${e?.message}`)
             );
         } else if (event === 'resolve_action') {
@@ -768,19 +886,36 @@ export class AcpProviderInstance implements ProviderInstance {
         }
 
  // Build prompt content
-        let promptParts: any[];
-        if (contentBlocks && contentBlocks.length > 0) {
-            // Rich content — forward ContentBlock[] as ACP prompt parts
-            promptParts = contentBlocks.map(b => {
+        const promptParts: any[] = contentBlocks && contentBlocks.length > 0
+            ? contentBlocks.map((b) => {
                 if (b.type === 'text') return { type: 'text', text: b.text };
-                if (b.type === 'image') return { type: 'image', data: b.data, mimeType: b.mimeType };
-                if (b.type === 'resource_link') return { type: 'resource_link', uri: b.uri, name: b.name };
+                if (b.type === 'image') {
+                    return {
+                        type: 'image',
+                        data: b.data,
+                        mimeType: b.mimeType,
+                        ...(b.uri ? { uri: b.uri } : {}),
+                    };
+                }
+                if (b.type === 'audio') {
+                    return {
+                        type: 'audio',
+                        data: b.data,
+                        mimeType: b.mimeType,
+                    };
+                }
+                if (b.type === 'resource_link') {
+                    return {
+                        type: 'resource_link',
+                        uri: b.uri,
+                        name: b.name,
+                        ...(b.mimeType ? { mimeType: b.mimeType } : {}),
+                    };
+                }
                 if (b.type === 'resource') return { type: 'resource', resource: b.resource };
                 return { type: 'text', text: flattenContent([b]) };
-            });
-        } else {
-            promptParts = [{ type: 'text', text }];
-        }
+            })
+            : [{ type: 'text', text }];
 
  // Add user message locally (store as ContentBlock[])
         this.messages.push({
@@ -862,6 +997,13 @@ export class AcpProviderInstance implements ProviderInstance {
                         type: 'image',
                         data: content.data,
                         mimeType: content.mimeType,
+                        ...(content.uri ? { uri: content.uri } : {}),
+                    });
+                } else if (content.type === 'audio') {
+                    this.partialBlocks.push({
+                        type: 'audio',
+                        data: content.data,
+                        mimeType: content.mimeType,
                     });
                 } else if (content.type === 'resource_link') {
                     this.partialBlocks.push({

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

@@ -10,7 +10,7 @@ import * as path from 'path';
 import * as crypto from 'crypto';
 import * as fs from 'fs';
 import { createRequire } from 'node:module';
-import type { ProviderModule } from './contracts.js';
+import { normalizeInputEnvelope, type ProviderModule } from './contracts.js';
 import type { ProviderInstance, ProviderState, ProviderEvent, InstanceContext } from './provider-instance.js';
 import { ProviderCliAdapter } from '../cli-adapters/provider-cli-adapter.js';
 import type { CliProviderModule } from '../cli-adapters/provider-cli-adapter.js';
@@ -21,6 +21,7 @@ import { LOG } from '../logging/logger.js';
 import type { ChatMessage } from '../types.js';
 import { extractProviderControlValues, normalizeProviderEffects } from './control-effects.js';
 import { formatAutoApprovalMessage, pickApprovalButton } from './approval-utils.js';
+import { getCliScriptCommand, parseCliScriptResult } from './cli-script-results.js';
 
 let CachedDatabaseSync: (new (path: string, options?: { readOnly?: boolean }) => {
     prepare(sql: string): { get(...params: Array<string | number>): unknown };
@@ -42,6 +43,29 @@ function getDatabaseSync() {
     return CachedDatabaseSync;
 }
 
+export function getForcedNewSessionScriptName(
+    provider: ProviderModule | undefined,
+    launchMode: 'new' | 'resume' | 'manual',
+): string | null {
+    if (!provider || launchMode !== 'new') return null;
+    const resume = provider.resume;
+    if (!resume?.supported) return null;
+    if (Array.isArray(resume.newSessionArgs) && resume.newSessionArgs.length > 0) return null;
+
+    const controls = Array.isArray((provider as any).controls) ? (provider as any).controls : [];
+    for (const control of controls) {
+        if (control?.type !== 'action') continue;
+        const invokeScript = typeof control?.invokeScript === 'string' ? control.invokeScript.trim() : '';
+        if (!invokeScript) continue;
+        const controlId = typeof control?.id === 'string' ? control.id.trim() : '';
+        if (controlId === 'new_session' || /^new.?session$/i.test(invokeScript)) {
+            return invokeScript;
+        }
+    }
+
+    return null;
+}
+
 export class CliProviderInstance implements ProviderInstance {
     readonly type: string;
     readonly category = 'cli' as const;
@@ -135,6 +159,7 @@ export class CliProviderInstance implements ProviderInstance {
 
  // PTY spawn
         await this.adapter.spawn();
+        await this.enforceFreshSessionLaunchIfNeeded();
         this.maybeAppendRuntimeRecoveryMessage(this.adapter.getRuntimeMetadata());
         if (this.providerSessionId) {
             this.historyWriter.compactHistorySession(this.type, this.providerSessionId);
@@ -370,10 +395,13 @@ export class CliProviderInstance implements ProviderInstance {
     }
 
     onEvent(event: string, data?: any): void {
-        if (event === 'send_message' && data?.text) {
-            void this.adapter.sendMessage(data.text).catch((e: any) => {
-                LOG.warn('CLI', `[${this.type}] send_message failed: ${e?.message || e}`);
-            });
+        if (event === 'send_message') {
+            const input = normalizeInputEnvelope(data);
+            if (input.textFallback) {
+                void this.adapter.sendMessage(input.textFallback).catch((e: any) => {
+                    LOG.warn('CLI', `[${this.type}] send_message failed: ${e?.message || e}`);
+                });
+            }
         } else if (event === 'server_connected' && data?.serverConn) {
             this.adapter.setServerConn(data.serverConn);
         } else if (event === 'resolve_action' && data) {
@@ -394,6 +422,27 @@ export class CliProviderInstance implements ProviderInstance {
     private completedDebounceTimer: NodeJS.Timeout | null = null;
     private completedDebouncePending: { chatTitle: string; duration: number; timestamp: number } | null = null;
 
+    private async enforceFreshSessionLaunchIfNeeded(): Promise<void> {
+        const scriptName = getForcedNewSessionScriptName(this.provider, this.launchMode);
+        if (!scriptName) return;
+
+        LOG.info('CLI', `[${this.type}] forcing fresh session launch via script: ${scriptName}`);
+        const raw = await this.adapter.invokeScript(scriptName, {});
+        const parsed = parseCliScriptResult(raw);
+        if (!parsed.success) {
+            throw new Error(parsed.payload?.error || `Failed to invoke fresh-session script '${scriptName}'`);
+        }
+
+        const cliCommand = getCliScriptCommand(parsed.payload);
+        if (cliCommand?.type === 'send_message' && cliCommand.text) {
+            await this.adapter.sendMessage(cliCommand.text);
+        } else if (cliCommand?.type === 'pty_write' && cliCommand.text) {
+            this.adapter.writeRaw(cliCommand.text + '\r');
+        }
+
+        this.applyProviderResponse(parsed.payload, { phase: 'immediate' });
+    }
+
     private detectStatusTransition(): void {
         const now = Date.now();
         const adapterStatus = this.adapter.getStatus();

package/src/providers/cli-script-results.ts

@@ -0,0 +1,39 @@
+export function parseCliScriptResult(result: unknown): { success: boolean; payload: any } {
+  if (typeof result === 'string') {
+    try {
+      const parsed = JSON.parse(result)
+      if (parsed && typeof parsed === 'object' && parsed.success === false) {
+        return { success: false, payload: parsed }
+      }
+      return { success: true, payload: parsed }
+    } catch {
+      return { success: true, payload: { result } }
+    }
+  }
+
+  if (result && typeof result === 'object' && 'success' in result && result.success === false) {
+    return { success: false, payload: result }
+  }
+
+  return { success: true, payload: result }
+}
+
+export function getCliScriptCommand(payload: any): { type: string; text?: string } | null {
+  if (!payload || typeof payload !== 'object') return null
+
+  if (typeof payload.sendMessage === 'string' && payload.sendMessage.trim()) {
+    return { type: 'send_message', text: payload.sendMessage.trim() }
+  }
+
+  const command = payload.command
+  if (!command || typeof command !== 'object') return null
+  if (command.type !== 'send_message' && command.type !== 'pty_write') return null
+
+  const text = typeof command.text === 'string'
+    ? command.text.trim()
+    : typeof command.message === 'string'
+      ? command.message.trim()
+      : ''
+  if (!text) return null
+  return { type: command.type, text }
+}