omp-fabric 1.0.4 → 1.1.0

package/dist/fabric-runtime-state.js

@@ -33,7 +33,7 @@ import {
   repairFabricGuestCode,
   resolveFabricIdentity,
   runFabricHandoffAtBoundary
-} from "./chunks/chunk-DOKANNFC.js";
+} from "./chunks/chunk-TLSJXU4F.js";
 import "./chunks/chunk-7VIQNUPS.js";
 import {
   AgentTranscriptReader,
@@ -94,7 +94,7 @@ import {
   resolveAgentCwd,
   resolveOmpBinary,
   validateAgentCwdRequest
-} from "./chunks/chunk-FFWALVBN.js";
+} from "./chunks/chunk-WXZP5VWP.js";
 import "./chunks/chunk-VPPIJRNZ.js";
 import {
   executeFile,
@@ -114,7 +114,7 @@ import {
   resolveAgentDir,
   resolveAvailableOmpModel,
   resolveFabricModel
-} from "./chunks/chunk-IFNDRFW7.js";
+} from "./chunks/chunk-EZPERYEG.js";
 import {
   FABRIC_ACTOR_HOST_EVENTS,
   isFabricActorHostEvent,

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EAGb,MAAM,2BAA2B,CAAC;AA4JnC,wBAA8B,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CA4sBxE;AAED,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,YAAY,EAEb,MAAM,2BAA2B,CAAC;AAiKnC,wBAA8B,SAAS,CAAC,GAAG,EAAE,YAAY,GAAG,OAAO,CAAC,IAAI,CAAC,CAqtBxE;AAED,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC"}

package/dist/index.js

@@ -60,14 +60,14 @@ import {
   expandSkillDirMarkersForRead,
   expandSkillDirMarkersInSkillBlock,
   filterPrewalkContinuationMessages,
-  formatSkillsForPrompt,
+  formatSkillsSection,
   hasPrewalkArmedPrompt,
   prewalkArmedPrompt,
   repairFabricGuestCode,
   resolveFabricIdentity,
   settleInPlacePrewalk,
   streamedToolCallName
-} from "./chunks/chunk-DOKANNFC.js";
+} from "./chunks/chunk-TLSJXU4F.js";
 import "./chunks/chunk-7VIQNUPS.js";
 import {
   AgentTranscriptReader
@@ -196,7 +196,7 @@ import {
   loadFabricConfigForScope,
   resolveAgentDir,
   saveFabricConfig
-} from "./chunks/chunk-IFNDRFW7.js";
+} from "./chunks/chunk-EZPERYEG.js";
 import {
   FABRIC_ACTOR_OMP_HOST_EVENTS
 } from "./chunks/chunk-UOSJZXJV.js";
@@ -213,7 +213,9 @@ import {
   resolveFabricModelGuidance
 } from "./chunks/chunk-77FQHHZD.js";
 import "./chunks/chunk-7363CD5A.js";
