dsh-agy-cli 0.12.2 → 0.12.4

package/README.md

@@ -30,7 +30,7 @@
 
 - **双工具路线**：MCP 桥把 DSH 工具交给 AGY（真工具事件、过程流可视化，推荐），失败自动降级为 prompt 契约
 - **DSH 主导 harness**：工作区、审批、沙箱、上下文预算全在 DSH；AGY 只出模型
-- **流式 + 状态机**：`stdinMode: hold` 防回滚、思考链折叠、尾流交付、断连保文本
+- **流式 + 状态机**：`stdinMode: hold` 防回滚、工具步骤折叠显示（只列执行了哪些工具，不显示模型的内部思考内容）、尾流交付、断连保文本
 - **会话管理 + 历史指纹链**：resume / full 双模式，每轮成功后记录 DSH 历史指纹；resume 前本地比对前缀，检出历史被编辑/压缩/截断即废弃旧会话并从完整历史重建，delta prompt 不会落在过期上下文上；死亡会话自动重放，会话映射落盘可迁移
 - **图片输入**（experimental）：附件经图片桥落盘，由最小权限的 view_file Agent 查看
 - **配额面板与凭据保活**：loopback-only；面板显示真实双窗口配额，令牌临近过期时自动拉起官方 CLI 续期

package/dist/client.js

@@ -3846,7 +3846,7 @@ function apply(ctx) {
             observer.observe(row ?? (parent ?? root), { childList: true });
             return () => observer.disconnect();
         }, []);
-        const expanded = manualOpen ?? hostOpen ?? true;
+        const expanded = manualOpen ?? hostOpen ?? false;
         const showToast = (text, type = 'info') => {
             setToast({ text, type, id: Date.now() });
             if (toastTimerRef.current !== null)
@@ -4193,20 +4193,20 @@ function apply(ctx) {
             style: { display: 'block', color: 'var(--agy-text-primary)', fontWeight: 600, fontSize: '12.5px', marginBottom: '6px', cursor: 'help' },
             title: t('models.hint'),
         }, t('models.label')), visibilityList));
-        return h('div', { ref: cardRef, style: S.container }, h('style', null, GLOBAL_CSS), h('div', { style: S.headerCard }, h('div', { style: { display: 'flex', gap: '8px', alignItems: 'center', flexWrap: 'wrap', minWidth: 0 } }, h('span', { style: { fontWeight: 700, fontSize: '13.5px', color: 'var(--agy-text-primary)' }, title: accountAlias }, accountAlias), h('span', { style: isAuthed ? S.badgeReady : S.badgeUnready }, isAuthed ? t('status.ready') : t('status.needsAuth')), tokenLine), h('div', { style: { display: 'flex', alignItems: 'center', gap: '6px', flexShrink: 0 } }, h('button', {
+        return h('div', { ref: cardRef, style: S.container }, h('style', null, GLOBAL_CSS), h('div', { style: S.headerCard }, h('div', { style: { display: 'flex', gap: '8px', alignItems: 'center', flexWrap: 'wrap', minWidth: 0 } }, expanded ? h('span', { style: { fontWeight: 700, fontSize: '13.5px', color: 'var(--agy-text-primary)' }, title: accountAlias }, accountAlias) : null, h('span', { style: isAuthed ? S.badgeReady : S.badgeUnready }, isAuthed ? t('status.ready') : t('status.needsAuth')), expanded ? tokenLine : null), h('div', { style: { display: 'flex', alignItems: 'center', gap: '6px', flexShrink: 0 } }, h('button', {
             type: 'button',
             className: 'agy-btn',
             style: { ...S.btn, padding: '4px 7px', gap: '0', minWidth: '24px', justifyContent: 'center' },
             title: expanded ? t('panel.collapse') : t('panel.expand'),
             'aria-expanded': expanded ? 'true' : 'false',
             onClick: () => setManualOpen(!expanded),
-        }, expanded ? '▾' : '▸'), h('button', {
+        }, expanded ? '▾' : '▸'), expanded ? h('button', {
             type: 'button',
             className: 'agy-btn',
             style: { ...S.btn, gap: '4px', flexShrink: 0 },
             disabled: isBusy,
             onClick: () => void refreshQuota(),
-        }, loadingAction === 'refresh:all' ? [renderSpinner(), t('header.refreshing')] : [uiIcon('refresh', 12, 'var(--agy-text-btn)'), ` ${t('header.refreshQuota')}`]))), renderToastBanner(), expanded
+        }, loadingAction === 'refresh:all' ? [renderSpinner(), t('header.refreshing')] : [uiIcon('refresh', 12, 'var(--agy-text-btn)'), ` ${t('header.refreshQuota')}`]) : null)), renderToastBanner(), expanded
             ? h('div', { style: { display: 'contents' } }, expiredBanner, quotaCard, settingsBlock)
             : null);
     };

