hoomanjs 1.32.0 → 1.34.0

package/README.md

@@ -21,7 +21,7 @@ It gives you a practical toolkit to build and run agent workflows:
 - a one-shot `exec` command for single prompts
 - a stateful `chat` interface for iterative sessions
 - a `daemon` command for channel-driven MCP automation
-- an in-chat `/config` workflow (Ink-powered) for app config, prompts, MCP servers, and installed skills
+- an in-chat `/config` workflow (Ink-powered) for general settings, models, MCP servers, and installed skills
 - an `acp` command for running Hooman as an Agent Client Protocol (ACP) agent over stdio
 
 ## Related
@@ -30,7 +30,7 @@ It gives you a practical toolkit to build and run agent workflows:
 
 ## Features
 
-- Multiple LLM providers: `anthropic`, `bedrock`, `google`, `groq`, `moonshot`, `ollama`, `openai`, `xai`
+- Multiple LLM providers: `anthropic`, `azure`, `bedrock`, `google`, `groq`, `minimax`, `moonshot`, `ollama`, `openai`, `openrouter`, `xai`
 - Local configuration under `~/.hooman`
 - Optional web search tool with provider selection (`brave`, `exa`, `firecrawl`, `serper`, or `tavily`)
 - MCP server support via `stdio`, `streamable-http`, and `sse`
@@ -39,6 +39,7 @@ It gives you a practical toolkit to build and run agent workflows:
 - Runtime skills via Strands `AgentSkills`, loading bundled built-in skills plus local `~/.hooman/skills`
 - Bundled prompt harness toggles (`behaviour`, `communication`, `execution`, `guardrails`); coding guidance ships as the built-in `hooman-coding` skill
 - Built-in research sub-agent runner (`research`) with configurable concurrency
+- Built-in `grep` tool backed by ripgrep (`rg`), with runtime bootstrap when `rg` is not available on PATH
 - Toolkit-oriented architecture with configurable tools, prompts, and transports
 - Interactive terminal UI for chat and configuration
 
