Fix runtime recovery output and grammar wrapper loading

Author: GlitterKill

grammar-wrappers/sdl-mcp-tree-sitter-kotlin/index.js

@@ -1,4 +1,10 @@
 // Re-export of tree-sitter-kotlin with a permissive tree-sitter peer range.
 // Generated by scripts/scaffold-grammar-wrappers.mjs — do not edit by hand.
 "use strict";
-module.exports = require("upstream-grammar");
+
+const { dirname } = require("node:path");
+const { createRequire } = require("node:module");
+
+const upstreamManifest = require.resolve("upstream-grammar/package.json");
+const upstreamRequire = createRequire(upstreamManifest);
+module.exports = upstreamRequire("node-gyp-build")(dirname(upstreamManifest));

scripts/scaffold-grammar-wrappers.mjs

@@ -227,3 +227,15 @@ function main() {
 }
 
 main();
+
+
+// tree-sitter-kotlin@0.3.8 omits its declared bindings/node entrypoint.
+// Load its shipped native binary directly until the upstream package is fixed.
+const { writeFile: writeKotlinWrapper } = await import("node:fs/promises");
+await writeKotlinWrapper(
+  new URL(
+    "../grammar-wrappers/sdl-mcp-tree-sitter-kotlin/index.js",
+    import.meta.url,
+  ),
+  "// Re-export of tree-sitter-kotlin with a permissive tree-sitter peer range.\n// Generated by scripts/scaffold-grammar-wrappers.mjs — do not edit by hand.\n\"use strict\";\n\nconst { dirname } = require(\"node:path\");\nconst { createRequire } = require(\"node:module\");\n\nconst upstreamManifest = require.resolve(\"upstream-grammar/package.json\");\nconst upstreamRequire = createRequire(upstreamManifest);\nmodule.exports = upstreamRequire(\"node-gyp-build\")(dirname(upstreamManifest));\n",
+);

src/code-mode/action-catalog.ts

