@mrciphersmith/keryx 0.3.42 → 0.3.43

package/dist/cli.js

@@ -14119,7 +14119,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@mrciphersmith/keryx",
-    version: "0.3.42",
+    version: "0.3.43",
     description: "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
     private: false,
     publishConfig: {
@@ -85714,6 +85714,127 @@ var init_contracts = __esm(() => {
   ];
 });
 
+// src/harness/external/strict-schema.ts
+function isSchema(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function mapSchemas(value) {
+  const out = {};
+  if (!isSchema(value))
+    return out;
+  for (const [key, child] of Object.entries(value))
+    out[key] = toStrictNode(child);
+  return out;
+}
+function makeNullable(schema) {
+  const type = schema.type;
+  if (typeof type === "string") {
+    if (type === "null")
+      return schema;
+    const out = { ...schema, type: [type, "null"] };
+    if (Array.isArray(schema.enum) && !schema.enum.includes(null))
+      out.enum = [...schema.enum, null];
+    return out;
+  }
+  if (Array.isArray(type)) {
+    if (type.includes("null")) {
+      const out = { ...schema };
+      if (Array.isArray(schema.enum) && !schema.enum.includes(null))
+        out.enum = [...schema.enum, null];
+      return out;
+    }
+    const out = { ...schema, type: [...type, "null"] };
+    if (Array.isArray(schema.enum) && !schema.enum.includes(null))
+      out.enum = [...schema.enum, null];
+    return out;
+  }
+  if (Array.isArray(schema.enum) && schema.anyOf === undefined) {
+    return schema.enum.includes(null) ? schema : { ...schema, enum: [...schema.enum, null] };
+  }
+  if (Array.isArray(schema.anyOf)) {
+    return { ...schema, anyOf: [...schema.anyOf, NULL_SCHEMA] };
+  }
+  return { anyOf: [schema, NULL_SCHEMA] };
+}
+function toStrictNode(node) {
+  if (!isSchema(node))
+    return {};
+  const out = {};
+  if (node.type !== undefined)
+    out.type = node.type;
+  if (Array.isArray(node.enum))
+    out.enum = [...node.enum];
+  else if ("const" in node)
+    out.enum = [node.const];
+  if (typeof node.$ref === "string")
+    out.$ref = node.$ref;
+  const union = node.anyOf ?? node.oneOf;
+  if (Array.isArray(union))
+    out.anyOf = union.map(toStrictNode);
+  if (isSchema(node.items))
+    out.items = toStrictNode(node.items);
+  if (isSchema(node.$defs))
+    out.$defs = mapSchemas(node.$defs);
+  const isObject = node.type === "object" || isSchema(node.properties);
+  if (isObject) {
+    const required = new Set(Array.isArray(node.required) ? node.required : []);
+    const properties = {};
+    for (const [key, child] of Object.entries(isSchema(node.properties) ? node.properties : {})) {
+      const strict = toStrictNode(child);
+      properties[key] = required.has(key) ? strict : makeNullable(strict);
+    }
+    out.type ??= "object";
+    out.properties = properties;
+    out.required = Object.keys(properties);
+    out.additionalProperties = false;
+  }
+  return out;
+}
+function toStrictOutputSchema(bundled) {
+  return toStrictNode(bundled);
+}
+function resolveRef3(node, root) {
+  let current = node;
+  for (let hops = 0;typeof current.$ref === "string" && hops < 16; hops += 1) {
+    const ref = current.$ref;
+    if (!ref.startsWith("#/"))
+      return current;
+    let target = root;
+    for (const part of ref.slice(2).split("/")) {
+      target = isSchema(target) ? target[decodeURIComponent(part)] : undefined;
+    }
+    if (!isSchema(target))
+      return current;
+    current = target;
+  }
+  return current;
+}
+function dropNulls(value, node, root) {
+  if (!isSchema(node))
+    return value;
+  const schema = resolveRef3(node, root);
+  if (Array.isArray(value)) {
+    return isSchema(schema.items) ? value.map((item) => dropNulls(item, schema.items, root)) : value;
+  }
+  if (!isSchema(value) || !isSchema(schema.properties))
+    return value;
+  const required = new Set(Array.isArray(schema.required) ? schema.required : []);
+  const out = {};
+  for (const [key, child] of Object.entries(value)) {
+    if (child === null && !required.has(key) && key in schema.properties)
+      continue;
+    out[key] = dropNulls(child, schema.properties[key], root);
+  }
+  return out;
+}
+function dropOptionalNulls(value, bundled) {
+  return isSchema(bundled) ? dropNulls(value, bundled, bundled) : value;
+}
+var NULL_SCHEMA;
+var init_strict_schema = __esm(() => {
+  NULL_SCHEMA = { type: "null" };
+});
+
 // src/harness/external/prompt.ts
 function byteLength(text) {
   return Buffer.byteLength(text, "utf8");
@@ -87661,6 +87782,7 @@ async function superviseExternalRun(input, deps) {
   if (verdict === "drained") {
     return build(reportedExitCode ?? exitCodeFromEvents(events), false);
   }
+  const exitedBeforeKill = reportedExitCode;
   handle.kill();
   const grace = afterMs2(input.killGraceMs ?? DEFAULT_KILL_GRACE_MS, undefined);
   const code = await Promise.race([exited, grace.promise]);
@@ -87668,7 +87790,7 @@ async function superviseExternalRun(input, deps) {
   if (verdict === "timeout") {
     return build(code ?? EXTERNAL_TIMEOUT_EXIT_CODE, true);
   }
-  return build(code ?? exitCodeFromEvents(events), false);
+  return build(exitedBeforeKill ?? exitCodeFromEvents(events), false);
 }
 function deferred() {
   let resolve = () => {
@@ -87737,7 +87859,7 @@ function describeError(error) {
     return "unknown error";
   }
 }
-var EXTERNAL_TIMEOUT_EXIT_CODE = 124, STDOUT_HEAD_BYTES, STDOUT_TAIL_BYTES, DEFAULT_KILL_GRACE_MS = 2000, DEFAULT_TERMINAL_SETTLE_MS = 2000, SUPERVISION_TICK_DIVISOR = 4, SUPERVISION_TICK_FLOOR_MS = 5;
+var EXTERNAL_TIMEOUT_EXIT_CODE = 124, STDOUT_HEAD_BYTES, STDOUT_TAIL_BYTES, DEFAULT_KILL_GRACE_MS = 2000, DEFAULT_TERMINAL_SETTLE_MS = 2000, CODEX_TERMINAL_SETTLE_MS = 1e4, SUPERVISION_TICK_DIVISOR = 4, SUPERVISION_TICK_FLOOR_MS = 5;
 var init_supervise = __esm(() => {
   init_bounded();
   init_bun_spawn_port();
@@ -88705,6 +88827,22 @@ async function runExternalChild(input, deps) {
     return refuse2("Error", schemaPrep.reason);
   const { schema: resultSchema, schemaText: resultSchemaText, schemaPath: resultSchemaPath, schemaDir } = schemaPrep;
   const resultSchemaInline = await prepareInlineSchema(resultSchema);
+  const bundledResultSchema = JSON.parse(resultSchemaInline);
+  const codexStrict = entry.id === "codex-cli";
+  let resultSchemaPathForCodec = resultSchemaPath;
+  if (codexStrict) {
+    resultSchemaPathForCodec = path208.join(schemaDir, STRICT_SCHEMA_FILE);
+    try {
+      await writeFile32(resultSchemaPathForCodec, JSON.stringify(toStrictOutputSchema(bundledResultSchema)), "utf8");
+    } catch (error) {
+      await rm15(schemaDir, { recursive: true, force: true }).catch(() => {
+        return;
+      });
+      const message = error instanceof Error ? error.message : String(error);
+      return refuse2("Error", `failed to prepare the required result schema for validation: ${message}`);
+    }
+  }
+  const normalize = codexStrict ? (value) => dropOptionalNulls(value, bundledResultSchema) : undefined;
   try {
     const assembled = buildExternalPrompt({
       taskTitle: input.taskTitle,
@@ -88731,7 +88869,7 @@ async function runExternalChild(input, deps) {
           write: sandbox === "worktree-write",
           worktreePath: created.path,
           prompt: assembled.prompt,
-          validate: (built) => validateStructuredResult(built, resultSchema)
+          validate: (built) => validateStructuredResult(built, resultSchema, normalize)
         });
       }
       const runInput = {
@@ -88741,7 +88879,7 @@ async function runExternalChild(input, deps) {
         ...input.runtime.model === undefined || input.runtime.model === null ? {} : { model: input.runtime.model },
         ...input.sessionId === undefined ? {} : { sessionId: input.sessionId },
         ...input.runtime.maxCostUnits === undefined || input.runtime.maxCostUnits === null ? {} : { maxCostUnits: input.runtime.maxCostUnits },
-        resultSchemaPath,
+        resultSchemaPath: resultSchemaPathForCodec,
         resultSchema: resultSchemaInline,
         printTimeoutSeconds: Math.ceil(input.timeoutMs / 1000)
       };
@@ -88762,6 +88900,7 @@ async function runExternalChild(input, deps) {
         timeoutMs: input.timeoutMs,
         ...entry.maxStderrBytes === undefined ? {} : { maxStderrBytes: entry.maxStderrBytes },
         stdin: streaming ? "pipe" : "ignore",
+        ...entry.id === "codex-cli" ? { terminalSettleMs: CODEX_TERMINAL_SETTLE_MS } : {},
         ...streaming ? {
           initialStdin: [
             codec.encodeStdinMessage(assembled.prompt)
@@ -88777,8 +88916,14 @@ async function runExternalChild(input, deps) {
         ...deps.onSupervisionTrigger === undefined ? {} : { onSupervisionTrigger: deps.onSupervisionTrigger }
       });
       const cause = outcome.overflow ?? codec.classifyFailure(outcome);
-      const built = buildOutcome({ cause, outcome, argv, worktreePath: created.path });
-      return await validateStructuredResult(built, resultSchema);
+      const built = buildOutcome({
+        cause,
+        outcome,
+        argv,
+        worktreePath: created.path,
+        finalMessageOnly: entry.id === "codex-cli"
+      });
+      return await validateStructuredResult(built, resultSchema, normalize);
     } finally {
       await deps.worktree.remove(input.worktreeId).catch(() => {
         return;
@@ -88790,7 +88935,7 @@ async function runExternalChild(input, deps) {
     });
   }
 }
-async function validateStructuredResult(built, resultSchema) {
+async function validateStructuredResult(built, resultSchema, normalize) {
   if (built.status !== "Completed")
     return built;
   let parsed;
@@ -88800,12 +88945,13 @@ async function validateStructuredResult(built, resultSchema) {
     const message = error instanceof Error ? error.message : String(error);
     return structuredResultError(`structured result is not valid JSON: ${message}`, built);
   }
-  const validationErrors = await validateJson(parsed, resultSchema);
+  const normalized = normalize === undefined ? parsed : normalize(parsed);
+  const validationErrors = await validateJson(normalized, resultSchema);
   if (validationErrors.length > 0) {
     const detail = validationErrors.slice(0, 3).map((e) => `${e.path}: ${e.message}`).join("; ");
     return structuredResultError(`structured result failed subagent-result schema validation: ${detail}`, built);
   }
-  return built;
+  return normalized === parsed ? built : { ...built, output: JSON.stringify(normalized) };
 }
 async function runAcpBranch(args) {
   const { input, deps, entry, worktreePath } = args;
@@ -88865,10 +89011,10 @@ async function runAcpBranch(args) {
   return { ...final, acp: record };
 }
 function buildOutcome(args) {
-  const { cause, outcome, argv, worktreePath } = args;
+  const { cause, outcome, argv, worktreePath, finalMessageOnly } = args;
   const sessionRef = findSessionRef(outcome.events);
   const costUnits = findCostUnits(outcome.events);
-  const text = collectAssistantText(outcome.events);
+  const text = collectAssistantText(outcome.events, finalMessageOnly);
   const base = {
     argv,
     worktreePath,
@@ -88903,13 +89049,21 @@ function findCostUnits(events) {
   }
   return cost;
 }
-function collectAssistantText(events) {
+function collectAssistantText(events, finalMessageOnly) {
   for (let i = events.length - 1;i >= 0; i -= 1) {
     const event = events[i];
     if (event?.kind === "child_finished" && event.text !== undefined && event.text.trim().length > 0) {
       return event.text.trim();
     }
   }
+  if (finalMessageOnly) {
+    for (let i = events.length - 1;i >= 0; i -= 1) {
+      const event = events[i];
+      if (event?.kind === "assistant_text" && event.text.trim().length > 0)
+        return event.text.trim();
+    }
+    return "";
+  }
   const parts = [];
   for (const event of events) {
     if (event.kind === "assistant_text")
@@ -88918,10 +89072,11 @@ function collectAssistantText(events) {
   return parts.join(`
 `).trim();
 }
-var DEFAULT_BUDGET_THRESHOLD_FRACTION = 0.8, DEFAULT_NO_PROGRESS_INTERVAL_MS = 30000, DENIED_CAUSE_MARKERS;
+var DEFAULT_BUDGET_THRESHOLD_FRACTION = 0.8, DEFAULT_NO_PROGRESS_INTERVAL_MS = 30000, DENIED_CAUSE_MARKERS, STRICT_SCHEMA_FILE = "subagent-result.strict.schema.json";
 var init_runtime2 = __esm(() => {
   init_contracts();
   init_dispatch();
+  init_strict_schema();
   init_env();
   init_prompt2();
   init_registry3();
@@ -92204,7 +92359,7 @@ function describeValue4(value) {
     return "null";
   return typeof value;
 }
-function resolveRef3(ref, rootSchema) {
+function resolveRef4(ref, rootSchema) {
   if (ref.startsWith("#/$defs/")) {
     const name = ref.replace("#/$defs/", "");
     const schema = rootSchema.$defs?.[name];
@@ -92226,7 +92381,7 @@ function validateAgainstSchema3(value, schema, rootSchema) {
 }
 function walk4(value, schema, valuePath, rootSchema, errors) {
   if (schema.$ref) {
-    const resolved = resolveRef3(schema.$ref, rootSchema);
+    const resolved = resolveRef4(schema.$ref, rootSchema);
     walk4(value, resolved.schema, valuePath, resolved.root, errors);
     return;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrciphersmith/keryx",
-  "version": "0.3.42",
+  "version": "0.3.43",
   "description": "Version-controlled project context for AI coding agents: code graph, architecture wiki, project memory, relevant tests, quality signals, and task flows.",
   "private": false,
   "publishConfig": {