@element47/ag 4.5.5 → 4.5.6

package/README.md

@@ -44,12 +44,34 @@ export OPENROUTER_API_KEY=sk-or-v1-...
 -k, --key <key>           API key (or set OPENROUTER_API_KEY)
 -s, --system <prompt>     Custom system prompt
 -b, --base-url <url>      API base URL (default: OpenRouter; use for local LLMs)
--n, --max-iterations <n>  Max tool-call iterations (default: 25)
+-n, --max-iterations <n>  Max tool-call iterations (default: 200)
 -y, --yes                 Auto-approve all tool calls (skip confirmation prompts)
     --stats               Show memory file paths and status
 -h, --help                Show help
 ```
 
+## Steering
+
+Press **Tab** while the agent is working to course-correct without aborting. This opens a `steer>` prompt with full editing support (backspace, arrow keys, paste). Output is buffered while you type.
+
+- **Tab** — opens steer prompt, pauses output
+- **Enter** — submits the steer message and resumes. The LLM sees it on the next turn.
+- **Escape** — aborts everything (destructive, same as before)
+
+```
+you> build an API with auth
+
+  ⠧ [bash] npm init...
+                                          ← press Tab
+  steer> use PostgreSQL not SQLite        ← type your correction
+                                          ← press Enter
+  [steered] use PostgreSQL not SQLite
+  ✓ [bash] done                           ← buffered output replays
+  ⠧ thinking [2/200]                      ← LLM adjusts
+```
+
+Steer messages are queued and injected before the next LLM call — current tool calls are not interrupted.
+
 ## REPL Commands
 
 All commands follow the pattern: `/noun` to show, `/noun subcommand` to act.
@@ -118,11 +140,11 @@ agent(prompt="Set up the database schema", taskId=2)
 agent(prompt="Write unit tests", model="anthropic/claude-haiku")
 ```
 
-Sub-agents get project memory, plan, skills, and tools but start with a clean context (no conversation history). When linked to a task via `taskId`, the task is auto-marked `in_progress` at start and `done` on completion.
+Sub-agents get project memory, plan, skills, tools, and extensions but start with a clean context (no conversation history). When linked to a task via `taskId`, the task is auto-marked `in_progress` at start and `done` on completion. Tasks can include a `description` for richer context.
 
-Multiple `agent()` calls in the same turn run in parallel. Use `model` to route cheap tasks to faster/cheaper models.
+Multiple `agent()` calls in the same turn run in parallel. Use `model` to route cheap tasks to faster/cheaper models. Sub-agents run silently — only the parent shows `[agent]` start/result lines.
 
-Sub-agents cannot spawn sub-sub-agents (depth limit = 1).
+Sub-agents cannot spawn sub-sub-agents (depth limit = 1). Extensions loaded on sub-agents can check `agent.isSilent()` to avoid output.
 
 ## Custom Tools
 
@@ -337,9 +359,10 @@ Three tiers, all plain markdown you can edit directly:
   projects/
     <id>/
       memory.md                     # project: architecture, decisions
-      plans/                        # timestamped plan files
+      plans/                        # timestamped plan files (created on demand)
         2026-04-13T12-31-22-add-auth.md
