pi-fabric 0.62.0 → 0.62.1

package/dist/capture/catalog.d.ts

@@ -1,4 +1,5 @@
-import { wrapRegisteredTool, type ExtensionRunner, type RegisteredTool, type SourceInfo, type ToolDefinition } from "@earendil-works/pi-coding-agent";
+import type { ExtensionRunner, RegisteredTool, SourceInfo, ToolDefinition } from "@earendil-works/pi-coding-agent";
+import { wrapRegisteredToolForCapture } from "./wrapper.js";
 import type { FabricToolCaptureConfig } from "../config.js";
 import type { FabricRisk } from "../protocol.js";
 export interface CapturedToolEntry {
@@ -7,7 +8,7 @@ export interface CapturedToolEntry {
     registeredTool: RegisteredTool;
     sourceInfo: SourceInfo;
     runner: ExtensionRunner;
-    wrappedTool: ReturnType<typeof wrapRegisteredTool>;
+    wrappedTool: ReturnType<typeof wrapRegisteredToolForCapture>;
     risk: FabricRisk;
 }
 export declare class CapturedToolCatalog {

package/dist/capture/catalog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/capture/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,KAAK,eAAe,EACpB,KAAK,cAAc,EACnB,KAAK,UAAU,EACf,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,UAAU,CAAC,OAAO,kBAAkB,CAAC,CAAC;IACnD,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,qBAAa,mBAAmB;;IAU9B,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,OAAO,CACL,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,uBAAuB,EAC/B,aAAa,EAAE,MAAM,GACpB,IAAI;IAyBP,KAAK,IAAI,IAAI;IAKb,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAK3C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;IAMxC,IAAI,IAAI,iBAAiB,EAAE;IAI3B,IAAI,IAAI,IAAI,MAAM,CAEjB;CAOF"}
+{"version":3,"file":"catalog.d.ts","sourceRoot":"","sources":["../../src/capture/catalog.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACnH,OAAO,EAAE,4BAA4B,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAEjD,MAAM,WAAW,iBAAiB;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC1C,cAAc,EAAE,cAAc,CAAC;IAC/B,UAAU,EAAE,UAAU,CAAC;IACvB,MAAM,EAAE,eAAe,CAAC;IACxB,WAAW,EAAE,UAAU,CAAC,OAAO,4BAA4B,CAAC,CAAC;IAC7D,IAAI,EAAE,UAAU,CAAC;CAClB;AAED,qBAAa,mBAAmB;;IAU9B,IAAI,MAAM,IAAI,eAAe,GAAG,SAAS,CAExC;IAED,OAAO,CACL,eAAe,EAAE,cAAc,EAAE,EACjC,MAAM,EAAE,eAAe,EACvB,MAAM,EAAE,uBAAuB,EAC/B,aAAa,EAAE,MAAM,GACpB,IAAI;IAyBP,KAAK,IAAI,IAAI;IAKb,SAAS,CAAC,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI;IAK3C,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB,GAAG,SAAS;IAIhD,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,iBAAiB;IAMxC,IAAI,IAAI,iBAAiB,EAAE;IAI3B,IAAI,IAAI,IAAI,MAAM,CAEjB;CAOF"}

package/dist/capture/interceptor.d.ts

@@ -1,4 +1,4 @@
-import { type ToolDefinition } from "@earendil-works/pi-coding-agent";
+import type { ToolDefinition } from "@earendil-works/pi-coding-agent";
 import { type FabricToolCaptureConfig } from "../config.js";
 import { CapturedToolCatalog } from "./catalog.js";
 export interface RegisteredToolCaptureController {

package/dist/capture/interceptor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../../src/capture/interceptor.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,KAAK,cAAc,EACpB,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAyB,KAAK,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAQnD,MAAM,WAAW,+BAA+B;IAC9C,SAAS,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACjD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAOxC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AAgGD,eAAO,MAAM,4BAA4B,GACvC,SAAS,4BAA4B,KACpC,OAAO,CAAC,+BAA+B,CAuCzC,CAAC"}
+{"version":3,"file":"interceptor.d.ts","sourceRoot":"","sources":["../../src/capture/interceptor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAGV,cAAc,EACf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAyB,KAAK,uBAAuB,EAAE,MAAM,cAAc,CAAC;AACnF,OAAO,EAAE,mBAAmB,EAAE,MAAM,cAAc,CAAC;AAQnD,MAAM,WAAW,+BAA+B;IAC9C,SAAS,CAAC,MAAM,EAAE,uBAAuB,GAAG,IAAI,CAAC;IACjD,OAAO,IAAI,IAAI,CAAC;CACjB;AAED,MAAM,WAAW,4BAA4B;IAC3C,gBAAgB,EAAE,cAAc,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAChD,OAAO,EAAE,mBAAmB,CAAC;IAC7B,aAAa,CAAC,EAAE,uBAAuB,CAAC;IAOxC,gBAAgB,CAAC,EAAE,MAAM,IAAI,CAAC;CAC/B;AA0GD,eAAO,MAAM,4BAA4B,GACvC,SAAS,4BAA4B,KACpC,OAAO,CAAC,+BAA+B,CAuCzC,CAAC"}

package/dist/capture/wrapper.d.ts

@@ -0,0 +1,15 @@
+import type { ExtensionRunner, RegisteredTool } from "@earendil-works/pi-coding-agent";
+type WrappedExecute = (toolCallId: unknown, params: unknown, signal: unknown, onUpdate: (update: any) => void, ctx?: unknown) => Promise<any>;
+export interface WrappedRegisteredTool {
+    name: string;
+    label: string | undefined;
+    description: string | undefined;
+    parameters: unknown;
+    constrainedSampling: unknown;
+    prepareArguments: ((args: Record<string, unknown>) => unknown) | undefined;
+    executionMode: unknown;
+    execute: WrappedExecute;
+}
+export declare const wrapRegisteredToolForCapture: (registeredTool: RegisteredTool, runner: ExtensionRunner) => WrappedRegisteredTool;
+export {};
+//# sourceMappingURL=wrapper.d.ts.map

package/dist/capture/wrapper.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wrapper.d.ts","sourceRoot":"","sources":["../../src/capture/wrapper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,cAAc,EAAkB,MAAM,iCAAiC,CAAC;AAQvG,KAAK,cAAc,GAAG,CACpB,UAAU,EAAE,OAAO,EACnB,MAAM,EAAE,OAAO,EACf,MAAM,EAAE,OAAO,EACf,QAAQ,EAAE,CAAC,MAAM,EAAE,GAAG,KAAK,IAAI,EAC/B,GAAG,CAAC,EAAE,OAAO,KACV,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,WAAW,qBAAqB;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1B,WAAW,EAAE,MAAM,GAAG,SAAS,CAAC;IAChC,UAAU,EAAE,OAAO,CAAC;IACpB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,OAAO,CAAC,GAAG,SAAS,CAAC;IAC3E,aAAa,EAAE,OAAO,CAAC;IACvB,OAAO,EAAE,cAAc,CAAC;CACzB;AAoBD,eAAO,MAAM,4BAA4B,GACvC,gBAAgB,cAAc,EAC9B,QAAQ,eAAe,KACtB,qBA2BF,CAAC"}

package/dist/chunks/{chunk-ZUQSDM5A.js → chunk-FDLTDTYJ.js}

@@ -4,12 +4,15 @@ import {
 import {
   headlineArg
 } from "./chunk-5A6GNO6K.js";
+import {
+  DynamicBorder
+} from "./chunk-SOBEXOWK.js";
 import {
   THINKING_DIGEST_CUSTOM_TYPE,
   buildThinkingDigest,
   snapshotHandoffSession,
   thinkingTransferPolicy
-} from "./chunk-PCTZDCIV.js";
+} from "./chunk-X2AL6J4G.js";
 import {
   isFabricThinking
 } from "./chunk-7B55UIZL.js";
@@ -27,10 +30,50 @@ import {
   FabricTraceSafeError
 } from "./chunk-HFYEEIXR.js";
 
+// src/capture/wrapper.ts
+var wrapToolDefinition = (definition, ctxFactory) => {
+  const execute = definition.execute;
+  return {
+    name: definition.name,
+    label: definition.label,
+    description: definition.description,
+    parameters: definition.parameters,
+    constrainedSampling: definition.constrainedSampling,
+    prepareArguments: definition.prepareArguments,
+    executionMode: definition.executionMode,
+    execute: (toolCallId, params, signal, onUpdate, ctx) => execute(toolCallId, params, signal, onUpdate, ctx ?? ctxFactory())
+  };
+};
+var wrapRegisteredToolForCapture = (registeredTool, runner) => {
+  const tool = wrapToolDefinition(
+    registeredTool.definition,
+    () => runner.createContext()
+  );
+  const execute = tool.execute;
+  return {
+    ...tool,
+    execute: async (toolCallId, params, signal, onUpdate) => {
+      const activeBefore = runner.getActiveTools();
+      const result = await execute(toolCallId, params, signal, onUpdate);
+      const activeAfter = runner.getActiveTools();
+      if (!activeBefore.every((name) => activeAfter.includes(name))) {
+        return result;
+      }
+      const beforeNames = new Set(activeBefore);
+      const addedToolNames = activeAfter.filter((name) => !beforeNames.has(name));
+      if (addedToolNames.length === 0) {
+        return result;
+      }
+      const previous = result?.addedToolNames ?? [];
+      return {
+        ...result,
+        addedToolNames: [.../* @__PURE__ */ new Set([...previous, ...addedToolNames])]
+      };
+    }
+  };
+};
+
 // src/capture/catalog.ts
-import {
-  wrapRegisteredTool
-} from "@earendil-works/pi-coding-agent";
 var CapturedToolCatalog = class {
   #tools = /* @__PURE__ */ new Map();
   #listeners = /* @__PURE__ */ new Set();
@@ -59,7 +102,7 @@ var CapturedToolCatalog = class {
         registeredTool,
         sourceInfo,
         runner,
-        wrappedTool: wrapRegisteredTool(registeredTool, runner),
+        wrappedTool: wrapRegisteredToolForCapture(registeredTool, runner),
         risk: config.risks[definition.name] ?? config.defaultRisk
       });
     }
@@ -528,8 +571,42 @@ var runFabricHandoffAtBoundary = async (controller, runner, extension, pending,
   }
 };
 
+// src/core/skill-block.ts
+var escapeXml = (str) => str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&apos;");
+var formatSkillsForPrompt = (skills) => {
+  const visibleSkills = skills.filter((skill) => !skill.disableModelInvocation);
+  if (visibleSkills.length === 0) {
+    return "";
+  }
+  const lines = [
+    "\n\nThe following skills provide specialized instructions for specific tasks.",
+    "Use the read tool to load a skill's file when the task matches its description.",
+    "When a skill file references a relative path, resolve it against the skill directory (parent of SKILL.md / dirname of the path) and use that absolute path in tool commands.",
+    "",
+    "<available_skills>"
+  ];
+  for (const skill of visibleSkills) {
+    lines.push("  <skill>");
+    lines.push(`    <name>${escapeXml(skill.name)}</name>`);
+    lines.push(`    <description>${escapeXml(skill.description)}</description>`);
+    lines.push(`    <location>${escapeXml(skill.filePath)}</location>`);
+    lines.push("  </skill>");
+  }
+  lines.push("</available_skills>");
+  return lines.join("\n");
+};
+var parseSkillBlock = (text) => {
+  const match = text.match(/^<skill name="([^"]+)" location="([^"]+)">\n([\s\S]*?)\n<\/skill>(?:\n\n([\s\S]+))?$/);
+  if (!match) return null;
+  return {
+    name: match[1],
+    location: match[2],
+    content: match[3],
+    userMessage: match[4]?.trim() || void 0
+  };
+};
+
 // src/core/skill-dir.ts
-import { parseSkillBlock } from "@earendil-works/pi-coding-agent";
 import { homedir } from "node:os";
 import path from "node:path";
 var SKILL_DIR_MARKER = "<skill-dir>";
@@ -562,10 +639,6 @@ var expandSkillDirMarkersForRead = (content, args, cwd) => {
 };
 
 // src/core/approval-controller.ts
-import {
-  DynamicBorder,
-  getSelectListTheme
-} from "@earendil-works/pi-coding-agent";
 import {
   Container,
   SelectList,
@@ -574,7 +647,7 @@ import {
 } from "@earendil-works/pi-tui";
 
 // src/core/auto-approval-classifier.ts
-import { completeSimple, Type } from "@earendil-works/pi-ai/compat";
+import { Type } from "typebox";
 var MAX_TRANSCRIPT_CHARS = 24e3;
 var MAX_ARGUMENT_CHARS = 16e3;
 var MAX_REASON_CHARS = 2e3;
@@ -633,13 +706,20 @@ var transcriptEvidence = (context) => {
   const joined = evidence.join("\n\n");
   return joined.length <= MAX_TRANSCRIPT_CHARS ? joined : joined.slice(joined.length - MAX_TRANSCRIPT_CHARS);
 };
+var completeSimpleLoader;
+var loadCompleteSimple = () => {
+  completeSimpleLoader ??= import("@earendil-works/pi-ai/compat").then((module) => module.completeSimple);
+  return completeSimpleLoader;
+};
 var nativeProvider = (context, providerId) => {
   const registry = context.modelRegistry;
   return registry.getProvider?.(providerId);
 };
-var completeWithPiProvider = (context, model, request, options) => {
+var completeWithPiProvider = async (context, model, request, options) => {
   const provider = nativeProvider(context, model.provider);
-  return provider ? provider.streamSimple(model, request, options).result() : completeSimple(model, request, options);
+  if (provider) return provider.streamSimple(model, request, options).result();
+  const completeSimple = await loadCompleteSimple();
+  return completeSimple(model, request, options);
 };
 var configuredModel = (context, modelKey) => {
   if (!modelKey) return context.model;
@@ -717,6 +797,16 @@ var FabricAutoApprovalClassifier = class {
 };
 
 // src/core/approval-controller.ts
+var selectListThemeFor = (theme) => {
+  const apply = (name, text) => theme.fg(name, text);
+  return {
+    selectedPrefix: (text) => apply("accent", text),
+    selectedText: (text) => apply("accent", text),
+    description: (text) => apply("muted", text),
+    scrollInfo: (text) => apply("muted", text),
+    noMatch: (text) => apply("muted", text)
+  };
+};
 var inheritedRisks = () => {
   const allowed = /* @__PURE__ */ new Set(["read", "write", "execute", "network", "agent"]);
   return (process.env.PI_FABRIC_GRANTED_RISKS ?? "").split(",").filter((risk) => allowed.has(risk));
@@ -883,7 +973,7 @@ var ApprovalController = class {
           description: "Block the requested action"
         }
       ];
-      const list = new SelectList(items, items.length, getSelectListTheme());
+      const list = new SelectList(items, items.length, selectListThemeFor(theme));
       list.onSelect = (item) => done(item.value);
       list.onCancel = () => done("deny");
       container.addChild(list);
@@ -2330,6 +2420,7 @@ export {
   claimFabricFsDriftHandoff,
   settleInPlacePrewalk,
   runFabricHandoffAtBoundary,
+  formatSkillsForPrompt,
   expandSkillDirMarkersInSkillBlock,
   expandSkillDirMarkersForRead,
   FabricAutoApprovalClassifier,
@@ -2356,4 +2447,4 @@ export {
   resolveFabricIdentity,
   MainAgentController
 };
-//# sourceMappingURL=chunk-ZUQSDM5A.js.map
+//# sourceMappingURL=chunk-FDLTDTYJ.js.map