npm - @runfusion/fusion - Versions diffs - 0.1.3 → 0.2.0 - Mend

@runfusion/fusion 0.1.3 → 0.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (44) hide show

package/dist/bin.js +2113 -1017
package/dist/client/assets/AgentDetailView-CDZED6Dy.css +1 -0
package/dist/client/assets/AgentDetailView-zycSdnO8.js +28 -0
package/dist/client/assets/AgentsView-DoQkkDLf.css +1 -0
package/dist/client/assets/AgentsView-pO7WiBS5.js +522 -0
package/dist/client/assets/ChatView-BOd-sxbT.js +1 -0
package/dist/client/assets/DevServerView-09GQf34f.js +11 -0
package/dist/client/assets/DevServerView-ZeBGQkLI.css +1 -0
package/dist/client/assets/DirectoryPicker-CcdN1Zs7.js +1 -0
package/dist/client/assets/DocumentsView-CS8aiwtz.js +1 -0
package/dist/client/assets/DocumentsView-Co9to4Zp.css +1 -0
package/dist/client/assets/InsightsView-Bu9Cv8Ol.js +11 -0
package/dist/client/assets/InsightsView-Egu71gmh.css +1 -0
package/dist/client/assets/MemoryView-CtqgDtV9.js +2 -0
package/dist/client/assets/MemoryView-DhinauGs.css +1 -0
package/dist/client/assets/NodesView-BInPcedy.js +14 -0
package/dist/client/assets/NodesView-DlQZHGXA.css +1 -0
package/dist/client/assets/PiExtensionsManager-COxkYM2m.js +11 -0
package/dist/client/assets/PiExtensionsManager-CPgmJgDk.css +1 -0
package/dist/client/assets/PluginManager-CXUWZBOc.js +1 -0
package/dist/client/assets/PluginManager-D64RIzmL.css +1 -0
package/dist/client/assets/RoadmapsView-BOYnyMCh.css +1 -0
package/dist/client/assets/RoadmapsView-BbCexaoi.js +6 -0
package/dist/client/assets/SetupWizardModal-Cakxqkad.js +1 -0
package/dist/client/assets/SkillsView-Cytf009Z.css +1 -0
package/dist/client/assets/SkillsView-D3iqYCVf.js +1 -0
package/dist/client/assets/folder-open-kO5Hsk66.js +6 -0
package/dist/client/assets/index-BiSuUXCa.css +1 -0
package/dist/client/assets/index-y194HxzU.js +644 -0
package/dist/client/assets/upload-DHBQat92.js +6 -0
package/dist/client/index.html +2 -2
package/dist/extension.js +175 -66
package/dist/pi-claude-cli/src/__tests__/control-handler.test.ts +191 -0
package/dist/pi-claude-cli/src/__tests__/event-bridge.test.ts +1244 -0
package/dist/pi-claude-cli/src/__tests__/mcp-config.test.ts +272 -0
package/dist/pi-claude-cli/src/__tests__/process-manager.test.ts +619 -0
package/dist/pi-claude-cli/src/__tests__/prompt-builder.test.ts +1067 -0
package/dist/pi-claude-cli/src/__tests__/provider.test.ts +1902 -0
package/dist/pi-claude-cli/src/__tests__/stream-parser.test.ts +188 -0
package/dist/pi-claude-cli/src/__tests__/thinking-config.test.ts +141 -0
package/dist/pi-claude-cli/src/__tests__/tool-mapping.test.ts +252 -0
package/package.json +11 -5
package/dist/client/assets/index-BuenKJX0.css +0 -1
package/dist/client/assets/index-CjGu8HRV.js +0 -1250

package/dist/client/assets/upload-DHBQat92.js ADDED Viewed

@@ -0,0 +1,6 @@
+import{c as a}from"./index-y194HxzU.js";/**
+ * @license lucide-react v1.7.0 - ISC
+ *
+ * This source code is licensed under the ISC license.
+ * See the LICENSE file in the root directory of this source tree.
+ */const o=[["path",{d:"M12 3v12",key:"1x0j5s"}],["path",{d:"m17 8-5-5-5 5",key:"7q97r8"}],["path",{d:"M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4",key:"ih7n3h"}]],t=a("upload",o);export{t as U};

package/dist/client/index.html CHANGED Viewed