@@ -34,7 +34,7 @@ export const META_ACTION_SEARCH_SCHEMA = z.object({
   includeExamples: z.boolean().optional(),
   excludeDisabled: z.boolean().optional(),
   summaryOnly: z.boolean().optional(),
-  detail: z.enum(["compact", "full"]).optional().default("compact"),
+  detail: z.enum(["compact", "standard", "full"]).optional().default("compact"),
   maxTokens: z.number().int().min(500).max(32000).optional().default(4000),
 });
 const META_MANUAL_SCHEMA = z.object({
@@ -43,7 +43,7 @@ const META_MANUAL_SCHEMA = z.object({
   actions: z.array(z.string()).optional(),
   includeSchemas: z.boolean().optional(),
   includeExamples: z.boolean().optional(),
-  detail: z.enum(["compact", "full"]).optional().default("compact"),
+  detail: z.enum(["compact", "standard", "full"]).optional().default("compact"),
 });
 
 const META_TOOL_SCHEMAS: Record<string, z.ZodType> = {

src/code-mode/index.ts

@@ -601,6 +601,12 @@ export function registerActionSearchTool(
         query: { type: "string", minLength: 1 },
         limit: { type: "integer", minimum: 1, maximum: 50 },
         offset: { type: "integer", minimum: 0 },
+        maxTokens: {
+          type: "integer",
+          minimum: 500,
+          maximum: 32000,
+          default: 4000,
+        },
         includeSchemas: { type: "boolean" },
         includeExamples: { type: "boolean" },
         summaryOnly: {

src/code-mode/recovery-action-catalog.ts

@@ -142,7 +142,7 @@ const RECOVERY_META_ACTION_SEARCH_SCHEMA = z.object({
   includeExamples: z.boolean().optional(),
   excludeDisabled: z.boolean().optional(),
   summaryOnly: z.boolean().optional(),
-  detail: z.enum(["compact", "full"]).optional().default("compact"),
+  detail: z.enum(["compact", "standard", "full"]).optional().default("compact"),
   maxTokens: z.number().int().min(500).max(32000).optional().default(4000),
 });
 
@@ -152,7 +152,7 @@ const RECOVERY_META_MANUAL_SCHEMA = z.object({
   actions: z.array(z.string()).optional(),
   includeSchemas: z.boolean().optional(),
   includeExamples: z.boolean().optional(),
-  detail: z.enum(["compact", "full"]).optional().default("compact"),
+  detail: z.enum(["compact", "standard", "full"]).optional().default("compact"),
 });
 
 const RECOVERY_META_ACTION_SCHEMAS = [

src/code-mode/types.ts

@@ -249,7 +249,11 @@ const WorkflowFailureStepOutputSchema = z
     failureTrace: WorkflowFailureTraceOutputSchema.optional(),
     nextAction: WorkflowCallableActionOutputSchema.optional(),
     result: z
-      .union([z.string(), WorkflowErrorDetailOutputSchema])
+      .union([
+        z.string(),
+        WorkflowErrorDetailOutputSchema,
+        z.record(z.string(), z.unknown()),
+      ])
       .optional(),
   })
   .strict();

src/mcp/response-projection/projectors/runtime.ts

@@ -305,6 +305,9 @@ function projectRuntimeExecute(input: ModelProjectionInput): unknown {
       : {};
 
   if (captureTruncated) {
+    const nextAction = artifactHandle
+      ? recovery(input, artifactHandle, observability)
+      : undefined;
     return {
       status,
       ...(hasPreview ? { preview } : {}),
@@ -319,6 +322,8 @@ function projectRuntimeExecute(input: ModelProjectionInput): unknown {
           "Runtime output exceeded capture limits; discarded bytes are not recoverable.",
         retryable: false,
       },
+      ...(artifactHandle ? { artifactHandle } : {}),
+      ...(nextAction ? { nextAction } : {}),
       ...diagnostics,
     };
   }

src/mcp/response-projection/projectors/workflow.ts

@@ -86,21 +86,8 @@ function projectChildValue(
 
 function errorValue(step: Record<string, unknown>): unknown {
   if (typeof step.error === "string") return step.error;
-  if (
-    isRecord(step.error)
-    && typeof step.error.message === "string"
-    && typeof step.error.code === "string"
-    && typeof step.error.classification === "string"
-    && typeof step.error.retryable === "boolean"
-  ) {
-    // Preserve only the stable generic error fields; recovery remains once-only
-    // at the workflow-step level.
-    return {
-      message: step.error.message,
-      code: step.error.code,
-      classification: step.error.classification,
-      retryable: step.error.retryable,
-    };
+  if (isRecord(step.error) && typeof step.error.message === "string") {
+    return sanitizeWorkflowStepValue(step.error, false, false);
   }
   if (isRecord(step.result)) {
     if (typeof step.result.error === "string") return step.result.error;
@@ -244,7 +231,14 @@ function compactStep(
   }
   out.fn = raw.fn;
   if (status !== "ok") out.status = status;
-  if (status === "ok" && "result" in raw) {
+  if (
+    "result" in raw
+    && result !== null
+    && (
+      status === "ok"
+      || (typeof raw.fn === "string" && getWorkflowChildAction(raw.fn) === "runtime.execute")
+    )
+  ) {
     const successResult = projectWorkflowSuccessResult(raw.fn, result);
     if (successResult !== undefined) out.result = successResult;
   }

tests/integration/runtime-output-contract.test.ts

@@ -641,17 +641,21 @@ describe("runtime output contract", () => {
             canonical,
             { outputMode },
           ).value as Record<string, unknown>;
-          assert.deepEqual(Object.keys(minimal), [
-            "status",
-            "incompleteCapture",
-            "handlingError",
-          ]);
+          assert.deepEqual(Object.keys(minimal), persistOutput
+            ? [
+                "status",
+                "incompleteCapture",
+                "handlingError",
+                "artifactHandle",
+                "nextAction",
+              ]
+            : ["status", "incompleteCapture", "handlingError"]);
           assert.equal("preview" in minimal, false);
-          assert.equal("artifactHandle" in minimal, false);
-          assert.equal("nextAction" in minimal, false);
+          assert.equal("artifactHandle" in minimal, persistOutput);
+          assert.equal("nextAction" in minimal, persistOutput);
           assert.equal(
             JSON.stringify(minimal).includes("runtime.queryOutput"),
-            false,
+            persistOutput,
           );
           assert.deepEqual(minimal.incompleteCapture, {
             stdoutTruncated: true,
@@ -664,16 +668,20 @@ describe("runtime output contract", () => {
           canonical,
           { outputMode: "summary" },
         ).value as Record<string, unknown>;
-        assert.deepEqual(Object.keys(projected), [
-          "status",
-          "preview",
-          "incompleteCapture",
-          "handlingError",
-        ]);
+        assert.deepEqual(Object.keys(projected), persistOutput
+          ? [
+              "status",
+              "preview",
+              "incompleteCapture",
+              "handlingError",
+              "artifactHandle",
+              "nextAction",
+            ]
+          : ["status", "preview", "incompleteCapture", "handlingError"]);
         assert.match(JSON.stringify(projected.preview), /x{16}/);
         assert.equal(
           JSON.stringify(projected).includes("runtime.queryOutput"),
-          false,
+          persistOutput,
         );
         assert.deepEqual(projected.incompleteCapture, {
           stdoutTruncated: true,
@@ -686,8 +694,8 @@ describe("runtime output contract", () => {
             "Runtime output exceeded capture limits; discarded bytes are not recoverable.",
           retryable: false,
         });
-        assert.equal("artifactHandle" in projected, false);
-        assert.equal("nextAction" in projected, false);
+        assert.equal("artifactHandle" in projected, persistOutput);
+        assert.equal("nextAction" in projected, persistOutput);
         assert.ok(
           Buffer.byteLength(JSON.stringify(projected), "utf8") <
             canonical.truncation.totalStdoutBytes,

tests/unit/mcp-action-search.test.ts

@@ -339,7 +339,7 @@ describe("sdl.action.search behavior", () => {
           .find((entry) => entry.action === action)
           ?.schemaSummary?.fields.find((field) => field.name === "detail");
         assert.ok(detail, `expected ${action} detail schema field`);
-        assert.deepStrictEqual(detail.enumValues, ["compact", "full"]);
+        assert.deepStrictEqual(detail.enumValues, ["compact", "standard", "full"]);
         assert.strictEqual(detail.default, "compact");
       }
     });