@@ -263,11 +264,12 @@ The configuration workflow is launched from inside a `chat` session with the `/c
 
 The configuration UI currently lets you:
 
-- edit app configuration values
+- manage general settings such as name, prompts, tools, and compaction
+- manage models and providers with field-by-field editors
 - choose search provider and set its API key
 - toggle bundled harness prompts (`behaviour`, `communication`, `execution`, `guardrails`)
 - edit `instructions.md` in your `$VISUAL` / `$EDITOR` (cross-platform fallback included)
-- add, edit, and delete MCP servers with confirmation
+- add, edit, and delete MCP servers with field-by-field editors and confirmation
 - search, install, refresh, and remove skills
 
 ### `hooman acp`
@@ -300,32 +302,37 @@ Important files and folders:
 - `instructions.md` - system instructions used to build the agent prompt
 - `mcp.json` - MCP server definitions
 - `skills/` - installed skills
+- `bin/` - runtime-managed helper binaries (including bootstrapped `rg` for the `grep` tool when system `rg` is unavailable)
+- `cache/` - runtime caches used by tools and subsystems
 - `sessions/` - persisted session data
 - `acp-sessions/` - persisted ACP session metadata and message snapshots
 
+`grep` tool binary resolution order:
+
+1. Use system `rg` when available.
+2. Else use cached `~/.hooman/bin/rg` (or `rg.exe` on Windows).
+3. Else download and verify a platform-specific ripgrep release into `~/.hooman/bin/`.
+
 ## Example `config.json`
 
-The on-disk shape uses a reusable **`providers`** array plus a non-empty **`llms`** array. Each provider stores the shared runtime type and params once; each LLM references a provider by name, sets its `model`, optional model-specific `params`, and `default`. The bundled **hooman-config** skill documents the full schema.
+The on-disk shape uses a reusable **`providers`** array plus a non-empty **`llms`** array. Each provider stores a runtime `provider` id plus provider-specific `options`; each LLM references a provider by name, stores its model `options`, and marks one entry as the default. The bundled **hooman-config** skill documents the full schema.
 
 ```json
 {
   "name": "Hooman",
   "providers": [
     {
-      "name": "ollama-local",
-      "options": {
-        "provider": "ollama",
-        "params": {}
-      }
+      "name": "Ollama",
+      "provider": "ollama",
+      "options": {}
     }
   ],
   "llms": [
     {
       "name": "Default",
+      "provider": "Ollama",
       "options": {
-        "provider": "ollama-local",
-        "model": "gemma4:e4b",
-        "params": {}
+        "model": "gemma4:e4b"
       },
       "default": true
     }
@@ -346,25 +353,12 @@ The on-disk shape uses a reusable **`providers`** array plus a non-empty **`llms
     "guardrails": true
   },
   "tools": {
-    "todo": {
-      "enabled": true
-    },
-    "fetch": {
-      "enabled": true
-    },
-    "filesystem": {
-      "enabled": true
-    },
-    "shell": {
-      "enabled": true
-    },
-    "sleep": {
-      "enabled": true
-    },
-    "agents": {
-      "enabled": true,
-      "concurrency": 2
-    }
+    "todo": { "enabled": true },
+    "fetch": { "enabled": true },
+    "filesystem": { "enabled": true },
+    "shell": { "enabled": true },
+    "sleep": { "enabled": true },
+    "agents": { "enabled": true, "concurrency": 2 }
   },
   "compaction": {
     "ratio": 0.75,
@@ -377,19 +371,20 @@ Tool approvals are session-scoped and are not persisted in `config.json`.
 
 Hooman enables Strands `ContextOffloader` by default with file-backed storage under `~/.hooman/sessions/offloaded-content`, so large tool results can be previewed in-context and retrieved later without bloating the active conversation window.
 
-Supported `providers[].options.provider` values registered in this release (see `src/core/models/index.ts`):
+Supported `providers[].provider` values registered in this release (see `src/core/models/index.ts`):
 
 - `anthropic`
+- `azure`
 - `bedrock`
 - `google`
 - `groq`
+- `minimax`
 - `moonshot`
 - `ollama`
 - `openai`
+- `openrouter`
 - `xai`
 
-The `LlmProvider` enum in `src/core/config.ts` may list additional strings for forwards compatibility; unknown providers are not loaded at runtime.
-
 Supported `search.provider` values:
 
 - `brave`
@@ -400,253 +395,62 @@ Supported `search.provider` values:
 
 ## Provider Notes
 
-### Ollama
-
-Good default for local usage. Example:
-
-```json
-{
-  "providers": [
-    {
-      "name": "ollama-local",
-      "options": {
-        "provider": "ollama",
-        "params": {}
-      }
-    }
-  ],
-  "llms": [
-    {
-      "name": "Default",
-      "options": {
-        "provider": "ollama-local",
-        "model": "gemma4:e4b",
-        "params": {}
-      },
-      "default": true
-    }
-  ]
-}
-```
-
-### OpenAI
-
-Uses Strands **OpenAIModel** (Chat Completions). `apiKey` is optional if `OPENAI_API_KEY` is set. Use `clientConfig` for a custom base URL or other OpenAI client options (OpenAI-compatible proxies and gateways).
-
-Example:
-
-```json
-{
-  "providers": [
-    {
-      "name": "openai",
-      "options": {
-        "provider": "openai",
-        "params": {
-          "apiKey": "..."
-        }
-      }
-    }
-  ],
-  "llms": [
-    {
-      "name": "GPT-5",
-      "options": {
-        "provider": "openai",
-        "model": "gpt-5",
-        "params": {}
-      },
-      "default": true
-    }
-  ]
-}
-```
-
-OpenAI-compatible gateways that put token `usage` on the last streamed chunk together with `choices` are handled via a small stream shim so usage still surfaces in the UI.
-
-### Anthropic
-
-Uses Strands **AnthropicModel** (Anthropic Messages API). `apiKey` or `authToken`, optional `baseURL` and `headers` (merged into `clientConfig`), optional `clientConfig`, and model fields such as `temperature` and `maxTokens`. A prebuilt `client` is not configurable from JSON.
-
-```json
-{
-  "providers": [
-    {
-      "name": "anthropic",
-      "options": {
-        "provider": "anthropic",
-        "params": {
-          "apiKey": "..."
-        }
-      }
-    }
-  ],
-  "llms": [
-    {
-      "name": "Claude Sonnet",
-      "options": {
-        "provider": "anthropic",
-        "model": "claude-sonnet-4-20250514",
-        "params": {
-          "temperature": 0.7
-        }
-      },
-      "default": true
-    }
-  ]
-}
-```
-
-### Google
-
-Uses Strands `GoogleModel` on top of `@google/genai`. Top-level options like `apiKey`, `client`, `clientConfig`, and `builtInTools` are supported; other values go into Google generation params.
-
-```json
-{
-  "providers": [
-    {
-      "name": "google",
-      "options": {
-        "provider": "google",
-        "params": {
-          "apiKey": "..."
-        }
-      }
-    }
-  ],
-  "llms": [
-    {
-      "name": "Gemini Flash",
-      "options": {
-        "provider": "google",
-        "model": "gemini-2.5-flash",
-        "params": {
-          "temperature": 0.7,
-          "maxOutputTokens": 2048,
-          "topP": 0.9,
-          "topK": 40
-        }
-      },
-      "default": true
-    }
-  ]
-}
-```
-
-### Bedrock
-
-Supports `region`, `clientConfig`, and optional `apiKey`, with all other values forwarded as Bedrock model options.
+Provider entries now look like:
 
 ```json
 {
-  "providers": [
-    {
-      "name": "bedrock-dev",
-      "options": {
-        "provider": "bedrock",
-        "params": {
-          "region": "us-east-1",
-          "clientConfig": {
-            "profile": "dev",
-            "maxAttempts": 3,
-            "credentials": {
-              "accessKeyId": "AKIA...",
-              "secretAccessKey": "...",
-              "sessionToken": "..."
-            }
-          }
-        }
-      }
-    }
-  ],
-  "llms": [
-    {
-      "name": "Claude Sonnet",
-      "options": {
-        "provider": "bedrock-dev",
-        "model": "anthropic.claude-sonnet-4-20250514-v1:0",
-        "params": {
-          "temperature": 0.7,
-          "maxTokens": 1024
-        }
-      },
-      "default": true
-    }
-  ]
-}
-```
-
-You can also rely on the AWS default credential chain (recommended) by setting environment variables such as `AWS_ACCESS_KEY_ID`, `AWS_SECRET_ACCESS_KEY`, and optionally `AWS_SESSION_TOKEN`.
-
-### Groq
-
-### Anthropic
-
-Uses Strands `AnthropicModel` on top of `@anthropic-ai/sdk`. Provider-specific settings `apiKey`/`authToken`, `baseURL`, `headers`, `clientConfig`, `betas`, and `useNativeTokenCount` are picked up directly. Standard model config such as `temperature`, `topP`, `maxTokens`, and `stopSequences` stays top-level. Any other keys are forwarded to the Anthropic Messages request body, which is useful for Anthropic-compatible providers such as MiniMax.
-
-For MiniMax specifically:
-
-- Use `baseURL: "https://api.minimax.io/anthropic"`.
-- `MiniMax-M3` can emit visible thinking blocks when you set `thinking: { "type": "adaptive" }`.
-- `MiniMax-M2.7` / `M2.5` / `M2.1` / `M2` do internal reasoning, but MiniMax’s Anthropic-compatible API does not expose those as `thinking` content blocks, so Hooman has nothing to render in the transcript.
-
-```json
-{
-  "provider": "anthropic",
-  "model": "MiniMax-M3",
-  "params": {
-    "apiKey": "...",
-    "baseURL": "https://api.minimax.io/anthropic",
-    "thinking": { "type": "adaptive" },
-    "temperature": 1
+  "name": "MiniMax",
+  "provider": "minimax",
+  "options": {
+    "apiKey": "..."
   }
 }
 ```
 
-### Groq
-
-Uses the Vercel AI SDK Groq provider (`@ai-sdk/groq`) on top of Strands `VercelModel`. Provider-specific settings `apiKey`, `baseURL`, and `headers` are picked up; other values are forwarded into the model config (`temperature`, `maxTokens`, etc.). Defaults to `GROQ_API_KEY` from the environment when no `apiKey` is supplied.
+LLM entries reference a provider by name and carry normalized model options:
 
 ```json
 {
-  "provider": "groq",
-  "model": "gemma2-9b-it",
-  "params": {
-    "apiKey": "...",
-    "temperature": 0.7
-  }
+  "name": "MiniMax M3",
+  "provider": "MiniMax",
+  "options": {
+    "model": "MiniMax-M3",
+    "temperature": 1,
+    "maxTokens": 4096
+  },
+  "default": true
 }
 ```
 
-### Moonshot
+Supported provider option fields:
 
-Uses the Vercel AI SDK Moonshot provider (`@ai-sdk/moonshotai`) on top of Strands `VercelModel`. Provider-specific settings `apiKey`, `baseURL`, `headers`, and `fetch` are picked up; other values are forwarded into the model config (`temperature`, `maxTokens`, `providerOptions`, etc.). Defaults to `MOONSHOT_API_KEY` from the environment when no `apiKey` is supplied. Moonshot reasoning models such as `kimi-k2-thinking` can be configured through `params.providerOptions.moonshotai`.
+- `anthropic`: `apiKey`, optional `baseURL`, optional `headers`, optional `thinking`
+- `azure`: optional `resourceName`, optional `baseURL`, optional `apiKey`, optional `headers`, optional `apiVersion`, optional `useDeploymentBasedUrls`
+- `bedrock`: `region`, `accessKeyId`, `secretAccessKey`, optional `sessionToken`, optional `apiKey`
+- `google`: `apiKey`
+- `groq`: `apiKey`, optional `baseURL`, optional `headers`
+- `minimax`: `apiKey`, optional `headers`, optional `thinking`
+- `moonshot`: `apiKey`, optional `baseURL`, optional `headers`
+- `ollama`: optional `baseURL`, optional `thinking`
+- `openai`: `apiKey`, optional `baseURL`, optional `headers`
+- `openrouter`: `apiKey`, optional `baseURL`, optional `headers`
+- `xai`: `apiKey`, optional `baseURL`, optional `headers`
 
-```json
-{
-  "provider": "moonshot",
-  "model": "kimi-k2.5",
-  "params": {
-    "apiKey": "...",
-    "temperature": 0.7
-  }
-}
-```
+Normalized LLM option fields:
 
-### xAI
+- `model`
+- optional `temperature`
+- optional `maxTokens`
 
-Uses the Vercel AI SDK xAI provider (`@ai-sdk/xai`) on top of Strands `VercelModel`. Provider-specific settings `apiKey`, `baseURL`, and `headers` are picked up; other values are forwarded into the model config (`temperature`, `maxTokens`, etc.). Defaults to `XAI_API_KEY` from the environment when no `apiKey` is supplied.
+Notes:
 
-```json
-{
-  "provider": "xai",
-  "model": "grok-4.20-non-reasoning",
-  "params": {
-    "apiKey": "...",
-    "temperature": 0.7
-  }
-}
-```
+- Google maps normalized `maxTokens` to the SDK's `maxOutputTokens` internally.
+- Azure uses the Vercel AI SDK `@ai-sdk/azure` provider. Set the LLM `model` to your Azure deployment name, not the raw OpenAI model id.
+- Ollama maps normalized `temperature` into Ollama `options.temperature`.
+- MiniMax uses the Anthropic-compatible endpoint `https://api.minimax.io/anthropic` automatically.
+- Moonshot defaults `baseURL` to `https://api.moonshot.ai/v1` when it is omitted.
+- OpenRouter defaults `baseURL` to `https://openrouter.ai/api/v1` when it is omitted, and model names are usually provider-qualified ids such as `anthropic/claude-3.5-sonnet`.
+- Bedrock can rely on the AWS default credential chain when explicit credentials are not provided.
 
 ## MCP Configuration
 
@@ -788,6 +592,19 @@ Run typecheck:
 npm run typecheck
 ```
 
+Build the project:
+
+```bash
+npm run build
+```
+
+After making any code change, run both verification steps:
+
+```bash
+npm run typecheck
+npm run build
+```
+
 ## License
 
 MIT. See `LICENSE`.

package/dist/acp/sessions/options.js

@@ -31,8 +31,8 @@ export function buildSessionConfigOptions(config, agent) {
                 description: (() => {
                     const resolved = config.resolveLlm(m.name);
                     return resolved
-                        ? `${m.options.provider} -> ${resolved.options.provider}/${resolved.options.model}`
-                        : `${m.options.provider}/${m.options.model}`;
+                        ? `${m.provider} -> ${resolved.provider}/${resolved.llmOptions.model}`
+                        : `${m.provider}/${m.options.model}`;
                 })(),
             })),
         },

package/dist/acp/sessions/options.js.map

@@ -1 +1 @@
-{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/acp/sessions/options.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"options.js","sourceRoot":"","sources":["../../../src/acp/sessions/options.ts"],"names":[],"mappings":"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"}

package/dist/acp/utils/tool-kind.js

@@ -8,7 +8,7 @@ const KNOWN_TOOL_KINDS = new Map([
     ["list_directory", "read"],
     ["directory_tree", "read"],
     ["move_file", "move"],
-    ["search_files", "search"],
+    ["grep", "search"],
     ["get_file_info", "read"],
     ["shell", "execute"],
     ["sleep", "other"],

package/dist/acp/utils/tool-kind.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-kind.js","sourceRoot":"","sources":["../../../src/acp/utils/tool-kind.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAmB;IACjD,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAC/B,CAAC,YAAY,EAAE,MAAM,CAAC;IACtB,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,kBAAkB,EAAE,MAAM,CAAC;IAC5B,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAC1B,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAC1B,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,cAAc,EAAE,QAAQ,CAAC;IAC1B,CAAC,eAAe,EAAE,MAAM,CAAC;IACzB,CAAC,OAAO,EAAE,SAAS,CAAC;IACpB,CAAC,OAAO,EAAE,OAAO,CAAC;IAClB,CAAC,KAAK,EAAE,OAAO,CAAC;IAChB,CAAC,OAAO,EAAE,OAAO,CAAC;IAClB,CAAC,YAAY,EAAE,QAAQ,CAAC;IACxB,CAAC,OAAO,EAAE,OAAO,CAAC;IAClB,CAAC,eAAe,EAAE,OAAO,CAAC;IAC1B,CAAC,cAAc,EAAE,OAAO,CAAC;IACzB,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAC7B,CAAC,cAAc,EAAE,OAAO,CAAC;CAC1B,CAAC,CAAC;AAEH,OAAO,EAAE,uBAAuB,EAAE,CAAC;AAEnC,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,QAAgB,EAChB,IAAsB;IAEtB,MAAM,IAAI,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QAC/B,OAAO,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}
+{"version":3,"file":"tool-kind.js","sourceRoot":"","sources":["../../../src/acp/utils/tool-kind.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAE7E,MAAM,gBAAgB,GAAG,IAAI,GAAG,CAAmB;IACjD,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAC/B,CAAC,YAAY,EAAE,MAAM,CAAC;IACtB,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,kBAAkB,EAAE,MAAM,CAAC;IAC5B,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAC1B,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAC1B,CAAC,WAAW,EAAE,MAAM,CAAC;IACrB,CAAC,MAAM,EAAE,QAAQ,CAAC;IAClB,CAAC,eAAe,EAAE,MAAM,CAAC;IACzB,CAAC,OAAO,EAAE,SAAS,CAAC;IACpB,CAAC,OAAO,EAAE,OAAO,CAAC;IAClB,CAAC,KAAK,EAAE,OAAO,CAAC;IAChB,CAAC,OAAO,EAAE,OAAO,CAAC;IAClB,CAAC,YAAY,EAAE,QAAQ,CAAC;IACxB,CAAC,OAAO,EAAE,OAAO,CAAC;IAClB,CAAC,eAAe,EAAE,OAAO,CAAC;IAC1B,CAAC,cAAc,EAAE,OAAO,CAAC;IACzB,CAAC,kBAAkB,EAAE,OAAO,CAAC;IAC7B,CAAC,cAAc,EAAE,OAAO,CAAC;CAC1B,CAAC,CAAC;AAEH,OAAO,EAAE,uBAAuB,EAAE,CAAC;AAEnC,MAAM,UAAU,aAAa,CAAC,QAAgB;IAC5C,OAAO,gBAAgB,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC;AACnD,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,QAAgB,EAChB,IAAsB;IAEtB,MAAM,IAAI,GAAG,IAAI,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC;IACvC,IAAI,IAAI,IAAI,IAAI,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;QAC/B,OAAO,GAAG,QAAQ,KAAK,IAAI,EAAE,CAAC;IAChC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC"}

package/dist/acp/utils/tool-locations.js

@@ -7,7 +7,7 @@ const KNOWN_TOOL_LOCATION_KEYS = new Map([
     ["list_directory", ["path"]],
     ["directory_tree", ["path"]],
     ["move_file", ["source", "destination"]],
-    ["search_files", ["path"]],
+    ["grep", ["path"]],
     ["get_file_info", ["path"]],
 ]);
 /** ACP `locations` extracted only from known core filesystem tools. */

package/dist/acp/utils/tool-locations.js.map

@@ -1 +1 @@
-{"version":3,"file":"tool-locations.js","sourceRoot":"","sources":["../../../src/acp/utils/tool-locations.ts"],"names":[],"mappings":"AAEA,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAA4B;IAClE,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACxC,CAAC,cAAc,EAAE,CAAC,MAAM,CAAC,CAAC;IAC1B,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;CAC5B,CAAC,CAAC;AAEH,uEAAuE;AACvE,MAAM,UAAU,0BAA0B,CACxC,QAAgB,EAChB,KAAc;IAEd,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,CAAC,GAAG,KAAgC,CAAC;IAC3C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACjB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5B,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE,CAAC;gBACrB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC"}
+{"version":3,"file":"tool-locations.js","sourceRoot":"","sources":["../../../src/acp/utils/tool-locations.ts"],"names":[],"mappings":"AAEA,MAAM,wBAAwB,GAAG,IAAI,GAAG,CAA4B;IAClE,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC,YAAY,EAAE,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC,kBAAkB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC9B,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC;IAC5B,CAAC,WAAW,EAAE,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;IACxC,CAAC,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;IAClB,CAAC,eAAe,EAAE,CAAC,MAAM,CAAC,CAAC;CAC5B,CAAC,CAAC;AAEH,uEAAuE;AACvE,MAAM,UAAU,0BAA0B,CACxC,QAAgB,EAChB,KAAc;IAEd,MAAM,IAAI,GAAG,wBAAwB,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACpD,IAAI,CAAC,IAAI,EAAE,CAAC;QACV,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,IAAI,CAAC,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QACxC,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,MAAM,CAAC,GAAG,KAAgC,CAAC;IAC3C,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC;QACjB,IAAI,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1C,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAChB,CAAC;aAAM,IAAI,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC;YAC5B,KAAK,MAAM,IAAI,IAAI,CAAC,EAAE,CAAC;gBACrB,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAChD,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACnB,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AACzC,CAAC"}

package/dist/chat/app.js

@@ -227,9 +227,9 @@ function listModelsText(config) {
         const marker = entry.name === current ? "*" : "-";
         const resolved = config.resolveLlm(entry.name);
         if (!resolved) {
-            return `${marker} ${entry.name} (${entry.options.provider}/${entry.options.model})`;
+            return `${marker} ${entry.name} (${entry.provider}/${entry.options.model})`;
         }
-        return `${marker} ${entry.name} (${entry.options.provider} -> ${resolved.options.provider}/${resolved.options.model})`;
+        return `${marker} ${entry.name} (${entry.provider} -> ${resolved.provider}/${resolved.llmOptions.model})`;
     });
     return [
         `Current model: ${current}`,
@@ -436,21 +436,6 @@ export function ChatApp({ agent, config, sessionId, manager, registry, approvals
     const removeLine = useCallback((id) => {
         setLines((prev) => prev.filter((line) => line.id !== id));
     }, []);
-    const moveLineToEnd = useCallback((id) => {
-        setLines((prev) => {
-            const index = prev.findIndex((line) => line.id === id);
-            if (index === -1 || index === prev.length - 1) {
-                return prev;
-            }
-            const next = [...prev];
-            const [line] = next.splice(index, 1);
-            if (!line) {
-                return prev;
-            }
-            next.push(line);
-            return next;
-        });
-    }, []);
     const replaceAssistantText = useCallback((text) => {
         const id = assistantLineIdRef.current;
         if (!id) {
@@ -579,8 +564,9 @@ export function ChatApp({ agent, config, sessionId, manager, registry, approvals
             })),
         });
         try {
-            const provider = await modelProviders[config.llm.provider]();
-            agent.model = provider.create(config.llm.model, config.llm.params);
+            const resolved = config.llm;
+            const provider = await modelProviders[resolved.provider]();
+            agent.model = provider.create(resolved.providerOptions, resolved.llmOptions);
         }
         catch (error) {
             config.update({