-      history.jsonl                 # conversation history
+      tasks.json                    # task tracking (created on demand)
+      history.jsonl                 # conversation history (created on demand)
 ```
 
 All memory is injected into the system prompt on every API call (capped at ~6000 chars total to avoid context bloat). The agent reads it automatically and writes via the `memory` and `plan` tools.
@@ -473,15 +496,15 @@ Tools execute in parallel when the model returns multiple tool calls.
 - A compact project file listing gives the model awareness of project structure.
 - `tool_choice: "auto"` encourages tool use over conversational responses.
 - Dangerous bash commands (`find ~`, `rm -rf /`, etc.) are blocked before execution.
-- Tool results over 8KB are smart-truncated (first 50 + last 50 lines) to preserve context.
+- Tool results over 32KB are smart-truncated (first 100 + last 100 lines) to preserve context.
 - For multi-step coding tasks, the agent creates a plan before starting and updates it as it goes.
 - For simple questions, it just answers directly.
-- At 25 iterations the REPL asks if you want to continue.
+- At 200 iterations the REPL asks if you want to continue.
 - At 90% context window usage, ag automatically summarizes older conversation messages to free space. Use `/context compact` to trigger manually. Only message history is compacted — system prompt, tools, and skills are unaffected.
 
 ## When to use something else
 
-- **Claude Code** -- if you have a subscription and want the full harness with MCP, sub-agents, and a polished UI. ag is not trying to replace it.
+- **Claude Code** -- if you have a subscription and want MCP, git worktrees, and a polished IDE integration. ag has sub-agents, tasks, and extensions but is terminal-only.
 - **aider** -- if your workflow is git-centric (commit-per-change, diff-based editing).
 - **Cursor / Windsurf** -- if you want IDE integration. ag is terminal-only.
 
@@ -494,9 +517,14 @@ src/
   cli.ts              # entry point
   cli/parser.ts       # arg parsing + help
   cli/repl.ts         # interactive REPL (unified /noun commands)
-  core/agent.ts       # the loop + skill activation
+  core/agent.ts       # agent class, chat loop, tool execution, steering
+  core/utils.ts       # spinner, retry, truncation, promise helpers
+  core/prompt.ts      # environment detection, read-only rules, request building
+  core/compaction.ts  # context compaction (summarize old messages)
   core/config.ts      # persistent config (~/.ag/config.json)
   core/context.ts     # context window usage tracking
+  core/events.ts      # event system for extensions (8 lifecycle events)
+  core/extensions.ts  # extension discovery and loading
   core/skills.ts      # skill discovery, parsing, loading
   core/registry.ts    # skills.sh search + GitHub install
   core/types.ts       # interfaces
@@ -506,13 +534,15 @@ src/
   core/guardrails.ts  # prompt injection scanning (5 threat categories)
   core/loader.ts      # custom tool loader (~/.ag/tools/, .ag/tools/)
   core/permissions.ts # permission manager with glob pattern matching
-  memory/memory.ts    # three-tier file memory
+  memory/memory.ts    # memory, plans, tasks, history
+  tools/agent.ts      # sub-agent spawning (in-process, parallel)
+  tools/bash.ts       # shell execution + background processes
   tools/file.ts       # file reading + directory listing
-  tools/bash.ts       # shell execution (with command safeguards)
-  tools/memory.ts     # memory tool
-  tools/plan.ts       # plan management tool
   tools/git.ts        # git operations tool
   tools/grep.ts       # code search + file find
+  tools/memory.ts     # memory tool
+  tools/plan.ts       # plan management tool
+  tools/task.ts       # task tracking tool
   tools/web.ts        # web fetch + search tool
   tools/skill.ts      # skill activation tool
 ```

