@agentprojectcontext/apx 1.32.0 → 1.33.0

package/src/interfaces/cli/commands/skills.js

@@ -3,14 +3,15 @@ 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 { findApfRoot } from "#core/apc/parser.js";
+import { http } from "../http.js";
 import {
   IDE_TARGETS,
   installIdeSkills,
   installGlobalSkills,
   listBundledSkillSlugs,
   listBundledSkills,
-} from "../../../core/scaffold.js";
+} from "#core/apc/scaffold.js";
 
 // ---------------------------------------------------------------------------
 // Prompt helper
@@ -182,7 +183,27 @@ export async function cmdSkillsSync(args) {
 // apx skills list
 // ---------------------------------------------------------------------------
 
-export async function cmdSkillsList() {
+export async function cmdSkillsList(args = {}) {
+  // --all queries the daemon, which returns project + global + bundled +
+  // runtime-skills (same catalog the super-agent sees and the web picker uses).
+  // Without --all we only list `.apc/skills/` (what the user installed in
+  // THIS project), matching the historical behaviour.
+  if (args?.flags?.all) {
+    const root = findApfRoot();
+    const params = root ? `?project_path=${encodeURIComponent(root)}` : "";
+    const out = await http.get(`/skills${params}`);
+    if (!out.count) {
+      console.log("(no skills available)");
+      return;
+    }
+    console.log(`SLUG`.padEnd(28) + "SOURCE".padEnd(10) + "DESCRIPTION");
+    for (const s of out.skills) {
+      const desc = (s.description || "").slice(0, 70);
+      console.log(s.slug.padEnd(28) + (s.source || "?").padEnd(10) + desc);
+    }
+    return;
+  }
+
   const root = findApfRoot();
   const skillsDir = root ? path.join(root, ".apc", "skills") : null;
   const files = skillsDir && fs.existsSync(skillsDir)
@@ -190,7 +211,7 @@ export async function cmdSkillsList() {
     : [];
 
   if (files.length === 0) {
-    console.log("(no skills installed in .apc/skills/)");
+    console.log("(no skills installed in .apc/skills/ — try `apx skills list --all` for the full catalog)");
     return;
   }
   for (const f of files) console.log(f.replace(/\.md$/, ""));

package/src/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/index.js";
 import { http } from "../http.js";
 
 const R  = "\x1b[0m";

package/src/interfaces/cli/commands/sys.js

@@ -1,8 +1,9 @@
 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/index.js";
+import { readIdentity } from "#core/identity/index.js";
+import { CHANNELS } from "#core/constants/channels.js";
 import {
   C,
   MODES,
@@ -40,12 +41,18 @@ export async function cmdSys(args) {
   // 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";
+    // bun must resolve node_modules/tsconfig from the apx package root, so the
+    // spawn cwd stays there — but we pass the user's actual working directory
+    // (where they ran `apx code`) via --cwd so the TUI shows the real project
+    // path + git branch instead of apx/src.
+    const userCwd = process.cwd();
     spawnSync(bunBin, [
       "--preload", "@opentui/solid/preload",
       TUI_SRC,
       "--pid", pid,
       "--agent", routedAgentSlug || defaultAgentLabel,
       "--model", cfg.super_agent?.model || "claude-3-5-sonnet",
+      "--cwd", userCwd,
     ], { stdio: "inherit", cwd: resolve(__dirname, "../../..") });
     return;
   }
@@ -425,7 +432,7 @@ 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/index.js");
     const currentCfg = configModule.readConfig();
     if (!currentCfg.super_agent) currentCfg.super_agent = {};
     currentCfg.super_agent.model = selected;
@@ -704,7 +711,7 @@ async function runPrompt(
     const currentMode = MODES[state.currentModeIdx];
     const body = {
       prompt: `[Mode: ${currentMode}]\n${text}`,
-      channel: "terminal",
+      channel: CHANNELS.CODE,
       channelMeta: { cwd },
       previousMessages,
       model: state.activeModel,

package/src/interfaces/cli/commands/update.js

@@ -1,7 +1,7 @@
 import { spawnSync } from "node:child_process";
 import readline from "node:readline";
 import { fileURLToPath } from "node:url";
-import { getLatestVersion } from "../../../core/update-check.js";
+import { getLatestVersion } from "#core/update-check.js";
 
 const PACKAGE_NAME = "@agentprojectcontext/apx";
 

package/src/interfaces/cli/index.js

@@ -108,8 +108,8 @@ import { cmdSetup } from "./commands/setup.js";
 import { cmdStatus } from "./commands/status.js";
 import { cmdModel } from "./commands/model.js";
 import { cmdPair, cmdPairWeb, cmdPairList, cmdPairRevoke } from "./commands/pair.js";
-import { checkForUpdate } from "../../core/update-check.js";
-import { mascot } from "../../core/mascot.js";
+import { checkForUpdate } from "#core/update-check.js";
+import { mascot } from "#core/mascot.js";
 import {
   cmdRoutineList,
   cmdRoutineGet,
@@ -119,6 +119,7 @@ import {
   cmdRoutineDisable,
   cmdRoutineRun,
   cmdRoutineHistory,
+  cmdRoutineMemory,
 } from "./commands/routine.js";
 import {
   cmdArtifactCreate,
@@ -1803,7 +1804,6 @@ 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",
@@ -2406,7 +2406,6 @@ async function dispatch(cmd, rest) {
         break;
 
       case "code":
-      case "sys":
         await cmdCode(parseArgs(rest));
         break;
 
@@ -2481,6 +2480,7 @@ async function dispatch(cmd, rest) {
         else if (sub === "disable") await cmdRoutineDisable(a);
         else if (sub === "run") await cmdRoutineRun(a);
         else if (sub === "history" || sub === "hist") await cmdRoutineHistory(a);
+        else if (sub === "memory" || sub === "mem") await cmdRoutineMemory(a);
         else die(`unknown routine subcommand: ${sub}`);
         break;
       }

package/src/interfaces/cli/postinstall.js

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 // Runs automatically after `npm install -g apx` and `npm update -g apx`.
 import os from "node:os";
-import { refreshApcContextSkill } from "../../core/apc-skill-sync.js";
-import { installGlobalSkills } from "../../core/scaffold.js";
+import { refreshApcContextSkill } from "#core/apc/skill-sync.js";
+import { installGlobalSkills } from "#core/apc/scaffold.js";
 
 try {
   const refresh = process.env.APX_SKIP_SKILL_REFRESH

package/src/interfaces/mcp-server/index.js

@@ -18,7 +18,7 @@ import { fileURLToPath } from "node:url";
 import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import { z } from "zod";
-import { findApfRoot } from "../../core/parser.js";
+import { findApfRoot } from "#core/apc/parser.js";
 import { ensureDaemon, http } from "../../cli/http.js";
 
 const __filename = fileURLToPath(import.meta.url);

package/src/interfaces/tui/component/prompt/index.tsx

@@ -1569,7 +1569,9 @@ export function Prompt(props: PromptProps) {
                   {(agent) => (
                     <>
                       <text fg={fadeColor(highlight(), agentMetaAlpha())}>
-                        {store.mode === "shell" ? "Shell" : Locale.titlecase(agent().name)}
+                        {/* APX: show the coding mode (Build) here, not the agent —
+                            the agent (Roby) is shown in the sidebar. */}
+                        {store.mode === "shell" ? "Shell" : "Build"}
                       </text>
                       <Show when={store.mode === "normal"}>
                         <box flexDirection="row" gap={1}>

package/src/interfaces/tui/context/sdk-apx.tsx

@@ -4,10 +4,23 @@ import { onCleanup } from "solid-js"
 import fs from "node:fs"
 import os from "node:os"
 import path from "node:path"
-import { spawn } from "node:child_process"
+import { spawn, execSync } from "node:child_process"
 
 const TOKEN_PATH = path.join(os.homedir(), ".apx", "daemon.token")
 
+/** Current git branch for `dir`, or "" when not a repo. Cheap, best-effort. */
+function gitBranch(dir: string): string {
+  try {
+    return execSync("git rev-parse --abbrev-ref HEAD", {
+      cwd: dir,
+      stdio: ["ignore", "pipe", "ignore"],
+      encoding: "utf8",
+    }).trim()
+  } catch {
+    return ""
+  }
+}
+
 function readToken(): string {
   try {
     return fs.readFileSync(TOKEN_PATH, "utf8").trim()
@@ -74,10 +87,21 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
       prompt: string,
       previousMessages: Array<{ role: string; content: string }> = [],
     ) {
-      // Send the live model selection as `body.model` so the daemon's
-      // super-agent honours the model the user picked via /models. When unset
-      // the daemon falls back to ~/.apx/config.json (super_agent.model).
-      const body: Record<string, unknown> = { prompt, previousMessages }
+      // Run on the `code` channel and hand the daemon our working directory so
+      // the agent knows WHERE it is (CWD/project) — otherwise it falls back to
+      // the generic API channel with no cwd and asks "which file? which project?".
+      // maxIters gives room to chain read→edit→verify; the code.md prompt already
+      // carries the "keep going until done" guidance. We deliberately do NOT send
+      // completionContract here — on weaker models (e.g. gemini-flash) the hard
+      // loop-until-finish contract causes runaway edit/rewrite loops.
+      const body: Record<string, unknown> = {
+        prompt,
+        previousMessages,
+        channel: "code",
+        channelMeta: { cwd: props.directory ?? process.cwd() },
+        maxIters: 40,
+        maxTokens: 8192,
+      }
       if (currentModel) body.model = currentModel
       const res = await fetch(`${props.url}/projects/${props.pid}/super-agent/chat/stream`, {
         method: "POST",
@@ -101,7 +125,12 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
       const reader = res.body.getReader()
       const dec = new TextDecoder()
       let buf = ""
-      while (true) {
+      // The daemon may keep the HTTP connection open after the final event, so
+      // we can't rely on stream-close to know the turn is done. Resolve as soon
+      // as we see `final` or `error` — otherwise the caller's `await` hangs and
+      // the next message queues forever.
+      let finished = false
+      while (!finished) {
         const { done, value } = await reader.read()
         if (done) break
         buf += dec.decode(value, { stream: true })
@@ -158,16 +187,25 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
                   usage: ev.result?.usage,
                   name: ev.result?.name,
                 })
+                finished = true
                 break
               case "error":
                 emitter.emit("event", { type: "error", sessionID, error: ev.error })
+                finished = true
                 break
             }
           } catch {
             // ignore parse errors for partial lines
           }
+          if (finished) break
         }
       }
+      // Stop reading and release the connection so the awaiting caller resumes.
+      try {
+        await reader.cancel()
+      } catch {
+        /* already closed */
+      }
     }
 
     // The APX daemon has no generic "create session" route — a chat turn is
@@ -296,8 +334,10 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
       // passed, show "APX" in the sidebar.
       agent: props.agent ?? "APX",
       model: props.model ?? "claude-3-5-sonnet",
-      // Legacy opencode compat
+      // Working directory (the user's project root, passed via --cwd) and its
+      // current git branch — shown in the sidebar / footer like OpenCode.
       directory: props.directory ?? process.cwd(),
+      branch: gitBranch(props.directory ?? process.cwd()),
       event: emitter,
       client,
       streamChat,

package/src/interfaces/tui/context/sync-apx.tsx

@@ -45,6 +45,10 @@ export interface ApxMessage {
   /** shell: process exit code (undefined while running) */
   exitCode?: number | null
   createdAt: number
+  /** assistant: model that produced the turn (from model_start). */
+  model?: string
+  /** assistant: when the final answer landed (for response-time display). */
+  completedAt?: number
 }
 
 export interface ApxUsage {
@@ -133,9 +137,11 @@ export const { use: useApxSync, provider: ApxSyncProvider } = createSimpleContex
           pushUser(event.sessionID, event.text)
           break
 
-        case "model_start":
-          ensureAssistant(event.sessionID)
+        case "model_start": {
+          const id = ensureAssistant(event.sessionID)
+          if (event.model) patchAssistant(event.sessionID, id, (msg) => { if (!msg.model) msg.model = event.model })
           break
+        }
 
         case "assistant_text": {
           if (!event.text) break
@@ -205,6 +211,7 @@ export const { use: useApxSync, provider: ApxSyncProvider } = createSimpleContex
             const id = activeAssistant.id
             patchAssistant(sessionID, id, (msg) => {
               msg.streaming = false
+              msg.completedAt = Date.now()
               const parts = msg.parts ?? (msg.parts = [])
               const finalText = (event.text ?? "").trim()
               const lastText = [...parts].reverse().find((p) => p.kind === "text") as
@@ -376,6 +383,17 @@ export const { use: useApxSync, provider: ApxSyncProvider } = createSimpleContex
     }
 
     return {
+      // The opencode sync shim (context/sync.tsx) reads these. apx has no async
+      // bootstrap / message-fetch, so we're always "ready". `data.messages` is
+      // only consumed by the Prompt's cost footer, which expects opencode's
+      // Message shape (item.tokens, providerID, …) that ApxMessage doesn't have.
+      // We render our own message list from session.messages(), so an empty map
+      // here is correct and avoids the Prompt crashing on missing fields.
+      status: "ready" as const,
+      ready: true,
+      data: {
+        messages: {} as Record<string, ApxMessage[]>,
+      },
       session: {
         current: currentSession,
         messages: messagesFor,

package/src/interfaces/tui/context/sync.tsx

@@ -40,7 +40,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({
     const apxModelKey = () => args.model || "apx-default"
     const apxProvider = () => ({
       id: "apx",
-      name: "APX",
+      // Shown as the gray label in the prompt status line: "Build · model · APX Code".
+      name: "APX Code",
       models: {
         [apxModelKey()]: {
           id: apxModelKey(),