@agentprojectcontext/apx 1.10.0 → 1.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@agentprojectcontext/apx",
-  "version": "1.10.0",
+  "version": "1.10.2",
   "description": "APX — unified CLI + daemon for the Agent Project Context (APC) standard.",
   "publishConfig": {
     "access": "public"

package/src/cli/commands/command.js

@@ -2,6 +2,8 @@
 import fs from "node:fs";
 import path from "node:path";
 import { findApfRoot } from "../../core/parser.js";
+import { http } from "../http.js";
+import { resolveProjectId } from "./project.js";
 
 function commandsDir(root) {
   return path.join(root, ".apc", "commands");
@@ -13,9 +15,28 @@ function listCommandFiles(root) {
   return fs.readdirSync(dir).filter((f) => f.endsWith(".md")).sort();
 }
 
-export function cmdCommandList() {
+async function resolveCommandRoot(args = {}) {
+  const explicitProject = args?.flags?.project;
+  if (explicitProject !== undefined && explicitProject !== null && explicitProject !== "") {
+    const pid = await resolveProjectId(explicitProject);
+    const projects = await http.get("/projects");
+    const project = projects.find((p) => p.id === pid);
+    if (!project) throw new Error(`project ${pid} not found`);
+    return project.path;
+  }
+
   const root = findApfRoot();
-  if (!root) throw new Error("not inside an APC project");
+  if (root) return root;
+
+  const pid = await resolveProjectId();
+  const projects = await http.get("/projects");
+  const project = projects.find((p) => p.id === pid);
+  if (!project) throw new Error(`project ${pid} not found`);
+  return project.path;
+}
+
+export async function cmdCommandList(args = {}) {
+  const root = await resolveCommandRoot(args);
   const files = listCommandFiles(root);
   if (files.length === 0) {
     console.log("(no commands — add .md files to .apc/commands/)");
@@ -31,11 +52,10 @@ export function cmdCommandList() {
   }
 }
 
-export function cmdCommandShow(args) {
+export async function cmdCommandShow(args) {
   const name = args._[0];
   if (!name) throw new Error("apx command show: missing <name>");
-  const root = findApfRoot();
-  if (!root) throw new Error("not inside an APC project");
+  const root = await resolveCommandRoot(args);
   const file = path.join(commandsDir(root), `${name}.md`);
   if (!fs.existsSync(file)) throw new Error(`command "${name}" not found in .apc/commands/`);
   process.stdout.write(fs.readFileSync(file, "utf8"));

package/src/cli/commands/sys.js

@@ -300,31 +300,93 @@ async function submitPrompt(pid, state, previousMessages, renderScreen, close) {
       model: state.activeModel,
     };
 
-    const result = await http.post(`/projects/${pid}/super-agent/chat`, body);
-    state.transcript.pop();
-    for (const trace of result.trace || []) {
-      state.transcript.push({ type: "tool", trace });
+    let result;
+    try {
+      result = await http.streamPost(
+        `/projects/${pid}/super-agent/chat/stream`,
+        body,
+        (event) => handleProgressEvent(event, state, renderScreen)
+      );
+    } catch (e) {
+      if (e.status !== 404) throw e;
+      result = await http.post(`/projects/${pid}/super-agent/chat`, body);
+      removeStatus(state);
+      for (const trace of result.trace || []) {
+        state.transcript.push({ type: "tool", trace });
+      }
     }
 
-    previousMessages.push({ role: "user", content: text });
-    previousMessages.push({ role: "assistant", content: result.text });
-    if (previousMessages.length > 20) previousMessages.splice(0, previousMessages.length - 20);
+    completeSuperAgentResult(result, text, startTime, state, previousMessages);
+  } catch (e) {
+    removeStatus(state);
+    state.transcript.push({ type: "error", text: e.message });
+  }
+
+  renderScreen();
+}
 
-    const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
-    state.usage.input += result.usage?.input_tokens || 0;
-    state.usage.output += result.usage?.output_tokens || 0;
-    state.usage.percent = Math.min(99, Math.round((state.usage.input / 200000) * 100));
+function removeStatus(state) {
+  const last = state.transcript[state.transcript.length - 1];
+  if (last?.type === "status") state.transcript.pop();
+}
 
+function handleProgressEvent(event, state, renderScreen) {
+  if (event.type === "model_start") {
+    const last = state.transcript[state.transcript.length - 1];
+    if (last?.type === "status") {
+      last.text = event.iteration > 1 ? `Thinking... step ${event.iteration}` : "Thinking...";
+      renderScreen();
+    }
+    return;
+  }
+
+  if (event.type === "assistant_text" && event.text) {
+    removeStatus(state);
     state.transcript.push({
       type: "assistant",
       name: state.activeAgent,
-      text: result.text,
-      meta: `${elapsed}s   ·   In: ${result.usage?.input_tokens || 0} Out: ${result.usage?.output_tokens || 0}`,
+      text: event.text,
+      meta: "intermediate",
     });
-  } catch (e) {
-    state.transcript.pop();
-    state.transcript.push({ type: "error", text: e.message });
+    renderScreen();
+    return;
   }
 
-  renderScreen();
+  if (event.type === "tool_start" && event.trace) {
+    removeStatus(state);
+    state.transcript.push({ type: "tool", trace: event.trace });
+    renderScreen();
+    return;
+  }
+
+  if (event.type === "tool_result" && event.trace) {
+    removeStatus(state);
+    const idx = state.transcript.findIndex(
+      (item) => item.type === "tool" && item.trace?.id && item.trace.id === event.trace.id
+    );
+    if (idx >= 0) state.transcript[idx] = { type: "tool", trace: event.trace };
+    else state.transcript.push({ type: "tool", trace: event.trace });
+    renderScreen();
+  }
+}
+
+function completeSuperAgentResult(result, userText, startTime, state, previousMessages) {
+  removeStatus(state);
+  if (!result) throw new Error("super-agent stream ended without final result");
+
+  previousMessages.push({ role: "user", content: userText });
+  previousMessages.push({ role: "assistant", content: result.text });
+  if (previousMessages.length > 20) previousMessages.splice(0, previousMessages.length - 20);
+
+  const elapsed = ((Date.now() - startTime) / 1000).toFixed(1);
+  state.usage.input += result.usage?.input_tokens || 0;
+  state.usage.output += result.usage?.output_tokens || 0;
+  state.usage.percent = Math.min(99, Math.round((state.usage.input / 200000) * 100));
+
+  state.transcript.push({
+    type: "assistant",
+    name: state.activeAgent,
+    text: result.text,
+    meta: `${elapsed}s   ·   In: ${result.usage?.input_tokens || 0} Out: ${result.usage?.output_tokens || 0}`,
+  });
 }

package/src/cli/http.js

@@ -91,9 +91,66 @@ async function request(method, path, body, opts = {}) {
   return json;
 }
 
+async function streamRequest(method, path, body, onEvent, opts = {}) {
+  if (opts.autoStart !== false) await ensureDaemon();
+  else if (!(await ping())) {
+    throw new Error(`apx daemon not running (no response on ${baseUrl()})`);
+  }
+
+  const res = await fetch(`${baseUrl()}${path}`, {
+    method,
+    headers: body ? { "content-type": "application/json" } : {},
+    body: body ? JSON.stringify(body) : undefined,
+  });
+
+  if (!res.ok) {
+    const text = await res.text();
+    let json = null;
+    try { json = text ? JSON.parse(text) : null; } catch {}
+    const err = new Error(json?.error || `${method} ${path} → ${res.status}`);
+    err.status = res.status;
+    throw err;
+  }
+
+  if (!res.body?.getReader) {
+    throw new Error("streaming response is not supported by this Node.js runtime");
+  }
+
+  const reader = res.body.getReader();
+  const decoder = new TextDecoder();
+  let buffer = "";
+  let finalResult = null;
+
+  while (true) {
+    const { value, done } = await reader.read();
+    if (done) break;
+    buffer += decoder.decode(value, { stream: true });
+    const lines = buffer.split(/\r?\n/);
+    buffer = lines.pop() || "";
+    for (const line of lines) {
+      if (!line.trim()) continue;
+      const event = JSON.parse(line);
+      if (event.type === "final") finalResult = event.result;
+      if (event.type === "error") throw new Error(event.error || "stream error");
+      await onEvent?.(event);
+    }
+  }
+
+  buffer += decoder.decode();
+  if (buffer.trim()) {
+    const event = JSON.parse(buffer);
+    if (event.type === "final") finalResult = event.result;
+    if (event.type === "error") throw new Error(event.error || "stream error");
+    await onEvent?.(event);
+  }
+
+  return finalResult;
+}
+
 export const http = {
   get: (p, opts) => request("GET", p, undefined, opts),
   post: (p, body, opts) => request("POST", p, body, opts),
+  streamPost: (p, body, onEvent, opts) => streamRequest("POST", p, body, onEvent, opts),
   put: (p, body, opts) => request("PUT", p, body, opts),
   patch: (p, body, opts) => request("PATCH", p, body, opts),
   delete: (p, opts) => request("DELETE", p, undefined, opts),

package/src/cli/index.js

@@ -60,7 +60,7 @@ import {
   cmdConversationsList,
   cmdConversationsGet,
 } from "./commands/chat.js";
-import { cmdSys } from "./commands/sys.js";
+import { cmdSys as cmdCode } from "./commands/sys.js";
 import { cmdRun, cmdEnvDetect } from "./commands/runtime.js";
 import { cmdSend, cmdConnections } from "./commands/a2a.js";
 import {
@@ -184,7 +184,7 @@ const HELP_TOPICS = new Map(Object.entries({
     title: "apx project add",
     summary: "Register a project with the APX daemon.",
     usage: ["apx project add [path]"],
-    examples: ["apx project add .", "apx add project ../repo"],
+    examples: ["apx project add .", "apx project add ../repo"],
   }),
   "project list": topic({
     title: "apx project list",
@@ -204,19 +204,6 @@ const HELP_TOPICS = new Map(Object.entries({
     usage: ["apx project rebuild [id]"],
     examples: ["apx project rebuild", "apx project rebuild default"],
   }),
-  add: topic({
-    title: "apx add",
-    summary: "Friendly alias namespace for add operations.",
-    usage: ["apx add project [path]"],
-    commands: [["project [path]", "Alias for apx project add [path]."]],
-    examples: ["apx add project ."],
-  }),
-  "add project": topic({
-    title: "apx add project",
-    summary: "Alias for apx project add.",
-    usage: ["apx add project [path]"],
-    examples: ["apx add project ."],
-  }),
   agent: topic({
     title: "apx agent",
     summary: "Create, inspect, import, and vault agent definitions.",
@@ -298,7 +285,7 @@ const HELP_TOPICS = new Map(Object.entries({
   }),
   identity: topic({
     title: "apx identity",
-    summary: "Read or edit daemon identity fields.",
+    summary: "Read or edit APX profile identity fields.",
     usage: ["apx identity <show|set|wizard> [args]"],
     commands: [
       ["show", "Print current identity."],
@@ -309,13 +296,13 @@ const HELP_TOPICS = new Map(Object.entries({
   }),
   "identity show": topic({
     title: "apx identity show",
-    summary: "Print current daemon identity.",
+    summary: "Print current APX profile identity.",
     usage: ["apx identity show"],
     examples: ["apx identity show"],
   }),
   "identity set": topic({
     title: "apx identity set",
-    summary: "Set one daemon identity field.",
+    summary: "Set one APX profile identity field.",
     usage: ["apx identity set <key> <value>"],
     examples: ["apx identity set agent_name Ada", "apx identity set owner_name Sam"],
   }),
@@ -364,7 +351,7 @@ const HELP_TOPICS = new Map(Object.entries({
   }),
   permission: topic({
     title: "apx permission",
-    summary: "Show or set super-agent permission mode.",
+    summary: "Show or set APX tool permission mode.",
     usage: ["apx permission show", "apx permission set <total|automatico|permiso>"],
     commands: [
       ["show", "Print current permission mode."],
@@ -374,13 +361,13 @@ const HELP_TOPICS = new Map(Object.entries({
   }),
   "permission show": topic({
     title: "apx permission show",
-    summary: "Print current super-agent permission mode.",
+    summary: "Print current APX tool permission mode.",
     usage: ["apx permission show"],
     examples: ["apx permission show"],
   }),
   "permission set": topic({
     title: "apx permission set",
-    summary: "Set super-agent permission mode.",
+    summary: "Set APX tool permission mode.",
     usage: ["apx permission set <total|automatico|permiso>"],
     examples: ["apx permission set permiso"],
   }),
@@ -702,14 +689,14 @@ const HELP_TOPICS = new Map(Object.entries({
     ],
     examples: ["apx chat reviewer", "apx chat reviewer --conversation abc123"],
   }),
-  sys: topic({
-    title: "apx sys",
-    summary: "Start an interactive super-agent chat REPL with system and workspace context.",
-    usage: ["apx sys [--project <name|id|path>]"],
+  code: topic({
+    title: "apx code",
+    summary: "Start the APX terminal coding assistant with system and workspace context.",
+    usage: ["apx code [--project <name|id|path>]"],
     options: [
       ["--project <name|id|path>", "Pin command to a specific project."],
     ],
-    examples: ["apx sys", "apx sys --project default"],
+    examples: ["apx code", "apx code --project default"],
   }),
   conversations: topic({
     title: "apx conversations",
@@ -779,17 +766,10 @@ const HELP_TOPICS = new Map(Object.entries({
   connections: topic({
     title: "apx connections",
     summary: "Show an agent communication map.",
-    usage: ["apx connections <agent> [--project <name|id|path>]", "apx graph <agent> [--project <name|id|path>]"],
+    usage: ["apx connections <agent> [--project <name|id|path>]"],
     options: [["--project <name|id|path>", "Pin command to a specific project."]],
     examples: ["apx connections reviewer"],
   }),
-  graph: topic({
-    title: "apx graph",
-    summary: "Alias for apx connections.",
-    usage: ["apx graph <agent> [--project <name|id|path>]"],
-    options: [["--project <name|id|path>", "Pin command to a specific project."]],
-    examples: ["apx graph reviewer"],
-  }),
   routine: topic({
     title: "apx routine",
     summary: "Manage scheduled APX routines.",
@@ -931,11 +911,12 @@ const HELP_TOPICS = new Map(Object.entries({
   command: topic({
     title: "apx command",
     summary: "List or show workflow commands from .apc/commands/.",
-    usage: ["apx command [list]", "apx command show <name>"],
+    usage: ["apx command [list] [--project <name|id|path>]", "apx command show <name> [--project <name|id|path>]"],
     commands: [
       ["list | ls", "List workflow commands."],
       ["show | get <name>", "Print one command file."],
     ],
+    options: [["--project <name|id|path>", "Pin command to a specific project; defaults to current APC project or default."]],
     examples: ["apx command list", "apx command show release"],
   }),
   commands: topic({
@@ -947,13 +928,15 @@ const HELP_TOPICS = new Map(Object.entries({
   "command list": topic({
     title: "apx command list",
     summary: "List workflow commands in .apc/commands/.",
-    usage: ["apx command list", "apx command ls"],
+    usage: ["apx command list [--project <name|id|path>]", "apx command ls [--project <name|id|path>]"],
+    options: [["--project <name|id|path>", "Pin command to a specific project; defaults to current APC project or default."]],
     examples: ["apx command list"],
   }),
   "command show": topic({
     title: "apx command show",
     summary: "Print one workflow command file.",
-    usage: ["apx command show <name>", "apx command get <name>"],
+    usage: ["apx command show <name> [--project <name|id|path>]", "apx command get <name> [--project <name|id|path>]"],
+    options: [["--project <name|id|path>", "Pin command to a specific project; defaults to current APC project or default."]],
     examples: ["apx command show release"],
   }),
   skills: topic({
@@ -1019,6 +1002,7 @@ const HELP_TOPICS = new Map(Object.entries({
 const HELP_ALIASES = new Map(Object.entries({
   "project ls": "project list",
   "project rm": "project remove",
+  "sys": "code",
   "agent ls": "agent list",
   "agent show": "agent get",
   "agent vault ls": "agent vault list",
@@ -1074,11 +1058,12 @@ function buildHelp(version) {
     hCmd("apx setup",                  36, "interactive wizard: provider → model → channels → daemon  (alias: install)"),
     hCmd("apx status",                 36, "full system status: daemon, super-agent, engines, telegram, projects"),
     hCmd("apx update",                 36, "check for updates and upgrade  (alias: upgrade)"),
+
+    hSec("Projects"),
     hCmd("apx project add [path]",     36, "register a project with the daemon"),
     hCmd("apx project list",           36, ""),
     hCmd("apx project remove <id>",    36, ""),
     hCmd("apx project rebuild [id]",   36, "rebuild project index from filesystem"),
-    hCmd("apx add project [path]",     36, "alias for: apx project add"),
 
     hSec("Agents"),
     hCmd("apx agent add <slug>",       36, "--role R  --model M  --skills a,b  --language es-AR  --description D"),
@@ -1088,15 +1073,16 @@ function buildHelp(version) {
     hCmd("apx agent vault list",       36, ""),
     hCmd("apx agent vault add",        36, ""),
 
-    hSec("Identity & Config"),
-    hCmd("apx identity show",          36, "print current agent identity (name, owner, personality)"),
+    hSec("APX Profile"),
+    hCmd("apx identity show",          36, "print current APX identity (name, owner, personality)"),
     hCmd("apx identity set <k> <v>",   36, "set identity field"),
     hCmd("apx identity wizard",        36, "interactive identity setup"),
+
+    hSec("Config"),
     hCmd("apx config show",            36, "--effective  --only-overrides"),
-    hCmd("apx config set <key> <val>", 36, "set key in .apc/config.json  (JSON-aware)"),
-    hCmd("apx permission show",        36, "show super-agent permission mode"),
+    hCmd("apx config set|unset",       36, "<key> [value]  edit .apc/config.json  (JSON-aware)"),
+    hCmd("apx permission show",        36, "show APX tool permission mode"),
     hCmd("apx permission set <mode>",  36, "mode: total | automatico | permiso"),
-    hCmd("apx config unset <key>",     36, "remove key from .apc/config.json"),
 
     hSec("Memory"),
     hCmd("apx memory <slug>",          36, "print memory.md"),
@@ -1123,7 +1109,7 @@ function buildHelp(version) {
     hCmd("apx mcp tools <name>",       36, "list available tools"),
     hCmd("apx mcp check",              36, "audit multi-source merge"),
 
-    hSec("Daemon"),
+    hSec("Daemon Service"),
     hCmd("apx daemon start",           36, ""),
     hCmd("apx daemon stop",            36, ""),
     hCmd("apx daemon status",          36, ""),
@@ -1139,11 +1125,11 @@ function buildHelp(version) {
     hCmd("apx messages chat",          36, "--channel telegram  -n 50"),
     hCmd("apx messages search \"q\"",  36, ""),
 
-    hSec("LLM / Chat"),
-    hCmd("apx exec <agent> \"prompt\"",36, "--model <id>  --max-tokens N  --temperature T"),
-    hCmd("apx chat <agent>",           36, "--conversation <id>  --model <id>  (interactive REPL)"),
-    hCmd("apx sys",                    36, "super-agent chat w/ system+workspace context"),
-    hCmd("apx conversations list",     36, "<agent>"),
+    hSec("LLM / Code"),
+    hCmd("apx code",                   36, "APX terminal coding assistant"),
+    hCmd("apx exec <agent> \"prompt\"",36, "one-shot agent call  --model <id>  --max-tokens N"),
+    hCmd("apx chat <agent>",           36, "interactive agent REPL  --conversation <id>"),
+    hCmd("apx conversations list",     36, "stored exec/chat conversations for <agent>"),
     hCmd("apx conversations get",      36, "<agent> <id>"),
 
     hSec("Runtimes"),
@@ -1154,7 +1140,6 @@ function buildHelp(version) {
     hSec("Agent-to-Agent"),
     hCmd("apx send <from> <to> \"msg\"",36, "--deliver  log A2A message; --deliver runs target engine"),
     hCmd("apx connections <agent>",    36, "mental map: who/how/when this agent talked"),
-    hCmd("apx graph <agent>",          36, "alias for connections"),
 
     hSec("Routines & Pipeline"),
     hCmd("apx routine list",           36, "list routines + next/last run"),
@@ -1452,8 +1437,9 @@ async function dispatch(cmd, rest) {
         await cmdChat(parseArgs(rest));
         break;
 
+      case "code":
       case "sys":
-        await cmdSys(parseArgs(rest));
+        await cmdCode(parseArgs(rest));
         break;
 
       case "conversations":
@@ -1482,7 +1468,6 @@ async function dispatch(cmd, rest) {
         break;
 
       case "connections":
-      case "graph":
         await cmdConnections(parseArgs(rest));
         break;
 
@@ -1543,8 +1528,8 @@ async function dispatch(cmd, rest) {
       case "commands": {
         const sub = rest[0];
         const a = parseArgs(rest.slice(1));
-        if (!sub || sub === "list" || sub === "ls") cmdCommandList();
-        else if (sub === "show" || sub === "get") cmdCommandShow(a);
+        if (!sub || sub === "list" || sub === "ls") await cmdCommandList(a);
+        else if (sub === "show" || sub === "get") await cmdCommandShow(a);
         else die(`unknown command subcommand: ${sub}`);
         break;
       }
@@ -1563,14 +1548,6 @@ async function dispatch(cmd, rest) {
         await cmdIdentity(parseArgs(rest));
         break;
 
-      case "add": {
-        // apx add <domain> [...args] — consistent alternative to apx <domain> add
-        const sub = rest[0];
-        if (sub === "project") await cmdProjectAdd(parseArgs(rest.slice(1)));
-        else die(`unknown 'add' subcommand: ${sub || "(none)"} — try: project`);
-        break;
-      }
-
       case "status":
         await cmdStatus();
         return; // skip checkForUpdate after status (avoid noise)

package/src/cli/terminal-chat/renderer.js

@@ -229,6 +229,11 @@ function addToolBlock(lines, item, width) {
   addLine(lines, "", C.bg);
   addLine(lines, margin + C.muted + `→ ${label}${target ? " " + fit(String(target), inner) : ""}`, C.bg);
 
+  if (trace.pending) {
+    addLine(lines, margin + C.dim + "  " + C.muted + "running...", C.bg);
+    return;
+  }
+
   if (trace.tool === "write_file") {
     const heading = `# Wrote ${args.path || "file"}`;
     addLine(lines, margin + C.panel + " " + C.muted + heading + " ".repeat(Math.max(0, inner - visible(heading))), C.bg);

package/src/core/apx-skill.md

@@ -88,7 +88,7 @@ apx messages tail --agent <slug> -n 20
 Message rows expose `type` (`user`, `agent`, `tool`, `system`) and `actor_id`; use `messages chat`
 when you need a readable transcript.
 
-## Super-agent permissions
+## APX tool permissions
 
 ```bash
 apx permission show

package/src/daemon/api.js

@@ -525,6 +525,50 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
   });
 
   // POST /projects/:pid/super-agent/chat
+  app.post("/projects/:pid/super-agent/chat/stream", async (req, res) => {
+    const p = project(req, res);
+    if (!p) return;
+    const { prompt, contextNote, previousMessages, model } = req.body || {};
+    if (!prompt) return res.status(400).json({ error: "prompt required" });
+
+    res.setHeader("content-type", "application/x-ndjson; charset=utf-8");
+    res.setHeader("cache-control", "no-cache, no-transform");
+    res.setHeader("x-accel-buffering", "no");
+    res.flushHeaders?.();
+
+    const send = (event) => {
+      res.write(JSON.stringify(event) + "\n");
+    };
+
+    try {
+      const saResult = await runSuperAgent({
+        globalConfig: config,
+        projects,
+        plugins,
+        registries,
+        prompt,
+        contextNote: contextNote || `Context: Project ${p.id} (${p.name}) at ${p.path}`,
+        previousMessages: previousMessages || [],
+        overrideModel: model,
+        onEvent: send,
+      });
+      projects.rebuild(p.id);
+      send({
+        type: "final",
+        result: {
+          text: saResult.text,
+          usage: saResult.usage,
+          name: saResult.name,
+          trace: saResult.trace,
+        },
+      });
+      res.end();
+    } catch (e) {
+      send({ type: "error", error: e.message });
+      res.end();
+    }
+  });
+
   app.post("/projects/:pid/super-agent/chat", async (req, res) => {
     const p = project(req, res);
     if (!p) return;

package/src/daemon/engines/mock.js

@@ -8,6 +8,23 @@ export default {
   async chat({ system, messages, model = "mock" }) {
     const last = [...messages].reverse().find((m) => m.role === "user");
     const userText = last?.content || "";
+    const requestedTool = userText.match(/\[mock:tool:([a-z_]+)\]/)?.[1];
+    const hasToolResult = messages.some((m) => m.role === "tool");
+    if (requestedTool && !hasToolResult) {
+      const toolCall = {
+        id: "mock-call-1",
+        type: "function",
+        function: { name: requestedTool, arguments: "{}" },
+      };
+      return {
+        text: "",
+        tool_calls: [toolCall],
+        message: { tool_calls: [toolCall] },
+        usage: { input_tokens: userText.length, output_tokens: 4 },
+        raw: { model, mock: true },
+      };
+    }
+
     const sysHint = system ? ` (system: ${system.slice(0, 40)}…)` : "";
     return {
       text: `[mock:${model}] received: ${userText}${sysHint}`,

package/src/daemon/super-agent-tools/tools/call-runtime.js

@@ -7,6 +7,8 @@ import {
   createRuntimeSession,
   extractApfResult,
 } from "../../apc-runtime-context.js";
+import { detectAll } from "../../env-detect.js";
+import { runProcess } from "../../runtimes/_spawn.js";
 import { getRuntime, RUNTIME_IDS } from "../../runtimes/index.js";
 import { buildAgentSystem, confirmedProperty, resolveProject } from "../helpers.js";
 
@@ -61,18 +63,43 @@ function buildRuntimeSystem(project, agent, runtime, sessionId, caller) {
   ].join("\n\n");
 }
 
+async function runtimeAvailability(runtime, rt) {
+  const probe = await runProcess({
+    command: rt.binary,
+    args: rt.versionFlag ? [rt.versionFlag] : ["--version"],
+    timeoutMs: 3000,
+  });
+  if (probe.exitCode === 0 || probe.stdout || probe.stderr) {
+    return { ok: true };
+  }
+
+  const detected = await detectAll();
+  const current = detected.find((d) => d.id === runtime || d.binary === rt.binary);
+  if (current?.installed) {
+    return { ok: true, detected };
+  }
+  return {
+    ok: false,
+    reason: current?.reason || `${rt.binary} not found`,
+    detected,
+    installed: detected
+      .filter((d) => d.category === "runtime" && d.installed)
+      .map((d) => d.id),
+  };
+}
+
 export default {
   name: "call_runtime",
   schema: {
     type: "function",
     function: {
       name: "call_runtime",
-      description: "Spawn an external CLI runtime (Claude Code, Codex, OpenCode, Aider, Cursor Agent, Gemini CLI, Qwen Code), optionally impersonating an APC agent.",
+      description: "Spawn an external CLI runtime (Claude Code, Codex, OpenCode, Aider, Cursor Agent, Gemini CLI, Qwen Code). Omit agent for the base APX/default self-run.",
       parameters: {
         type: "object",
         properties: {
           project: { type: "string" },
-          agent: { type: "string", description: "Optional APC agent slug from AGENTS.md, not runtime name. Omit when the user did not name an agent." },
+          agent: { type: "string", description: "Optional APC agent slug from AGENTS.md, not runtime name. Use only when the user explicitly named that agent. Omit for 'vos mismo', 'default', 'base', or no agent." },
           runtime: {
             type: "string",
             enum: RUNTIME_IDS,
@@ -108,6 +135,19 @@ export default {
       return { error: `${e.message}. Available runtimes: ${RUNTIME_IDS.join(", ")}` };
     }
 
+    const availability = await runtimeAvailability(runtime, rt);
+    if (!availability.ok) {
+      return {
+        error: `runtime "${runtime}" is not installed or not runnable (${availability.reason})`,
+        runtime,
+        binary: rt.binary,
+        installed_runtimes: availability.installed,
+        hint: availability.installed.length
+          ? `Try one of: ${availability.installed.join(", ")}`
+          : "No external runtime CLIs were detected. Run apx env detect for details.",
+      };
+    }
+
     const actor = agent?.slug || "apx";
     const session = createRuntimeSession({
       projectRoot: p.path,
@@ -163,6 +203,7 @@ export default {
         apc_session: session.id,
         exit_code: r.exitCode,
         output: (r.output || "").slice(0, 4000),
+        stderr: (r.stderr || "").slice(0, 2000),
         truncated: (r.output || "").length > 4000,
         external_session_path: r.externalSessionPath || null,
         session_id: r.sessionId || null,

package/src/daemon/super-agent-tools/tools/set-identity.js

@@ -7,7 +7,7 @@ export default {
     type: "function",
     function: {
       name: "set_identity",
-      description: "Update daemon identity fields. Persists to ~/.apx/identity.json.",
+      description: "Update APX profile identity fields. Persists to ~/.apx/identity.json.",
       parameters: {
         type: "object",
         properties: {

package/src/daemon/super-agent-tools/tools/set-permission-mode.js

@@ -9,7 +9,7 @@ export default {
     type: "function",
     function: {
       name: "set_permission_mode",
-      description: "Set the super-agent permission mode in ~/.apx/config.json. Modes: total, automatico, permiso.",
+      description: "Set APX tool permission mode in ~/.apx/config.json. Modes: total, automatico, permiso.",
       parameters: {
         type: "object",
         properties: {

package/src/daemon/super-agent.js

@@ -53,13 +53,14 @@ HARD RULES (do not deviate):
 7. Stay brief: under 6 sentences unless asked for detail.
 8. You DO see recent prior turns of this chat as previous messages when applicable. **Use them ONLY to disambiguate references** (e.g. "el primero" → first project mentioned earlier). For ANY factual data — agent details, MCP details, file contents, memory — RE-CALL the tool. Past turns are context, not a cache. Models change, agents change, files change.
 9. /reset or /new from the user means "forget previous turns and answer this one fresh" — if you see those prefixes the operator already cleared the context for you.
-10. DELEGATION RULE: when the user asks an agent to do a task, use call_agent (unless they specify opening it in a runtime, then see rule 11).
-11. DISPATCH RULE: when the user asks to work inside Claude, Codex, OpenCode, Aider, Cursor, Gemini CLI, or Qwen Code, use call_runtime({runtime: 'claude-code'|'codex'|'opencode'|'aider'|'cursor-agent'|'gemini-cli'|'qwen-code', prompt: <user's request>}). If they explicitly name an agent to spawn, pass agent: <slug>. If they don't name an agent, DO NOT pass an agent argument. When an agent is passed, its memory + skills become the system prompt of the runtime.
-12. PROJECT RULE: when the user gives no project, use project "default". Do not infer a non-default project from old chat history unless the user references it. If they mention a path or project name, look it up or add it with add_project.
-13. VAULT RULE: when the user wants a new existing agent/template, call list_vault_agents first. If a suitable vault agent exists, import_agent into the chosen project. If none fits, say briefly what is missing.
-14. NO-PENDING RULE: never say "give me a second", "I will do it", or "I will try later" as a final answer. Either call the tool in this same turn or say what blocks you.
-15. IDENTITY RULE: when the user asks you to change your name, call yourself something, or update your personality/language, call set_identity and persist the change. Then confirm with your new name.
-16. ROUTINES RULE: NEVER create a routine in the default project (id=0). Routines MUST be tied to a specific registered project. Before adding a routine, call list_projects to find the correct project id or name. Then pass --project <id|name> to apx routine add. If no project fits, ask the user which project to use. Creating routines in project 0/default mixes unrelated projects' schedules and corrupts state.`;
+10. SELF-RUN RULE: if the user says "vos mismo", "tu mismo", "same", "base", "default", "sin agente", or does not explicitly name an agent slug, act as APX itself. Do NOT call list_agents to choose a candidate. Do NOT pass agent to call_runtime/call_agent.
+11. DELEGATION RULE: when the user asks a named APC agent to do a task, use call_agent (unless they specify opening it in a runtime, then see rule 12).
+12. DISPATCH RULE: when the user asks to work inside Claude, Codex, OpenCode, Aider, Cursor, Gemini CLI, or Qwen Code, use call_runtime({runtime: 'claude-code'|'codex'|'opencode'|'aider'|'cursor-agent'|'gemini-cli'|'qwen-code', prompt: <user's request>}). First prefer runtimes the tool reports as installed/runnable; if a runtime is missing or fails, report that fact and its stderr/error instead of pretending success. If the user explicitly named an agent slug, pass agent: <slug>. If they didn't, DO NOT pass agent. When an agent is passed, its memory + skills become the system prompt of the runtime.
+13. PROJECT RULE: when the user gives no project, use project "default". Do not infer a non-default project from old chat history unless the user references it. If they mention a path or project name, look it up or add it with add_project.
+14. VAULT RULE: when the user wants a new existing agent/template, call list_vault_agents first. If a suitable vault agent exists, import_agent into the chosen project. If none fits, say briefly what is missing.
+15. NO-PENDING RULE: never say "give me a second", "I will do it", or "I will try later" as a final answer. Either call the tool in this same turn or say what blocks you.
+16. IDENTITY RULE: when the user asks you to change your name, call yourself something, or update your personality/language, call set_identity and persist the change. Then confirm with your new name.
+17. ROUTINES RULE: NEVER create a routine in the default project (id=0). Routines MUST be tied to a specific registered project. Before adding a routine, call list_projects to find the correct project id or name. Then pass --project <id|name> to apx routine add. If no project fits, ask the user which project to use. Creating routines in project 0/default mixes unrelated projects' schedules and corrupts state.`;
 
 function isShortConfirmation(text) {
   return /^(yes|y|si|si dale|dale|ok|okay|confirm|confirmed|go|proceed|do it)\b/i
@@ -87,6 +88,7 @@ export async function runSuperAgent({
   contextNote = "",
   previousMessages = [],
   overrideModel = null,
+  onEvent = null,
 }) {
   if (!isSuperAgentEnabled(globalConfig)) {
     throw new Error("super-agent not enabled (set super_agent.enabled and .model in ~/.apx/config.json)");
@@ -141,6 +143,7 @@ export async function runSuperAgent({
   let lastText = "";
 
   for (let iter = 0; iter < MAX_TOOL_ITERS; iter++) {
+    await emitProgress(onEvent, { type: "model_start", iteration: iter + 1 });
     const result = await callEngine({
       modelId: activeModel,
       system,
@@ -174,6 +177,11 @@ export async function runSuperAgent({
       break;
     }
 
+    const visibleText = cleanTextOfPseudoToolCalls(lastText).trim();
+    if (visibleText) {
+      await emitProgress(onEvent, { type: "assistant_text", text: visibleText, iteration: iter + 1 });
+    }
+
     // Append the assistant turn (with its tool_calls) and execute each call.
     conversation.push({
       role: "assistant",
@@ -191,6 +199,12 @@ export async function runSuperAgent({
       args = args || {};
 
       let toolResult;
+      const traceId = `${iter + 1}:${trace.length + 1}`;
+      await emitProgress(onEvent, {
+        type: "tool_start",
+        trace: { id: traceId, tool: name, args, pending: true },
+        iteration: iter + 1,
+      });
       try {
         const handler = handlers[name];
         if (!handler) {
@@ -202,7 +216,13 @@ export async function runSuperAgent({
         toolResult = { error: e.message };
       }
 
-      trace.push({ tool: name, args, result: summarizeForTrace(toolResult) });
+      const traceItem = { id: traceId, tool: name, args, result: summarizeForTrace(toolResult) };
+      trace.push(traceItem);
+      await emitProgress(onEvent, {
+        type: "tool_result",
+        trace: traceItem,
+        iteration: iter + 1,
+      });
 
       conversation.push({
         role: "tool",
@@ -220,6 +240,11 @@ export async function runSuperAgent({
   };
 }
 
+async function emitProgress(onEvent, event) {
+  if (typeof onEvent !== "function") return;
+  await onEvent(event);
+}
+
 function summarizeForTrace(r) {
   if (r === null || r === undefined) return r;
   const s = JSON.stringify(r);