thinkwell 0.5.6 → 0.5.7

package/dist-pkg/cli-loader.cjs

@@ -238798,8 +238798,9 @@ function transformJsonSchemas(path, source, projectDir) {
     return source;
   const schemas = generateSchemas2(path, markedTypes, source, projectDir), insertions = generateInsertions(markedTypes, schemas);
   let modifiedSource = applyInsertions(source, insertions);
-  return modifiedSource = generateSchemaImport() + `
-` + modifiedSource, modifiedSource;
+  const [shebang, rest] = extractShebang(modifiedSource);
+  return modifiedSource = shebang + generateSchemaImport() + `
+` + rest, modifiedSource;
 }
 __name(transformJsonSchemas, "transformJsonSchemas");
 

package/dist-pkg/thinkwell.cjs

@@ -19060,8 +19060,9 @@ __name(createSkillServer, "createSkillServer");
 
 // dist/generated/features.js
 var features2 = {
+  FAULT_INJECTION: false,
   LOG_PERMISSIONS: false,
-  STRIP_CLAUDECODE_ENV: false
+  STRIP_CLAUDECODE_ENV: true
 };
 
 // dist/think-builder.js
@@ -19326,12 +19327,31 @@ Available tools:
 `;
     }
     const serverBuilder = mcpServer("thinkwell");
-    let resultReceived = false, result, resolveResultReady;
+    let resultReceived = false, result, resultError, resolveResultReady;
     const resultReady = new Promise((r) => {
       resolveResultReady = r;
-    }), acceptResult = /* @__PURE__ */ __name((input) => {
-      result = needsWrap ? input.result : input, resultReceived = true, resolveResultReady();
-    }, "acceptResult"), rawSchema = this._schemaProvider?.toJsonSchema() ?? { type: "object" }, needsWrap = rawSchema.type !== "object", outputSchema = needsWrap ? { type: "object", properties: { result: rawSchema }, required: ["result"] } : rawSchema;
+    }), rawSchema = this._schemaProvider?.toJsonSchema() ?? { type: "object" }, needsWrap = rawSchema.type !== "object", outputSchema = needsWrap ? { type: "object", properties: { result: rawSchema }, required: ["result"] } : rawSchema, acceptResult = /* @__PURE__ */ __name((input) => {
+      if (resultReceived)
+        return;
+      const value = needsWrap ? input.result : input, schemaRequired = rawSchema.required;
+      let required2 = Array.isArray(schemaRequired) ? schemaRequired : void 0;
+      if (features2.FAULT_INJECTION) {
+        const injectedField = process.env.THINKWELL_INJECT_REQUIRED_FIELD;
+        injectedField && (required2 = required2 ? [...required2, injectedField] : [injectedField]);
+      }
+      if (Array.isArray(required2)) {
+        if (value == null || typeof value != "object") {
+          resultError = new TypeError(`Agent result must be an object when schema has required fields, got ${value === null ? "null" : typeof value}`), resultReceived = true, resolveResultReady();
+          return;
+        }
+        const obj = value, missing = required2.filter((key) => !Object.hasOwn(obj, key));
+        if (missing.length > 0) {
+          resultError = new TypeError(`Agent result is missing required field(s): ${missing.join(", ")}`), resultReceived = true, resolveResultReady();
+          return;
+        }
+      }
+      result = value, resultReceived = true, resolveResultReady();
+    }, "acceptResult");
     prompt += "\n\nWhen you have your answer, call the `return_result` MCP tool with the result.", serverBuilder.tool("return_result", "Return the final result", outputSchema, { type: "object", properties: { success: { type: "boolean" } } }, async (input) => (acceptResult(input), { success: true }));
     for (const tool of this._tools.values())
       serverBuilder.tool(tool.name, tool.description, tool.inputSchema.toJsonSchema(), tool.outputSchema.toJsonSchema(), async (input, _context) => tool.handler(input));
@@ -19404,7 +19424,7 @@ ${msg}`);
 `) + "\n\nWhen you have your answer, call the `return_result` MCP tool with the result.";
           await sendTurn(followUp);
         }
-        resultReceived && result !== void 0 ? stream.resolveResult(result) : stream.rejectResult(new Error("Session ended without calling return_result"));
+        resultError ? stream.rejectResult(resultError) : resultReceived && result !== void 0 ? stream.resolveResult(result) : resultReceived ? stream.rejectResult(new TypeError("Agent returned an undefined value")) : stream.rejectResult(new Error("Agent session ended without returning a result"));
       } finally {
         stream.close(), session.close(), this._conn.sessionHandlers.delete(sessionId);
       }
@@ -19487,7 +19507,7 @@ var Session = class {
 var import_node_fs3 = require("node:fs");
 var import_node_path4 = require("node:path");
 var AGENT_COMMANDS = {
-  claude: "npx -y @zed-industries/claude-agent-acp",
+  claude: "npx -y @agentclientprotocol/claude-agent-acp",
   codex: "npx -y @zed-industries/codex-acp",
   gemini: "npx -y @google/gemini-cli --experimental-acp",
   kiro: "kiro-cli acp",
@@ -19531,12 +19551,39 @@ var AgentImpl = class {
     }), this._conn.initialized = true);
   }
 };
-function componentConnectionToStream(connection) {
+function createTracer() {
+  const traceDir = process.env.THINKWELL_TRACE;
+  if (!traceDir)
+    return null;
+  try {
+    (0, import_node_fs3.mkdirSync)(traceDir, { recursive: true });
+  } catch {
+    return null;
+  }
+  const tracePath = (0, import_node_path4.join)(traceDir, `trace-${process.pid}-${Date.now()}.ndjson`);
+  let seq = 0;
+  const t0 = performance.now();
+  return (dir, msg) => {
+    const record2 = {
+      seq: seq++,
+      ms: Math.round((performance.now() - t0) * 1e3) / 1e3,
+      dir,
+      msg
+    };
+    try {
+      (0, import_node_fs3.appendFileSync)(tracePath, JSON.stringify(record2) + `
+`);
+    } catch {
+    }
+  };
+}
+__name(createTracer, "createTracer");
+function componentConnectionToStream(connection, trace) {
   const readable = new ReadableStream({
     async start(controller) {
       try {
         for await (const message of connection.messages)
-          controller.enqueue(message);
+          trace?.("recv", message), controller.enqueue(message);
         controller.close();
       } catch (error40) {
         controller.error(error40);
@@ -19544,7 +19591,7 @@ function componentConnectionToStream(connection) {
     }
   }), writable = new WritableStream({
     write(message) {
-      connection.send(message);
+      trace?.("send", message), connection.send(message);
     },
     close() {
       connection.close();
@@ -19700,7 +19747,7 @@ async function open(nameOrOptions, maybeOptions) {
     ...options?.env
   }, commandSpec = parseCommandWithEnv(command, agentEnv), conductor = new Conductor({
     instantiator: fromCommands([commandSpec])
-  }), pair = createChannelPair(), stream = componentConnectionToStream(pair.left), mcpHandler = new McpOverAcpHandler(), conn = {
+  }), pair = createChannelPair(), trace = createTracer(), stream = componentConnectionToStream(pair.left, trace), mcpHandler = new McpOverAcpHandler(), conn = {
     conductor,
     connection: null,
     // Set below after creating the client

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwell",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "TypeScript library for blending deterministic code with LLM-powered reasoning",
   "type": "module",
   "main": "./dist/index.js",
@@ -40,9 +40,9 @@
     "@agentclientprotocol/sdk": "^0.16.1",
     "ts-json-schema-generator": "^2.4.0",
     "typescript": "^5.7.2",
-    "@thinkwell/acp": "0.5.6",
-    "@thinkwell/conductor": "0.5.6",
-    "@thinkwell/protocol": "0.5.6"
+    "@thinkwell/acp": "0.5.7",
+    "@thinkwell/conductor": "0.5.7",
+    "@thinkwell/protocol": "0.5.7"
   },
   "devDependencies": {
     "@types/node": "^24.10.4",
@@ -82,6 +82,7 @@
     "build:binary:linux-arm64": "tsx scripts/bundle.ts && tsx scripts/build-binary.ts linux-arm64",
     "bundle": "tsx scripts/bundle.ts",
     "clean": "rm -rf dist dist-bin dist-pkg",
-    "test": "node --test --import tsx src/**/*.test.ts"
+    "test": "node --test --import tsx src/**/*.test.ts",
+    "test:smoke": "node --test --test-force-exit --test-timeout=180000 --import tsx src/integration.test.ts"
   }
 }