-import "./chunks/chunk-KAD7UWT2.js";
+import {
+  writeJsonAtomic
+} from "./chunks/chunk-KAD7UWT2.js";
 import {
   compactAtConfiguredThreshold,
   fabricExecTitleHintCached,
@@ -2175,23 +2177,35 @@ var fabricSchemaGuidance = (mode) => {
 };
 
 // src/core/skill-prompt.ts
+import { getActiveSkills, Settings } from "@oh-my-pi/pi-coding-agent";
 var OMP_SKILL_SECTION_MARKER = "<skills>";
+var OMP_SKILL_SECTION_HEADING = "# Skills & Rules\n";
 var OMP_SKILL_LOAD_INSTRUCTION = "Matching skill \u2192 MUST read `skill://<name>` first.";
+var OMP_CUSTOM_SKILL_LOAD_INSTRUCTION = "If a skill applies, you MUST read `skill://<name>` before proceeding.";
 var FABRIC_OMP_SKILL_LOAD_INSTRUCTION = "Matching skill \u2192 MUST read `skill://<name>` through `omp.read` inside `fabric_exec` first.";
-var LEGACY_SKILL_LOAD_INSTRUCTION = "Use the read tool to load a skill's file when the task matches its description.";
-var FABRIC_SKILL_LOAD_INSTRUCTION = "Use `omp.read` inside `fabric_exec` to load a skill's file when the task matches its description.";
+var FABRIC_CUSTOM_SKILL_LOAD_INSTRUCTION = "If a skill applies, you MUST read `skill://<name>` through `omp.read` inside `fabric_exec` before proceeding.";
+var activeSkills = () => getActiveSkills();
+var listableSkills = (skills) => {
+  try {
+    if (Settings.instance.get("skillful") === false) return [];
+  } catch {
+    return skills;
+  }
+  return skills;
+};
 var restoreSkillsForFullCodePrompt = (systemPrompt, skills) => {
   if (systemPrompt.includes(OMP_SKILL_SECTION_MARKER)) {
-    return systemPrompt.replace(
-      OMP_SKILL_LOAD_INSTRUCTION,
-      FABRIC_OMP_SKILL_LOAD_INSTRUCTION
-    );
+    return systemPrompt.replace(OMP_SKILL_LOAD_INSTRUCTION, FABRIC_OMP_SKILL_LOAD_INSTRUCTION).replace(OMP_CUSTOM_SKILL_LOAD_INSTRUCTION, FABRIC_CUSTOM_SKILL_LOAD_INSTRUCTION);
   }
-  const section = formatSkillsForPrompt([...skills]).replace(
-    LEGACY_SKILL_LOAD_INSTRUCTION,
-    FABRIC_SKILL_LOAD_INSTRUCTION
-  );
-  return section ? `${systemPrompt}${section}` : systemPrompt;
+  const section = formatSkillsSection(skills, FABRIC_OMP_SKILL_LOAD_INSTRUCTION);
+  if (!section) return systemPrompt;
+  const heading = systemPrompt.indexOf(OMP_SKILL_SECTION_HEADING);
+  if (heading < 0) return `${systemPrompt}
+
+${section}`;
+  const insertAt = heading + OMP_SKILL_SECTION_HEADING.length;
+  return `${systemPrompt.slice(0, insertAt)}${section}
+${systemPrompt.slice(insertAt)}`;
 };
 
 // src/core/proxy-contract.ts
@@ -2346,7 +2360,7 @@ var buildSkillReferenceGuidance = (prompt, skills) => {
   const body = prompt.slice(openingEnd + 2, closingTag);
   const invocationLines = body.split("\n").filter((line) => INVOCATION_VERB.test(line) && !NEGATED_INVOCATION.test(line));
   const referenced = skills.filter(
-    (skill) => skill.name !== active.name && skill.disableModelInvocation !== true && invocationLines.some((line) => referencesSkill(line, skill.name))
+    (skill) => skill.name !== active.name && skill.hide !== true && invocationLines.some((line) => referencesSkill(line, skill.name))
   );
   if (referenced.length === 0) return void 0;
   const mappings = referenced.map((skill) => `- /${skill.name} -> ${JSON.stringify(skill.filePath)}`).join("\n");
@@ -2389,8 +2403,8 @@ var formatFailureProgress = (trace) => {
   );
   if (completed.length === 0) return void 0;
   const summaries = completed.slice(0, MAX_COMPLETED_CALLS).map((operation) => {
-    const path10 = operation.args.path;
-    return typeof path10 === "string" ? `${operation.ref}(${compactPath(path10)})` : operation.ref;
+    const path11 = operation.args.path;
+    return typeof path11 === "string" ? `${operation.ref}(${compactPath(path11)})` : operation.ref;
   });
   const omitted = completed.length - summaries.length;
   return [
@@ -4095,8 +4109,138 @@ var ompHostCompatibilityWarning = (version = detectOmpHostVersion()) => {
   return `OMP Fabric requires OMP >= ${MINIMUM_OMP_HOST_VERSION}; detected ${version}. Upgrade OMP before relying on Fabric continuation behavior.`;
 };
 
-// src/ui/controller.ts
+// src/update/check.ts
+import fs3 from "node:fs";
 import path8 from "node:path";
+import { fileURLToPath } from "node:url";
+var PACKAGE_NAME = "omp-fabric";
+var REGISTRY_URL = `https://registry.npmjs.org/${PACKAGE_NAME}/latest`;
+var UPGRADE_COMMAND = `omp plugin install ${PACKAGE_NAME}`;
+var REQUEST_TIMEOUT_MS = 4e3;
+var UPDATE_STATUS_KEY = "fabric-update";
+var UPDATE_CHECK_TTL_MS = 24 * 60 * 60 * 1e3;
+var updateCheckCachePath = (agentDir) => path8.join(agentDir, "fabric", "update-check.json");
+var installedVersionFromManifest = () => {
+  let directory = path8.dirname(fileURLToPath(import.meta.url));
+  while (true) {
+    try {
+      const manifest = JSON.parse(
+        fs3.readFileSync(path8.join(directory, "package.json"), "utf8")
+      );
+      if (manifest.name === PACKAGE_NAME && typeof manifest.version === "string") {
+        return manifest.version;
+      }
+    } catch {
+    }
+    const parent = path8.dirname(directory);
+    if (parent === directory) return void 0;
+    directory = parent;
+  }
+};
+var readCache = (cachePath) => {
+  try {
+    const parsed = JSON.parse(fs3.readFileSync(cachePath, "utf8"));
+    if (typeof parsed.checkedAt !== "number" || !Number.isFinite(parsed.checkedAt)) return void 0;
+    if (typeof parsed.latest !== "string" || parsed.latest.length === 0) return void 0;
+    return {
+      format: 1,
+      checkedAt: parsed.checkedAt,
+      latest: parsed.latest,
+      ...typeof parsed.notified === "string" ? { notified: parsed.notified } : {}
+    };
+  } catch {
+    return void 0;
+  }
+};
+var writeCache = (cachePath, value) => {
+  try {
+    writeJsonAtomic(cachePath, value, { space: 2, newline: true });
+  } catch {
+  }
+};
+var fetchLatestVersion = async (fetchImpl, timeoutMs) => {
+  const controller = new AbortController();
+  const timer = setTimeout(() => controller.abort(), timeoutMs);
+  timer.unref?.();
+  try {
+    const response = await fetchImpl(REGISTRY_URL, {
+      signal: controller.signal,
+      headers: { accept: "application/json" }
+    });
+    if (!response.ok) return void 0;
+    const payload = await response.json();
+    const version = payload?.version;
+    return typeof version === "string" && version.length > 0 ? version : void 0;
+  } catch {
+    return void 0;
+  } finally {
+    clearTimeout(timer);
+  }
+};
+var checkFabricUpdate = async (options) => {
+  try {
+    const installed = options.installedVersion ?? installedVersionFromManifest();
+    if (installed === void 0) return void 0;
+    const now = options.now ?? Date.now();
+    const cachePath = updateCheckCachePath(options.agentDir);
+    const cached = readCache(cachePath);
+    const age = cached === void 0 ? void 0 : now - cached.checkedAt;
+    const fresh = cached !== void 0 && age !== void 0 && age >= 0 && age < UPDATE_CHECK_TTL_MS;
+    let record;
+    if (fresh && cached !== void 0) {
+      record = cached;
+    } else {
+      const latest = await fetchLatestVersion(
+        options.fetchImpl ?? globalThis.fetch,
+        options.timeoutMs ?? REQUEST_TIMEOUT_MS
+      );
+      if (latest === void 0) return void 0;
+      record = {
+        format: 1,
+        checkedAt: now,
+        latest,
+        ...cached?.notified === void 0 ? {} : { notified: cached.notified }
+      };
+    }
+    const behind = compareVersions(record.latest, installed) === 1;
+    const announce = behind && record.notified !== record.latest;
+    if (!fresh || announce) {
+      writeCache(cachePath, announce ? { ...record, notified: record.latest } : record);
+    }
+    if (!announce) return void 0;
+    return {
+      installed,
+      latest: record.latest,
+      message: `${PACKAGE_NAME} ${installed} \u2192 ${record.latest} \xB7 ${UPGRADE_COMMAND}`
+    };
+  } catch {
+    return void 0;
+  }
+};
+var scheduleFabricUpdateCheck = async (context, options) => {
+  if (!options.enabled || !context.hasUI) return;
+  let sessionId;
+  try {
+    sessionId = context.sessionManager.getSessionId();
+  } catch {
+    return;
+  }
+  if (resolveFabricIdentity(sessionId).identity.kind !== "main") return;
+  const notice = await checkFabricUpdate({
+    agentDir: options.agentDir,
+    ...options.installedVersion === void 0 ? {} : { installedVersion: options.installedVersion },
+    ...options.fetchImpl === void 0 ? {} : { fetchImpl: options.fetchImpl },
+    ...options.now === void 0 ? {} : { now: options.now }
+  });
+  if (notice === void 0) return;
+  try {
+    context.ui.setStatus(UPDATE_STATUS_KEY, notice.message);
+  } catch {
+  }
+};
+
+// src/ui/controller.ts
+import path9 from "node:path";
 
 // src/ui/snapshot.ts
 var MAX_UI_AGENTS = 240;
@@ -4953,7 +5097,7 @@ var FabricUiController = class {
         logFile: actor.worker.logFile
       };
     }
-    const retained = actor.lastRunId && actor.logDir ? path8.join(actor.logDir, actor.lastRunId, "events.jsonl") : void 0;
+    const retained = actor.lastRunId && actor.logDir ? path9.join(actor.logDir, actor.lastRunId, "events.jsonl") : void 0;
     if (retained) return { id: actor.id, status: actor.status, logFile: retained };
     if (actor.sessionFile) {
       return { id: actor.id, status: actor.status, logFile: actor.sessionFile };
@@ -5112,15 +5256,15 @@ var REFRESH_CARDS_PER_TICK = 3;
 
 // src/index.ts
 import { existsSync as existsSync4 } from "node:fs";
-import path9 from "node:path";
-import { fileURLToPath } from "node:url";
-var FABRIC_EXTENSION_ENTRY_PATH = path9.resolve(fileURLToPath(import.meta.url));
-var FABRIC_ENTRY_DIR = path9.dirname(FABRIC_EXTENSION_ENTRY_PATH);
+import path10 from "node:path";
+import { fileURLToPath as fileURLToPath2 } from "node:url";
+var FABRIC_EXTENSION_ENTRY_PATH = path10.resolve(fileURLToPath2(import.meta.url));
+var FABRIC_ENTRY_DIR = path10.dirname(FABRIC_EXTENSION_ENTRY_PATH);
 var FABRIC_RUNTIME_PATHS = {
   extension: FABRIC_EXTENSION_ENTRY_PATH,
-  worker: path9.join(FABRIC_ENTRY_DIR, "worker.js"),
-  residentHost: path9.join(FABRIC_ENTRY_DIR, "residency", "launcher.js"),
-  skills: path9.resolve(FABRIC_ENTRY_DIR, "..", "skills")
+  worker: path10.join(FABRIC_ENTRY_DIR, "worker.js"),
+  residentHost: path10.join(FABRIC_ENTRY_DIR, "residency", "launcher.js"),
+  skills: path10.resolve(FABRIC_ENTRY_DIR, "..", "skills")
 };
 var FABRIC_SKILLS_DIR = FABRIC_RUNTIME_PATHS.skills;
 var componentRegistrationFrom = (value) => {
@@ -5146,6 +5290,7 @@ async function ompFabric(omp) {
   const codePreviewSettings = defaultCodePreviewSettings();
   const decorateShell = withCodePreviewShell;
   let compatibilityWarningShown = false;
+  let updateCheckStarted = false;
   configureHighlighting(
     codePreviewSettings.shikiTheme,
     codePreviewSettings.syntaxHighlighting
@@ -5425,6 +5570,13 @@ async function ompFabric(omp) {
     await state.bootstrap(context);
     refreshCodePreviewSettings();
     applyFabricMode();
+    if (!updateCheckStarted) {
+      updateCheckStarted = true;
+      void scheduleFabricUpdateCheck(context, {
+        enabled: state.config.update.check,
+        agentDir: resolveAgentDir()
+      });
+    }
     if (state.shouldEagerlyActivate(context)) await state.ensure(context);
   });
   omp.on("session_tree", async (_event, context) => {
@@ -5595,9 +5747,12 @@ async function ompFabric(omp) {
     reassertToolOwnership();
     const effectiveFullCodeMode = fullCodeMode || schemaMode === "enforce";
     if (!omp.getActiveTools().includes("fabric_exec")) return;
-    const skills = event.systemPromptOptions?.skills ?? [];
+    const skills = activeSkills();
     const captureSnapshot = state.cwd ? capturePolicy() : void 0;
-    const systemPrompt = effectiveFullCodeMode ? restoreSkillsForFullCodePrompt(event.systemPrompt.join("\n"), skills) : event.systemPrompt.join("\n");
+    const systemPrompt = effectiveFullCodeMode ? restoreSkillsForFullCodePrompt(
+      event.systemPrompt.join("\n"),
+      listableSkills(skills)
+    ) : event.systemPrompt.join("\n");
     const skillReferenceGuidance = effectiveFullCodeMode ? buildSkillReferenceGuidance(event.prompt, skills) : void 0;
     const currentModel = context.model ? `${context.model.provider}/${context.model.id}` : void 0;
     const resolvedGuidance = resolveFabricModelGuidance(state.modelGuidance(), {