package/lib/agy/experimental-transport.js

@@ -1,4 +1,5 @@
 import { spawn } from 'node:child_process';
+import { buildWindowsNoConsoleLaunch } from './windows-launcher.js';
 import { randomUUID } from 'node:crypto';
 export class PersistentTransportError extends Error {
     code;
@@ -200,8 +201,9 @@ class PersistentAgyWorker {
             await this.stop('reset');
             throw new PersistentTransportError('Persistent AGY request aborted before write', 'ABORTED');
         }
-        const timeoutMs = input.timeoutMs ?? this.options.defaultRequestTimeoutMs;
-        validateInteger('timeoutMs', timeoutMs, 1, 3_600_000);
+        const timeoutMs = input.timeoutMs !== undefined
+            ? validateInteger('timeoutMs', input.timeoutMs, 1, 3_600_000)
+            : undefined;
         const maxOutputBytes = Math.min(input.maxOutputBytes ?? this.options.maxOutputBytes, this.options.maxOutputBytes);
         validateInteger('maxOutputBytes', maxOutputBytes, 1, this.options.maxOutputBytes);
         this.clearIdleTimer();
@@ -225,7 +227,9 @@ class PersistentAgyWorker {
             this.active = active;
             active.abortListener = () => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request aborted', 'ABORTED'));
             input.signal?.addEventListener('abort', active.abortListener, { once: true });
-            active.timer = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its timeout', 'TIMEOUT')), timeoutMs);
+            if (timeoutMs !== undefined) {
+                active.timer = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its timeout', 'TIMEOUT')), timeoutMs);
+            }
             void this.sendRequest(active, input.payload);
         });
     }