@@ -78,11 +78,11 @@
         }
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-CjGu8HRV.js"></script>
+    <script type="module" crossorigin src="/assets/index-y194HxzU.js"></script>
     <link rel="modulepreload" crossorigin href="/assets/vendor-react-K0fH_qHe.js">
     <link rel="modulepreload" crossorigin href="/assets/vendor-xterm-DzcZoU0P.js">
     <link rel="stylesheet" crossorigin href="/assets/vendor-xterm-LZoznX6r.css">
-    <link rel="stylesheet" crossorigin href="/assets/index-BuenKJX0.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-BiSuUXCa.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/extension.js CHANGED Viewed

@@ -60,6 +60,7 @@ var init_settings_schema = __esm({
       defaultThinkingLevel: void 0,
       ntfyEnabled: false,
       ntfyTopic: void 0,
+      ntfyBaseUrl: void 0,
       ntfyEvents: ["in-review", "merged", "failed", "awaiting-approval", "awaiting-user-review", "planning-awaiting-input"],
       ntfyDashboardHost: void 0,
       defaultProjectId: void 0,
@@ -47985,7 +47986,7 @@ var init_src = __esm({
   }
 });
-// ../engine/src/logger.js
+// ../engine/src/logger.ts
 function withSeverityMarker2(level, payload) {
   return `${LOG_LEVEL_MARKER_PREFIX2}${level}${LOG_LEVEL_MARKER_SUFFIX2}${payload}`;
 }
@@ -47993,13 +47994,13 @@ function createLogger2(prefix) {
   const tag = `[${prefix}]`;
   return {
     log(message, ...args) {
-      globalThis.console.error(withSeverityMarker2("info", `${tag} ${message}`), ...args);
+      console.error(withSeverityMarker2("info", `${tag} ${message}`), ...args);
     },
     warn(message, ...args) {
-      globalThis.console.warn(withSeverityMarker2("warn", `${tag} ${message}`), ...args);
+      console.warn(withSeverityMarker2("warn", `${tag} ${message}`), ...args);
     },
     error(message, ...args) {
-      globalThis.console.error(withSeverityMarker2("error", `${tag} ${message}`), ...args);
+      console.error(withSeverityMarker2("error", `${tag} ${message}`), ...args);
     }
   };
 }
@@ -48025,7 +48026,7 @@ ${stack}` : message2;
 }
 var LOG_LEVEL_MARKER_PREFIX2, LOG_LEVEL_MARKER_SUFFIX2, schedulerLog, executorLog, triageLog, piLog, extensionsLog, mergerLog, worktreePoolLog, reviewerLog, prMonitorLog, runtimeLog, ipcLog, projectManagerLog, hybridExecutorLog, autopilotLog, heartbeatLog, remoteNodeLog, nodeHealthMonitorLog, peerExchangeLog;
 var init_logger2 = __esm({
-  "../engine/src/logger.js"() {
+  "../engine/src/logger.ts"() {
     "use strict";
     LOG_LEVEL_MARKER_PREFIX2 = "\0fnlvl=";
     LOG_LEVEL_MARKER_SUFFIX2 = "\0";
@@ -49184,7 +49185,7 @@ var init_concurrency = __esm({
   }
 });
-// ../engine/src/skill-resolver.js
+// ../engine/src/skill-resolver.ts
 import { existsSync as existsSync18, readFileSync as readFileSync4 } from "node:fs";
 import { join as join22 } from "node:path";
 function readJsonObject(path) {
@@ -49308,9 +49309,13 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
     let filteredSkills;
     if (hasRequestedNames) {
       const requestedNamesLower = new Set(requestedSkillNames.map((n) => n.toLowerCase()));
-      filteredSkills = base.skills.filter((skill) => requestedNamesLower.has(skill.name.toLowerCase()) && !excludedSkillPaths.has(skill.filePath));
+      filteredSkills = base.skills.filter(
+        (skill) => requestedNamesLower.has(skill.name.toLowerCase()) && !excludedSkillPaths.has(skill.filePath)
+      );
     } else if (hasPatterns) {
-      filteredSkills = base.skills.filter((skill) => allowedSkillPaths.has(skill.filePath) && !excludedSkillPaths.has(skill.filePath));
+      filteredSkills = base.skills.filter(
+        (skill) => allowedSkillPaths.has(skill.filePath) && !excludedSkillPaths.has(skill.filePath)
+      );
     } else if (hasExcluded) {
       filteredSkills = base.skills.filter((skill) => !excludedSkillPaths.has(skill.filePath));
     } else {
@@ -49350,6 +49355,7 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
       }
     }
     if (newDiagnostics.length > 0) {
+      const _purpose = sessionPurpose ? `[${sessionPurpose}]` : "skills";
       for (const diag of newDiagnostics) {
         piLog.warn(`[skills] ${diag.type}: ${diag.message}`);
       }
@@ -49361,21 +49367,20 @@ function createSkillsOverrideFromSelection(selection, options = {}) {
   };
 }
 var init_skill_resolver = __esm({
-  "../engine/src/skill-resolver.js"() {
+  "../engine/src/skill-resolver.ts"() {
     "use strict";
     init_logger2();
   }
 });
-// ../engine/src/context-limit-detector.js
+// ../engine/src/context-limit-detector.ts
 function isContextLimitError(message) {
-  if (!message)
-    return false;
+  if (!message) return false;
   return CONTEXT_OVERFLOW_PATTERNS.some((pattern) => pattern.test(message));
 }
 var CONTEXT_OVERFLOW_PATTERNS;
 var init_context_limit_detector = __esm({
-  "../engine/src/context-limit-detector.js"() {
+  "../engine/src/context-limit-detector.ts"() {
     "use strict";
     CONTEXT_OVERFLOW_PATTERNS = [
       // Anthropic: "prompt is too long: X tokens > Y maximum"
@@ -49412,14 +49417,14 @@ var init_context_limit_detector = __esm({
   }
 });
-// ../engine/src/auth-storage.js
+// ../engine/src/auth-storage.ts
 import { existsSync as existsSync19, readFileSync as readFileSync5 } from "node:fs";
 import { homedir as homedir4 } from "node:os";
 import { join as join23 } from "node:path";
 import { AuthStorage } from "@mariozechner/pi-coding-agent";
 import { getOAuthProvider } from "@mariozechner/pi-ai/oauth";
 function getHomeDir2() {
-  return globalThis.process.env.HOME || globalThis.process.env.USERPROFILE || homedir4();
+  return process.env.HOME || process.env.USERPROFILE || homedir4();
 }
 function getFusionAuthPath(home = getHomeDir2()) {
   return join23(home, ".fusion", "agent", "auth.json");
@@ -49463,9 +49468,8 @@ function readLegacyCredentials(authPaths = getLegacyAuthPaths()) {
   return credentials;
 }
 function resolveStoredApiKey(key) {
-  if (!key)
-    return void 0;
-  return globalThis.process.env[key] ?? key;
+  if (!key) return void 0;
+  return process.env[key] ?? key;
 }
 function resolveOAuthApiKey(providerId, credential) {
   if (credential.type !== "oauth" || typeof credential.access !== "string" || typeof credential.refresh !== "string" || typeof credential.expires !== "number" || Date.now() >= credential.expires) {
@@ -49511,8 +49515,7 @@ function createFusionAuthStorage() {
       if (prop === "getApiKey") {
         return async (provider) => {
           const primaryKey = await target.getApiKey(provider);
-          if (primaryKey)
-            return primaryKey;
+          if (primaryKey) return primaryKey;
           return resolveStoredCredentialApiKey(provider, legacyCredentials[provider]);
         };
       }
@@ -49521,12 +49524,12 @@ function createFusionAuthStorage() {
   });
 }
 var init_auth_storage = __esm({
-  "../engine/src/auth-storage.js"() {
+  "../engine/src/auth-storage.ts"() {
     "use strict";
   }
 });
-// ../engine/src/pi.js
+// ../engine/src/pi.ts
 var pi_exports = {};
 __export(pi_exports, {
   COMPACTION_FALLBACK_INSTRUCTIONS: () => COMPACTION_FALLBACK_INSTRUCTIONS,
@@ -49540,19 +49543,35 @@ import { existsSync as existsSync20, readFileSync as readFileSync6 } from "node:
 import { exec } from "node:child_process";
 import { promisify as promisify2 } from "node:util";
 import { basename as basename7, dirname as dirname7, join as join24, relative as relative3, isAbsolute as isAbsolute6, resolve as resolve10 } from "node:path";
-import { createAgentSession, createCodingTools, createExtensionRuntime, createReadOnlyTools, DefaultResourceLoader, DefaultPackageManager, discoverAndLoadExtensions, ModelRegistry, SessionManager, SettingsManager } from "@mariozechner/pi-coding-agent";
+import {
+  createAgentSession,
+  createCodingTools,
+  createExtensionRuntime,
+  createReadOnlyTools,
+  DefaultResourceLoader,
+  DefaultPackageManager,
+  discoverAndLoadExtensions,
+  ModelRegistry,
+  SessionManager,
+  SettingsManager
+} from "@mariozechner/pi-coding-agent";
 function getSessionStateError(session) {
-  const error = session.state?.error;
+  const state = session.state;
+  const error = state?.errorMessage ?? state?.error;
   return typeof error === "string" ? error : "";
 }
 function clearSessionStateError(session) {
   const state = session.state;
-  if (!state || typeof state !== "object" || !("error" in state)) {
+  if (!state || typeof state !== "object") {
     return;
   }
-  try {
-    state.error = void 0;
-  } catch {
+  for (const key of ["errorMessage", "error"]) {
+    if (key in state) {
+      try {
+        state[key] = void 0;
+      } catch {
+      }
+    }
   }
 }
 async function promptSessionAndCheck(session, prompt, options) {
@@ -49564,6 +49583,29 @@ async function promptSessionAndCheck(session, prompt, options) {
   }
   const stateError = getSessionStateError(session);
   if (stateError) {
+    if (/Cannot read propert(y|ies) of (undefined|null)/i.test(stateError)) {
+      try {
+        const messages = session.agent?.state?.messages ?? session.state?.messages;
+        if (Array.isArray(messages)) {
+          const recent = messages.slice(-6).map((m, idx) => {
+            const i = messages.length - 6 + idx;
+            const content = m?.content;
+            return {
+              index: i < 0 ? idx : i,
+              role: m?.role,
+              contentType: Array.isArray(content) ? `array(len=${content.length})` : typeof content,
+              toolName: m.toolName,
+              stopReason: m.stopReason
+            };
+          });
+          piLog.error(`pi state error \u2014 transcript tail (${messages.length} msgs total): ${JSON.stringify(recent)}`);
+        } else {
+          piLog.error(`pi state error \u2014 state.messages is not an array: ${typeof messages}`);
+        }
+      } catch (inspectErr) {
+        piLog.warn(`pi state error \u2014 failed to inspect transcript: ${inspectErr instanceof Error ? inspectErr.message : String(inspectErr)}`);
+      }
+    }
     throw new Error(stateError);
   }
 }
@@ -49615,8 +49657,7 @@ async function promptWithFallback(session, prompt, options) {
 }
 function describeModel(session) {
   const model = session.model;
-  if (!model)
-    return "unknown model";
+  if (!model) return "unknown model";
   return `${model.provider}/${model.id}`;
 }
 function compactMarkdownMemorySection(sectionBody) {
@@ -49669,7 +49710,9 @@ async function retryWithCompactedPromptMemory(session, prompt, options) {
   if (!compactedPrompt) {
     return { recovered: false };
   }
-  piLog.log(`promptWithFallback: retrying with compacted prompt memory (${prompt.length} \u2192 ${compactedPrompt.length} chars)`);
+  piLog.log(
+    `promptWithFallback: retrying with compacted prompt memory (${prompt.length} \u2192 ${compactedPrompt.length} chars)`
+  );
   try {
     await promptSessionAndCheck(session, compactedPrompt, options);
     piLog.log("promptWithFallback: prompt completed after prompt-memory compaction");
@@ -49686,7 +49729,7 @@ async function flushMemoryBeforeSessionCompaction(session) {
   }
   const flushPrompt = [
     "Before context compaction, preserve only unresolved durable memory if needed.",
-    "If memory_append is available and you learned reusable project decisions, conventions, pitfalls, or open loops that are not already saved, append them now.",
+    "If fn_memory_append is available and you learned reusable project decisions, conventions, pitfalls, or open loops that are not already saved, append them now.",
     'Use layer="long-term" for durable facts and layer="daily" for running notes/open loops.',
     "If there is nothing durable to save, reply exactly: NONE."
   ].join("\n");
@@ -49731,7 +49774,9 @@ function resolveConfiguredModel(modelRegistry, kind, provider, modelId) {
     piLog.warn(`${kind} model ${provider}/${modelId} not in registry; using provider base model as template`);
     return { ...baseModel, id: modelId, name: modelId };
   }
-  throw new Error(`Configured ${kind} model ${provider}/${modelId} was not found in the pi model registry. Open Settings and choose a model from /api/models, or update your pi model configuration.`);
+  throw new Error(
+    `Configured ${kind} model ${provider}/${modelId} was not found in the pi model registry. Open Settings and choose a model from /api/models, or update your pi model configuration.`
+  );
 }
 function isRetryableModelSelectionError(message) {
   const normalized = message.toLowerCase();
@@ -49776,11 +49821,18 @@ function normalizeAssistantOrToolResultMessage(message) {
     return false;
   }
   const role = message.role;
-  if (role !== "assistant" && role !== "toolResult") {
+  if (role !== "assistant" && role !== "toolResult" && role !== "user") {
     return false;
   }
-  if (!Array.isArray(message.content)) {
-    message.content = [];
+  const obj = message;
+  if (role === "user") {
+    if (typeof obj.content !== "string" && !Array.isArray(obj.content)) {
+      obj.content = [];
+    }
+    return true;
+  }
+  if (!Array.isArray(obj.content)) {
+    obj.content = [];
   }
   return true;
 }
@@ -49837,6 +49889,12 @@ function installMessageContentGuard(session, sessionManager) {
   if (session.__fusionMessageContentGuardInstalled) {
     return;
   }
+  const existingMessages = session.agent?.state?.messages;
+  if (Array.isArray(existingMessages)) {
+    for (const candidate of existingMessages) {
+      normalizeAssistantOrToolResultMessage(candidate);
+    }
+  }
   if (typeof session.subscribe === "function") {
     session.subscribe((event) => {
       if (!event || typeof event !== "object" || event.type !== "message_end") {
@@ -49879,8 +49937,8 @@ function createReadOnlyPiSettingsView(cwd, agentDir) {
   const fusionProjectSettings = readJsonObject2(join24(projectRoot, ".fusion", "settings.json"));
   const mergedSettings = { ...globalSettings, ...fusionProjectSettings };
   return {
-    getGlobalSettings: () => globalThis.structuredClone(globalSettings),
-    getProjectSettings: () => globalThis.structuredClone(fusionProjectSettings),
+    getGlobalSettings: () => structuredClone(globalSettings),
+    getProjectSettings: () => structuredClone(fusionProjectSettings),
     getNpmCommand: () => Array.isArray(mergedSettings.npmCommand) ? [...mergedSettings.npmCommand] : void 0
   };
 }
@@ -49907,7 +49965,11 @@ async function registerExtensionProviders(cwd, modelRegistry) {
     });
     const resolvedPaths = await packageManager.resolve();
     const packageExtensionPaths = resolvedPaths.extensions.filter((resource) => resource.enabled).map((resource) => resource.path);
-    const extensionsResult = await discoverAndLoadExtensions([...getEnabledPiExtensionPaths(cwd), ...packageExtensionPaths], cwd, join24(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery"));
+    const extensionsResult = await discoverAndLoadExtensions(
+      [...getEnabledPiExtensionPaths(cwd), ...packageExtensionPaths],
+      cwd,
+      join24(resolvePiExtensionProjectRoot(cwd), ".fusion", "disabled-auto-extension-discovery")
+    );
     for (const { path, error } of extensionsResult.errors) {
       extensionsLog.warn(`Failed to load ${path}: ${error}`);
     }
@@ -49942,7 +50004,9 @@ async function isRegisteredGitWorktree(projectRoot, worktreePath) {
       encoding: "utf-8"
     });
     const resolvedWorktree = resolve10(worktreePath);
-    return stdout.split("\n").some((line) => line.startsWith("worktree ") && resolve10(line.slice("worktree ".length)) === resolvedWorktree);
+    return stdout.split("\n").some(
+      (line) => line.startsWith("worktree ") && resolve10(line.slice("worktree ".length)) === resolvedWorktree
+    );
   } catch {
     return false;
   }
@@ -49969,7 +50033,7 @@ async function assertValidWorktreeSession(cwd, projectRoot) {
     throw new Error(`Refusing to start coding agent in unregistered git worktree: ${cwd}`);
   }
 }
-function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath) {
+function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath, toolName) {
   const worktreeResolved = resolve10(worktreePath);
   const projectRootResolved = resolve10(projectRoot);
   const requestedResolved = isAbsolute6(requestedPath) ? resolve10(requestedPath) : resolve10(worktreeResolved, requestedPath);
@@ -49984,8 +50048,20 @@ function isWorktreeAllowedPath(worktreePath, projectRoot, requestedPath) {
   if (relToProjectRoot.match(/^\.fusion\/tasks\/[^/]+\/attachments\//)) {
     return true;
   }
+  const readOnlyTools = /* @__PURE__ */ new Set(["read", "glob", "grep"]);
+  if (toolName && readOnlyTools.has(toolName) && /^\.fusion\/tasks\/[^/]+\/(PROMPT\.md|task\.json)$/.test(relToProjectRoot)) {
+    return true;
+  }
   return false;
 }
+function boundaryRejection(message) {
+  return {
+    content: [{ type: "text", text: message }],
+    isError: true,
+    ok: false,
+    error: message
+  };
+}
 function wrapToolsWithBoundary(tools, worktreePath, projectRoot) {
   if (!worktreePath || !projectRoot) {
     return tools;
@@ -49999,21 +50075,21 @@ function wrapToolsWithBoundary(tools, worktreePath, projectRoot) {
     return {
       ...tool,
       execute: async (...args) => {
+        const _toolCallId = args[0];
         const params = args[1];
+        const _signal = args[2];
         const pathArg = params.path;
-        if (pathArg && !isWorktreeAllowedPath(worktreePath, projectRoot, pathArg)) {
+        if (pathArg && !isWorktreeAllowedPath(worktreePath, projectRoot, pathArg, tool.name)) {
           const relToProject = relative3(projectRoot, pathArg);
-          return {
-            ok: false,
-            error: `Path "${relToProject}" is outside the worktree boundary. Coding agents can only modify files inside the current worktree. Exception: .fusion/memory/ (project root) and .fusion/tasks/*/attachments/* are permitted for reading.`
-          };
+          return boundaryRejection(
+            `Path "${relToProject}" is outside the worktree boundary. Coding agents can only modify files inside the current worktree. Exceptions (read-only): .fusion/memory/, .fusion/tasks/*/attachments/, and .fusion/tasks/*/{PROMPT.md,task.json} for dependency context.`
+          );
         }
         const cwdArg = params.cwd;
-        if (tool.name === "bash" && cwdArg && !isWorktreeAllowedPath(worktreePath, projectRoot, cwdArg)) {
-          return {
-            ok: false,
-            error: `Working directory is outside the worktree boundary. Commands must run inside the worktree.`
-          };
+        if (tool.name === "bash" && cwdArg && !isWorktreeAllowedPath(worktreePath, projectRoot, cwdArg, tool.name)) {
+          return boundaryRejection(
+            `Working directory is outside the worktree boundary. Commands must run inside the worktree.`
+          );
         }
         return originalExecute(...args);
       }
@@ -50023,7 +50099,7 @@ function wrapToolsWithBoundary(tools, worktreePath, projectRoot) {
 async function createFnAgent2(options) {
   piLog.log(`createFnAgent called (cwd=${options.cwd}, tools=${options.tools}, provider=${options.defaultProvider}, model=${options.defaultModelId})`);
   const authStorage = createFusionAuthStorage();
-  const modelRegistry = new ModelRegistry(authStorage, getModelRegistryModelsPath());
+  const modelRegistry = ModelRegistry.create(authStorage, getModelRegistryModelsPath());
   await registerExtensionProviders(options.cwd, modelRegistry);
   const tools = options.tools === "readonly" ? createReadOnlyTools(options.cwd) : createCodingTools(options.cwd);
   const worktreePath = options.cwd;
@@ -50036,8 +50112,18 @@ async function createFnAgent2(options) {
     compaction: { enabled: true },
     retry: { enabled: true, maxRetries: 3 }
   });
-  const selectedModel = resolveConfiguredModel(modelRegistry, "primary", options.defaultProvider, options.defaultModelId);
-  const fallbackModel = resolveConfiguredModel(modelRegistry, "fallback", options.fallbackProvider, options.fallbackModelId);
+  const selectedModel = resolveConfiguredModel(
+    modelRegistry,
+    "primary",
+    options.defaultProvider,
+    options.defaultModelId
+  );
+  const fallbackModel = resolveConfiguredModel(
+    modelRegistry,
+    "fallback",
+    options.fallbackProvider,
+    options.fallbackModelId
+  );
   let effectiveSkillSelection = options.skillSelection;
   if (!effectiveSkillSelection && options.skills && options.skills.length > 0) {
     piLog.log(`Using skills from convenience parameter: [${options.skills.join(", ")}]`);
@@ -50063,6 +50149,7 @@ async function createFnAgent2(options) {
   }
   const resourceLoader = new DefaultResourceLoader({
     cwd: options.cwd,
+    agentDir: getFusionAgentDir(),
     settingsManager,
     systemPromptOverride: () => options.systemPrompt,
     appendSystemPromptOverride: () => [],
@@ -50072,13 +50159,17 @@ async function createFnAgent2(options) {
   const sessionManager = options.sessionManager ?? SessionManager.inMemory();
   normalizeSessionHistoryEntries(sessionManager);
   const createSessionWithModel = async (modelOverride) => {
+    const customToolList = [
+      ...wrappedTools,
+      ...options.customTools ?? []
+    ];
     return createAgentSession({
       cwd: options.cwd,
       authStorage,
       modelRegistry,
       resourceLoader,
-      tools: wrappedTools,
-      customTools: options.customTools,
+      noTools: "builtin",
+      customTools: customToolList,
       sessionManager,
       settingsManager,
       ...modelOverride ? { model: modelOverride } : {}
@@ -50102,7 +50193,7 @@ async function createFnAgent2(options) {
   const { session } = sessionResult;
   installToolResultContentGuard(session);
   installMessageContentGuard(session, sessionManager);
-  session.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === "memory_append") === true;
+  session.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === FN_MEMORY_APPEND_TOOL_NAME) === true;
   const promptableSession = session;
   promptableSession.promptWithFallback = async (prompt, promptOptions) => {
     try {
@@ -50152,8 +50243,11 @@ async function createFnAgent2(options) {
       const fallbackSessionResult = await createSessionWithModel(fallbackModel);
       const fallbackSession = fallbackSessionResult.session;
       installToolResultContentGuard(fallbackSession);
-      installMessageContentGuard(fallbackSession, sessionManager);
-      fallbackSession.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === "memory_append") === true;
+      installMessageContentGuard(
+        fallbackSession,
+        sessionManager
+      );
+      fallbackSession.__fusionMemoryAppendAvailable = options.customTools?.some((tool) => tool.name === FN_MEMORY_APPEND_TOOL_NAME) === true;
       if (options.defaultThinkingLevel) {
         fallbackSession.setThinkingLevel(options.defaultThinkingLevel);
       }
@@ -50235,9 +50329,9 @@ async function createFnAgent2(options) {
   });
   return { session: promptableSession, sessionFile: promptableSession.sessionFile };
 }
-var execAsync, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS;
+var execAsync, FN_MEMORY_APPEND_TOOL_NAME, COMPACTION_FALLBACK_INSTRUCTIONS, MAX_COMPACTED_PROMPT_MEMORY_CHARS;
 var init_pi = __esm({
-  "../engine/src/pi.js"() {
+  "../engine/src/pi.ts"() {
     "use strict";
     init_src();
     init_skill_resolver();
@@ -50245,6 +50339,7 @@ var init_pi = __esm({
     init_auth_storage();
     init_logger2();
     execAsync = promisify2(exec);
+    FN_MEMORY_APPEND_TOOL_NAME = "fn_memory_append";
     COMPACTION_FALLBACK_INSTRUCTIONS = [
       "Summarize all completed steps concisely.",
       "Preserve the current step number and any in-progress work details.",
@@ -63639,6 +63734,13 @@ function formatTaskIdentifier(task) {
   const snippet = task.description.length > maxLen ? task.description.slice(0, maxLen) + "..." : task.description;
   return `${task.id}: ${snippet}`;
 }
+function resolveNtfyBaseUrl(baseUrl, fallback = DEFAULT_NTFY_BASE_URL) {
+  const trimmed = baseUrl?.trim();
+  if (!trimmed) {
+    return fallback;
+  }
+  return trimmed.replace(/\/+$/, "");
+}
 function resolveNtfyEvents(events) {
   return events ? [...events] : [...DEFAULT_NTFY_EVENTS];
 }
@@ -63662,7 +63764,7 @@ function buildNtfyClickUrl(options) {
   return query ? `${normalizedHost}/?${query}` : `${normalizedHost}/`;
 }
 async function sendNtfyNotification({
-  ntfyBaseUrl = "https://ntfy.sh",
+  ntfyBaseUrl,
   topic,
   title,
   message,
@@ -63679,7 +63781,8 @@ async function sendNtfyNotification({
     if (clickUrl) {
       headers.Click = clickUrl;
     }
-    const response = await fetch(`${ntfyBaseUrl}/${topic}`, {
+    const resolvedBaseUrl = resolveNtfyBaseUrl(ntfyBaseUrl);
+    const response = await fetch(`${resolvedBaseUrl}/${topic}`, {
       method: "POST",
       headers,
       body: message,
@@ -63695,11 +63798,12 @@ async function sendNtfyNotification({
     schedulerLog.log(`Failed to send ntfy notification: ${err}`);
   }
 }
-var DEFAULT_NTFY_EVENTS, NtfyNotifier;
+var DEFAULT_NTFY_BASE_URL, DEFAULT_NTFY_EVENTS, NtfyNotifier;
 var init_notifier = __esm({
   "../engine/src/notifier.ts"() {
     "use strict";
     init_logger2();
+    DEFAULT_NTFY_BASE_URL = "https://ntfy.sh";
     DEFAULT_NTFY_EVENTS = [
       "in-review",
       "merged",
@@ -63711,7 +63815,8 @@ var init_notifier = __esm({
     NtfyNotifier = class {
       constructor(store, options = {}) {
         this.store = store;
-        this.ntfyBaseUrl = options.ntfyBaseUrl ?? "https://ntfy.sh";
+        this.defaultNtfyBaseUrl = resolveNtfyBaseUrl(options.ntfyBaseUrl);
+        this.ntfyBaseUrl = this.defaultNtfyBaseUrl;
         this.projectId = options.projectId;
       }
       config = {
@@ -63721,6 +63826,7 @@ var init_notifier = __esm({
         events: [...DEFAULT_NTFY_EVENTS]
       };
       ntfyBaseUrl;
+      defaultNtfyBaseUrl;
       projectId;
       notifiedEvents = /* @__PURE__ */ new Set();
       abortController = null;
@@ -63859,7 +63965,7 @@ var init_notifier = __esm({
       };
       handleSettingsUpdated = (data) => {
         const { settings, previous } = data;
-        if (settings.ntfyEnabled !== previous.ntfyEnabled || settings.ntfyTopic !== previous.ntfyTopic || settings.ntfyDashboardHost !== previous.ntfyDashboardHost || JSON.stringify(settings.ntfyEvents) !== JSON.stringify(previous.ntfyEvents)) {
+        if (settings.ntfyEnabled !== previous.ntfyEnabled || settings.ntfyTopic !== previous.ntfyTopic || settings.ntfyBaseUrl !== previous.ntfyBaseUrl || settings.ntfyDashboardHost !== previous.ntfyDashboardHost || JSON.stringify(settings.ntfyEvents) !== JSON.stringify(previous.ntfyEvents)) {
           const wasEnabled = this.config.enabled;
           this.loadConfig(settings);
           if (this.config.enabled && !wasEnabled) {
@@ -63868,6 +63974,8 @@ var init_notifier = __esm({
             schedulerLog.log("NtfyNotifier disabled");
           } else if (this.config.topic !== previous.ntfyTopic) {
             schedulerLog.log("NtfyNotifier topic updated");
+          } else if (this.ntfyBaseUrl !== resolveNtfyBaseUrl(previous.ntfyBaseUrl)) {
+            schedulerLog.log("NtfyNotifier base URL updated");
           } else if (this.config.dashboardHost !== previous.ntfyDashboardHost) {
             schedulerLog.log("NtfyNotifier dashboard host updated");
           } else if (JSON.stringify(this.config.events) !== JSON.stringify(previous.ntfyEvents)) {
@@ -63882,6 +63990,7 @@ var init_notifier = __esm({
           dashboardHost: settings.ntfyDashboardHost,
           events: resolveNtfyEvents(settings.ntfyEvents)
         };
+        this.ntfyBaseUrl = resolveNtfyBaseUrl(settings.ntfyBaseUrl, this.defaultNtfyBaseUrl);
       }
       isEventEnabled(event) {
         return isNtfyEventEnabled(this.config.events, event);