package/dist/cli/parser.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/cli/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG;IAAE,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAkB/E;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAkC/B"}
+{"version":3,"file":"parser.d.ts","sourceRoot":"","sources":["../../src/cli/parser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAE9C,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,UAAU,GAAG;IAAE,UAAU,EAAE,MAAM,EAAE,CAAA;CAAE,CAqB/E;AAED,wBAAgB,QAAQ,IAAI,IAAI,CAkC/B"}

package/dist/cli/parser.js

@@ -11,8 +11,11 @@ export function parseArgs(args) {
             options.system = args[++i];
         else if ((arg === '--base-url' || arg === '-b') && i + 1 < args.length)
             options.baseURL = args[++i];
-        else if ((arg === '--max-iterations' || arg === '-n') && i + 1 < args.length)
-            options.maxIterations = parseInt(args[++i], 10);
+        else if ((arg === '--max-iterations' || arg === '-n') && i + 1 < args.length) {
+            const n = parseInt(args[++i], 10);
+            if (!isNaN(n) && n > 0)
+                options.maxIterations = n;
+        }
         else if (arg === '--stats')
             options.stats = true;
         else if (arg === '--yes' || arg === '-y')
@@ -39,7 +42,7 @@ Options:
   -k, --key <key>           API key (or set OPENROUTER_API_KEY)
   -s, --system <prompt>     Custom system prompt
   -b, --base-url <url>      API base URL (default: OpenRouter; use for local LLMs)
-  -n, --max-iterations <n>  Max tool-call iterations (default: 25)
+  -n, --max-iterations <n>  Max tool-call iterations (default: 200)
   -y, --yes                 Auto-approve all tool calls (skip confirmation prompts)
       --stats               Show memory file locations and status
   -h, --help                Show this help
@@ -55,8 +58,8 @@ REPL commands:
   /exit                    Exit
 
 Install:
-  npx @iambarryking/ag     # Run directly
-  npm install -g @iambarryking/ag  # Install globally
+  npx @element47/ag     # Run directly
+  npm install -g @element47/ag  # Install globally
 `);
 }
 //# sourceMappingURL=parser.js.map

package/dist/cli/parser.js.map

@@ -1 +1 @@
-{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/cli/parser.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAC,IAAc;IACtC,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aACrF,IAAI,CAAC,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aACtF,IAAI,CAAC,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aAC5F,IAAI,CAAC,GAAG,KAAK,YAAY,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aAC/F,IAAI,CAAC,GAAG,KAAK,kBAAkB,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,aAAa,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;aACzH,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;aAC5C,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;aACxD,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;aAC1D,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCb,CAAC,CAAC;AACH,CAAC"}
+{"version":3,"file":"parser.js","sourceRoot":"","sources":["../../src/cli/parser.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,SAAS,CAAC,IAAc;IACtC,MAAM,OAAO,GAAe,EAAE,CAAC;IAC/B,MAAM,UAAU,GAAa,EAAE,CAAC;IAEhC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACrC,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,CAAC,GAAG,KAAK,SAAS,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aACrF,IAAI,CAAC,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aACtF,IAAI,CAAC,GAAG,KAAK,UAAU,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aAC5F,IAAI,CAAC,GAAG,KAAK,YAAY,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;aAC/F,IAAI,CAAC,GAAG,KAAK,kBAAkB,IAAI,GAAG,KAAK,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;YAC7E,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAClC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;gBAAE,OAAO,CAAC,aAAa,GAAG,CAAC,CAAC;QACpD,CAAC;aACI,IAAI,GAAG,KAAK,SAAS;YAAE,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;aAC5C,IAAI,GAAG,KAAK,OAAO,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,CAAC,GAAG,GAAG,IAAI,CAAC;aACxD,IAAI,GAAG,KAAK,QAAQ,IAAI,GAAG,KAAK,IAAI;YAAE,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;aAC1D,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC;YAAE,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACtD,CAAC;IAED,OAAO,EAAE,GAAG,OAAO,EAAE,UAAU,EAAE,CAAC;AACpC,CAAC;AAED,MAAM,UAAU,QAAQ;IACtB,OAAO,CAAC,GAAG,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgCb,CAAC,CAAC;AACH,CAAC"}

package/dist/cli/repl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../../src/cli/repl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAsB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,OAAO,EAAE,iBAAiB,EAAgB,MAAM,wBAAwB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,kBAAkB,CAAC;AAqCvE,wBAAgB,qBAAqB,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,eAAe,GAAG;IAAE,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;CAAE,CAgBnH;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,eAAe,GAAG;IAAE,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;CAAE,CAiD7I;AA8GD,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2B;IAC9C,OAAO,CAAC,SAAS,CAAqD;gBAE1D,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,iBAAiB,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC;IAqBnG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAwNd,aAAa;IAgZ3B,OAAO,CAAC,GAAG;CAGZ"}
+{"version":3,"file":"repl.d.ts","sourceRoot":"","sources":["../../src/cli/repl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmB,SAAS,EAAsB,MAAM,eAAe,CAAC;AAC/E,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAKzC,OAAO,EAAE,iBAAiB,EAAgB,MAAM,wBAAwB,CAAC;AACzE,OAAO,KAAK,EAAE,eAAe,EAAiB,MAAM,kBAAkB,CAAC;AAqCvE,wBAAgB,qBAAqB,CAAC,QAAQ,CAAC,EAAE,SAAS,GAAG,eAAe,GAAG;IAAE,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;CAAE,CAgBnH;AAED,wBAAgB,wBAAwB,CAAC,EAAE,EAAE,iBAAiB,EAAE,QAAQ,CAAC,EAAE,SAAS,GAAG,eAAe,GAAG;IAAE,YAAY,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,CAAA;CAAE,CAiD7I;AA8GD,qBAAa,IAAI;IACf,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAQ;IAC9B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAY;IAC/B,OAAO,CAAC,QAAQ,CAAC,EAAE,CAA2B;IAC9C,OAAO,CAAC,SAAS,CAAqD;gBAE1D,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,EAAE,iBAAiB,EAAE,SAAS,CAAC,EAAE,UAAU,CAAC,OAAO,wBAAwB,CAAC;IAqBnG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;YAkRd,aAAa;IAkZ3B,OAAO,CAAC,GAAG;CAGZ"}

package/dist/cli/repl.js

@@ -305,7 +305,11 @@ export class REPL {
                 const runAgent = async (message) => {
                     const controller = new AbortController();
                     let activeSpinnerStop = null;
-                    // ── Escape key listener: immediate visual feedback ──
+                    // ── Steer state ──
+                    let steerActive = false;
+                    let steerResolve = null;
+                    const chunkBuffer = [];
+                    // ── Keypress handler: Escape to abort, Tab to steer ──
                     const onKeypress = (_ch, key) => {
                         if (key?.name === 'escape') {
                             // 1. Clear whatever spinner is showing
@@ -318,6 +322,37 @@ export class REPL {
                             // 3. Signal abort (async propagation begins)
                             controller.abort();
                         }
+                        else if (key?.name === 'tab' && !steerActive) {
+                            // Tab opens steer prompt — pause spinner, buffer output until resolved
+                            steerActive = true;
+                            clearSpinner();
+                            process.stdin.removeListener('keypress', onKeypress);
+                            this.rl.resume();
+                            this.rl.question(`  ${C.yellow}steer>${C.reset} `, (answer) => {
+                                this.rl.pause();
+                                if (answer.trim()) {
+                                    this.agent.queueSteer(answer.trim());
+                                }
+                                // Clear the steer prompt line, show acknowledgement
+                                process.stderr.write('\x1b[A\x1b[2K');
+                                if (answer.trim()) {
+                                    process.stderr.write(`  ${C.yellow}[steered]${C.reset} ${C.dim}${answer.trim()}${C.reset}\n`);
+                                }
+                                // Flush buffered chunks
+                                for (const buffered of chunkBuffer) {
+                                    renderChunk(buffered);
+                                }
+                                chunkBuffer.length = 0;
+                                steerActive = false;
+                                process.stdin.on('keypress', onKeypress);
+                                process.stdin.resume();
+                                // Unblock any waiting permission prompts
+                                if (steerResolve) {
+                                    steerResolve();
+                                    steerResolve = null;
+                                }
+                            });
+                        }
                     };
                     if (process.stdin.isTTY) {
                         this.rl.pause(); // Detach readline so only our keypress handler runs
@@ -342,7 +377,6 @@ export class REPL {
                     this.agent.setSpinnerControl({
                         pause: () => {
                             clearSpinner();
-                            // Flush any in-progress text line so extension output starts on a clean line
                             if (hasText) {
                                 flushLines(true);
                                 process.stderr.write('\n');
@@ -351,6 +385,19 @@ export class REPL {
                         },
                         resume: () => { },
                     });
+                    // Wrap permissions to wait for steer to finish
+                    if (this.confirmCb) {
+                        const originalCb = this.agent.getConfirmToolCall();
+                        if (originalCb) {
+                            this.agent.setConfirmToolCall(async (toolName, args, pk) => {
+                                // Wait for active steer to resolve before prompting
+                                while (steerActive) {
+                                    await new Promise(r => { steerResolve = r; });
+                                }
+                                return originalCb(toolName, args, pk);
+                            });
+                        }
+                    }
                     const flushLines = (final) => {
                         const parts = lineBuf.split('\n');
                         lineBuf = final ? '' : (parts.pop() || '');
@@ -362,78 +409,86 @@ export class REPL {
                             lineBuf = '';
                         }
                     };
-                    try {
-                        for await (const chunk of this.agent.chatStream(message, controller.signal)) {
-                            switch (chunk.type) {
-                                case 'thinking':
-                                    clearSpinner();
-                                    if (hasText) {
-                                        flushLines(true);
-                                        process.stderr.write('\n');
-                                        hasText = false;
-                                    }
-                                    setSpinner(startSpinner(chunk.content || 'thinking'));
-                                    break;
-                                case 'text':
-                                    clearSpinner();
-                                    if (!hasText) {
-                                        if (hadTools)
-                                            process.stderr.write('\n');
-                                        process.stderr.write(`${C.bold}agent>${C.reset} `);
-                                        hasText = true;
-                                    }
-                                    lineBuf += (chunk.content || '');
-                                    if (lineBuf.includes('\n'))
-                                        flushLines(false);
-                                    break;
-                                case 'tool_start': {
-                                    clearSpinner();
-                                    if (hasText) {
-                                        flushLines(true);
+                    const renderChunk = (chunk) => {
+                        switch (chunk.type) {
+                            case 'thinking':
+                                clearSpinner();
+                                if (hasText) {
+                                    flushLines(true);
+                                    process.stderr.write('\n');
+                                    hasText = false;
+                                }
+                                setSpinner(startSpinner(chunk.content || 'thinking'));
+                                break;
+                            case 'text':
+                                clearSpinner();
+                                if (!hasText) {
+                                    if (hadTools)
                                         process.stderr.write('\n');
-                                        hasText = false;
-                                    }
-                                    const cmdPreview = truncateCommand(chunk.content || '', 60);
-                                    setSpinner(startSpinner(`[${chunk.toolName}] ${cmdPreview}`));
-                                    break;
+                                    process.stderr.write(`${C.bold}agent>${C.reset} `);
+                                    hasText = true;
                                 }
-                                case 'tool_end': {
-                                    clearSpinner();
-                                    hadTools = true;
-                                    let endLabel = chunk.toolName || '';
-                                    const activeSkills = this.agent.getActiveSkillNames();
-                                    if (endLabel === 'bash' && activeSkills.length > 0) {
-                                        endLabel = `${endLabel} via ${activeSkills[activeSkills.length - 1]}`;
-                                    }
-                                    const icon = chunk.success ? `${C.green}✓` : `${C.red}✗`;
-                                    const preview = (chunk.content || '').slice(0, 150).split('\n')[0];
-                                    process.stderr.write(`  ${icon} ${C.dim}[${endLabel}]${C.reset} ${C.dim}${preview}${(chunk.content || '').length > 150 ? '...' : ''}${C.reset}\n`);
-                                    break;
+                                lineBuf += (chunk.content || '');
+                                if (lineBuf.includes('\n'))
+                                    flushLines(false);
+                                break;
+                            case 'tool_start': {
+                                clearSpinner();
+                                if (hasText) {
+                                    flushLines(true);
+                                    process.stderr.write('\n');
+                                    hasText = false;
                                 }
-                                case 'done':
-                                    clearSpinner();
-                                    if (hasText) {
-                                        flushLines(true);
-                                        process.stderr.write('\n\n');
-                                    }
-                                    else if (!hadTools)
-                                        process.stderr.write(`${C.bold}agent>${C.reset} ${renderMarkdown(chunk.content || '')}\n\n`);
-                                    break;
-                                case 'max_iterations':
-                                    clearSpinner();
-                                    hitMaxIterations = true;
-                                    break;
-                                case 'interrupted':
-                                    clearSpinner();
-                                    interrupted = true;
-                                    if (hasText) {
-                                        flushLines(true);
-                                        process.stderr.write('\n');
-                                    }
-                                    const summary = chunk.content || 'stopped';
-                                    process.stderr.write(`  ${C.yellow}⚡ Interrupted${C.reset} ${C.dim}(${summary})${C.reset}\n\n`);
-                                    break;
+                                const cmdPreview = truncateCommand(chunk.content || '', 60);
+                                setSpinner(startSpinner(`[${chunk.toolName}] ${cmdPreview}`));
+                                break;
                             }
+                            case 'tool_end': {
+                                clearSpinner();
+                                hadTools = true;
+                                let endLabel = chunk.toolName || '';
+                                const activeSkills = this.agent.getActiveSkillNames();
+                                if (endLabel === 'bash' && activeSkills.length > 0) {
+                                    endLabel = `${endLabel} via ${activeSkills[activeSkills.length - 1]}`;
+                                }
+                                const icon = chunk.success ? `${C.green}✓` : `${C.red}✗`;
+                                const preview = (chunk.content || '').slice(0, 150).split('\n')[0];
+                                process.stderr.write(`  ${icon} ${C.dim}[${endLabel}]${C.reset} ${C.dim}${preview}${(chunk.content || '').length > 150 ? '...' : ''}${C.reset}\n`);
+                                break;
+                            }
+                            case 'done':
+                                clearSpinner();
+                                if (hasText) {
+                                    flushLines(true);
+                                    process.stderr.write('\n\n');
+                                }
+                                else if (!hadTools)
+                                    process.stderr.write(`${C.bold}agent>${C.reset} ${renderMarkdown(chunk.content || '')}\n\n`);
+                                break;
+                            case 'max_iterations':
+                                clearSpinner();
+                                hitMaxIterations = true;
+                                break;
+                            case 'steer':
+                                break;
+                            case 'interrupted':
+                                clearSpinner();
+                                interrupted = true;
+                                if (hasText) {
+                                    flushLines(true);
+                                    process.stderr.write('\n');
+                                }
+                                process.stderr.write(`  ${C.yellow}⚡ Interrupted${C.reset} ${C.dim}(${chunk.content || 'stopped'})${C.reset}\n\n`);
+                                break;
+                        }
+                    };
+                    try {
+                        for await (const chunk of this.agent.chatStream(message, controller.signal)) {
+                            if (steerActive) {
+                                chunkBuffer.push(chunk);
+                                continue;
+                            }
+                            renderChunk(chunk);
                         }
                         clearSpinner();
                     }
@@ -448,10 +503,14 @@ export class REPL {
                         }
                     }
                     finally {
-                        this.agent.setSpinnerControl(null);
                         if (process.stdin.isTTY) {
                             process.stdin.removeListener('keypress', onKeypress);
                         }
+                        this.agent.setSpinnerControl(null);
+                        // Restore original confirm callback if we wrapped it
+                        if (this.confirmCb) {
+                            this.agent.setConfirmToolCall(this.confirmCb);
+                        }
                     }
                 };
                 await runAgent(input);
@@ -700,7 +759,12 @@ export class REPL {
                     }
                     let parsed = value;
                     if (key === 'maxIterations') {
-                        parsed = parseInt(value, 10);
+                        const n = parseInt(value, 10);
+                        if (isNaN(n) || n <= 0) {
+                            console.error(`${C.red}Invalid number: ${value}${C.reset}\n`);
+                            break;
+                        }
+                        parsed = n;
                     }
                     else if (key === 'autoApprove') {
                         parsed = ['true', '1', 'yes'].includes(value.toLowerCase());