@agentprojectcontext/apx 1.33.1 → 1.34.0

package/src/host/daemon/api/code.js

@@ -16,6 +16,7 @@ import { runSuperAgent } from "#core/agent/super-agent.js";
 import { appendSuperAgentErrorTrace } from "./shared.js";
 import { createWebConfirmAdapter } from "#core/confirmation/adapters/web.js";
 import { CHANNELS } from "#core/constants/channels.js";
+import { CODE_MODES, DEFAULT_CODE_MODE } from "#core/constants/code-modes.js";
 import {
   listCodeSessions,
   getCodeSession,
@@ -23,181 +24,28 @@ import {
   updateCodeSession,
   removeCodeSession,
   appendTurn,
+  codeSessionHistory,
 } from "#core/stores/code-sessions.js";
+import { makeTurnAccumulator } from "#core/agent/stream/turn-accumulator.js";
 import { captureBaseline, diffAgainstBaseline, initGitRepo } from "#core/git-baseline.js";
 import { loggerFor } from "#core/logging.js";
 import { readAgents } from "#core/apc/parser.js";
+import { CODE_PLAN_TOOLS, CODE_BUILD_TOOLS } from "#core/agent/tools/names.js";
+import { codeModeGuidance } from "#core/agent/prompts/modes/index.js";
 
 const log = loggerFor("code");
 
-// Read-only tool allowlist for PLAN mode: the agent can explore the repo but
-// not mutate it (no write/edit/shell/delegation/side-effects). Build mode gets
-// the unrestricted set ("*"). Names must match super-agent-tools/index.js.
-const PLAN_TOOLS = [
-  "read_file",
-  "list_files",
-  "search_files",
-  "grep",
-  "glob",
-  "list_projects",
-  "list_agents",
-  "list_mcps",
-  "read_agent_memory",
-  "read_self_memory",
-  "search_sessions",
-  "search_messages",
-  "tail_messages",
-  "list_skills",
-  "load_skill",
-  "list_tasks",
-  "ask_questions",
-  "fetch",
-  "search",
-];
-
+// Mode-specific tool allow-lists and prompt fragments are owned by core/:
+//   - tool names + plan/build lists → #core/agent/tools/names.js
+//   - per-mode guidance text         → #core/agent/prompts/modes/*.md
+// This file just picks the right pair for the request.
 function modeGuidanceFor(mode) {
-  if (mode === "plan") {
-    return [
-      "MODE: plan. Investigate the codebase (read/list/search/grep) and propose",
-      "an approach with the EXACT changes you would make (files + diffs/snippets).",
-      "Do NOT write or edit files and do NOT run mutating shell commands — your",
-      "editing tools are disabled in this mode. End with a concise, ordered plan.",
-    ].join(" ");
-  }
-  return [
-    "MODE: build. Make the changes directly using your file and shell tools",
-    "(read_file, write_file, edit_file, run_shell, …). Do not ask for",
-    "confirmation and do not stop after one step — keep calling tools until the",
-    "entire task is done, then briefly summarize what you changed and why.",
-    "Prefer surgical edits over rewrites.",
-    "When the user asks for a reusable script, snippet, or 'artifact' (something",
-    "they want to keep and run later), put it under `artifacts/<name>` inside",
-    "the project — it then shows up in the Artifacts tab. Don't drop reusable",
-    "scripts at the project root.",
-    "If a parameter you need is missing (API key, app id, target URL, …), call",
-    "`ask_questions` ONCE with all your questions and stop — control returns",
-    "to the user. Do not call ask_questions again in the same turn; you'll just",
-    "get the same blank state back. Each question can be a string (free-text",
-    "answer) OR an object {question, options:[{label, description}], multiSelect}",
-    "for choices. Prefer 2–4 mutually-exclusive options when a question has a",
-    "natural shortlist (yes/no, which-of-these, …); leave options empty for",
-    "open-ended answers (API keys, names, free-form ideas).",
-    "If the previous assistant turn already asked these same questions and the",
-    "current user message is the compiled answers, DO NOT call ask_questions",
-    "again — process the answers and proceed with the task.",
-  ].join(" ");
-}
-
-// Build the [{role, content}] history the super-agent expects from the stored
-// rich transcript: flatten each turn's text parts. Tool parts are normally
-// internal, but ask_questions is special — without surfacing it the model
-// loses track that it ALREADY asked, sees the user's compiled-answer reply
-// as a fresh request, and asks again forever. We render a one-line synthetic
-// summary of each ask_questions call so the next turn's context shows
-// "I asked X, the user replied Y" naturally.
-function summarizeAskQuestionsPart(part) {
-  const raw = part?.args?.questions;
-  if (!Array.isArray(raw) || raw.length === 0) return null;
-  const lines = raw
-    .map((q) => {
-      if (typeof q === "string") return `- ${q}`;
-      if (!q || typeof q !== "object" || typeof q.question !== "string") return null;
-      const opts = Array.isArray(q.options) ? q.options : [];
-      const optStr = opts
-        .map((o) => (typeof o === "string" ? o : (o && typeof o.label === "string" ? o.label : "")))
-        .filter(Boolean)
-        .join(", ");
-      return optStr ? `- ${q.question} (opciones: ${optStr})` : `- ${q.question}`;
-    })
-    .filter(Boolean);
-  if (lines.length === 0) return null;
-  return `[ask_questions]\n${lines.join("\n")}`;
-}
-
-function historyFrom(session) {
-  return (session.messages || []).map((m) => {
-    const chunks = [];
-    for (const p of m.parts || []) {
-      if (!p) continue;
-      if (p.kind === "text" && p.text) chunks.push(p.text);
-      else if (p.kind === "tool" && p.tool === "ask_questions") {
-        const summary = summarizeAskQuestionsPart(p);
-        if (summary) chunks.push(summary);
-      }
-    }
-    return { role: m.role, content: chunks.join("\n\n").trim() };
-  });
+  return codeModeGuidance(mode);
 }
 
-// Accumulate stream events into the rich ChatPart shape so the persisted
-// assistant turn matches exactly what the UI rendered live. Mirrors the
-// front-end reducer in hooks/useChat.ts (applyStreamEvent).
-function makeTurnAccumulator() {
-  const parts = [];
-  const notes = [];
-  let model = null;
-  let usage = null;
-  const findTool = (id) => parts.find((p) => p.kind === "tool" && p.id === id);
-  return {
-    apply(ev) {
-      switch (ev?.type) {
-        case "model_start":
-          if (ev.model) model = ev.model;
-          break;
-        case "model_routed":
-          if (ev.model) model = ev.model;
-          if (ev.from_fallback) notes.push(`routing fell back → ${ev.model}`);
-          break;
-        case "engine_failed":
-          notes.push(`engine ${ev.model || "?"} failed → ${ev.retry_with || "retry"}`);
-          break;
-        case "model_retry":
-          notes.push(`retry (${ev.reason || "?"})`);
-          break;
-        case "tools_suppressed":
-          notes.push(`tools suppressed: ${(ev.tools || []).join(", ")}`);
-          break;
-        case "assistant_text":
-          if (ev.text) parts.push({ kind: "text", text: ev.text });
-          break;
-        case "tool_start":
-          if (ev.trace)
-            parts.push({
-              kind: "tool",
-              id: ev.trace.id,
-              tool: ev.trace.tool,
-              args: ev.trace.args,
-              status: "running",
-            });
-          break;
-        case "tool_deduped": {
-          const t = ev.trace && findTool(ev.trace.id);
-          if (t) t.status = "deduped";
-          break;
-        }
-        case "tool_result": {
-          const t = ev.trace && findTool(ev.trace.id);
-          if (t) {
-            t.result = ev.trace.result;
-            const errored =
-              ev.trace.result && typeof ev.trace.result === "object" && ev.trace.result.error;
-            t.status = errored ? "error" : t.status === "deduped" ? "deduped" : "done";
-          }
-          break;
-        }
-        case "final":
-          usage = ev.result?.usage ?? usage;
-          if (!model) model = ev.result?.name || null;
-          break;
-        default:
-          break;
-      }
-    },
-    build() {
-      return { parts, notes, model, usage };
-    },
-  };
-}
+// History flattening + stream-event accumulator now live in core/ — see
+// codeSessionHistory() (transcript → engine messages) and makeTurnAccumulator()
+// (stream events → persistable ChatParts) imported above.
 
 export function register(app, { projects, project, config, registries, plugins }) {
   const findProject = (req, res) => project(req, res);
@@ -290,8 +138,8 @@ export function register(app, { projects, project, config, registries, plugins }
     const { prompt } = req.body || {};
     if (!prompt) return res.status(400).json({ error: "prompt required" });
 
-    const mode = session.mode === "plan" ? "plan" : "build";
-    const previousMessages = historyFrom(session);
+    const mode = session.mode === CODE_MODES.PLAN ? CODE_MODES.PLAN : DEFAULT_CODE_MODE;
+    const previousMessages = codeSessionHistory(session);
 
     // If a project agent is selected, inject its system prompt as a suffix so
     // the super-agent's tool loop runs with the agent's personality/context.
@@ -340,7 +188,7 @@ export function register(app, { projects, project, config, registries, plugins }
         previousMessages,
         systemSuffix: agentSystemSuffix,
         overrideModel: session.model || undefined,
-        allowedTools: mode === "plan" ? PLAN_TOOLS : "*",
+        allowedTools: mode === CODE_MODES.PLAN ? CODE_PLAN_TOOLS : CODE_BUILD_TOOLS,
         // Coding tasks are multi-step: give the loop a high safety ceiling so it
         // can chain 20-30+ tools (read → edit → run → verify …) and a real
         // output budget for substantial code / explanations per turn. The
@@ -351,7 +199,7 @@ export function register(app, { projects, project, config, registries, plugins }
         // Build mode = the model must keep calling tools until it calls `finish`.
         // Plan mode is read-only investigation that ends with a written plan, so
         // it keeps the normal "text ends the turn" behavior.
-        completionContract: mode === "build",
+        completionContract: mode === CODE_MODES.BUILD,
         onEvent,
         requestConfirmation: createWebConfirmAdapter({ onEvent }),
       });

package/src/host/daemon/api/config.js

@@ -10,10 +10,9 @@ import {
   setDottedKey,
   unsetDottedKey,
 } from "../project-config.js";
+import { apcProjectFile, apcProjectConfigFile } from "#core/apc/paths.js";
 
-function projectJsonPath(root) {
-  return path.join(root, ".apc", "project.json");
-}
+const projectJsonPath = apcProjectFile;
 
 function readProjectJson(root) {
   const p = projectJsonPath(root);
@@ -34,7 +33,7 @@ export function register(app, { projects, project }) {
     res.json({
       effective: p.config || {},
       project_only: readProjectConfig(p.path),
-      project_config_path: path.join(p.path, ".apc", "config.json"),
+      project_config_path: apcProjectConfigFile(p.path),
       apc_project: readProjectJson(p.path),
       project_json_path: projectJsonPath(p.path),
     });

package/src/host/daemon/api/conversations.js

@@ -4,12 +4,10 @@
 //   POST /projects/:pid/agents/:slug/compact
 //   POST /projects/:pid/agents/:slug/conversations/:id/compact
 //   POST /projects/:pid/send                                   (agent-to-agent)
-import fs from "node:fs";
-import path from "node:path";
 import { readAgents } from "#core/apc/parser.js";
-import { callEngine } from "#core/engines/index.js";
-import { listConversations, readConversation } from "../conversations.js";
-import { compactConversation } from "../compact.js";
+import { listConversations, readConversation } from "#core/stores/conversations.js";
+import { compactConversation } from "#core/stores/conversations-compactor.js";
+import { replyAsAgent } from "#core/agent/a2a/reply.js";
 import { nowIso } from "./shared.js";
 
 export function register(app, { project, config }) {
@@ -102,30 +100,11 @@ export function register(app, { project, config }) {
     let reply = null;
     if (deliver && toAgent.fields.Model) {
       try {
-        const tf = toAgent.fields;
-        const parts = [];
-        if (tf.Description) parts.push(tf.Description);
-        if (tf.Role) parts.push(`Role: ${tf.Role}`);
-        if (tf.Language) parts.push(`Default language: ${tf.Language}`);
-        parts.push(
-          `You are ${toAgent.slug}. You just received a message from ${fromAgent.slug}. Reply concisely.`
-        );
-        const memPath = path.join(
-          p.path,
-          ".apc",
-          "agents",
-          toAgent.slug,
-          "memory.md"
-        );
-        if (fs.existsSync(memPath))
-          parts.push("## Memory\n" + fs.readFileSync(memPath, "utf8"));
-
-        const result = await callEngine({
-          modelId: toAgent.fields.Model,
-          system: parts.join("\n\n"),
-          messages: [
-            { role: "user", content: `From ${fromAgent.slug}:\n\n${body}` },
-          ],
+        const result = await replyAsAgent({
+          projectPath: p.path,
+          toAgent,
+          fromAgent,
+          body,
           config: p.config || config,
         });