@harperfast/agent 0.15.10 → 0.16.1

package/dist/agent.js

@@ -296,8 +296,8 @@ var defaultAnthropicModel = "claude-4-6-opus-latest";
 var defaultAnthropicCompactionModel = "claude-4-5-haiku-latest";
 var defaultGoogleModel = "gemini-3-pro";
 var defaultGoogleCompactionModel = "gemini-2.5-flash-lite";
-var defaultOllamaModel = "ollama-qwen3-coder:30b";
-var defaultOllamaCompactionModel = "ollama-qwen2.5-coder";
+var defaultOllamaModel = "ollama-qwen3.5";
+var defaultOllamaCompactionModel = "ollama-qwen3.5:2b";
 var defaultModels = [
   defaultOpenAIModel,
   defaultAnthropicModel,
@@ -311,12 +311,45 @@ var defaultCompactionModels = [
   defaultOllamaCompactionModel
 ];
 
+// utils/ollama/normalizeOllamaBaseUrl.ts
+function normalizeOllamaBaseUrl(baseUrl) {
+  let url = baseUrl.trim();
+  if (!url.startsWith("http://") && !url.startsWith("https://")) {
+    url = `http://${url}`;
+  }
+  const urlObj = new URL(url);
+  if (!urlObj.port) {
+    urlObj.port = "11434";
+  }
+  let pathname = urlObj.pathname;
+  if (pathname.endsWith("/")) {
+    pathname = pathname.slice(0, -1);
+  }
+  if (!pathname.endsWith("/api")) {
+    pathname += "/api";
+  }
+  urlObj.pathname = pathname;
+  return urlObj.toString().replace(/\/$/, "");
+}
+
 // lifecycle/getModel.ts
 function isOpenAIModel(modelName) {
   if (!modelName || modelName === defaultOpenAIModel) {
     return true;
   }
-  return !modelName.startsWith("claude-") && !modelName.startsWith("gemini-") && !modelName.startsWith("ollama-");
+  return !modelName.startsWith("claude-") && !modelName.startsWith("gemini-") && !modelName.startsWith("ollama-") && !modelName.includes(":");
+}
+function getProvider(modelName) {
+  if (modelName.startsWith("claude-")) {
+    return "Anthropic";
+  }
+  if (modelName.startsWith("gemini-")) {
+    return "Google";
+  }
+  if (modelName.startsWith("ollama-") || modelName.includes(":")) {
+    return "Ollama";
+  }
+  return "OpenAI";
 }
 function getModel(modelName) {
   if (modelName.startsWith("claude-")) {
@@ -325,9 +358,9 @@ function getModel(modelName) {
   if (modelName.startsWith("gemini-")) {
     return aisdk(google(modelName));
   }
-  if (modelName.startsWith("ollama-")) {
+  if (modelName.startsWith("ollama-") || modelName.includes(":")) {
     const ollamaBaseUrl = process.env.OLLAMA_BASE_URL ? normalizeOllamaBaseUrl(process.env.OLLAMA_BASE_URL) : void 0;
-    const ollamaProvider = ollamaBaseUrl ? createOllama({ baseURL: ollamaBaseUrl }) : ollama;
+    const ollamaProvider = ollamaBaseUrl ? createOllama({ baseURL: ollamaBaseUrl, compatibility: "strict" }) : ollama;
     return aisdk(ollamaProvider(getModelName(modelName)));
   }
   return aisdk(openai(modelName));
@@ -340,29 +373,10 @@ function getModelName(modelName) {
     return modelName;
   }
   if (modelName.startsWith("ollama-")) {
-    return modelName.replace("ollama-", "");
+    return modelName.slice(7);
   }
   return modelName;
 }
-function normalizeOllamaBaseUrl(baseUrl) {
-  let url = baseUrl.trim();
-  if (!url.startsWith("http://") && !url.startsWith("https://")) {
-    url = `http://${url}`;
-  }
-  const urlObj = new URL(url);
-  if (!urlObj.port) {
-    urlObj.port = "11434";
-  }
-  let pathname = urlObj.pathname;
-  if (pathname.endsWith("/")) {
-    pathname = pathname.slice(0, -1);
-  }
-  if (!pathname.endsWith("/api")) {
-    pathname += "/api";
-  }
-  urlObj.pathname = pathname;
-  return urlObj.toString().replace(/\/$/, "");
-}
 
 // lifecycle/handleExit.ts
 import { getGlobalTraceProvider } from "@openai/agents";
@@ -1134,7 +1148,23 @@ async function execute11(operation) {
     if (needed) {
       const content = await execute10({ skill: needed });
       console.error(`Understanding ${needed} is necessary before applying this patch.`);
-      return { status: "failed, skill guarded", output: content };
+      return {
+        status: "skill_required",
+        output: `apply_patch blocked: you must understand the "${needed}" skill before writing to "${operation.path}".
+
+REQUIRED NEXT STEP: Call apply_patch again with the EXACT same arguments:
+  type="${operation.type}", path="${operation.path}", diff=<same diff as before>
+
+PROHIBITED \u2014 do NOT attempt any of the following to work around this:
+  - Use the shell tool to write or create files
+  - Call set_patch_auto_approve or set_shell_auto_approve
+  - Use any other workaround
+
+Read the skill content below, then retry apply_patch immediately.
+
+--- Skill: ${needed} ---
+${content}`
+      };
     }
     switch (operation.type) {
       case "create_file":
@@ -1165,7 +1195,12 @@ async function execute11(operation) {
 function createApplyPatchTool() {
   return tool11({
     name: "apply_patch",
-    description: "Applies a patch (create, update, or delete a file) to the workspace.",
+    description: `Applies a patch (create, update, or delete a file) to the workspace.
+
+SKILL GUARD: Some file paths require reading a specific Harper skill before writing. If this tool returns status "skill_required", you MUST:
+  1. Read the skill content included in the response carefully.
+  2. Call apply_patch again with the EXACT same type, path, and diff arguments.
+Do NOT use shell, set_patch_auto_approve, set_shell_auto_approve, or any other workaround to bypass this requirement.`,
     parameters: ApplyPatchParameters,
     needsApproval,
     execute: execute11
@@ -2464,6 +2499,66 @@ function createTools() {
   ];
 }
 
+// utils/ollama/fetchOllamaModels.ts
+async function fetchOllamaModels() {
+  const ollamaBaseUrl = process.env.OLLAMA_BASE_URL ? normalizeOllamaBaseUrl(process.env.OLLAMA_BASE_URL) : "http://localhost:11434/api";
+  try {
+    const response = await fetch(`${ollamaBaseUrl}/tags`);
+    if (!response.ok) {
+      return [];
+    }
+    const data = await response.json();
+    return data.models.map((m) => m.name);
+  } catch {
+    return [];
+  }
+}
+
+// utils/ollama/pullOllamaModel.ts
+async function pullOllamaModel(modelName, onProgress) {
+  const ollamaBaseUrl = process.env.OLLAMA_BASE_URL ? normalizeOllamaBaseUrl(process.env.OLLAMA_BASE_URL) : "http://localhost:11434/api";
+  const response = await fetch(`${ollamaBaseUrl}/pull`, {
+    method: "POST",
+    body: JSON.stringify({ name: modelName, stream: true })
+  });
+  if (!response.ok) {
+    throw new Error(`Failed to pull Ollama model ${modelName}: ${response.statusText}`);
+  }
+  if (!response.body) {
+    throw new Error(`Failed to pull Ollama model ${modelName}: No response body`);
+  }
+  const reader = response.body.getReader();
+  const decoder = new TextDecoder();
+  while (true) {
+    const { done, value } = await reader.read();
+    if (done) {
+      break;
+    }
+    const chunk = decoder.decode(value, { stream: true });
+    const lines = chunk.split("\n");
+    for (const line of lines) {
+      if (!line.trim()) {
+        continue;
+      }
+      try {
+        const json = JSON.parse(line);
+        if (onProgress) {
+          onProgress(json);
+        }
+      } catch {
+      }
+    }
+  }
+}
+
+// utils/ollama/ensureOllamaModel.ts
+async function ensureOllamaModel(modelName, onProgress) {
+  const models = await fetchOllamaModels();
+  if (!models.includes(modelName)) {
+    await pullOllamaModel(modelName, onProgress);
+  }
+}
+
 // utils/sessions/createSession.ts
 import { MemorySession as MemorySession3 } from "@openai/agents";
 
@@ -2843,6 +2938,18 @@ async function compactConversation(items) {
   let noticeContent = "... conversation history compacted ...";
   if (trackedState.compactionModel && itemsToCompact.length > 0) {
     try {
+      if (getProvider(trackedState.compactionModel) === "Ollama") {
+        const modelName = getModelName(trackedState.compactionModel);
+        await ensureOllamaModel(modelName, (progress) => {
+          emitToListeners("SetPulling", {
+            modelName,
+            status: progress.status,
+            completed: progress.completed ?? 0,
+            total: progress.total ?? 0
+          });
+        });
+        emitToListeners("SetPulling", null);
+      }
       const agent = new Agent({
         name: "History Compactor",
         model: isOpenAIModel(trackedState.compactionModel) ? trackedState.compactionModel : getModel(trackedState.compactionModel),
@@ -3724,7 +3831,7 @@ async function runAgentForOnePass(agent, session, input, controller, isPrompt) {
 }
 
 // agent/AgentManager.ts
-var AgentManager = class {
+var AgentManager = class _AgentManager {
   isInitialized = false;
   controller = null;
   queuedUserInputs = [];
@@ -3732,17 +3839,20 @@ var AgentManager = class {
   agent = null;
   session = null;
   initialMessages = [];
-  async initialize() {
-    if (this.isInitialized) {
-      return;
-    }
-    this.agent = new Agent3({
+  static instantiateAgent(tools) {
+    return new Agent3({
       name: "Harper Agent",
       model: isOpenAIModel(trackedState.model) ? trackedState.model : getModel(trackedState.model),
       modelSettings: getModelSettings(trackedState.model),
       instructions: readAgentSkillsRoot() || defaultInstructions(),
-      tools: createTools()
+      tools
     });
+  }
+  async initialize() {
+    if (this.isInitialized) {
+      return;
+    }
+    this.agent = _AgentManager.instantiateAgent(createTools());
     this.session = createSession(trackedState.sessionPath);
     try {
       const plan = await this.session?.getPlanState?.();
@@ -3871,6 +3981,23 @@ var AgentManager = class {
   async runTask(task, isPrompt) {
     this.controller = new AbortController();
     await this.runCompactionIfWeWereIdle();
+    if (getProvider(trackedState.model) === "Ollama") {
+      try {
+        const modelName = getModelName(trackedState.model);
+        await ensureOllamaModel(modelName, (progress) => {
+          emitToListeners("SetPulling", {
+            modelName,
+            status: progress.status,
+            completed: progress.completed ?? 0,
+            total: progress.total ?? 0
+          });
+        });
+        emitToListeners("SetPulling", null);
+      } catch (err) {
+        emitToListeners("SetPulling", null);
+        logError(err);
+      }
+    }
     emitToListeners("SetThinking", true);
     let taskOrState = task;
     const lowerTask = task.toLowerCase();
@@ -3990,6 +4117,7 @@ var ChatProvider = ({
   const [userInputMode, setUserInputMode] = useState3("waiting");
   const [isThinking, setIsThinking] = useState3(false);
   const [isCompacting, setIsCompacting] = useState3(false);
+  const [pullingState, setPullingState] = useState3(null);
   const [focusedArea, setFocusedArea] = useState3("input");
   useListener("PushNewMessages", (messages2) => {
     setMessages((prev) => {
@@ -4007,6 +4135,9 @@ var ChatProvider = ({
   useListener("SetCompacting", (value2) => {
     setIsCompacting(Boolean(value2));
   }, []);
+  useListener("SetPulling", (value2) => {
+    setPullingState(value2);
+  }, []);
   useListener("InterruptThought", () => {
     setIsThinking(false);
   }, []);
@@ -4044,9 +4175,10 @@ var ChatProvider = ({
     userInputMode,
     isThinking,
     isCompacting,
+    pullingState,
     focusedArea,
     setFocusedArea
-  }), [messages, userInputMode, isThinking, isCompacting, focusedArea]);
+  }), [messages, userInputMode, isThinking, isCompacting, pullingState, focusedArea]);
   return /* @__PURE__ */ jsx3(ChatContext.Provider, { value, children });
 };
 
@@ -5330,7 +5462,7 @@ function calculatePlaceholder(mode) {
 // ink/components/ChatContent.tsx
 import { jsx as jsx17, jsxs as jsxs9 } from "react/jsx-runtime";
 function ChatContent() {
-  const { messages, isThinking, isCompacting, focusedArea, setFocusedArea } = useChat();
+  const { messages, isThinking, isCompacting, pullingState, focusedArea, setFocusedArea } = useChat();
   const { payload } = useApproval();
   const size = useTerminalSize();
   useMessageListener();
@@ -5426,6 +5558,7 @@ function ChatContent() {
     return 6;
   }, []);
   const availableTextWidth = timelineWidth - 4;
+  const pullingHeight = pullingState ? 1 : 0;
   const lineItems = useMemo11(() => {
     const acc = [];
     for (const msg of messages) {
@@ -5512,7 +5645,7 @@ function ChatContent() {
   ], []);
   const timelineTitle = "TIMELINE:";
   const timelineHeaderWidth = timelineWidth - 1;
-  const showSpinner = isCompacting || isThinking;
+  const showSpinner = isCompacting || isThinking || Boolean(pullingState);
   const timelineDashes = timelineHeaderWidth - timelineTitle.length - (showSpinner ? 5 : 0);
   const tabsTotalWidth = tabs.reduce((acc, t) => acc + t.label.length + 2, 0) + (tabs.length - 1);
   const statusDashes = Math.max(0, statusWidth - tabsTotalWidth - 2);
@@ -5549,7 +5682,7 @@ function ChatContent() {
         "\u256E"
       ] })
     ] }),
-    /* @__PURE__ */ jsxs9(Box10, { flexDirection: "row", height: contentHeight - 2, children: [
+    /* @__PURE__ */ jsxs9(Box10, { flexDirection: "row", height: contentHeight - 2 - pullingHeight, children: [
       /* @__PURE__ */ jsx17(
         Box10,
         {
@@ -5562,7 +5695,7 @@ function ChatContent() {
             {
               items: lineItems,
               itemHeight: 1,
-              height: contentHeight - 2,
+              height: contentHeight - 2 - pullingHeight,
               selectedIndex,
               renderOverflowTop: useCallback5((count) => /* @__PURE__ */ jsxs9(Box10, { children: [
                 /* @__PURE__ */ jsx17(Text10, { color: "gray", dimColor: true, children: "\u2502" }),
@@ -5630,17 +5763,36 @@ function ChatContent() {
               /* @__PURE__ */ jsx17(Box10, { marginTop: 1, children: /* @__PURE__ */ jsx17(SettingsView, { isDense: true }) })
             ] }),
             activeTab === "planDescription" && /* @__PURE__ */ jsx17(PlanView, {}),
-            activeTab === "actions" && /* @__PURE__ */ jsx17(ActionsView, { height: contentHeight - 2, isFocused: focusedArea === "status" })
+            activeTab === "actions" && /* @__PURE__ */ jsx17(
+              ActionsView,
+              {
+                height: contentHeight - 2 - pullingHeight,
+                isFocused: focusedArea === "status"
+              }
+            )
           ] })
         }
       )
     ] }),
-    /* @__PURE__ */ jsxs9(Box10, { flexDirection: "row", height: 1, children: [
-      /* @__PURE__ */ jsx17(Text10, { color: junctionLeftColor, children: "\u2522" }),
-      /* @__PURE__ */ jsx17(Text10, { color: timelineBottomColor, children: "\u2501".repeat(timelineWidth - 1) }),
-      /* @__PURE__ */ jsx17(Text10, { color: junctionMiddleColor, children: "\u2537" }),
-      /* @__PURE__ */ jsx17(Text10, { color: statusBottomColor, children: "\u2501".repeat(Math.max(0, statusWidth - 2)) }),
-      /* @__PURE__ */ jsx17(Text10, { color: junctionRightColor, children: "\u252A" })
+    /* @__PURE__ */ jsxs9(Box10, { flexDirection: "column", children: [
+      pullingState && /* @__PURE__ */ jsx17(Box10, { paddingLeft: 2, paddingRight: 2, marginBottom: 0, children: /* @__PURE__ */ jsxs9(Text10, { color: "yellow", children: [
+        `\uF019 Downloading `,
+        /* @__PURE__ */ jsx17(Text10, { bold: true, children: pullingState.modelName }),
+        ` from Ollama... `,
+        /* @__PURE__ */ jsx17(Text10, { dimColor: true, children: pullingState.status === "pulling manifest" ? "initializing" : pullingState.status }),
+        pullingState.total > 0 && /* @__PURE__ */ jsxs9(Text10, { children: [
+          ` [${"=".repeat(Math.floor(pullingState.completed / pullingState.total * 20))}${" ".repeat(20 - Math.floor(pullingState.completed / pullingState.total * 20))}] `,
+          Math.round(pullingState.completed / pullingState.total * 100),
+          "%"
+        ] })
+      ] }) }),
+      /* @__PURE__ */ jsxs9(Box10, { flexDirection: "row", height: 1, children: [
+        /* @__PURE__ */ jsx17(Text10, { color: junctionLeftColor, children: "\u2522" }),
+        /* @__PURE__ */ jsx17(Text10, { color: timelineBottomColor, children: "\u2501".repeat(timelineWidth - 1) }),
+        /* @__PURE__ */ jsx17(Text10, { color: junctionMiddleColor, children: "\u2537" }),
+        /* @__PURE__ */ jsx17(Text10, { color: statusBottomColor, children: "\u2501".repeat(Math.max(0, statusWidth - 2)) }),
+        /* @__PURE__ */ jsx17(Text10, { color: junctionRightColor, children: "\u252A" })
+      ] })
     ] }),
     /* @__PURE__ */ jsx17(UserInput, {})
   ] });
@@ -5845,7 +5997,7 @@ function DiffApprovalView() {
 // ink/configurationWizard/ConfigurationWizard.tsx
 import { Box as Box18, useInput as useInput10 } from "ink";
 import { Step, Stepper } from "ink-stepper";
-import { useState as useState17 } from "react";
+import { useEffect as useEffect14, useState as useState17 } from "react";
 
 // utils/files/getEnvVarForProvider.ts
 function getEnvVarForProvider(provider) {
@@ -6040,7 +6192,7 @@ var modelsByProvider = {
   OpenAI: [defaultOpenAIModel, "gpt-5.0", defaultOpenAICompactionModel],
   Anthropic: [defaultAnthropicModel, "claude-4-5-sonnet-latest", defaultAnthropicCompactionModel],
   Google: [defaultGoogleModel, "gemini-3-flash", "gemini-2.5-flash", defaultGoogleCompactionModel],
-  Ollama: [defaultOllamaModel, "mistral", defaultOllamaCompactionModel]
+  Ollama: [defaultOllamaModel, "ollama-qwen3.5:27b", defaultOllamaCompactionModel]
 };
 var compactorModelsByProvider = {
   OpenAI: modelsByProvider.OpenAI.slice().reverse(),
@@ -6194,13 +6346,23 @@ function StepperProgress({ steps, currentStep }) {
 import { jsx as jsx25, jsxs as jsxs17 } from "react/jsx-runtime";
 function ConfigurationWizard({ onComplete }) {
   const [provider, setProvider] = useState17("OpenAI");
+  const [ollamaModels, setOllamaModels] = useState17([]);
+  useEffect14(() => {
+    if (provider === "Ollama") {
+      fetchOllamaModels().then((models2) => {
+        if (models2.length > 0) {
+          setOllamaModels(models2);
+        }
+      });
+    }
+  }, [provider]);
   useInput10((input, key) => {
     if (key.ctrl && input === "x") {
       emitToListeners("ExitUI", void 0);
     }
   });
-  const models = modelsByProvider[provider];
-  const compactorModels = compactorModelsByProvider[provider];
+  const models = provider === "Ollama" && ollamaModels.length > 0 ? [.../* @__PURE__ */ new Set([...ollamaModels, ...modelsByProvider[provider]])] : modelsByProvider[provider];
+  const compactorModels = provider === "Ollama" && ollamaModels.length > 0 ? [.../* @__PURE__ */ new Set([...ollamaModels, ...compactorModelsByProvider[provider]])] : compactorModelsByProvider[provider];
   return /* @__PURE__ */ jsx25(Box18, { flexDirection: "column", padding: 1, minHeight: 10, children: /* @__PURE__ */ jsxs17(
     Stepper,
     {
@@ -6245,7 +6407,8 @@ function ConfigurationWizard({ onComplete }) {
             title: "What model would you like to use?",
             models,
             onConfirm: (m) => {
-              updateEnv("HARPER_AGENT_MODEL", m);
+              const finalModelName = provider === "Ollama" && !m.startsWith("ollama-") && !m.includes(":") ? `ollama-${m}` : m;
+              updateEnv("HARPER_AGENT_MODEL", finalModelName);
               goNext();
             },
             onBack: goBack
@@ -6257,7 +6420,8 @@ function ConfigurationWizard({ onComplete }) {
             title: "What model should we use for memory compaction?",
             models: compactorModels,
             onConfirm: (m) => {
-              updateEnv("HARPER_AGENT_COMPACTION_MODEL", m);
+              const finalModelName = provider === "Ollama" && !m.startsWith("ollama-") && !m.includes(":") ? `ollama-${m}` : m;
+              updateEnv("HARPER_AGENT_COMPACTION_MODEL", finalModelName);
               goNext();
             },
             onBack: goBack
@@ -6709,7 +6873,7 @@ function ensureApiKey() {
       requiredEnvVars.add("ANTHROPIC_API_KEY");
     } else if (model.startsWith("gemini-")) {
       requiredEnvVars.add("GOOGLE_GENERATIVE_AI_API_KEY");
-    } else if (model.startsWith("ollama-")) {
+    } else if (model.startsWith("ollama-") || model.includes(":")) {
     } else {
       requiredEnvVars.add("OPENAI_API_KEY");
     }

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@harperfast/agent",
 	"description": "AI to help you with Harper app management",
-	"version": "0.15.10",
+	"version": "0.16.1",
 	"main": "dist/agent.js",
 	"repository": "github:HarperFast/harper-agent",
 	"bugs": {