@@ -279,7 +283,11 @@ class PersistentAgyWorker {
             this.readyReject = reject;
         });
         try {
-            const child = spawn(this.options.executable, [...this.options.args], {
+            const args = [...this.options.args];
+            const launch = process.platform === 'win32'
+                ? buildWindowsNoConsoleLaunch(this.options.executable, args)
+                : { executable: this.options.executable, args };
+            const child = spawn(launch.executable, [...launch.args], {
                 cwd: this.options.cwd,
                 env: {
                     ...process.env,

package/lib/agy/keepalive.js

@@ -56,46 +56,46 @@ export const AGY_KEYRING_TARGET = 'gemini:antigravity';
  * 2026-10-22. Duplicated rather than imported so the keep-alive path has no
  * dependency on the HTTP layer.
  */
-const WIN_CRED_SCRIPT = `
-param($target)
-$sig = @'
-using System;
-using System.Runtime.InteropServices;
-public class WinCredKeepalive {
-  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
-  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);
-  [DllImport("advapi32.dll", SetLastError=true)]
-  public static extern void CredFree(IntPtr cred);
-  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
-  public struct CREDENTIAL {
-    public int Flags;
-    public int Type;
-    public string TargetName;
-    public string Comment;
-    public long LastWritten;
-    public int CredentialBlobSize;
-    public IntPtr CredentialBlob;
-    public int Persist;
-    public int AttributeCount;
-    public IntPtr Attributes;
-    public string TargetAlias;
-    public string UserName;
-  }
-  public static string Read(string target) {
-    IntPtr ptr;
-    if (CredRead(target, 1, 0, out ptr)) {
-      CREDENTIAL c = (CREDENTIAL)Marshal.PtrToStructure(ptr, typeof(CREDENTIAL));
-      byte[] b = new byte[c.CredentialBlobSize];
-      Marshal.Copy(c.CredentialBlob, b, 0, c.CredentialBlobSize);
-      CredFree(ptr);
-      return System.Convert.ToBase64String(b);
-    }
-    return null;
-  }
-}
-'@
-Add-Type -TypeDefinition $sig -ErrorAction SilentlyContinue
-[Console]::Out.Write([WinCredKeepalive]::Read($target))
+const WIN_CRED_SCRIPT = `
+param($target)
+$sig = @'
+using System;
+using System.Runtime.InteropServices;
+public class WinCredKeepalive {
+  [DllImport("advapi32.dll", SetLastError=true, CharSet=CharSet.Unicode)]
+  public static extern bool CredRead(string target, int type, int flags, out IntPtr credential);
+  [DllImport("advapi32.dll", SetLastError=true)]
+  public static extern void CredFree(IntPtr cred);
+  [StructLayout(LayoutKind.Sequential, CharSet=CharSet.Unicode)]
+  public struct CREDENTIAL {
+    public int Flags;
+    public int Type;
+    public string TargetName;
+    public string Comment;
+    public long LastWritten;
+    public int CredentialBlobSize;
+    public IntPtr CredentialBlob;
+    public int Persist;
+    public int AttributeCount;
+    public IntPtr Attributes;
+    public string TargetAlias;
+    public string UserName;
+  }
+  public static string Read(string target) {
+    IntPtr ptr;
+    if (CredRead(target, 1, 0, out ptr)) {
+      CREDENTIAL c = (CREDENTIAL)Marshal.PtrToStructure(ptr, typeof(CREDENTIAL));
+      byte[] b = new byte[c.CredentialBlobSize];
+      Marshal.Copy(c.CredentialBlob, b, 0, c.CredentialBlobSize);
+      CredFree(ptr);
+      return System.Convert.ToBase64String(b);
+    }
+    return null;
+  }
+}
+'@
+Add-Type -TypeDefinition $sig -ErrorAction SilentlyContinue
+[Console]::Out.Write([WinCredKeepalive]::Read($target))
 `;
 /** macOS/Linux read path: untouched, never part of the Windows hot path. */
 function readKeyringTokenStateSyncImpl() {
@@ -401,6 +401,7 @@ export async function startAgyKeepaliveRun(input) {
             executable: input.executable,
             args: buildKeepaliveArgs(input.model),
             stdinMode: 'close',
+            windowsNoConsole: true,
             ...(home === undefined ? {} : { cwd: home }),
             timeoutMs: input.timeoutMs ?? 45_000,
         });

package/lib/agy/persistent-transport.js

@@ -276,10 +276,12 @@ class PersistentAgyWorker {
             await this.stop('reset');
             throw new PersistentTransportError('Persistent AGY request aborted before write', 'ABORTED');
         }
-        const timeoutMs = input.timeoutMs ?? this.options.defaultRequestTimeoutMs;
-        validateInteger('timeoutMs', timeoutMs, 1, 3_600_000);
-        const idleTimeoutMs = input.idleTimeoutMs ?? timeoutMs;
-        validateInteger('idleTimeoutMs', idleTimeoutMs, 1, 3_600_000);
+        const timeoutMs = input.timeoutMs !== undefined
+            ? validateInteger('timeoutMs', input.timeoutMs, 1, 3_600_000)
+            : undefined;
+        const idleTimeoutMs = input.idleTimeoutMs !== undefined
+            ? validateInteger('idleTimeoutMs', input.idleTimeoutMs, 1, 3_600_000)
+            : this.options.defaultRequestTimeoutMs;
         const maxOutputBytes = Math.min(input.maxOutputBytes ?? this.options.maxOutputBytes, this.options.maxOutputBytes);
         validateInteger('maxOutputBytes', maxOutputBytes, 1, this.options.maxOutputBytes);
         this.clearIdleTimer();
@@ -305,10 +307,12 @@ class PersistentAgyWorker {
             this.active = active;
             active.abortListener = () => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request aborted', 'ABORTED'));
             input.signal?.addEventListener('abort', active.abortListener, { once: true });
-            // Two independent clocks: the wall clock is a hard ceiling, the idle clock
-            // is re-armed by every frame so a long thinking or tool pause is not a kill.
-            const wallClock = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its wall-clock timeout', 'TIMEOUT')), timeoutMs);
-            active.timer = wallClock;
+            // Idle watchdog is re-armed by every frame so a long thinking or tool pause is not a kill.
+            // Wall clock is an optional ceiling only armed when an explicit timeoutMs is requested.
+            if (timeoutMs !== undefined) {
+                const wallClock = setTimeout(() => this.failActiveAndReset(new PersistentTransportError('Persistent AGY request exceeded its wall-clock timeout', 'TIMEOUT')), timeoutMs);
+                active.timer = wallClock;
+            }
             this.touchActive(active);
             void this.sendRequest(active, input.text);
         });

package/lib/index.js

@@ -229,6 +229,7 @@ export function apply(ctx, config) {
                     // controller bundle finishes mounting, and a value captured here
                     // stays undefined for the life of the host.
                     sessionControllerLookup: () => ctx.get('sessionController'),
+                    agentsLookup: () => ctx.get('agents'),
                     ...((activeConfig.mcpToolAllowlist ?? []).length > 0 ? { toolAllowlist: activeConfig.mcpToolAllowlist } : {}),
                     serverVersion: '0.0.0',
                     logger: message => {

package/lib/mcp/bridge.d.ts

@@ -38,6 +38,10 @@ export interface DshMcpBridgeOptions {
      * agent plane). Resolving per turn removes the load-order dependency.
      */
     readonly sessionControllerLookup?: (() => DshSessionControllerLike | undefined) | undefined;
+    /** Direct Cordis agent registry lookup, resolving child/subagent sessions. */
+    readonly agentsLookup?: (() => {
+        get(sessionId: unknown): unknown;
+    } | undefined) | undefined;
     /** Optional allowlist of DSH tool names exposed to AGY. */
     readonly toolAllowlist?: readonly string[] | undefined;
     readonly serverVersion: string;

package/lib/mcp/bridge.js

@@ -174,14 +174,29 @@ async function agentOf(options, sessionHandle) {
     }
     if (sessionHandle.length === 0)
         return undefined;
-    const resolved = await controller.resolveAgent(sessionHandle).catch((error) => {
-        const rejection = subagentRejectionIn(error);
-        options.logger?.(rejection === undefined
-            ? `dsh mcp bridge: resolveAgent("${sessionHandle}") threw ${String(error)}`
-            : `dsh mcp bridge: session "${sessionHandle}" is owned by subagent routing (${rejection}); the host refuses an agent handle for a child session by design, so this turn sees the global tool view`);
-        return undefined;
-    });
-    const agent = agentIn(resolved);
+    let resolved;
+    if (controller !== undefined) {
+        resolved = await controller.resolveAgent(sessionHandle).catch((error) => {
+            const rejection = subagentRejectionIn(error);
+            options.logger?.(rejection === undefined
+                ? `dsh mcp bridge: resolveAgent("${sessionHandle}") threw ${String(error)}`
+                : `dsh mcp bridge: session "${sessionHandle}" is owned by subagent routing (${rejection}); attempting direct agents lookup`);
+            return undefined;
+        });
+    }
+    let agent = agentIn(resolved);
+    if (agent === undefined && options.agentsLookup !== undefined) {
+        try {
+            const direct = options.agentsLookup()?.get(sessionHandle);
+            if (direct !== undefined) {
+                agent = direct;
+                options.logger?.(`dsh mcp bridge: resolved agent for session "${sessionHandle}" via direct agents registry`);
+            }
+        }
+        catch (err) {
+            options.logger?.(`dsh mcp bridge: direct agents lookup threw ${String(err)}`);
+        }
+    }
     if (agent === undefined) {
         options.logger?.(`dsh mcp bridge: no agent resolved for session "${sessionHandle}"`);
     }

package/lib/mcp/tool-projection.js

@@ -107,7 +107,7 @@ function expectedDescriptionOf(expected) {
 }
 export function projectDshTools(registry, options = {}) {
     const excluded = [];
-    const maxTools = options.maxTools ?? TOOL_PROTOCOL_LIMITS.maxTools;
+    const maxTools = options.maxTools ?? Number.POSITIVE_INFINITY;
     if (registry === undefined || typeof registry.schemas !== 'function') {
         return { tools: [], excluded };
     }

package/lib/provider/agy.js

@@ -911,8 +911,14 @@ export class AgyAdapter extends LlmAdapter {
         this.resolveToolBridge = dependencies.resolveToolBridge;
         this.mcpBridgeEnabled = config.mcpBridge !== false;
         this.agyPath = config.agyPath?.trim() === '' ? undefined : config.agyPath?.trim();
-        this.timeoutMs = config.timeoutMs ?? 900_000;
-        this.idleTimeoutMs = config.idleTimeoutMs ?? 300_000;
+        const envTimeout = process.env.DSH_AGY_TIMEOUT_MS ? Number(process.env.DSH_AGY_TIMEOUT_MS) : undefined;
+        this.timeoutMs = envTimeout !== undefined && Number.isFinite(envTimeout) && envTimeout > 0
+            ? envTimeout
+            : undefined;
+        const envIdleTimeout = process.env.DSH_AGY_IDLE_TIMEOUT_MS ? Number(process.env.DSH_AGY_IDLE_TIMEOUT_MS) : undefined;
+        this.idleTimeoutMs = envIdleTimeout !== undefined && Number.isFinite(envIdleTimeout) && envIdleTimeout > 0
+            ? envIdleTimeout
+            : (config.idleTimeoutMs ?? 60_000);
         this.stdinMode = config.stdinMode ?? 'hold';
         this.run = dependencies.runAgyProcess ?? runAgyProcess;
         this.sessionMode = config.sessionMode === 'resume' ? 'resume' : 'full';
@@ -1042,7 +1048,7 @@ export class AgyAdapter extends LlmAdapter {
             ...(this.agyPath === undefined ? {} : { executable: this.agyPath }),
             expectedAgent: this.agent,
             minimumVersion: this.minimumAgyVersion,
-            timeoutMs: Math.min(this.timeoutMs, 10_000),
+            timeoutMs: Math.min(this.timeoutMs ?? 10_000, 10_000),
         });
     }
     providerInfo(provider) {
@@ -1162,7 +1168,7 @@ export class AgyAdapter extends LlmAdapter {
             ...(persistentExtraArgsOf(this.mode).length === 0
                 ? {}
                 : { extraArgs: persistentExtraArgsOf(this.mode) }),
-            timeoutMs: this.timeoutMs,
+            ...(this.timeoutMs === undefined ? {} : { timeoutMs: this.timeoutMs }),
             idleTimeoutMs: this.idleTimeoutMs,
             maxOutputBytes: this.maxOutputBytes,
             ...(options.signal === undefined ? {} : { signal: options.signal }),
@@ -1288,6 +1294,16 @@ export class AgyAdapter extends LlmAdapter {
             }
             await persistentRequest;
         }
+        catch (error) {
+            if (modelText.trim().length > 0) {
+                telemetry.partialAnswerDelivered = true;
+                lastResultError = error instanceof Error ? error.message : String(error);
+                finalStatus = "ERROR";
+            }
+            else {
+                throw error;
+            }
+        }
         finally {
             queue.end();
             persistentRequest?.catch(() => undefined);
@@ -1355,9 +1371,8 @@ export class AgyAdapter extends LlmAdapter {
         // text already streamed, keep that text and park AGY's reason as a
         // reasoning annotation; otherwise fail the turn exactly like one-shot —
         // delivering the placeholder as the answer is worse than either.
-        const streamedPartialAnswer = finalStatus !== undefined
-            && !isSuccessStatus(finalStatus)
-            && modelText.trim().length > 0;
+        const streamedPartialAnswer = ((finalStatus !== undefined && !isSuccessStatus(finalStatus))
+            || lastResultError !== undefined) && modelText.trim().length > 0;
         if (finalStatus !== undefined && !isSuccessStatus(finalStatus) && !streamedPartialAnswer) {
             const detail = [finalStatus, finalErrorDetail].filter(value => value !== undefined).join(' ');
             const code = classifyAgyFailure(detail, 'AGY_STATUS');
@@ -1784,7 +1799,7 @@ export class AgyAdapter extends LlmAdapter {
             prompt,
             agent: imageRuntime?.agent ?? route.agent,
             model: route.model,
-            timeoutMs: this.timeoutMs,
+            ...(this.timeoutMs === undefined ? {} : { timeoutMs: this.timeoutMs }),
             idleTimeoutMs: this.idleTimeoutMs,
             maxStdoutBytes: this.maxOutputBytes,
             maxStderrBytes: this.maxOutputBytes,
@@ -2013,7 +2028,11 @@ export class AgyAdapter extends LlmAdapter {
             : result === undefined
                 ? new LlmError('AGY process did not return a result', 'AGY_PROCESS')
                 : processFailure(result);
-        if (failure !== undefined)
+        const isFailureOrCutShort = failure !== undefined || (resultSeen && !isSuccessStatus(finalStatus));
+        const streamedPartialAnswer = isFailureOrCutShort && modelText.trim().length > 0;
+        if (streamedPartialAnswer)
+            telemetry.partialAnswerDelivered = true;
+        if (failure !== undefined && !streamedPartialAnswer)
             throw failure;
         // AGY reports `status: ERROR` on a turn it cut short, and it can carry a
         // placeholder under `response` ("(no content)") instead of the answer. When
@@ -2025,9 +2044,6 @@ export class AgyAdapter extends LlmAdapter {
         // 1508 and the result branch at src/host/mapper.ts:400-428); the difference
         // is that a placeholder response is not deliverable content, so the streamed
         // text decides whether anything survives.
-        const streamedPartialAnswer = resultSeen && !isSuccessStatus(finalStatus) && modelText.trim().length > 0;
-        if (streamedPartialAnswer)
-            telemetry.partialAnswerDelivered = true;
         if (resultSeen && !isSuccessStatus(finalStatus) && !streamedPartialAnswer) {
             const detail = [finalStatus, finalErrorDetail].filter(value => value !== undefined).join(' ');
             const code = classifyAgyFailure(detail, 'AGY_STATUS');
@@ -2119,7 +2135,7 @@ export class AgyAdapter extends LlmAdapter {
         // AGY's own reason for a cut-short turn belongs in the same reasoning block
         // as the bridged tool steps, so the transcript gets one annotation, not two.
         if (streamedPartialAnswer) {
-            const reason = (lastResultError ?? finalErrorDetail ?? 'AGY reported status ERROR').trim();
+            const reason = (lastResultError ?? finalErrorDetail ?? failure?.message ?? 'AGY reported status ERROR').trim();
             const line = `[agy finished with error] ${reason}\n\n`;
             if (!mcpStepsOpen) {
                 mcpStepsOpen = true;

package/lib/provider/serialize.js

@@ -6,6 +6,35 @@ export class AgyPromptError extends Error {
         this.name = 'AgyPromptError';
     }
 }
+function imageBlockText(block) {
+    const att = block.attachment;
+    const meta = [];
+    if (att?.name)
+        meta.push(`name=${att.name}`);
+    if (att?.mediaType)
+        meta.push(`media_type=${att.mediaType}`);
+    if (att?.width !== undefined && att?.height !== undefined) {
+        meta.push(`width=${att.width} height=${att.height}`);
+    }
+    if (att?.bytes !== undefined)
+        meta.push(`bytes=${att.bytes}`);
+    if (att?.attachmentId !== undefined)
+        meta.push(`id=${att.attachmentId}`);
+    const metaStr = meta.length > 0 ? ` ${meta.join(' ')}` : '';
+    return `[IMAGE_ATTACHMENT${metaStr}]`;
+}
+function fileBlockText(block) {
+    const att = block.attachment;
+    const meta = [];
+    if (att?.name)
+        meta.push(`name=${att.name}`);
+    if (att?.bytes !== undefined)
+        meta.push(`bytes=${att.bytes}`);
+    if (att?.attachmentId !== undefined)
+        meta.push(`id=${att.attachmentId}`);
+    const metaStr = meta.length > 0 ? ` ${meta.join(' ')}` : '';
+    return `[FILE_ATTACHMENT${metaStr}]`;
+}
 function blockText(block, messageIndex, blockIndex) {
     switch (block.type) {
         case 'text':
@@ -18,8 +47,18 @@ function blockText(block, messageIndex, blockIndex) {
                 name: block.name,
                 arguments: block.arguments,
             })}`;
-        default:
-            throw new AgyPromptError(`AGY text MVP does not support content block ${block.type} at message ${messageIndex}, block ${blockIndex}`, 'UNSUPPORTED_CONTENT');
+        case 'image':
+            return imageBlockText(block);
+        case 'file':
+            return fileBlockText(block);
+        case 'tool-addition':
+            return `[DSH TOOL ADDITION: ${block.toolName}]`;
+        case 'tool-removal':
+            return `[DSH TOOL REMOVAL: ${block.toolName}]`;
+        default: {
+            const unknownBlock = block;
+            throw new AgyPromptError(`AGY text MVP does not support content block ${unknownBlock.type} at message ${messageIndex}, block ${blockIndex}`, 'UNSUPPORTED_CONTENT');
+        }
     }
 }
 function blockValue(block, messageIndex, blockIndex) {
@@ -30,8 +69,35 @@ function blockValue(block, messageIndex, blockIndex) {
             return { type: 'reasoning', text: block.text };
         case 'tool-call':
             return { type: 'tool-call', id: block.id, name: block.name, arguments: block.arguments };
-        default:
-            throw new AgyPromptError(`AGY text MVP does not support content block ${block.type} at message ${messageIndex}, block ${blockIndex}`, 'UNSUPPORTED_CONTENT');
+        case 'image': {
+            const att = block.attachment;
+            return {
+                type: 'image',
+                ...(att?.attachmentId !== undefined ? { attachmentId: att.attachmentId } : {}),
+                ...(att?.mediaType !== undefined ? { mediaType: att.mediaType } : {}),
+                ...(att?.width !== undefined ? { width: att.width } : {}),
+                ...(att?.height !== undefined ? { height: att.height } : {}),
+                ...(att?.name !== undefined ? { name: att.name } : {}),
+                ...(att?.bytes !== undefined ? { bytes: att.bytes } : {}),
+            };
+        }
+        case 'file': {
+            const att = block.attachment;
+            return {
+                type: 'file',
+                ...(att?.attachmentId !== undefined ? { attachmentId: att.attachmentId } : {}),
+                ...(att?.name !== undefined ? { name: att.name } : {}),
+                ...(att?.bytes !== undefined ? { bytes: att.bytes } : {}),
+            };
+        }
+        case 'tool-addition':
+            return { type: 'tool-addition', toolName: block.toolName };
+        case 'tool-removal':
+            return { type: 'tool-removal', toolName: block.toolName };
+        default: {
+            const unknownBlock = block;
+            throw new AgyPromptError(`AGY text MVP does not support content block ${unknownBlock.type} at message ${messageIndex}, block ${blockIndex}`, 'UNSUPPORTED_CONTENT');
+        }
     }
 }
 function messageText(message, messageIndex) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-agy-cli",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "private": false,
   "publishConfig": {
     "access": "public"