dsh-agy-cli 0.12.1 → 0.12.3

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/index.js

@@ -20,6 +20,12 @@ export const name = 'dsh-agy-cli';
  * and the host does not provide one.
  */
 export const inject = ['llm', 'sessions', 'sandboxPolicy', 'permissionPresets', 'approval'];
+/**
+ * How long the MCP bridge waits for `webServer` and `tools` to mount before it
+ * gives up and reports the carrier as unavailable. Host startup binds the HTTP
+ * carrier within a few seconds; the ceiling only bounds a broken composition.
+ */
+const BRIDGE_SERVICE_WAIT_MS = 20_000;
 /** Programmatic library default: enabled=false, toolPolicy=reject. */
 export const Config = ConfigSchema;
 export { AgyAdapter, MockAdapter };
@@ -188,16 +194,42 @@ export function apply(ctx, config) {
     const wantsBridge = activeConfig.mcpBridge !== false
         && activeConfig.toolPolicy === 'dsh-owned';
     if (wantsBridge) {
+        /**
+         * Both carrier services mount after this plugin under the shipped desktop
+         * composition, so a `ctx.get()` sampled while the plugin applies can read
+         * `undefined` and latch "host webServer service is unavailable" for the
+         * whole host lifetime. Wait for them instead: a late bridge retries what a
+         * latch can never undo. `sessionController` already resolves late for the
+         * same reason; only the two carriers were sampled eagerly.
+         */
+        const waitForService = async (lookup, timeoutMs) => {
+            const deadline = Date.now() + timeoutMs;
+            for (;;) {
+                const value = lookup();
+                if (value !== undefined)
+                    return value;
+                if (Date.now() >= deadline)
+                    return undefined;
+                await new Promise(resolve => setTimeout(resolve, 100));
+            }
+        };
         ctx.effect(() => {
             let cancelled = false;
             void (async () => {
+                const [webServer, tools] = await Promise.all([
+                    waitForService(() => ctx.get('webServer'), BRIDGE_SERVICE_WAIT_MS),
+                    waitForService(() => ctx.get('tools'), BRIDGE_SERVICE_WAIT_MS),
+                ]);
+                if (cancelled)
+                    return;
                 const bridge = await startDshMcpBridge({
-                    webServer: ctx.get('webServer'),
-                    tools: ctx.get('tools'),
+                    webServer: webServer,
+                    tools: tools,
                     // Late-bound on purpose: this plugin loads before the Session
                     // 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
+            : (config.timeoutMs ?? 600_000);
+        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';
@@ -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');
@@ -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/lib/provider/tool-protocol.js

@@ -78,6 +78,23 @@ const SUPPORTED_SCHEMA_KEYS = new Set([
     'type',
     'uniqueItems',
 ]);
+/**
+ * JSON Schema keywords that carry no validation semantics. A dialect
+ * declaration such as `$schema` is a compatibility detail of whoever published
+ * the schema (the Context7 MCP server emits draft 2020-12 on every tool), so
+ * dropping these keeps the fail-closed policy for real keywords — anything the
+ * validator would act on still has to be supported — while a well-formed tool
+ * catalogue no longer fails the whole request over metadata.
+ */
+const IGNORED_METADATA_KEYS = new Set([
+    '$comment',
+    '$id',
+    '$schema',
+    'deprecated',
+    'examples',
+    'readOnly',
+    'writeOnly',
+]);
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -176,6 +193,8 @@ function sanitizeSchemaNode(value, depth, path) {
         if (!isSafeObjectKey(key)) {
             throw new ToolProtocolError(TOOL_PROTOCOL_SCHEMA_INVALID_CODE, 'unsafe object key');
         }
+        if (IGNORED_METADATA_KEYS.has(key))
+            continue;
         if (!SUPPORTED_SCHEMA_KEYS.has(key)) {
             throw new ToolProtocolError(TOOL_PROTOCOL_SCHEMA_INVALID_CODE, `unsupported keyword ${key}`);
         }

package/package.json

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