thinkwell 0.5.2 → 0.5.4

package/dist-pkg/thinkwell.cjs

@@ -219,8 +219,8 @@ var init_stdio = __esm({
 var index_exports = {};
 __export(index_exports, {
   Session: () => Session,
-  ThinkBuilder: () => ThinkBuilder,
   ThoughtStream: () => ThoughtStream,
+  createPlan: () => createPlan,
   open: () => open,
   schemaOf: () => schemaOf
 });
@@ -19986,7 +19986,7 @@ var ThoughtStream = class {
    * @internal
    */
   rejectResult(error40) {
-    this._rejectResult(error40);
+    this._rejectResult(error40 instanceof Error ? error40 : new Error(String(error40?.message ?? error40)));
   }
   [Symbol.asyncIterator]() {
     return {
@@ -20070,60 +20070,59 @@ var ThinkSession = class {
     this._updateResolvers = [];
   }
 };
-var ThinkBuilder = class {
+var PlanImpl = class _PlanImpl {
   static {
-    __name(this, "ThinkBuilder");
+    __name(this, "PlanImpl");
   }
   _conn;
-  _promptParts = [];
-  _tools = /* @__PURE__ */ new Map();
-  _skills = [];
+  _promptParts;
+  _tools;
+  _skills;
   _schemaProvider;
   _cwd;
   _existingSessionId;
-  constructor(conn, schema, existingSessionId) {
-    this._conn = conn;
-    this._schemaProvider = schema;
-    this._existingSessionId = existingSessionId;
+  constructor(state) {
+    this._conn = state.conn;
+    this._promptParts = state.promptParts;
+    this._tools = state.tools;
+    this._skills = state.skills;
+    this._schemaProvider = state.schemaProvider;
+    this._cwd = state.cwd;
+    this._existingSessionId = state.existingSessionId;
+  }
+  _clone(overrides) {
+    return new _PlanImpl({
+      conn: this._conn,
+      promptParts: this._promptParts,
+      tools: this._tools,
+      skills: this._skills,
+      schemaProvider: this._schemaProvider,
+      cwd: this._cwd,
+      existingSessionId: this._existingSessionId,
+      ...overrides
+    });
   }
-  /**
-   * Add literal text to the prompt
-   */
   text(content) {
-    this._promptParts.push(content);
-    return this;
+    return this._clone({ promptParts: [...this._promptParts, content] });
   }
-  /**
-   * Add a line of text with newline
-   */
   textln(content) {
-    this._promptParts.push(content + "\n");
-    return this;
+    return this._clone({ promptParts: [...this._promptParts, content + "\n"] });
   }
-  /**
-   * Quote some content delimited by XML-style tags.
-   */
   quote(content, tag = "quote") {
-    if (!content.includes("\n")) {
-      this._promptParts.push(`<${tag}>${content}</${tag}>
-`);
-    } else {
-      this._promptParts.push(`<${tag}>
+    const part = !content.includes("\n") ? `<${tag}>${content}</${tag}>
+` : `<${tag}>
 ${content}
 </${tag}>
-`);
-    }
-    return this;
+`;
+    return this._clone({ promptParts: [...this._promptParts, part] });
   }
-  /**
-   * Quote some content as a Markdown-style code block.
-   */
   code(content, language = "") {
-    this._promptParts.push(`\`\`\`${language}
+    return this._clone({
+      promptParts: [...this._promptParts, `\`\`\`${language}
 ${content}
 \`\`\`
-`);
-    return this;
+`]
+    });
   }
   tool(name, description, inputSchemaOrHandler, outputSchemaOrHandler, handler) {
     let inputSchema;
@@ -20142,7 +20141,8 @@ ${content}
       outputSchema = outputSchemaOrHandler;
       actualHandler = handler;
     }
-    this._tools.set(name, {
+    const newTools = new Map(this._tools);
+    newTools.set(name, {
       name,
       description,
       handler: actualHandler,
@@ -20150,7 +20150,7 @@ ${content}
       outputSchema,
       includeInPrompt: true
     });
-    return this;
+    return this._clone({ tools: newTools });
   }
   defineTool(name, description, inputSchemaOrHandler, outputSchemaOrHandler, handler) {
     let inputSchema;
@@ -20169,7 +20169,8 @@ ${content}
       outputSchema = outputSchemaOrHandler;
       actualHandler = handler;
     }
-    this._tools.set(name, {
+    const newTools = new Map(this._tools);
+    newTools.set(name, {
       name,
       description,
       handler: actualHandler,
@@ -20177,53 +20178,30 @@ ${content}
       outputSchema,
       includeInPrompt: false
     });
-    return this;
+    return this._clone({ tools: newTools });
   }
-  /**
-   * Attach a skill to this prompt.
-   *
-   * When called with a string, it is treated as a path to a SKILL.md file
-   * that will be parsed at run() time (deferred stored skill).
-   *
-   * When called with an object, it is treated as a virtual skill definition
-   * and validated eagerly.
-   *
-   * @param pathOrDef - Path to a SKILL.md file, or a virtual skill definition
-   */
   skill(pathOrDef) {
     if (typeof pathOrDef === "string") {
-      this._skills.push({ type: "stored", path: pathOrDef });
+      return this._clone({ skills: [...this._skills, { type: "stored", path: pathOrDef }] });
     } else {
       validateSkillName(pathOrDef.name);
       validateSkillDescription(pathOrDef.description);
-      this._skills.push({
-        type: "virtual",
-        skill: {
-          name: pathOrDef.name,
-          description: pathOrDef.description,
-          body: pathOrDef.body,
-          tools: pathOrDef.tools
-        }
+      return this._clone({
+        skills: [...this._skills, {
+          type: "virtual",
+          skill: {
+            name: pathOrDef.name,
+            description: pathOrDef.description,
+            body: pathOrDef.body,
+            tools: pathOrDef.tools
+          }
+        }]
       });
     }
-    return this;
   }
-  /**
-   * Set the working directory for the session
-   */
   cwd(path) {
-    this._cwd = path;
-    return this;
+    return this._clone({ cwd: path });
   }
-  /**
-   * Resolve all deferred skills into ResolvedSkill instances.
-   *
-   * - Virtual skills are passed through as-is.
-   * - Stored skills are loaded from disk: SKILL.md is parsed and basePath is
-   *   set to the directory containing the file.
-   *
-   * Skills are returned in attachment order.
-   */
   async _resolveSkills() {
     const resolved = [];
     for (const deferred of this._skills) {
@@ -20243,12 +20221,6 @@ ${content}
     }
     return resolved;
   }
-  /**
-   * Build the `<available_skills>` XML block and infrastructure instructions.
-   *
-   * Returns the string to prepend before the user's prompt parts, or an
-   * empty string when no skills are attached.
-   */
   _buildSkillsPrompt(skills) {
     if (skills.length === 0)
       return "";
@@ -20271,30 +20243,15 @@ ${content}
     xml += "If the skill references files, use `read_skill_file` to access them.\n";
     return xml + "\n";
   }
-  /**
-   * Execute the prompt and return the result.
-   *
-   * This method:
-   * 1. Builds the final prompt from all text parts
-   * 2. Creates an MCP server with all registered tools
-   * 3. Adds a return_result tool for the output
-   * 4. Sends the prompt to the agent
-   * 5. Handles tool calls until the agent returns a result
-   * 6. Returns the typed result
-   */
   async run() {
     return this.stream().result;
   }
-  /**
-   * Start executing the prompt, returning a stream handle that provides
-   * both an async iterable of intermediate `ThoughtEvent`s and a `.result`
-   * promise for the final typed output.
-   *
-   * Execution begins eagerly — the returned stream is already "hot".
-   */
   stream() {
     const stream = new ThoughtStream();
-    this._executeStream(stream).catch((err) => stream.rejectResult(err));
+    this._executeStream(stream).catch((err) => {
+      stream.rejectResult(err instanceof Error ? err : new Error(String(err?.message ?? err)));
+      stream.close();
+    });
     return stream;
   }
   async _executeStream(stream) {
@@ -20318,10 +20275,12 @@ ${content}
     const serverBuilder = mcpServer("thinkwell");
     let resultReceived = false;
     let result;
-    const outputSchema = this._schemaProvider?.toJsonSchema() ?? { type: "object" };
+    const rawSchema = this._schemaProvider?.toJsonSchema() ?? { type: "object" };
+    const needsWrap = rawSchema.type !== "object";
+    const outputSchema = needsWrap ? { type: "object", properties: { result: rawSchema }, required: ["result"] } : rawSchema;
     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) => {
-      result = input;
+      result = needsWrap ? input.result : input;
       resultReceived = true;
       return { success: true };
     });
@@ -20396,6 +20355,18 @@ ${content}
     }
   }
 };
+function createPlan(conn, schema, existingSessionId) {
+  return new PlanImpl({
+    conn,
+    promptParts: [],
+    tools: /* @__PURE__ */ new Map(),
+    skills: [],
+    schemaProvider: schema,
+    cwd: void 0,
+    existingSessionId
+  });
+}
+__name(createPlan, "createPlan");
 
 // dist/session.js
 var Session = class {
@@ -20421,7 +20392,7 @@ var Session = class {
     return this._sessionId;
   }
   /**
-   * Create a new think builder for constructing a prompt with tools.
+   * Create a new plan for constructing a prompt with tools.
    *
    * Unlike `agent.think()`, prompts sent through a session maintain
    * conversation context - the agent remembers previous interactions.
@@ -20444,7 +20415,7 @@ var Session = class {
     if (this._closed) {
       throw new Error("Session is closed");
     }
-    return new ThinkBuilder(this._conn, schema, this._sessionId);
+    return createPlan(this._conn, schema, this._sessionId);
   }
   /**
    * Close the session.
@@ -20459,7 +20430,7 @@ var Session = class {
 
 // dist/agent.js
 var AGENT_COMMANDS = {
-  claude: "npx -y @zed-industries/claude-code-acp",
+  claude: "npx -y @zed-industries/claude-agent-acp",
   codex: "npx -y @zed-industries/codex-acp",
   gemini: "npx -y @google/gemini-cli --experimental-acp",
   kiro: "kiro-cli acp",
@@ -20479,7 +20450,7 @@ var AgentImpl = class {
     this._conn = conn;
   }
   think(schema) {
-    return new ThinkBuilder(this._conn, schema);
+    return createPlan(this._conn, schema);
   }
   async createSession(options) {
     await this._initialize();
@@ -20727,8 +20698,8 @@ __name(schemaOf, "schemaOf");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Session,
-  ThinkBuilder,
   ThoughtStream,
+  createPlan,
   open,
   schemaOf
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thinkwell",
-  "version": "0.5.2",
+  "version": "0.5.4",
   "description": "TypeScript library for blending deterministic code with LLM-powered reasoning",
   "type": "module",
   "main": "./dist/index.js",
@@ -13,6 +13,11 @@
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js",
       "default": "./dist/index.js"
+    },
+    "./build": {
+      "types": "./dist/build.d.ts",
+      "import": "./dist/build.js",
+      "default": "./dist/build.js"
     }
   },
   "engines": {
@@ -35,9 +40,9 @@
     "@agentclientprotocol/sdk": "^0.12.0",
     "ts-json-schema-generator": "^2.4.0",
     "typescript": "^5.7.2",
-    "@thinkwell/conductor": "0.5.2",
-    "@thinkwell/acp": "0.5.2",
-    "@thinkwell/protocol": "0.5.2"
+    "@thinkwell/acp": "0.5.4",
+    "@thinkwell/conductor": "0.5.4",
+    "@thinkwell/protocol": "0.5.4"
   },
   "devDependencies": {
     "@types/node": "^24.10.4",