dsh-agy-cli 0.12.1 → 0.12.2

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,12 +194,37 @@ 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.

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.2",
   "private": false,
   "publishConfig": {
     "access": "public"