@agentprojectcontext/apx 1.7.0 → 1.8.1

package/src/core/agent-system.js

@@ -0,0 +1,95 @@
+import fs from "node:fs";
+import path from "node:path";
+
+function listField(value) {
+  if (Array.isArray(value)) return value.map(String).map((s) => s.trim()).filter(Boolean);
+  return String(value || "").split(",").map((s) => s.trim()).filter(Boolean);
+}
+
+function projectName(project) {
+  if (project?.name) return project.name;
+  try {
+    const meta = JSON.parse(fs.readFileSync(path.join(project.path, ".apc", "project.json"), "utf8"));
+    return meta.name || path.basename(project.path);
+  } catch {
+    return path.basename(project?.path || "");
+  }
+}
+
+export function agentSkills(agent) {
+  return listField(agent?.fields?.Skills);
+}
+
+export function buildAgentSystem(project, agent, {
+  invocation = "engine",
+  runtime = null,
+  channel = null,
+  caller = null,
+  routine = null,
+  extraParts = [],
+} = {}) {
+  const fields = agent.fields || {};
+  const parts = [
+    `You are APC agent "${agent.slug}".`,
+    `Project: ${projectName(project)} (${project.path}).`,
+  ];
+
+  if (fields.Description) parts.push(String(fields.Description));
+  if (fields.Role) parts.push(`Role: ${fields.Role}`);
+  if (fields.Language) parts.push(`Default language: ${fields.Language}`);
+
+  const declaredTools = listField(fields.Tools);
+  if (declaredTools.length) {
+    parts.push(
+      [
+        "## Declared Tool Hints",
+        declaredTools.join(", "),
+        "These are agent-level tool expectations, not a guarantee. Actual callable tools depend on invocation surface.",
+      ].join("\n")
+    );
+  }
+
+  parts.push(buildInvocationContext({ invocation, runtime, channel, caller, routine }));
+
+  const memPath = path.join(project.path, ".apc", "agents", agent.slug, "memory.md");
+  if (fs.existsSync(memPath)) parts.push("## Memory\n" + fs.readFileSync(memPath, "utf8"));
+
+  const apxSkill = path.join(project.path, ".apc", "skills", "apx.md");
+  if (fs.existsSync(apxSkill)) parts.push("## APX\n" + fs.readFileSync(apxSkill, "utf8"));
+
+  for (const skill of agentSkills(agent)) {
+    const skillPath = path.join(project.path, ".apc", "skills", `${skill}.md`);
+    if (fs.existsSync(skillPath)) parts.push(`## Skill: ${skill}\n` + fs.readFileSync(skillPath, "utf8"));
+  }
+
+  for (const ep of extraParts) {
+    if (ep) parts.push(ep);
+  }
+
+  return parts.join("\n\n");
+}
+
+function buildInvocationContext({ invocation, runtime, channel, caller, routine }) {
+  const lines = [
+    "## Invocation Context",
+    `invocation: ${invocation}`,
+  ];
+  if (runtime) lines.push(`runtime: ${runtime}`);
+  if (channel) lines.push(`channel: ${channel}`);
+  if (caller) lines.push(`caller: ${caller}`);
+  if (routine) lines.push(`routine: ${routine}`);
+
+  if (runtime) {
+    lines.push(
+      "You are running inside the named external runtime. Use only tools and permissions that runtime actually exposes."
+    );
+  } else if (invocation === "engine") {
+    lines.push("You are a direct LLM call through APX. Do not claim shell, file, MCP, or Telegram tools unless APX explicitly provided them.");
+  } else if (invocation === "telegram") {
+    lines.push("You are replying through Telegram. Keep responses brief, plain text, and matched to the user's language.");
+  } else if (invocation === "routine") {
+    lines.push("You were invoked by an APX routine. Complete the requested work now; do not say you will do it later.");
+  }
+
+  return lines.join("\n");
+}

package/src/core/apc-context-skill.md

@@ -95,6 +95,9 @@ APX can provide a local daemon, MCP management, Telegram bridge, routines, and r
 across Codex, Claude Code, OpenCode, Aider, or direct LLM engines. Those are APX runtime features,
 not APC portable-core requirements.
 
