typebulb 0.21.2 → 0.21.4

package/dist/agents/pi/matchu-patchu.ts

@@ -2217,7 +2217,7 @@ var Patcher = class _Patcher {
 
 // cli/agents/pi/server/piPatcherExtension.ts
 var DESCRIPTION = true ? "Apply unified diffs to files \u2014 tolerant of form, strict about intent. Repairs sloppy AI-generated diffs (mangled headers, whitespace drift, missing prefixes; line numbers can be wrong or absent \u2014 hunks anchor by fuzzy-matched context lines) and applies all hunks atomically when the intent is unambiguous; fails with a precise, typed error when it isn't. Use for multi-hunk edits in one step, or when exact string-replacement editing fails on whitespace or invisible characters." : "Apply unified diffs to files.";
-var BUILD_TAG = true ? "matchu-patchu-pi 0.2.0, built 2026-07-07 23:36:13" : "matchu-patchu-pi dev";
+var BUILD_TAG = true ? "matchu-patchu-pi 0.2.0, built 2026-07-08 16:28:04" : "matchu-patchu-pi dev";
 var errorBlocks = (errors) => {
   const parts = [`Patch failed with ${errors.length} error(s):`];
   for (const e of errors) parts.push("", e.toString());
@@ -2289,36 +2289,51 @@ function logErr(...a) {
   } catch {
   }
 }
+function patchOwnership(tools, registeredByUs) {
+  const patch = tools.find((t) => t.name === "patch");
+  if (!patch) return "absent";
+  return registeredByUs || /matchu-patchu/i.test(patch.sourceInfo?.path ?? "") ? "ours" : "foreign";
+}
+var PATCH_TOOL = {
+  name: "patch",
+  label: "Patch",
+  description: DESCRIPTION,
+  promptSnippet: "Modify one or more existing files by applying a unified diff",
+  promptGuidelines: [
+    "Use patch for every edit to an existing file; write is only for creating new files or full rewrites.",
+    "patch accepts lenient unified diffs: line numbers are optional and hunks anchor by context lines. One diff may target several files via ---/+++ headers; pass filePath instead for a headerless single-file diff."
+  ],
+  parameters: Type.Object({
+    diff: Type.String({ description: "Unified diff content to apply" }),
+    filePath: Type.Optional(Type.String({
+      description: "Path of the single file to patch (absolute or relative to the project root); the diff's headers are then ignored. Omit to target the file(s) named by the diff's ---/+++ headers."
+    })),
+    dryRun: Type.Optional(Type.Boolean({ description: "If true, return the patched content without writing to disk" }))
+  }),
+  async execute(_id, params, _signal, _onUpdate, ctx) {
+    const { ok, message } = applyPatch(ctx.cwd, params);
+    if (!ok) throw new Error(message);
+    return { content: [{ type: "text", text: message }], details: {} };
+  }
+};
 function piPatcherExtension_default(pi) {
+  let registeredPatch = false;
   try {
-    pi.registerTool({
-      name: "patch",
-      label: "Patch",
-      description: DESCRIPTION,
-      promptSnippet: "Modify one or more existing files by applying a unified diff",
-      promptGuidelines: [
-        "Use patch for every edit to an existing file; write is only for creating new files or full rewrites.",
-        "patch accepts lenient unified diffs: line numbers are optional and hunks anchor by context lines. One diff may target several files via ---/+++ headers; pass filePath instead for a headerless single-file diff."
-      ],
-      parameters: Type.Object({
-        diff: Type.String({ description: "Unified diff content to apply" }),
-        filePath: Type.Optional(Type.String({
-          description: "Path of the single file to patch (absolute or relative to the project root); the diff's headers are then ignored. Omit to target the file(s) named by the diff's ---/+++ headers."
-        })),
-        dryRun: Type.Optional(Type.Boolean({ description: "If true, return the patched content without writing to disk" }))
-      }),
-      async execute(_id, params, _signal, _onUpdate, ctx) {
-        const { ok, message } = applyPatch(ctx.cwd, params);
-        if (!ok) throw new Error(message);
-        return { content: [{ type: "text", text: message }], details: {} };
-      }
-    });
     pi.on("session_start", () => {
       try {
+        const owner = patchOwnership(pi.getAllTools(), registeredPatch);
+        if (owner === "foreign") {
+          logErr('another extension already provides "patch" \u2014 typebulb patcher standing down (built-in edit kept)');
+          return;
+        }
+        if (owner === "absent") {
+          pi.registerTool(PATCH_TOOL);
+          registeredPatch = true;
+        }
         const active = pi.getActiveTools();
         if (active.includes("edit")) pi.setActiveTools(active.filter((n) => n !== "edit"));
       } catch (e) {
-        logErr("remove edit", e);
+        logErr("session_start", e);
       }
     });
   } catch (e) {
@@ -2328,5 +2343,6 @@ function piPatcherExtension_default(pi) {
 export {
   applyPatch,
   piPatcherExtension_default as default,
-  discoverDiffKeys
+  discoverDiffKeys,
+  patchOwnership
 };