@agentprojectcontext/apx 1.25.0 → 1.27.2

package/src/{cli → interfaces/cli}/commands/setup.js

@@ -7,8 +7,9 @@ import https from "node:https";
 import http from "node:http";
 import readline from "node:readline";
 import { spawnSync } from "node:child_process";
-import { readConfig, writeConfig } from "../../core/config.js";
-import { mascot } from "../../core/mascot.js";
+import { readConfig, writeConfig } from "../../../core/config.js";
+import { mascot } from "../../../core/mascot.js";
+import { setupClaudePermissions } from "../claude-permissions.js";
 
 // ── ANSI helpers ──────────────────────────────────────────────────────────────
 const c = {
@@ -178,6 +179,10 @@ export async function cmdSetup() {
 
   let botToken = "";
   let chatId = "";
+  // Optional pin: which project this default channel belongs to + which agent
+  // handles its messages. Empty = global super-agent + no project bias.
+  let tgPinProject = "";
+  let tgMasterAgent = "";
 
   if (wantTelegram) {
     console.log();
@@ -187,6 +192,24 @@ export async function cmdSetup() {
     console.log();
     botToken = await ask("  Bot token: ");
     chatId   = await ask("  Your chat ID: ");
+
+    // Optional channel-to-project pin (only if any project is registered).
+    const existing = readConfig();
+    const projects = Array.isArray(existing.projects) ? existing.projects : [];
+    if (projects.length > 0) {
+      console.log();
+      console.log(b("  Pin default channel to a project?"));
+      console.log(`    ${cy("0")}. (none — first registered project as fallback)`);
+      projects.forEach((p, i) => console.log(`    ${cy(String(i + 1))}. ${p.path}`));
+      const pIdx = parseInt(await ask("  Choose [0]: "), 10);
+      if (Number.isInteger(pIdx) && pIdx >= 1 && pIdx <= projects.length) {
+        tgPinProject = projects[pIdx - 1].path;
+        // Master agent name is free-form — `apx telegram channel add` can
+        // browse .apc/agents/ properly once channels CLI is wired up.
+        const agentAns = await ask(`  Master agent slug ${di("(blank → default APX super-agent)")}: `);
+        if (agentAns) tgMasterAgent = agentAns;
+      }
+    }
   }
 
   // ── Language ────────────────────────────────────────────────────────────────
@@ -207,6 +230,43 @@ export async function cmdSetup() {
     }
   }
 
+  // ── Claude Code (optional) ──────────────────────────────────────────────────
+  console.log();
+  console.log(b("  Claude Code (optional):"));
+  console.log(di("  Adds Bash(*), Read(*), Write(*), Edit(*) to ~/.claude/settings.json"));
+  console.log(di("  so Claude Code can run terminal commands without extra prompts."));
+  console.log();
+  const wantClaudePerms = /^y/i.test(await ask(`  Configure Claude Code permissions? ${di("[y/N]")} `));
+
+  // ── Voice (TTS) ─────────────────────────────────────────────────────────────
+  console.log();
+  console.log(b("  Voice (text-to-speech):"));
+  console.log(di("  Optional. Enables spoken replies via `apx voice say` and /voice/turn."));
+  const ttsAns = await ask(`  Enable voice (TTS)? ${di("[y/N]")} `);
+  const wantVoice = /^y/i.test(ttsAns);
+  let ttsProvider = "auto";
+  let ttsApiKey = "";
+  if (wantVoice) {
+    console.log();
+    console.log(b("  TTS provider:"));
+    console.log(`    ${cy("1")}. ${di("auto")} (probe piper → elevenlabs → openai → gemini → mock)`);
+    console.log(`    ${cy("2")}. piper      ${di("(local, offline; needs piper CLI + voice model)")}`);
+    console.log(`    ${cy("3")}. elevenlabs ${di("(cloud; eleven_multilingual_v2)")}`);
+    console.log(`    ${cy("4")}. openai     ${di("(cloud; tts-1, reuses your openai key)")}`);
+    console.log(`    ${cy("5")}. gemini     ${di("(experimental, best-effort)")}`);
+    console.log(`    ${cy("6")}. mock       ${di("(silent WAV; useful for tests)")}`);
+    console.log();
+    const choice = (await ask(`  Choose [1-6, default 1]: `)).trim() || "1";
+    ttsProvider = ({ "1":"auto", "2":"piper", "3":"elevenlabs", "4":"openai", "5":"gemini", "6":"mock" })[choice] || "auto";
+    if (ttsProvider === "elevenlabs") {
+      ttsApiKey = await ask(`  ElevenLabs API key ${di("(blank to keep current/env)")}: `);
+    } else if (ttsProvider === "openai" && provider.id !== "openai" && !apiKey) {
+      ttsApiKey = await ask(`  OpenAI API key for TTS ${di("(blank to keep current/env)")}: `);
+    } else if (ttsProvider === "gemini" && provider.id !== "gemini" && !apiKey) {
+      ttsApiKey = await ask(`  Gemini API key for TTS ${di("(blank to keep current/env)")}: `);
+    }
+  }
+
   // ── Summary ─────────────────────────────────────────────────────────────────
   console.log();
   console.log(b("  ─── Summary ───────────────────────────────────────────"));
@@ -214,7 +274,9 @@ export async function cmdSetup() {
   console.log(`  Model:      ${cy(chosenModel)}`);
   if (provider.id === "ollama") console.log(`  Ollama URL: ${cy(ollamaUrl)}`);
   console.log(`  Telegram:   ${wantTelegram ? gr("enabled") : di("disabled")}`);
+  console.log(`  Voice TTS:  ${wantVoice ? cy(ttsProvider) : di("disabled")}`);
   console.log(`  Language:   ${cy(language)}`);
+  console.log(`  Claude Code:${wantClaudePerms ? gr(" permissions") : di(" skip")}`);
   console.log(b("  ────────────────────────────────────────────────────────"));
   console.log();
 
@@ -243,15 +305,47 @@ export async function cmdSetup() {
 
   if (wantTelegram && botToken && chatId) {
     cfg.telegram.enabled = true;
-    cfg.telegram.bot_token = botToken;
-    cfg.telegram.chat_id = chatId;
+    if (!Array.isArray(cfg.telegram.channels)) cfg.telegram.channels = [];
+    const existing = cfg.telegram.channels.find((c) => c?.name === "default");
+    const patch = {
+      bot_token: botToken,
+      chat_id: chatId,
+      ...(tgPinProject ? { project: tgPinProject } : {}),
+      ...(tgMasterAgent ? { route_to_agent: tgMasterAgent } : {}),
+    };
+    if (existing) {
+      Object.assign(existing, patch);
+    } else {
+      cfg.telegram.channels.push({ name: "default", ...patch });
+    }
   }
 
   cfg.user = { ...(cfg.user || {}), language };
 
+  if (wantVoice) {
+    cfg.voice = cfg.voice || {};
+    cfg.voice.tts = cfg.voice.tts || {};
+    cfg.voice.tts.provider = ttsProvider;
+    if (ttsApiKey) {
+      cfg.voice.tts[ttsProvider] = {
+        ...(cfg.voice.tts[ttsProvider] || {}),
+        api_key: ttsApiKey,
+      };
+    }
+  }
+
   writeConfig(cfg);
   console.log(`\n  ${gr("✓")} Config saved to ${di("~/.apx/config.json")}`);
 
+  if (wantClaudePerms) {
+    const result = setupClaudePermissions();
+    if (result === true) {
+      console.log(`  ${gr("✓")} Claude Code permissions updated at ${di("~/.claude/settings.json")}`);
+    } else {
+      console.log(`  ${c.yellow}⚠${c.reset} Could not update Claude Code settings: ${result}`);
+    }
+  }
+
   // ── Start daemon ─────────────────────────────────────────────────────────────
   console.log();
   process.stdout.write(`  Starting daemon... `);

package/src/{cli → interfaces/cli}/commands/skills.js

@@ -3,8 +3,14 @@ import fs from "node:fs";
 import path from "node:path";
 import os from "node:os";
 import readline from "node:readline";
-import { findApfRoot } from "../../core/parser.js";
-import { IDE_TARGETS, installIdeSkills, installGlobalSkills } from "../../core/scaffold.js";
+import { findApfRoot } from "../../../core/parser.js";
+import {
+  IDE_TARGETS,
+  installIdeSkills,
+  installGlobalSkills,
+  listBundledSkillSlugs,
+  listBundledSkills,
+} from "../../../core/scaffold.js";
 
 // ---------------------------------------------------------------------------
 // Prompt helper
@@ -85,6 +91,93 @@ export async function cmdSkillsAdd(args) {
   }
 }
 
+// ---------------------------------------------------------------------------
+// apx skills sync — non-interactive refresh of every bundled skill to every
+// global skill dir (.claude, .cursor, .codex, .agents). Same logic that runs
+// from postinstall — exposed as a command so the user can force-refresh
+// without reinstalling the package.
+// ---------------------------------------------------------------------------
+
+export async function cmdSkillsSync(args) {
+  const includeOptional = !!args?.flags?.["include-optional"] || !!args?.flags?.optional;
+  const includeInternal = !!args?.flags?.["include-internal"] || !!args?.flags?.internal;
+  const prune = args?.flags?.["no-prune"] ? false : true;
+
+  const results = installGlobalSkills({ includeOptional, includeInternal, prune });
+  const home = os.homedir();
+
+  // Group by skill so the output is dense and scannable.
+  const bySkill = {};
+  const scopeOf = {};
+  for (const r of results) {
+    if (!bySkill[r.skill]) bySkill[r.skill] = [];
+    bySkill[r.skill].push({ dir: r.dir.replace(home, "~"), status: r.status });
+    scopeOf[r.skill] = r.scope;
+  }
+
+  const slugs = Object.keys(bySkill).sort();
+  if (slugs.length === 0) {
+    console.log("(no bundled skills found in skills/)");
+    return;
+  }
+
+  const filters = [];
+  if (includeOptional) filters.push("+optional");
+  if (includeInternal) filters.push("+internal");
+  console.log(
+    `Syncing ${slugs.length} bundled skill(s) to global skill dirs` +
+      (filters.length ? ` [${filters.join(" ")}]` : "") + ":\n"
+  );
+
+  const sw = Math.max(...slugs.map((s) => s.length));
+  const totals = { unchanged: 0, updated: 0, created: 0, pruned: 0 };
+  for (const slug of slugs) {
+    const entries = bySkill[slug];
+    const counts = { unchanged: 0, updated: 0, created: 0, pruned: 0 };
+    for (const e of entries) counts[e.status] = (counts[e.status] || 0) + 1;
+    for (const k of Object.keys(totals)) totals[k] += counts[k] || 0;
+    const parts = [];
+    for (const k of ["created", "updated", "unchanged", "pruned"]) {
+      if (counts[k]) parts.push(`${counts[k]} ${k}`);
+    }
+    const scope = scopeOf[slug];
+    const tag = scope === "public" ? "" : ` [${scope}]`;
+    console.log(`  ${slug.padEnd(sw)}${tag.padEnd(11)}  ${parts.join(", ")}`);
+  }
+  console.log("");
+  console.log(`Targets: .claude/skills, .cursor/skills, .codex/skills, .agents/skills`);
+  const totalParts = [];
+  for (const k of ["created", "updated", "unchanged", "pruned"]) {
+    if (totals[k]) totalParts.push(`${totals[k]} ${k}`);
+  }
+  console.log(`Totals:  ${totalParts.join(", ") || "(no changes)"}`);
+
+  // Hint about non-default tiers.
+  const skipped = listBundledSkills().filter(
+    (s) =>
+      (s.scope === "internal" && !includeInternal) ||
+      (s.scope === "optional" && !includeOptional)
+  );
+  if (skipped.length > 0) {
+    console.log("");
+    console.log("Skipped (not pushed by default):");
+    for (const s of skipped) console.log(`  ${s.slug.padEnd(sw)}  scope=${s.scope}`);
+    console.log("");
+    console.log("Re-run with --include-optional / --include-internal to push them too,");
+    console.log("or `apx skills add <slug> --global` for one-off install.");
+  }
+
+  if (args?.flags?.verbose) {
+    console.log("");
+    for (const slug of slugs) {
+      console.log(`${slug}:`);
+      for (const e of bySkill[slug]) {
+        console.log(`  ${e.status.padEnd(10)}  ${e.dir}`);
+      }
+    }
+  }
+}
+
 // ---------------------------------------------------------------------------
 // apx skills list
 // ---------------------------------------------------------------------------
@@ -110,21 +203,36 @@ export async function cmdSkillsList() {
 export async function cmdSkillsStatus() {
   const root = findApfRoot();
 
-  // Global
-  const SKILL_SLUGS = ["apx", "apc-context"];
-  console.log("Global skills:");
+  // Global — discovered list of every bundled skill with its scope.
+  const bundled = listBundledSkills();
+  const byScope = {
+    public: bundled.filter((s) => s.scope === "public"),
+    optional: bundled.filter((s) => s.scope === "optional"),
+    internal: bundled.filter((s) => s.scope === "internal"),
+  };
+  console.log(
+    `Bundled skills: ${bundled.length} total (${byScope.public.length} public, ` +
+      `${byScope.optional.length} optional, ${byScope.internal.length} internal)`
+  );
+  console.log("");
+  console.log(`Global skill dirs:`);
   const GLOBAL_DIRS = [
     { label: "Claude Code / Cursor compat", dir: path.join(os.homedir(), ".claude", "skills") },
     { label: "Cursor (primary)",            dir: path.join(os.homedir(), ".cursor", "skills") },
     { label: "Codex",                       dir: path.join(os.homedir(), ".codex",  "skills") },
     { label: "Antigravity / others",        dir: path.join(os.homedir(), ".agents", "skills") },
   ];
-  const gw = Math.max(...GLOBAL_DIRS.map((d) => d.label.length));
-  const sw = Math.max(...SKILL_SLUGS.map((s) => s.length));
+  const sw = Math.max(...bundled.map((s) => s.slug.length));
   for (const { label, dir } of GLOBAL_DIRS) {
-    for (const slug of SKILL_SLUGS) {
+    console.log(`\n  ${label} — ${dir.replace(os.homedir(), "~")}`);
+    for (const { slug, scope } of bundled) {
       const dest = path.join(dir, slug, "SKILL.md");
-      console.log(`  ${label.padEnd(gw)}  ${slug.padEnd(sw)}  ${fs.existsSync(dest) ? "installed" : "not installed"}`);
+      const present = fs.existsSync(dest);
+      const tag = scope === "public" ? "" : ` [${scope}]`;
+      const state = present
+        ? "✓ installed"
+        : (scope === "public" ? "✗ MISSING (run `apx skills sync`)" : "—");
+      console.log(`    ${slug.padEnd(sw)}${tag.padEnd(11)}  ${state}`);
     }
   }
 

package/src/{cli → interfaces/cli}/commands/status.js

@@ -1,7 +1,7 @@
 // apx status — show full system status at a glance.
 // Daemon, super-agent, engines, telegram, projects.
 
-import { readConfig } from "../../core/config.js";
+import { readConfig } from "../../../core/config.js";
 import { http } from "../http.js";
 
 const R  = "\x1b[0m";
@@ -48,6 +48,10 @@ export async function cmdStatus() {
       const preview = sa.system.length > 60 ? sa.system.slice(0, 60) + "…" : sa.system;
       console.log(`${key("system")}${DI}${preview}${R}`);
     }
+    const fb = sa.model_fallback;
+    if (fb?.enabled !== false && Array.isArray(fb?.order)) {
+      console.log(`${key("fallback")}${val(fb.order.join(" → "))}`);
+    }
     if (cfg.identity?.agent_name) {
       console.log(`${key("identity")}${val(cfg.identity.agent_name)}${cfg.identity.owner_name ? DI + "  for " + cfg.identity.owner_name + R : ""}`);
     }
@@ -61,6 +65,10 @@ export async function cmdStatus() {
   const engineList = [
     { id: "anthropic", label: "Anthropic",  check: () => !!engines.anthropic?.api_key },
     { id: "openai",    label: "OpenAI",     check: () => !!engines.openai?.api_key },
+    { id: "groq",      label: "Groq",       check: () => !!engines.groq?.api_key,
+      detail: () => engines.groq?.base_url || "https://api.groq.com/openai/v1" },
+    { id: "openrouter",label: "OpenRouter", check: () => !!engines.openrouter?.api_key,
+      detail: () => engines.openrouter?.base_url || "https://openrouter.ai/api/v1" },
     { id: "gemini",    label: "Gemini",     check: () => !!engines.gemini?.api_key },
     { id: "ollama",    label: "Ollama",     check: () => true,
       detail: () => engines.ollama?.base_url || "http://localhost:11434" },

package/src/{cli → interfaces/cli}/commands/sys.js

@@ -1,8 +1,8 @@
 import readline from "node:readline";
 import { http } from "../http.js";
 import { resolveProjectId } from "./project.js";
-import { readConfig } from "../../core/config.js";
-import { readIdentity } from "../../core/identity.js";
+import { readConfig } from "../../../core/config.js";
+import { readIdentity } from "../../../core/identity.js";
 import {
   C,
   MODES,
@@ -31,6 +31,12 @@ export async function cmdSys(args) {
   const cfg = readConfig();
   const id = readIdentity();
 
+  // Optional --agent <slug>: route chat to a project agent instead of the APX
+  // default. Empty / missing flag means default ("super-agent" mode).
+  const agentFlag = typeof args?.flags?.agent === "string" ? args.flags.agent.trim() : "";
+  const routedAgentSlug = agentFlag || null;
+  const defaultAgentLabel = id?.agent_name || cfg.super_agent?.name || "APX";
+
   // Launch new Solid.js TUI via bun (runs TS source directly — no esbuild bundle needed)
   if (existsSync(TUI_SRC)) {
     const bunBin = process.env.BUN_PATH || "bun";
@@ -38,7 +44,7 @@ export async function cmdSys(args) {
       "--preload", "@opentui/solid/preload",
       TUI_SRC,
       "--pid", pid,
-      "--agent", id?.agent_name || cfg.super_agent?.name || "super-agent",
+      "--agent", routedAgentSlug || defaultAgentLabel,
       "--model", cfg.super_agent?.model || "claude-3-5-sonnet",
     ], { stdio: "inherit", cwd: resolve(__dirname, "../../..") });
     return;
@@ -53,7 +59,10 @@ export async function cmdSys(args) {
     paletteSelection: 0,
     paletteState: "main",
     paletteOptions: [...MAIN_PALETTE_OPTIONS],
-    activeAgent: titlecase(id?.agent_name || cfg.super_agent?.name || "SuperAgent"),
+    activeAgent: titlecase(routedAgentSlug || defaultAgentLabel || "APX"),
+    activeAgentSlug: routedAgentSlug, // null => super-agent route; string => /agents/:slug/chat
+    activeAgentConversationId: null,
+    defaultAgentLabel: defaultAgentLabel || "APX",
     activeModel: cfg.super_agent?.model || "Claude 3.5 Sonnet",
     version: readPackageVersion(),
     hasStarted: false,
@@ -416,12 +425,16 @@ async function handlePaletteKey(key, pid, cfg, state, renderScreen, close) {
     !selected.startsWith("No ")
   ) {
     state.activeModel = selected;
-    const configModule = await import("../../core/config.js");
+    const configModule = await import("../../../core/config.js");
     const currentCfg = configModule.readConfig();
     if (!currentCfg.super_agent) currentCfg.super_agent = {};
     currentCfg.super_agent.model = selected;
     configModule.writeConfig(currentCfg);
 
+    // Tell the daemon to re-read ~/.apx/config.json so the next chat picks
+    // up the new model without needing a full restart.
+    try { await http.post("/admin/reload", {}); } catch {}
+
     state.inCommandPalette = false;
     state.transcript.push({ type: "status", text: `Model → ${selected}` });
     renderScreen();
@@ -434,9 +447,20 @@ async function handlePaletteKey(key, pid, cfg, state, renderScreen, close) {
     !selected.startsWith("Failed") &&
     !selected.startsWith("No ")
   ) {
-    state.activeAgent = selected;
+    // The "APX (default)" option resets routing back to the APX default
+    // (a.k.a. super-agent mode); any other selection routes chat to that
+    // project agent's /agents/:slug/chat endpoint.
+    if (selected === "APX (default)") {
+      state.activeAgentSlug = null;
+      state.activeAgent = titlecase(state.defaultAgentLabel || "APX");
+      state.activeAgentConversationId = null;
+    } else {
+      state.activeAgentSlug = selected;
+      state.activeAgent = titlecase(selected);
+      state.activeAgentConversationId = null;
+    }
     state.inCommandPalette = false;
-    state.transcript.push({ type: "status", text: `Agent → ${selected}` });
+    state.transcript.push({ type: "status", text: `Agent → ${state.activeAgent}` });
     renderScreen();
     return;
   }
@@ -479,13 +503,15 @@ function loadAgentOptions(pid, state, renderScreen) {
   }
   http.get(`/projects/${pid}/agents`)
     .then((agents) => {
-      state.paletteOptions = Array.isArray(agents) && agents.length
-        ? agents.map((a) => a.slug || a.name || String(a))
-        : ["No agents found"];
+      const list = Array.isArray(agents)
+        ? agents.map((a) => a.slug || a.name || String(a)).filter(Boolean)
+        : [];
+      // Always offer a way back to the APX default agent ("super-agent" mode).
+      state.paletteOptions = ["APX (default)", ...list];
       if (state.paletteState === "switch_agent") renderScreen();
     })
     .catch(() => {
-      state.paletteOptions = ["Failed to load agents"];
+      state.paletteOptions = ["APX (default)", "Failed to load agents"];
       if (state.paletteState === "switch_agent") renderScreen();
     });
 }
@@ -631,16 +657,69 @@ async function runPrompt(
 
   try {
     const cwd = process.cwd();
+
+    // --- Project-agent routing ------------------------------------------
+    // When --agent <slug> was passed (or the user picked one from the
+    // palette), bypass the super-agent stream and POST to the agent's chat
+    // endpoint. /agents/:slug/chat is non-streaming today — the spinner
+    // stays "Thinking..." until the full reply lands.
+    if (state.activeAgentSlug) {
+      const agentBody = {
+        prompt: `[Mode: ${MODES[state.currentModeIdx]}]\n${text}`,
+        conversation_id: state.activeAgentConversationId || undefined,
+        model: state.activeModel,
+      };
+      let agentInterrupted = false;
+      let agentResult;
+      try {
+        agentResult = await http.post(
+          `/projects/${pid}/agents/${encodeURIComponent(state.activeAgentSlug)}/chat`,
+          agentBody,
+          { signal: abortCtrl.signal }
+        );
+      } catch (e) {
+        if (abortCtrl.signal.aborted) {
+          agentInterrupted = true;
+          removeStatus(state);
+          appendLiveItem(state, {
+            type: "status",
+            text: `⚡ Interrupted — ${text.slice(0, 60)}${text.length > 60 ? "…" : ""}`,
+          });
+        } else {
+          throw e;
+        }
+      }
+      if (!agentInterrupted && agentResult) {
+        if (agentResult.conversation_id) {
+          state.activeAgentConversationId = agentResult.conversation_id;
+        }
+        completeSuperAgentResult(agentResult, text, startTime, state, previousMessages);
+      }
+      if (userItem) delete userItem.meta;
+      setAbortCtrl(null);
+      renderScreen();
+      return;
+    }
+
+    const currentMode = MODES[state.currentModeIdx];
     const body = {
-      prompt: `[Mode: ${MODES[state.currentModeIdx]}]\n${text}`,
-      contextNote: [
-        "Channel: terminal. Format freely using markdown, but keep it readable. Use code diffs when editing.",
-        `CWD: ${cwd}`,
-        "When the user says \"este directorio\", \"este proyecto\", \"acá\", \"aquí\", \"this directory\", \"current dir\" or any equivalent reference without naming a path, they mean exactly the CWD above. Use it as the path argument directly — don't ask the user to provide it.",
-      ].join("\n"),
+      prompt: `[Mode: ${currentMode}]\n${text}`,
+      channel: "terminal",
+      channelMeta: { cwd },
       previousMessages,
       model: state.activeModel,
     };
+    // Coding modes mirror the web Code module: high iteration ceiling + a real
+    // output budget so multi-step tasks run to completion. Build additionally
+    // turns on the completion contract (the model keeps calling tools until it
+    // calls `finish` — no early "I'll do X" stops). Zen stays lightweight chat.
+    if (currentMode === "Build" || currentMode === "Plan") {
+      body.maxIters = 100;
+      body.maxTokens = 8192;
+    }
+    if (currentMode === "Build") {
+      body.completionContract = true;
+    }
 
     let result;
     let interrupted = false;