+The APX super-agent uses `~/.apx/projects/default` for system-level work when no project is named.
+APX routines can run heartbeat, shell, Telegram, project agent, or super-agent tasks on a schedule.
+
 APX runtime state belongs outside the repository:
 
 ```text

package/src/core/apx-skill.md

@@ -5,6 +5,9 @@ The daemon runs on `127.0.0.1:7430` and auto-starts on first `apx` call.
 APX reads APC project context from `.apc/`, but APX runtime state belongs outside the repository
 under `~/.apx/projects/<project-id>/`.
 
+The APX super-agent has an always-available default workspace at `~/.apx/projects/default`.
+When no project is named, system-level work belongs there.
+
 ---
 
 ## Coordinate with other agents
@@ -73,10 +76,37 @@ apx session check                                # exits 1 if session already ac
 
 ```bash
 apx messages tail                               # last 50 messages, all channels
+apx messages chat --channel telegram -n 20      # chat view with user/agent/system type
 apx messages tail --channel runtime             # only agent invocations
 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
+
+```bash
+apx permission show
+apx permission set automatico   # total | automatico | permiso
+```
+
+`automatico` runs read/list/safe shell checks directly and asks before destructive shell, MCP,
+runtime, outbound, config, or filesystem mutation actions.
+
+## Routines
+
+```bash
+apx routine list
+apx routine get <name>
+apx routine history <name>
+apx routine add clima --kind super_agent --schedule every:5m \
+  --permission-mode total \
+  --spec '{"prompt":"Check weather and send Telegram update."}'
+```
+
+Routine kinds: `heartbeat`, `exec_agent`, `super_agent`, `telegram`, `shell`.
+
 ## APC_RESULT
 
 Print on the last meaningful line of your output so the invoker captures it:

package/src/core/messages-store.js

@@ -7,7 +7,7 @@
 //   ~/.apx/messages/<channel>/YYYY-MM-DD.jsonl
 //
 // Each line:
-//   {"ts":"...","channel":"...","direction":"in|out","author":"...","body":"...","meta":{...}}
+//   {"ts":"...","channel":"...","direction":"in|out","type":"user|agent|tool|system","author":"...","actor_id":"...","body":"...","meta":{...}}
 //
 // Why JSONL: same shape as Claude Code's ~/.claude/projects/<id>.jsonl.
 // Streamable, structured, no markdown parsing fragility.
@@ -32,24 +32,61 @@ function dayPathMd(projectRoot, ts) {
   return path.join(projectRoot, "messages", `${day}.md`);
 }
 
