@agentprojectcontext/apx 1.32.0 → 1.33.0

package/src/{host/daemon/super-agent-tools/tools → core/agent/tools/handlers}/transcribe-audio.js

@@ -2,7 +2,7 @@ import fs from "node:fs";
 import os from "node:os";
 import path from "node:path";
 import crypto from "node:crypto";
-import { transcribe } from "../../transcription.js";
+import { transcribe } from "#host/daemon/transcription.js";
 
 export default {
   name: "transcribe_audio",

package/src/{host/daemon/super-agent-tools/tools → core/agent/tools/handlers}/write-file.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { confirmedProperty, resolveProject, safePathJoin } from "../helpers.js";
+import { resolveProject, safePathJoin } from "../helpers.js";
 
 export default {
   name: "write_file",
@@ -15,7 +15,6 @@ export default {
           project: { type: "string" },
           path: { type: "string", description: "relative path inside the project" },
           content: { type: "string" },
-          confirmed: confirmedProperty("true only after explicit user confirmation for this exact file write"),
         },
         required: ["path", "content"],
       },

package/src/core/agent/tools/helpers.js

@@ -0,0 +1,74 @@
+// Pure / config-only helpers used by tool handlers. Anything that needs the
+// running daemon's projects registry (projectMeta, resolveProject) lives in
+// host/daemon/projects-helpers.js and is re-exported here for back-compat.
+import path from "node:path";
+import { agentSkills, buildAgentSystem as buildCoreAgentSystem } from "#core/agent/build-agent-system.js";
+import { buildConfirmDescription } from "#core/confirmation/index.js";
+import { PERMISSION_MODES, DEFAULT_PERMISSION_MODE } from "#core/constants/permissions.js";
+
+export { projectMeta, resolveProject } from "#host/daemon/projects-helpers.js";
+
+export function safePathJoin(root, sub = ".") {
+  const target = path.resolve(root, sub || ".");
+  const rootResolved = path.resolve(root);
+  if (target !== rootResolved && !target.startsWith(rootResolved + path.sep)) {
+    throw new Error(`path "${sub}" escapes the project root`);
+  }
+  return target;
+}
+
+export function skillsFromFields(fields = {}) {
+  return agentSkills({ fields });
+}
+
+export function agentRow(agent) {
+  return {
+    slug: agent.slug,
+    role: agent.fields.Role || null,
+    model: agent.fields.Model || null,
+    language: agent.fields.Language || null,
+    description: agent.fields.Description || null,
+    skills: skillsFromFields(agent.fields),
+  };
+}
+
+export function buildAgentSystem(project, agent, opts = {}) {
+  return buildCoreAgentSystem(project, agent, opts);
+}
+
+export function createPermissionGuard(globalConfig = {}, {
+  requestConfirmation = null,
+} = {}) {
+  const permissionMode = globalConfig.super_agent?.permission_mode || DEFAULT_PERMISSION_MODE;
+  const allowedTools = new Set(globalConfig.super_agent?.allowed_tools || []);
+
+  // async so tools can `await requirePermission(...)` and the confirmation
+  // dialog resolves transparently before execution continues. The model never
+  // self-approves: the only path past a blocked call is the interface's own
+  // confirmation dialog via the requestConfirmation callback.
+  return async function requirePermission(tool, { dangerous = false, args } = {}) {
+    if (permissionMode === PERMISSION_MODES.TOTAL) return;
+
+    const blocked =
+      (permissionMode === PERMISSION_MODES.PERMISO && !allowedTools.has(tool)) ||
+      (permissionMode === PERMISSION_MODES.AUTOMATICO && dangerous);
+
+    if (!blocked) return;
+
+    const description = buildConfirmDescription(tool, args || {});
+
+    if (!requestConfirmation) {
+      // No confirmation channel wired for this invocation context (e.g. routine,
+      // autonomous agent). Surface a clear message so the model can explain it.
+      throw new Error(`Action requires user confirmation: ${description}`);
+    }
+
+    const userConfirmed = await requestConfirmation(tool, args || {}, description);
+
+    if (!userConfirmed) {
+      throw new Error(`User did not confirm: ${description}`);
+    }
+    // Confirmed — fall through, tool executes normally.
+  };
+}
+

package/src/{host/daemon/super-agent-tools → core/agent/tools}/registry-bridge.js

@@ -19,13 +19,13 @@
 // super-agent-tools/tools/, no import in index.js.
 
 import fs from "node:fs";
-import { TOOL_DEFINITIONS } from "../../../core/tools/registry.js";
-import { TOKEN_PATH } from "../../../core/config.js";
+import { TOOL_DEFINITIONS } from "#core/tools/registry.js";
+import { TOKEN_PATH } from "#core/config/index.js";
 
 // The bridge POSTs to the daemon's OWN HTTP server, which is behind the bearer
 // auth middleware (see api/shared.js). Without a token every bridged tool call
 // (web_search, browser_*, http_*, glob, grep) comes back 401 "unauthorized" —
-// which is exactly what Roby hit. We read the daemon's master token from
+// which is exactly what the super-agent hit. We read the daemon's master token from
 // ~/.apx/daemon.token (the same file the CLI authenticates with) and cache it.
 let cachedToken = null;
 function daemonToken() {

package/src/{host/daemon/super-agent-tools/index.js → core/agent/tools/registry.js}

@@ -1,34 +1,34 @@
-import listProjects from "./tools/list-projects.js";
-import listAgents from "./tools/list-agents.js";
-import listVaultAgents from "./tools/list-vault-agents.js";
-import importAgent from "./tools/import-agent.js";
-import addProject from "./tools/add-project.js";
-import listMcps from "./tools/list-mcps.js";
-import readAgentMemory from "./tools/read-agent-memory.js";
-import remember from "./tools/remember.js";
-import readSelfMemory from "./tools/read-self-memory.js";
-import listFiles from "./tools/list-files.js";
-import readFile from "./tools/read-file.js";
-import writeFile from "./tools/write-file.js";
-import editFile from "./tools/edit-file.js";
-import runShell from "./tools/run-shell.js";
-import tailMessages from "./tools/tail-messages.js";
-import searchMessages from "./tools/search-messages.js";
-import searchSessions from "./tools/search-sessions.js";
-import callAgent from "./tools/call-agent.js";
-import callMcp from "./tools/call-mcp.js";
-import callRuntime from "./tools/call-runtime.js";
-import sendTelegram from "./tools/send-telegram.js";
-import setIdentity from "./tools/set-identity.js";
-import setPermissionMode from "./tools/set-permission-mode.js";
-import searchFiles from "./tools/search-files.js";
-import listSkills from "./tools/list-skills.js";
-import loadSkill from "./tools/load-skill.js";
-import transcribeAudio from "./tools/transcribe-audio.js";
-import askQuestions from "./tools/ask-questions.js";
-import createTask from "./tools/create-task.js";
-import listTasks from "./tools/list-tasks.js";
-import discoverTools from "./tools/discover-tools.js";
+import listProjects from "./handlers/list-projects.js";
+import listAgents from "./handlers/list-agents.js";
+import listVaultAgents from "./handlers/list-vault-agents.js";
+import importAgent from "./handlers/import-agent.js";
+import addProject from "./handlers/add-project.js";
+import listMcps from "./handlers/list-mcps.js";
+import readAgentMemory from "./handlers/read-agent-memory.js";
+import remember from "./handlers/remember.js";
+import readSelfMemory from "./handlers/read-self-memory.js";
+import listFiles from "./handlers/list-files.js";
+import readFile from "./handlers/read-file.js";
+import writeFile from "./handlers/write-file.js";
+import editFile from "./handlers/edit-file.js";
+import runShell from "./handlers/run-shell.js";
+import tailMessages from "./handlers/tail-messages.js";
+import searchMessages from "./handlers/search-messages.js";
+import searchSessions from "./handlers/search-sessions.js";
+import callAgent from "./handlers/call-agent.js";
+import callMcp from "./handlers/call-mcp.js";
+import callRuntime from "./handlers/call-runtime.js";
+import sendTelegram from "./handlers/send-telegram.js";
+import setIdentity from "./handlers/set-identity.js";
+import setPermissionMode from "./handlers/set-permission-mode.js";
+import searchFiles from "./handlers/search-files.js";
+import listSkills from "./handlers/list-skills.js";
+import loadSkill from "./handlers/load-skill.js";
+import transcribeAudio from "./handlers/transcribe-audio.js";
+import askQuestions from "./handlers/ask-questions.js";
+import createTask from "./handlers/create-task.js";
+import listTasks from "./handlers/list-tasks.js";
+import discoverTools from "./handlers/discover-tools.js";
 import { createPermissionGuard } from "./helpers.js";
 import { buildBridgedTools, DEFAULT_CATEGORIES } from "./registry-bridge.js";
 
@@ -334,7 +334,6 @@ export function makeToolHandlers(ctx) {
   const toolCtx = {
     ...ctx,
     requirePermission: createPermissionGuard(ctx.globalConfig || {}, {
-      implicitConfirmation: !!ctx.implicitConfirmation,
       requestConfirmation: ctx.requestConfirmation || null,
     }),
   };

package/src/core/apc/agents-vault.js

@@ -0,0 +1,37 @@
+// Vault = global agent templates. Two layers:
+//   - bundled defaults shipped with APX (assets/agent-vault-defaults/)
+//   - user overrides + brand-new ones in ~/.apx/agents/ (copy-on-write)
+//
+// This module owns the *normalisation* of vault input patches: which fields
+// the public surface accepts, how they get split (skills/tools = arrays),
+// and how casing maps to the on-disk frontmatter convention (Title case).
+// Read/write to disk lives in apc/scaffold.js + apc/parser.js — this is the
+// pure transform layer so HTTP routes, CLI commands, and the super-agent
+// `import_agent` tool all agree on what fields exist.
+
+export const VAULT_PATCH_FIELDS = ["role", "model", "language", "description", "skills", "tools", "is_master"];
+
+/**
+ * Normalize a user-provided vault patch:
+ *   - accept lowercase OR Title case keys
+ *   - drop unknown / undefined / null fields
+ *   - turn skills/tools into a string[] (accepting csv strings or arrays)
+ *   - emit Title-case keys so the writer doesn't have to guess
+ */
+export function normalizeVaultPatch(input = {}) {
+  const out = {};
+  for (const k of VAULT_PATCH_FIELDS) {
+    const lower = k;
+    const title = k.charAt(0).toUpperCase() + k.slice(1);
+    const v = input[lower] ?? input[title];
+    if (v === undefined || v === null) continue;
+    if (k === "skills" || k === "tools") {
+      out[title] = Array.isArray(v)
+        ? v.map(String).map((s) => s.trim()).filter(Boolean)
+        : String(v).split(",").map((s) => s.trim()).filter(Boolean);
+    } else {
+      out[title] = v;
+    }
+  }
+  return out;
+}

package/src/core/{scaffold.js → apc/scaffold.js}

@@ -9,10 +9,12 @@ import {
   readVaultTombstones,
   writeVaultTombstones,
 } from "./parser.js";
-import { readApcContextSkill } from "./apc-skill-sync.js";
+import { readApcContextSkill } from "./skill-sync.js";
+import { nowIso } from "../util/time.js";
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const PACKAGE_ROOT = path.resolve(__dirname, "..", "..");
+// Now under src/core/apc/ — one more "../" to escape than before.
+const PACKAGE_ROOT = path.resolve(__dirname, "..", "..", "..");
 const BUNDLED_SKILLS_DIR = path.join(PACKAGE_ROOT, "skills");
 const RUNTIME_SKILLS_DIR = path.join(__dirname, "runtime-skills");
 
@@ -381,9 +383,6 @@ migrate.md
 .DS_Store
 `;
 
-function nowIso() {
-  return new Date().toISOString().replace(/\.\d{3}Z$/, "Z");
-}
 
 // Files that carry project context but are IDE-specific — candidates for APC migration.
 const SCATTERED_CONTEXT_FILES = [

package/src/core/{config.js → config/index.js}

@@ -1,32 +1,26 @@
 // Global APX config under ~/.apx/config.json. Cross-platform.
+//
+// Filesystem paths live in ./paths.js and are re-exported from here so callers
+// can keep `import { APX_HOME, projectStorageRoot } from ".../config"` working.
 import fs from "node:fs";
-import os from "node:os";
 import path from "node:path";
-
-export const APX_HOME = path.join(os.homedir(), ".apx");
-export const CONFIG_PATH = path.join(APX_HOME, "config.json");
-export const PID_PATH = path.join(APX_HOME, "daemon.pid");
-export const LOG_PATH = path.join(APX_HOME, "daemon.log");
-export const TELEGRAM_STATE_PATH = path.join(APX_HOME, "telegram-state.json");
-export const TOKEN_PATH = path.join(APX_HOME, "daemon.token");
-// Global channel messages (telegram, direct, whatsapp, …) live here,
-// separated from any project.  Structure: ~/.apx/messages/<channel>/YYYY-MM-DD.jsonl
-export const GLOBAL_MESSAGES_DIR = path.join(APX_HOME, "messages");
-// Per-project runtime storage (conversations, sessions) — never in the repo.
-// Structure: ~/.apx/projects/<apx_id>/agents/<slug>/conversations/
-export const PROJECT_STORE_ROOT = path.join(APX_HOME, "projects");
-export const DEFAULT_PROJECT_ID = "default";
-export const DEFAULT_PROJECT_STORE = path.join(PROJECT_STORE_ROOT, DEFAULT_PROJECT_ID);
-
-export function projectStorageRoot(apxId) {
-  return path.join(PROJECT_STORE_ROOT, apxId);
-}
-
-export function ensureProjectStorage(apxId) {
-  const root = projectStorageRoot(apxId);
-  fs.mkdirSync(root, { recursive: true });
-  return root;
-}
+import { APX_HOME, CONFIG_PATH } from "./paths.js";
+import { PERMISSION_MODES, DEFAULT_PERMISSION_MODE } from "../constants/permissions.js";
+
+export {
+  APX_HOME,
+  CONFIG_PATH,
+  PID_PATH,
+  LOG_PATH,
+  TELEGRAM_STATE_PATH,
+  TOKEN_PATH,
+  GLOBAL_MESSAGES_DIR,
+  PROJECT_STORE_ROOT,
+  DEFAULT_PROJECT_ID,
+  DEFAULT_PROJECT_STORE,
+  projectStorageRoot,
+  ensureProjectStorage,
+} from "./paths.js";
 
 const DEFAULT_CONFIG = {
   port: 7430,
@@ -60,7 +54,7 @@ const DEFAULT_CONFIG = {
     name: "apx",
     model: "",                          // e.g. "ollama:llama3.2:3b"
     system: "",                         // optional override; defaults in src/core/agent/prompts/
-    permission_mode: "automatico",       // total | automatico | permiso
+    permission_mode: PERMISSION_MODES.AUTOMATICO,       // total | automatico | permiso
     allowed_tools: [],                   // used by permission_mode="permiso"
     // Model fallback: ordered list. Each item carries its own provider
     // prefix; the array order IS the attempt order. The router tries the

package/src/core/config/paths.js

@@ -0,0 +1,32 @@
+// Filesystem layout for the APX home directory. Re-exported by config/index.js
+// for back-compat; new code can import directly from here for paths-only work.
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+
+export const APX_HOME = path.join(os.homedir(), ".apx");
+export const CONFIG_PATH = path.join(APX_HOME, "config.json");
+export const PID_PATH = path.join(APX_HOME, "daemon.pid");
+export const LOG_PATH = path.join(APX_HOME, "daemon.log");
+export const TELEGRAM_STATE_PATH = path.join(APX_HOME, "telegram-state.json");
+export const TOKEN_PATH = path.join(APX_HOME, "daemon.token");
+
+// Global channel messages (telegram, direct, whatsapp, …) live here,
+// separated from any project. Structure: ~/.apx/messages/<channel>/YYYY-MM-DD.jsonl
+export const GLOBAL_MESSAGES_DIR = path.join(APX_HOME, "messages");
+
+// Per-project runtime storage (conversations, sessions) — never in the repo.
+// Structure: ~/.apx/projects/<apx_id>/agents/<slug>/conversations/
+export const PROJECT_STORE_ROOT = path.join(APX_HOME, "projects");
+export const DEFAULT_PROJECT_ID = "default";
+export const DEFAULT_PROJECT_STORE = path.join(PROJECT_STORE_ROOT, DEFAULT_PROJECT_ID);
+
+export function projectStorageRoot(apxId) {
+  return path.join(PROJECT_STORE_ROOT, apxId);
+}
+
+export function ensureProjectStorage(apxId) {
+  const root = projectStorageRoot(apxId);
+  fs.mkdirSync(root, { recursive: true });
+  return root;
+}

package/src/core/constants/actors.js

@@ -0,0 +1,8 @@
+// Stable actor identifiers used in message records, sessions, and confirmation
+// flows. These are NEVER the persona name (which can be renamed) — they are
+// machine ids so storage stays stable across persona renames.
+
+// The super-agent (the daemon's default action loop, runs when no project agent
+// was named). Identity (display name + personality) lives in identity.json and
+// is resolved at runtime via resolveAgentName().
+export const SUPERAGENT_ACTOR_ID = "super_agent";

package/src/core/constants/channels.js

@@ -0,0 +1,19 @@
+// Channel names — kept in one place so a typo can't silently route the wrong
+// prompt or skip a logging path. Each value is the exact string the daemon
+// expects in `channel:` fields of API requests, message records, and
+// CHANNEL_PROMPT_FILES keys.
+//
+// Channels are SURFACES (where the user is). Voice is NOT a channel — it's a
+// MODE that layers on top of a surface via channelMeta.voice.
+export const CHANNELS = Object.freeze({
+  TELEGRAM: "telegram",
+  CLI: "cli",
+  ROUTINE: "routine",
+  API: "api",
+  WEB: "web",                 // Web admin big chat
+  WEB_SIDEBAR: "web_sidebar", // Web admin docked sidebar
+  WEB_CODE: "web_code",       // Web admin `/m/code` (OpenCode-style)
+  DECK: "deck",               // Mobile cockpit dashboard
+  DESKTOP: "desktop",         // Electron capsule (always voice mode)
+  CODE: "code",               // `apx code` — terminal coding session
+});

package/src/core/constants/index.js

@@ -0,0 +1,5 @@
+// Public re-exports — pick the constants you need from a single entry point.
+export * from "./permissions.js";
+export * from "./channels.js";
+export * from "./roles.js";
+export * from "./actors.js";

package/src/core/constants/permissions.js

@@ -0,0 +1,17 @@
+// Permission modes for the super-agent. The value lives in
+// config.super_agent.permission_mode and is read by createPermissionGuard
+// (super-agent-tools/helpers.js).
+//
+//   total      — execute every tool without confirmation.
+//   automatico — read-only / safe shell runs directly; destructive,
+//                outbound, runtime, MCP, and filesystem-mutating actions
+//                require user confirmation via the interface dialog.
+//   permiso    — only allowed_tools run directly; everything else requires
+//                user confirmation.
+export const PERMISSION_MODES = Object.freeze({
+  TOTAL: "total",
+  AUTOMATICO: "automatico",
+  PERMISO: "permiso",
+});
+
+export const DEFAULT_PERMISSION_MODE = PERMISSION_MODES.AUTOMATICO;

package/src/core/constants/roles.js

@@ -0,0 +1,9 @@
+// Sender roles resolved by core/identity/telegram.js. Owner is whoever owns
+// the channel; contact is a known person added to the roster; guest is anyone
+// else (no permissions, must be claimed by the owner or added by a real user
+// via terminal/web).
+export const SENDER_ROLES = Object.freeze({
+  OWNER: "owner",
+  CONTACT: "contact",
+  GUEST: "guest",
+});

package/src/core/engines/_streaming.js

@@ -0,0 +1,63 @@
+// Shared streaming primitives for engine adapters.
+//
+// Every cloud chat API that supports streaming sends a sequence of newline
+// terminated lines: SSE for OpenAI / Anthropic / Groq / OpenRouter, JSONL for
+// Ollama / Gemini. Adapters used to inline the same TextDecoder loop —
+// `streamLines` collapses that into one place; `streamSseDataEvents` walks
+// the SSE-flavoured form on top of it (`data: <json>` lines).
+
+/**
+ * Yield complete newline-terminated lines from a streaming `fetch` Response.
+ * Handles chunk boundaries falling mid-line and never yields empty trailing
+ * tokens. The caller decides what each line means (raw JSON, SSE `data:` row,
+ * etc.).
+ */
+export async function* streamLines(response) {
+  if (!response || !response.body) return;
+  const decoder = new TextDecoder();
+  let buf = "";
+  for await (const chunk of response.body) {
+    buf += decoder.decode(chunk, { stream: true });
+    let nl;
+    while ((nl = buf.indexOf("\n")) !== -1) {
+      const line = buf.slice(0, nl);
+      buf = buf.slice(nl + 1);
+      // Yield even empty lines — SSE uses them as event boundaries.
+      yield line;
+    }
+  }
+  // Flush whatever the decoder left buffered + the trailing partial line, if any.
+  buf += decoder.decode();
+  if (buf.length > 0) yield buf;
+}
+
+/**
+ * Walk an SSE stream and yield the parsed JSON body of each `data: <json>`
+ * row. Skips `data: [DONE]` and rows whose body isn't valid JSON. Lines that
+ * don't start with `data: ` (comments, event names, blank separators) are
+ * ignored — adapters that need those should use streamLines directly.
+ */
+export async function* streamSseDataEvents(response) {
+  for await (const line of streamLines(response)) {
+    if (!line.startsWith("data: ")) continue;
+    const raw = line.slice(6).trim();
+    if (!raw || raw === "[DONE]") continue;
+    let evt;
+    try { evt = JSON.parse(raw); } catch { continue; }
+    yield evt;
+  }
+}
+
+/**
+ * Walk a newline-delimited JSON stream (Ollama-style) and yield each parsed
+ * object. Empty lines and invalid JSON are skipped.
+ */
+export async function* streamJsonLines(response) {
+  for await (const line of streamLines(response)) {
+    const trimmed = line.trim();
+    if (!trimmed) continue;
+    let obj;
+    try { obj = JSON.parse(trimmed); } catch { continue; }
+    yield obj;
+  }
+}

package/src/core/engines/anthropic.js

@@ -1,5 +1,6 @@
 // Anthropic Messages API adapter (https://docs.anthropic.com/en/api/messages).
 // No SDK dependency — direct fetch, keeps the daemon lean.
+import { streamSseDataEvents } from "./_streaming.js";
 
 const API_BASE = "https://api.anthropic.com/v1/messages";
 const API_VERSION = "2023-06-01";
@@ -74,33 +75,21 @@ export default {
         throw new Error(`anthropic ${res.status}: ${err.slice(0, 200)}`);
       }
 
-      const decoder = new TextDecoder();
       let text = "";
       let inputTokens = 0;
       let outputTokens = 0;
       let stopReason = null;
-      let buf = "";
 
-      for await (const chunk of res.body) {
-        buf += decoder.decode(chunk, { stream: true });
-        const lines = buf.split("\n");
-        buf = lines.pop(); // keep incomplete last line
-        for (const line of lines) {
-          if (!line.startsWith("data: ")) continue;
-          const raw = line.slice(6).trim();
-          if (raw === "[DONE]") continue;
-          let evt;
-          try { evt = JSON.parse(raw); } catch { continue; }
-          if (evt.type === "content_block_delta" && evt.delta?.type === "text_delta") {
-            const t = evt.delta.text || "";
-            if (t) { text += t; onToken(t); }
-          } else if (evt.type === "message_delta") {
-            stopReason = evt.delta?.stop_reason || stopReason;
-            outputTokens = evt.usage?.output_tokens || outputTokens;
-          } else if (evt.type === "message_start") {
-            inputTokens = evt.message?.usage?.input_tokens || 0;
-            outputTokens = evt.message?.usage?.output_tokens || 0;
-          }
+      for await (const evt of streamSseDataEvents(res)) {
+        if (evt.type === "content_block_delta" && evt.delta?.type === "text_delta") {
+          const t = evt.delta.text || "";
+          if (t) { text += t; onToken(t); }
+        } else if (evt.type === "message_delta") {
+          stopReason = evt.delta?.stop_reason || stopReason;
+          outputTokens = evt.usage?.output_tokens || outputTokens;
+        } else if (evt.type === "message_start") {
+          inputTokens = evt.message?.usage?.input_tokens || 0;
+          outputTokens = evt.message?.usage?.output_tokens || 0;
         }
       }
 

package/src/core/engines/ollama.js

@@ -1,6 +1,7 @@
 // Ollama adapter (https://github.com/ollama/ollama/blob/main/docs/api.md#generate-a-chat-completion).
 // Local-only. No API key. Default base_url http://localhost:11434.
 import { pingUrl, fetchJsonWithTimeout, modelInOllamaTags } from "./_health.js";
+import { streamJsonLines } from "./_streaming.js";
 
 function baseUrl(config) {
   return config.base_url || process.env.OLLAMA_HOST || "http://localhost:11434";
@@ -102,25 +103,15 @@ export default {
         const t = await res.text();
         throw new Error(`ollama ${res.status}: ${t}`);
       }
-      const decoder = new TextDecoder();
       let text = "";
       let inputTokens = 0;
       let outputTokens = 0;
-      let buf = "";
-      for await (const chunk of res.body) {
-        buf += decoder.decode(chunk, { stream: true });
-        const lines = buf.split("\n");
-        buf = lines.pop();
-        for (const line of lines) {
-          if (!line.trim()) continue;
-          let evt;
-          try { evt = JSON.parse(line); } catch { continue; }
-          const t = evt.message?.content || "";
-          if (t) { text += t; onToken(t); }
-          if (evt.done) {
-            inputTokens = evt.prompt_eval_count || 0;
-            outputTokens = evt.eval_count || 0;
-          }
+      for await (const evt of streamJsonLines(res)) {
+        const t = evt.message?.content || "";
+        if (t) { text += t; onToken(t); }
+        if (evt.done) {
+          inputTokens = evt.prompt_eval_count || 0;
+          outputTokens = evt.eval_count || 0;
         }
       }
       return {

package/src/core/identity/index.js

@@ -0,0 +1,8 @@
+// Public entry for everything identity-related.
+//
+// self.js      → the super-agent's persona (identity.json) — agent_name,
+//                personality, owner.
+// telegram.js  → sender resolution for inbound Telegram messages — who is
+//                writing right now (owner / contact / guest), per-user_id roster.
+export * from "./self.js";
+export * from "./telegram.js";

package/src/core/{identity.js → identity/self.js}

@@ -1,13 +1,13 @@
 import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
+import { SUPERAGENT_ACTOR_ID } from "../constants/actors.js";
 
-export const IDENTITY_PATH = path.join(os.homedir(), ".apx", "identity.json");
+// Re-export so callers that already imported the actor id from here keep
+// working. The single source of truth lives in core/constants/actors.js.
+export { SUPERAGENT_ACTOR_ID };
 
-// Stable machine id for the daemon-level "super-agent" mode. Never tied to the
-// persona name, so renaming the persona (identity.json) doesn't break message
-// attribution / history queries.
-export const SUPERAGENT_ACTOR_ID = "super_agent";
+export const IDENTITY_PATH = path.join(os.homedir(), ".apx", "identity.json");
 
 // Shown when no persona is configured yet. Brand of the app, not a persona.
 export const SUPERAGENT_DISPLAY_FALLBACK = "APX";

package/src/core/{telegram-identity.js → identity/telegram.js}

@@ -16,7 +16,7 @@ import {
   findTelegramChannel,
   upsertContact,
   upsertTelegramChannel,
-} from "./config.js";
+} from "../config/index.js";
 
 function telegramDisplayName(from) {
   const full = [from?.first_name, from?.last_name].filter(Boolean).join(" ").trim();

package/src/core/logging.js

@@ -1,6 +1,6 @@
 import fs from "node:fs";
 import path from "node:path";
-import { APX_HOME } from "./config.js";
+import { APX_HOME } from "./config/index.js";
 
 export const LOG_DIR = path.join(APX_HOME, "logs");
 export const ERROR_TRACE_PATH = path.join(LOG_DIR, "errors.jsonl");

package/src/core/mascot.js

@@ -1,5 +1,5 @@
 // APX mascot — a panda that appears in different moods across the CLI.
-// Usage: import { mascot } from '../core/mascot.js'; mascot('happy');
+// Usage: import { mascot } from '#core/mascot.js'; mascot('happy');
 
 const R = "\x1b[0m";
 const B = "\x1b[1m";