@gakim-digital/dexter-bridge 0.5.11 → 0.5.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gakim-digital/dexter-bridge",
-  "version": "0.5.11",
+  "version": "0.5.13",
   "description": "Local Companion bridge for the Dexter Framer plugin — runs Codex or Claude Code on your machine.",
   "type": "module",
   "bin": {
@@ -29,5 +29,8 @@
   "publishConfig": {
     "access": "public"
   },
-  "license": "SEE LICENSE IN LICENSE"
+  "license": "SEE LICENSE IN LICENSE",
+  "dependencies": {
+    "cross-spawn": "^7.0.6"
+  }
 }

package/src/agent.js

@@ -1,7 +1,8 @@
-import { execFileSync, spawn } from 'node:child_process';
+import { execFileSync } from 'node:child_process';
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
+import crossSpawn from 'cross-spawn';
 import { postRunEvent } from './api.js';
 import { createCompanionUsageAccumulator, parseAgentOutput } from './agentOutput.js';
 import {
@@ -337,12 +338,66 @@ function argsWithoutVariadicFlag(args, flag) {
   return filtered;
 }
 
-function argsWithOutputSchema(args, definition, outputSchema) {
+function compactClaudeOutputSchema(outputSchema) {
+  const toolCalls = outputSchema?.properties?.toolCalls;
+  const itemSchema = toolCalls?.items;
+  const variants = Array.isArray(itemSchema?.anyOf)
+    ? itemSchema.anyOf
+    : itemSchema
+      ? [itemSchema]
+      : [];
+  const toolNames = Array.from(new Set(
+    variants.flatMap((variant) => (
+      Array.isArray(variant?.properties?.name?.enum)
+        ? variant.properties.name.enum.filter((name) => typeof name === 'string' && name)
+        : []
+    )),
+  ));
+  return {
+    type: 'object',
+    properties: {
+      text: { type: 'string' },
+      toolCalls: {
+        type: 'array',
+        ...(Number.isFinite(Number(toolCalls?.minItems))
+          ? { minItems: Number(toolCalls.minItems) }
+          : {}),
+        ...(Number.isFinite(Number(toolCalls?.maxItems))
+          ? { maxItems: Number(toolCalls.maxItems) }
+          : {}),
+        items: {
+          type: 'object',
+          properties: {
+            id: { type: 'string' },
+            name: {
+              type: 'string',
+              ...(toolNames.length ? { enum: toolNames } : {}),
+            },
+            arguments: { type: 'object' },
+          },
+          required: ['id', 'name', 'arguments'],
+          additionalProperties: false,
+        },
+      },
+      finishReason: outputSchema?.properties?.finishReason || {
+        type: 'string',
+        enum: ['tool_calls', 'stop', 'length'],
+      },
+    },
+    required: ['text', 'toolCalls', 'finishReason'],
+    additionalProperties: false,
+  };
+}
+
+function argsWithOutputSchema(args, definition, outputSchema, platform = process.platform) {
   if (definition.id !== 'claude-code' || !outputSchema) return args;
+  const launchSchema = platform === 'win32'
+    ? compactClaudeOutputSchema(outputSchema)
+    : outputSchema;
   return [
     ...argsWithoutFlagValue(args, '--json-schema'),
     '--json-schema',
-    JSON.stringify(outputSchema),
+    JSON.stringify(launchSchema),
   ];
 }
 
@@ -412,7 +467,12 @@ export function buildAgentArgs(definition, modelDefinition, env = process.env, o
   const structuredArgs = argsWithStructuredOutput(modelArgs, definition, env);
   const isolatedArgs = argsWithClaudeIsolation(structuredArgs, definition);
   const modelEngineArgs = argsWithClaudeModelEngine(isolatedArgs, definition, options, env);
-  const schemaArgs = argsWithOutputSchema(modelEngineArgs, definition, options.outputSchema);
+  const schemaArgs = argsWithOutputSchema(
+    modelEngineArgs,
+    definition,
+    options.outputSchema,
+    options.platform,
+  );
   const resumedArgs = argsWithResumedSession(schemaArgs, definition, options.resumeSessionId);
   return argsWithPromptInput(resumedArgs, definition);
 }
@@ -643,21 +703,8 @@ export function selectAgentRuntime(inspections, definition, modelDefinition) {
   };
 }
 
-function quoteWindowsCommandArg(value) {
-  return `"${String(value).replace(/%/g, '%%').replace(/(["^&|<>])/g, '^$1')}"`;
-}
-
 export function processInvocation(command, args, env = process.env, platform = process.platform) {
   const resolvedCommand = resolveExecutableCommand(command, env, platform);
-  if (platform === 'win32' && /\.(cmd|bat)$/i.test(resolvedCommand)) {
-    const commandLine = [resolvedCommand, ...args].map(quoteWindowsCommandArg).join(' ');
-    return {
-      command: env.ComSpec || env.COMSPEC || 'cmd.exe',
-      args: ['/d', '/s', '/c', commandLine],
-      resolvedCommand,
-      windowsHide: true,
-    };
-  }
   return { command: resolvedCommand, args, resolvedCommand, windowsHide: platform === 'win32' };
 }
 
@@ -738,7 +785,7 @@ function runProcess(command, args, stdin, {
       timeoutMs,
       maxDurationMs: hardDeadlineMs,
     });
-    const child = spawn(invocation.command, invocation.args, {
+    const child = crossSpawn(invocation.command, invocation.args, {
       stdio: ['pipe', 'pipe', 'pipe'],
       env: childEnv,
       cwd,

package/src/providers/claudeAgentSdk.js

@@ -286,7 +286,7 @@ export function createClaudeAgentSdkAdapter({
     return {
       ...inherited,
       CLAUDE_CONFIG_DIR: configDir,
-      CLAUDE_AGENT_SDK_CLIENT_APP: 'dexter-hosted-worker/0.2.0',
+      CLAUDE_AGENT_SDK_CLIENT_APP: 'dexter-hosted-worker/0.2.1',
     };
   }