-export function appendMessageToFs({ projectRoot, channel, direction, author, body, meta = {}, ts, agent_slug, session_id, external_id }) {
-  ts = ts || nowIso();
-  const file = dayPathJsonl(projectRoot, ts);
-  fs.mkdirSync(path.dirname(file), { recursive: true });
+const VALID_MESSAGE_TYPES = new Set(["user", "agent", "tool", "system"]);
+
+function normalizeMessageType(type) {
+  return typeof type === "string" && VALID_MESSAGE_TYPES.has(type) ? type : null;
+}
+
+export function inferMessageType({ type, channel, direction, author, agent_slug, meta = {} } = {}) {
+  const explicit = normalizeMessageType(type) || normalizeMessageType(meta.type) || normalizeMessageType(meta.actor_type);
+  if (explicit) return explicit;
+  if (channel === "a2a") return "agent";
+  if (meta.tool || meta.tool_name) return "tool";
+  if (author === "system") return "system";
+  if (agent_slug && author && author !== "user" && !String(author).startsWith("@")) return "agent";
+  if (direction === "in" && (author === "user" || String(author || "").startsWith("@"))) return "user";
+  if (direction === "out") return "agent";
+  return direction === "in" ? "user" : "agent";
+}
 
-  // Compose meta from explicit fields plus the bag
-  const fullMeta = {
+function inferActorId({ type, actor_id, author, agent_slug, meta = {} } = {}) {
+  if (actor_id) return actor_id;
+  if (meta.actor_id) return meta.actor_id;
+  if (type === "user") return meta.user_id ? String(meta.user_id) : (author || "user");
+  if (type === "agent") return agent_slug || author || "agent";
+  if (type === "tool") return meta.tool || meta.tool_name || author || "tool";
+  if (type === "system") return author || "system";
+  return author || null;
+}
+
+function messageMeta({ type, actor_id, agent_slug, session_id, external_id, meta = {} }) {
+  return {
+    ...meta,
+    type,
+    ...(actor_id ? { actor_id } : {}),
     ...(agent_slug ? { agent: agent_slug } : {}),
     ...(session_id ? { session_id } : {}),
     ...(external_id ? { external_id } : {}),
-    ...meta,
   };
+}
+
+export function appendMessageToFs({ projectRoot, channel, direction, type, actor_id, author, body, meta = {}, ts, agent_slug, session_id, external_id }) {
+  ts = ts || nowIso();
+  const file = dayPathJsonl(projectRoot, ts);
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+
+  const msgType = inferMessageType({ type, channel, direction, author, agent_slug, meta });
+  const msgActorId = inferActorId({ type: msgType, actor_id, author, agent_slug, meta });
+  const fullMeta = messageMeta({ type: msgType, actor_id: msgActorId, agent_slug, session_id, external_id, meta });
 
   const record = {
     ts,
     channel,
     direction,
+    type: msgType,
     author: author || null,
+    ...(msgActorId ? { actor_id: msgActorId } : {}),
     body: body || "",
     ...(Object.keys(fullMeta).length ? { meta: fullMeta } : {}),
   };
@@ -65,6 +102,16 @@ export function insertMessageRow(db, m) {
     const a = db.prepare("SELECT id FROM agents WHERE slug = ?").get(m.agent_slug);
     if (a) agent_id = a.id;
   }
+  const type = inferMessageType(m);
+  const actor_id = inferActorId({ ...m, type });
+  const meta = messageMeta({
+    type,
+    actor_id,
+    agent_slug: m.agent_slug,
+    session_id: m.session_id,
+    external_id: m.external_id,
+    meta: m.meta || {},
+  });
   return db
     .prepare(
       `INSERT INTO messages (agent_id, session_id, channel, direction, external_id, author, body, meta_json, ts)
@@ -78,17 +125,19 @@ export function insertMessageRow(db, m) {
       m.external_id || null,
       m.author || null,
       m.body || "",
-      JSON.stringify(m.meta || {}),
+      JSON.stringify(meta),
       m.ts
     );
 }
 
 // Single entry point used by everywhere the daemon writes a message.
-export function appendMessage({ projectRoot, db, channel, direction, author, body, meta = {}, ts, agent_slug, session_id, external_id }) {
+export function appendMessage({ projectRoot, db, channel, direction, type, actor_id, author, body, meta = {}, ts, agent_slug, session_id, external_id }) {
   const written = appendMessageToFs({
     projectRoot,
     channel,
     direction,
+    type,
+    actor_id,
     author,
     body,
     meta,
@@ -100,6 +149,8 @@ export function appendMessage({ projectRoot, db, channel, direction, author, bod
   insertMessageRow(db, {
     channel,
     direction,
+    type,
+    actor_id,
     author,
     body,
     meta,
@@ -121,15 +172,33 @@ export function parseDayJsonl(text) {
     try { obj = JSON.parse(trimmed); } catch { continue; }
     if (!obj || typeof obj !== "object") continue;
     const meta = obj.meta || {};
+    const agent_slug = obj.agent_slug || meta.agent;
+    const type = inferMessageType({
+      type: obj.type,
+      channel: obj.channel,
+      direction: obj.direction,
+      author: obj.author,
+      agent_slug,
+      meta,
+    });
+    const actor_id = inferActorId({
+      type,
+      actor_id: obj.actor_id,
+      author: obj.author,
+      agent_slug,
+      meta,
+    });
     out.push({
       ts: obj.ts,
       channel: obj.channel,
       direction: obj.direction,
+      type,
       author: obj.author,
+      actor_id,
       body: obj.body || "",
       meta,
-      agent_slug: meta.agent,
-      session_id: typeof meta.apc_session_id === "number" ? meta.apc_session_id : null,
+      agent_slug,
+      session_id: meta.session_id ?? (typeof meta.apc_session_id === "number" ? meta.apc_session_id : null),
       external_id: meta.external_id,
     });
   }
@@ -156,10 +225,15 @@ export function parseDayFile(text) {
       body = body.replace(metaMatch[0], "");
     }
     body = body.trim();
+    const agent_slug = meta.agent;
+    const type = inferMessageType({ channel, direction, author, agent_slug, meta });
+    const actor_id = inferActorId({ type, author, agent_slug, meta });
     out.push({
       ts, channel, direction, author, body, meta,
-      agent_slug: meta.agent,
-      session_id: typeof meta.apc_session_id === "number" ? meta.apc_session_id : null,
+      type,
+      actor_id,
+      agent_slug,
+      session_id: meta.session_id ?? (typeof meta.apc_session_id === "number" ? meta.apc_session_id : null),
       external_id: meta.external_id,
     });
   }
@@ -223,9 +297,9 @@ export function getRecentTelegramTurns(
 // answer that mixes fragments of the old one with hallucinations. The
 // failure observed with qwen2.5:14b was:
 //
-//   prev assistant: "agente sandbox con modelo ollama:llama3.2:3b"
-//   user: "y en el otro proyecto qué agente tiene?"
-//   assistant (alucinated): "agente assistant con modelo ollama:llama3.2:3b"
+//   prev assistant: "sandbox agent with model ollama:llama3.2:3b"
+//   user: "and what agent does the other project have?"
+//   assistant (hallucinated): "assistant agent with model ollama:llama3.2:3b"
 //                           (sofia exists, not "assistant", and her model is
 //                            claude-haiku-4-5, not the carry-over from above)
 //
@@ -343,21 +417,21 @@ export function getRecentTelegramTurnsFromFs({
 // ---------------------------------------------------------------------------
 
 // Write a message to the global channel store.  No SQL cache — JSONL only.
-export function appendGlobalMessage({ channel, direction, author, body, meta = {}, ts, agent_slug, external_id }) {
+export function appendGlobalMessage({ channel, direction, type, actor_id, author, body, meta = {}, ts, agent_slug, external_id }) {
   ts = ts || nowIso();
   const dir = path.join(GLOBAL_MESSAGES_DIR, channel);
   fs.mkdirSync(dir, { recursive: true });
   const file = path.join(dir, `${ts.slice(0, 10)}.jsonl`);
-  const fullMeta = {
-    ...(agent_slug ? { agent: agent_slug } : {}),
-    ...(external_id ? { external_id } : {}),
-    ...meta,
-  };
+  const msgType = inferMessageType({ type, channel, direction, author, agent_slug, meta });
+  const msgActorId = inferActorId({ type: msgType, actor_id, author, agent_slug, meta });
+  const fullMeta = messageMeta({ type: msgType, actor_id: msgActorId, agent_slug, external_id, meta });
   const record = {
     ts,
     channel,
     direction,
+    type: msgType,
     author: author || null,
+    ...(msgActorId ? { actor_id: msgActorId } : {}),
     body: body || "",
     ...(Object.keys(fullMeta).length ? { meta: fullMeta } : {}),
   };

package/src/core/routines-store.js

@@ -75,7 +75,7 @@ export function getRoutine(projectPath, name) {
   return readFile(projectPath).find((r) => r.name === name) || null;
 }
 
-export function upsertRoutine(projectPath, { name, kind, schedule, spec, enabled = true }) {
+export function upsertRoutine(projectPath, { name, kind, schedule, spec, enabled = true, permission_mode, allowed_tools }) {
   if (!name || !kind || !schedule) throw new Error("routine requires name, kind, schedule");
   const now = nowIso();
   const routines = readFile(projectPath);
@@ -87,6 +87,8 @@ export function upsertRoutine(projectPath, { name, kind, schedule, spec, enabled
     kind,
     schedule,
     spec: spec || {},
+    permission_mode: permission_mode || prev?.permission_mode || null,
+    allowed_tools: Array.isArray(allowed_tools) ? allowed_tools : (prev?.allowed_tools || []),
     enabled: enabled !== false,
     last_run_at: prev?.last_run_at ?? null,
     last_status: prev?.last_status ?? null,

package/src/daemon/apc-runtime-context.js

@@ -66,7 +66,7 @@ export function createRuntimeSession({ projectRoot, storageRoot = projectRoot, a
     `agent: ${agentSlug}\n` +
     `title: ${sessionTitle}\n` +
     `task_ref: ${taskRef}\n` +
-    `status: 🔄 En progreso\n` +
+    `status: 🔄 In progress\n` +
     `started: ${started}\n` +
     `completed: \n` +
     `result: \n` +
@@ -91,7 +91,7 @@ export function closeRuntimeSession({ filePath, externalSessionPath, exitCode, r
   } else if (result) {
     text = setField(text, "result", result.slice(0, 300));
   }
-  text = setField(text, "status", exitCode === 0 ? "✅ Completada" : "⚠️ Cerrada con error");
+  text = setField(text, "status", exitCode === 0 ? "✅ Completed" : "⚠️ Closed with error");
   fs.writeFileSync(filePath, text);
 }
 

package/src/daemon/api.js

@@ -42,6 +42,7 @@ import { readGlobalMessages, readProjectMessages, searchProjectMessages } from "
 import { readAgents } from "../core/parser.js";
 import { parseSessionFrontmatter } from "../core/parser.js";
 import { writeAgentFile, ensureAgentDir, regenerateAgentsMd } from "../core/scaffold.js";
+import { buildAgentSystem } from "../core/agent-system.js";
 
 const nowIso = () => new Date().toISOString().replace(/\.\d{3}Z$/, "Z");
 
@@ -348,13 +349,13 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
   app.post("/projects/:pid/messages", (req, res) => {
     const p = project(req, res);
     if (!p) return;
-    const { channel, direction, agent_slug, body, meta = {}, author = null } =
+    const { channel, direction, type, actor_id, agent_slug, body, meta = {}, author = null } =
       req.body || {};
     if (!channel || !direction || !body)
       return res.status(400).json({ error: "channel, direction, body required" });
     if (!["in", "out"].includes(direction))
       return res.status(400).json({ error: "direction must be in|out" });
-    const r = p.logMessage({ agent_slug: agent_slug || null, channel, direction, author, body, meta });
+    const r = p.logMessage({ agent_slug: agent_slug || null, channel, direction, type, actor_id, author, body, meta });
     res.status(201).json({ ok: true, ts: r.ts });
   });
 
@@ -421,7 +422,7 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
     if (!modelId) return res.status(400).json({ error: "agent has no model and none provided" });
 
     try {
-      const system = buildAgentSystem(p, agent);
+      const system = buildAgentSystem(p, agent, { invocation: "engine" });
       const conv = startConversation({ storagePath: p.storagePath, agentSlug: agent.slug, engine: modelId, system });
       appendTurn({ filePath: conv.path, role: "user", content: prompt });
 
@@ -488,9 +489,9 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
 
       // Build system prompt — inject compact summary if this conversation was compacted.
       const extraParts = compactSummary
-        ? [`## Contexto de conversación anterior (compactado)\n${compactSummary}`]
+        ? [`## Previous Conversation Context (Compacted)\n${compactSummary}`]
         : [];
-      const system = buildAgentSystem(p, agent, { extraParts });
+      const system = buildAgentSystem(p, agent, { invocation: "engine", extraParts });
 
       if (!conversation_id) {
         const conv = startConversation({ storagePath: p.storagePath, agentSlug: agent.slug, engine: modelId, system });
@@ -688,6 +689,8 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
     });
 
     const system = buildAgentSystem(p, agent, {
+      invocation: "runtime",
+      runtime,
       extraParts: [
         buildApfHint({
           projectName,
@@ -775,11 +778,11 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
     if (req.query.summarize === "true" && isSuperAgentEnabled(config)) {
       try {
         const prompt =
-          `Resumí qué pasó en esta sesión APC en 4 bullets concretos.\n\n` +
+          `Summarize what happened in this APC session in 4 concrete bullets.\n\n` +
           `Frontmatter:\n${JSON.stringify(out.frontmatter, null, 2)}\n\n` +
           (out.external_transcript
-            ? `Transcript externo (últimos ${out.external_transcript.tail.length} chars):\n${out.external_transcript.tail}`
-            : `(sin transcript externo)`);
+            ? `External transcript (last ${out.external_transcript.tail.length} chars):\n${out.external_transcript.tail}`
+            : `(no external transcript)`);
         const sa = await runSuperAgent({ globalConfig: config, projects, plugins, registries, prompt, contextNote: `Resume request for session ${id}.` });
         out.summary = sa.text;
       } catch (e) {
@@ -843,7 +846,7 @@ export function buildApi({ projects, registries, plugins, scheduler, version, st
     const r = getRoutine(p.path, req.params.name);
     if (!r) return res.status(404).json({ error: "routine not found" });
     try {
-      const result = await runRoutineNow({ project: p, plugins, globalConfig: config }, r);
+      const result = await runRoutineNow({ project: p, projects, plugins, registries, globalConfig: config }, r);
       res.json(result);
     } catch (e) {
       res.status(500).json({ error: e.message });
@@ -1084,26 +1087,3 @@ function agentToResponse(a) {
     extra,
   };
 }
-
-// Build system prompt from an agent's fields + memory + skills.
-// Optional `extraParts` are appended at the end.
-function buildAgentSystem(p, agent, { extraParts = [] } = {}) {
-  const f = agent.fields || {};
-  const parts = [];
-  if (f.Description) parts.push(f.Description);
-  if (f.Role) parts.push(`Role: ${f.Role}`);
-  if (f.Language) parts.push(`Default language: ${f.Language}`);
-  const memPath = path.join(p.path, ".apc", "agents", agent.slug, "memory.md");
-  if (fs.existsSync(memPath)) {
-    parts.push("## Memory\n" + fs.readFileSync(memPath, "utf8"));
-  }
-  const apxSkill = path.join(p.path, ".apc", "skills", "apx.md");
-  if (fs.existsSync(apxSkill)) parts.push("## APX\n" + fs.readFileSync(apxSkill, "utf8"));
-  const skills = Array.isArray(f.Skills) ? f.Skills : [];
-  for (const skill of skills) {
-    const sp = path.join(p.path, ".apc", "skills", `${skill}.md`);
-    if (fs.existsSync(sp)) parts.push(`## Skill: ${skill}\n` + fs.readFileSync(sp, "utf8"));
-  }
-  for (const ep of extraParts) parts.push(ep);
-  return parts.join("\n\n");
-}

package/src/daemon/index.js

@@ -126,6 +126,7 @@ async function main() {
   const scheduler = new RoutineScheduler({
     projects,
     plugins,
+    registries,
     globalConfig: cfg,
     log,
   });

package/src/daemon/plugins/telegram.js

@@ -28,13 +28,13 @@
 //   }
 
 import fs from "node:fs";
-import path from "node:path";
 import { TELEGRAM_STATE_PATH } from "../../core/config.js";
 import { callEngine } from "../engines/index.js";
 import { runSuperAgent, isSuperAgentEnabled } from "../super-agent.js";
 import { stripThinking } from "../thinking.js";
 import { getRecentTelegramTurnsFromFs, appendGlobalMessage } from "../../core/messages-store.js";
 import { readAgents } from "../../core/parser.js";
+import { buildAgentSystem } from "../../core/agent-system.js";
 
 const API_BASE = "https://api.telegram.org";
 const nowIso = () => new Date().toISOString().replace(/\.\d{3}Z$/, "Z");
@@ -252,7 +252,7 @@ class ChannelPoller {
     if (chat_id && !isReset) {
       previousMessages = getRecentTelegramTurnsFromFs({
         chat_id,
-        limit: 12,
+        limit: 20,
         max_age_hours: 24,
       });
       // Honour a /reset marker: drop everything up to and including it.
@@ -276,11 +276,14 @@ class ChannelPoller {
     appendGlobalMessage({
       channel: "telegram",
       direction: "in",
+      type: "user",
+      actor_id: msg.from?.id ? String(msg.from.id) : author,
       external_id: String(u.update_id),
       author,
       body: text,
       meta: {
         chat_id,
+        user_id: msg.from?.id || null,
         message_id: msg.message_id,
         tg_channel: this.channel.name,
       },
@@ -294,11 +297,13 @@ class ChannelPoller {
     // honor it for future messages.
     if (isReset) {
       try {
-        const ack = "Listo, contexto limpiado. Empezamos de cero — ¿qué necesitás?";
+        const ack = "Done, context cleared. Starting fresh. What do you need?";
         await this._send({ chat_id, text: ack });
         appendGlobalMessage({
           channel: "telegram",
           direction: "out",
+          type: "agent",
+          actor_id: "apx",
           author: "apx",
           body: ack,
           meta: { chat_id, tg_channel: this.channel.name, in_reply_to: u.update_id, reset: true },
@@ -322,7 +327,11 @@ class ChannelPoller {
       const agent = readAgents(target.path).find((a) => a.slug === routeSlug);
       if (agent && agent.fields.Model) {
         try {
-          const system = buildAgentSystem(target, agent, author);
+          const system = buildAgentSystem(target, agent, {
+            invocation: "telegram",
+            channel: this.channel.name,
+            caller: author,
+          });
           const result = await callEngine({
             modelId: agent.fields.Model,
             system,
@@ -355,7 +364,7 @@ class ChannelPoller {
           registries: this.registries,
           prompt: text,
           previousMessages,
-          contextNote: `Inbound came on Telegram channel "${this.channel.name}" from ${author}. Previous turns of this chat are included for context.`,
+          contextNote: `You are replying inside Telegram right now. Telegram channel="${this.channel.name}", author=${author}, chat_id=${chat_id}. Keep the reply plain-text and concise. Previous turns of this chat are included only for local conversational context; re-call tools for facts.`,
         });
         replyText = sa.text;
         replyAuthor = sa.name;
@@ -401,12 +410,34 @@ class ChannelPoller {
       appendGlobalMessage({
         channel: "telegram",
         direction: "out",
+        type: "agent",
+        actor_id: replyAuthor || "apx",
+        agent_slug: replyAuthor || "apx",
         author: replyAuthor || "apx",
         body: clean || replyText,
         meta,
       });
     } catch (e) {
       this.log(`telegram[${this.channel.name}] send-back error: ${e.message}`);
+      appendGlobalMessage({
+        channel: "telegram",
+        direction: "out",
+        type: "agent",
+        actor_id: replyAuthor || "apx",
+        agent_slug: replyAuthor || "apx",
+        author: replyAuthor || "apx",
+        body: `[send_failed] ${clean || replyText}`,
+        meta: {
+          chat_id,
+          tg_channel: this.channel.name,
+          in_reply_to: u.update_id,
+          send_error: e.message,
+          ...(saTrace && saTrace.length > 0
+            ? { tools_called: saTrace.map((t) => ({ tool: t.tool, args: t.args })) }
+            : {}),
+          ...(saUsage ? { usage: saUsage } : {}),
+        },
+      });
     }
   }
 
@@ -459,26 +490,6 @@ class ChannelPoller {
   }
 }
 
-// ---------- system-prompt builder (same as /exec) ---------------------------
-
-function buildAgentSystem(target, agent, author) {
-  const parts = [];
-  if (agent.fields.Description) parts.push(agent.fields.Description);
-  if (agent.fields.Role) parts.push(`Role: ${agent.fields.Role}`);
-  if (agent.fields.Language) parts.push(`Default language: ${agent.fields.Language}`);
-  parts.push(
-    `You are speaking via Telegram with ${author}. Keep responses brief — ideally under 4 sentences. Mirror their language.`
-  );
-  const memPath = path.join(target.path, ".apc", "agents", agent.slug, "memory.md");
-  if (fs.existsSync(memPath)) parts.push("## Memory\n" + fs.readFileSync(memPath, "utf8"));
-  const skills = (agent.fields.Skills || "").split(",").map((s) => s.trim()).filter(Boolean);
-  for (const skill of skills) {
-    const sp = path.join(target.path, ".apc", "skills", `${skill}.md`);
-    if (fs.existsSync(sp)) parts.push(`## Skill: ${skill}\n` + fs.readFileSync(sp, "utf8"));
-  }
-  return parts.join("\n\n");
-}
-
 function sleep(ms) {
   return new Promise((r) => setTimeout(r, ms));
 }
@@ -533,6 +544,9 @@ export default {
         appendGlobalMessage({
           channel: "telegram",
           direction: "out",
+          type: "agent",
+          actor_id: author,
+          agent_slug: author,
           author,
           body: text,
           meta: {