@agentprojectcontext/apx 1.33.0 → 1.34.0

package/src/host/daemon/api/sessions-search.js

@@ -2,169 +2,53 @@
 //   GET  /sessions/search?q=…&project=…&limit=20
 //   POST /sessions/:id/compact     resolves which project/agent owns the file
 //                                  then delegates to compactConversation.
-import fs from "node:fs";
 import path from "node:path";
 import { readAgents } from "#core/apc/parser.js";
-import { compactConversation } from "../compact.js";
+import { compactConversation } from "#core/stores/conversations-compactor.js";
+import { searchSessions, findSessionFile } from "#core/stores/sessions-search.js";
+
+function resolveProjects(projects, projectRef) {
+  const all = projects.list();
+  if (projectRef != null) {
+    const ref = String(projectRef);
+    const found = all.find((p) => String(p.id) === ref || p.path === path.resolve(ref));
+    return found ? [projects.get(found.id)] : [];
+  }
+  return all.map((p) => projects.get(p.id)).filter(Boolean);
+}
 
 export function register(app, { projects, config }) {
   app.get("/sessions/search", (req, res) => {
     const { q, project: projectRef, limit = "20" } = req.query;
     if (!q) return res.status(400).json({ error: "q required" });
     const lim = Math.min(parseInt(limit, 10) || 20, 200);
-    const needle = q.toLowerCase();
-
-    const allProjects = projects.list();
-    const targetProjects = (() => {
-      if (projectRef != null) {
-        const ref = String(projectRef);
-        const found = allProjects.find(
-          (p) => String(p.id) === ref || p.path === path.resolve(ref)
-        );
-        return found ? [projects.get(found.id)] : [];
-      }
-      return allProjects.map((p) => projects.get(p.id)).filter(Boolean);
-    })();
-
-    const matches = [];
-
-    for (const p of targetProjects) {
-      if (!p) continue;
-
-      // 1) Legacy session files in the repo (.apc/agents/<slug>/sessions/)
-      const sessionAgentsDir = path.join(p.path, ".apc", "agents");
-      if (fs.existsSync(sessionAgentsDir)) {
-        for (const slug of fs.readdirSync(sessionAgentsDir)) {
-          const sessionsDir = path.join(sessionAgentsDir, slug, "sessions");
-          if (!fs.existsSync(sessionsDir)) continue;
-          for (const f of fs
-            .readdirSync(sessionsDir)
-            .filter((x) => x.endsWith(".md"))) {
-            const filePath = path.join(sessionsDir, f);
-            try {
-              const text = fs.readFileSync(filePath, "utf8");
-              if (text.toLowerCase().includes(needle)) {
-                const lines = text.split("\n");
-                const matchLine = lines.findIndex((l) =>
-                  l.toLowerCase().includes(needle)
-                );
-                const excerpt = lines
-                  .slice(Math.max(0, matchLine - 1), matchLine + 3)
-                  .join("\n");
-                matches.push({
-                  type: "session",
-                  project: p.id,
-                  agent: slug,
-                  filename: f,
-                  path: filePath,
-                  excerpt: excerpt.slice(0, 300),
-                });
-                if (matches.length >= lim) break;
-              }
-            } catch {}
-          }
-          if (matches.length >= lim) break;
-        }
-      }
-
-      if (matches.length >= lim) break;
-
-      // 2) Conversation files in daemon storage (~/.apx/…/conversations/)
-      const convAgentsDir = path.join(p.storagePath, "agents");
-      if (fs.existsSync(convAgentsDir)) {
-        for (const slug of fs.readdirSync(convAgentsDir)) {
-          const convDir = path.join(convAgentsDir, slug, "conversations");
-          if (!fs.existsSync(convDir)) continue;
-          for (const f of fs
-            .readdirSync(convDir)
-            .filter((x) => x.endsWith(".md"))) {
-            const filePath = path.join(convDir, f);
-            try {
-              const text = fs.readFileSync(filePath, "utf8");
-              if (text.toLowerCase().includes(needle)) {
-                const lines = text.split("\n");
-                const matchLine = lines.findIndex((l) =>
-                  l.toLowerCase().includes(needle)
-                );
-                const excerpt = lines
-                  .slice(Math.max(0, matchLine - 1), matchLine + 3)
-                  .join("\n");
-                matches.push({
-                  type: "conversation",
-                  project: p.id,
-                  agent: slug,
-                  filename: f,
-                  path: filePath,
-                  excerpt: excerpt.slice(0, 300),
-                });
-                if (matches.length >= lim) break;
-              }
-            } catch {}
-          }
-          if (matches.length >= lim) break;
-        }
-      }
-
-      if (matches.length >= lim) break;
-    }
-
-    res.json({ q, count: matches.length, results: matches });
+    const targets = resolveProjects(projects, projectRef);
+    const results = searchSessions(targets, q, lim);
+    res.json({ q, count: results.length, results });
   });
 
   app.post("/sessions/:id/compact", async (req, res) => {
     const { id } = req.params;
     const { model: modelOverride, project: projectRef } = req.body || {};
-
-    const candidates =
-      projectRef != null
-        ? (() => {
-            const ref = String(projectRef);
-            const found = projects
-              .list()
-              .find(
-                (p) => String(p.id) === ref || p.path === path.resolve(ref)
-              );
-            return found ? [projects.get(found.id)] : [];
-          })()
-        : projects.list().map((p) => projects.get(p.id)).filter(Boolean);
-
-    let found = null;
-    const filename = id.endsWith(".md") ? id : `${id}.md`;
-
-    for (const p of candidates) {
-      if (!p) continue;
-      const agentsDir = path.join(p.storagePath, "agents");
-      if (fs.existsSync(agentsDir)) {
-        for (const slug of fs.readdirSync(agentsDir)) {
-          const f = path.join(agentsDir, slug, "conversations", filename);
-          if (fs.existsSync(f)) {
-            found = { p, slug };
-            break;
-          }
-        }
-      }
-      if (found) break;
-    }
+    const candidates = resolveProjects(projects, projectRef);
+    const found = findSessionFile(candidates, id);
 
     if (!found) {
-      return res
-        .status(404)
-        .json({ error: `session/conversation "${id}" not found` });
+      return res.status(404).json({ error: `session/conversation "${id}" not found` });
     }
 
-    const { p, slug } = found;
+    const { project: p, agentSlug, filename } = found;
     const agents = readAgents(p.path);
-    const agent = agents.find((a) => a.slug === slug);
+    const agent = agents.find((a) => a.slug === agentSlug);
     const modelId = modelOverride || agent?.fields?.Model;
-    if (!modelId)
-      return res
-        .status(400)
-        .json({ error: "agent has no model; pass model in body" });
+    if (!modelId) {
+      return res.status(400).json({ error: "agent has no model; pass model in body" });
+    }
 
     try {
       const result = await compactConversation({
         storagePath: p.storagePath,
-        agentSlug: slug,
+        agentSlug,
         filename,
         modelId,
         config: p.config || config,

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

@@ -4,9 +4,15 @@
 //   GET  /projects/:pid/sessions/:sid              by filename (cross-agent lookup)
 import fs from "node:fs";
 import path from "node:path";
-import { parseSessionFrontmatter, readAgents } from "#core/apc/parser.js";
+import { readAgents } from "#core/apc/parser.js";
+import {
+  parseSessionFrontmatter,
+} from "#core/apc/parser.js";
+import {
+  agentSessionsDir,
+  createAgentSessionFile,
+} from "#core/stores/sessions.js";
 import { collectAllSessions } from "#interfaces/cli/commands/sessions.js";
-import { nowIso } from "./shared.js";
 
 export function register(app, { projects, project }) {
   // Cross-engine sessions (apx · claude · codex), newest first.
@@ -29,12 +35,7 @@ export function register(app, { projects, project }) {
     const agents = readAgents(p.path);
     if (!agents.find((a) => a.slug === req.params.slug))
       return res.status(404).json({ error: "agent not found" });
-    const sessionsDir = path.join(
-      p.storagePath,
-      "agents",
-      req.params.slug,
-      "sessions"
-    );
+    const sessionsDir = agentSessionsDir(p.storagePath, req.params.slug);
     if (!fs.existsSync(sessionsDir)) return res.json([]);
     const sessions = fs
       .readdirSync(sessionsDir)
@@ -62,32 +63,13 @@ export function register(app, { projects, project }) {
     if (!p) return;
     const { title, body = "" } = req.body || {};
     if (!title) return res.status(400).json({ error: "title required" });
-    const sessionsDir = path.join(
+    const { filename, path: filePath } = createAgentSessionFile(
       p.storagePath,
-      "agents",
       req.params.slug,
-      "sessions"
+      { title, body }
     );
-    fs.mkdirSync(sessionsDir, { recursive: true });
-    const titleSlug =
-      title
-        .toLowerCase()
-        .replace(/[^a-z0-9]+/g, "-")
-        .replace(/^-|-$/g, "") || "session";
-    const today = new Date().toISOString().slice(0, 10);
-    let candidate = path.join(sessionsDir, `${today}-${titleSlug}.md`);
-    let n = 2;
-    while (fs.existsSync(candidate)) {
-      candidate = path.join(sessionsDir, `${today}-${titleSlug}-${n}.md`);
-      n++;
-    }
-    const started = nowIso();
-    const content = `---\ntitle: ${title}\nstarted: ${started}\n---\n\n# ${title}\n\n${body}\n`;
-    fs.writeFileSync(candidate, content);
     projects.rebuild(p.id);
-    res
-      .status(201)
-      .json({ filename: path.basename(candidate), path: candidate });
+    res.status(201).json({ filename, path: filePath });
   });
 
   // GET session by filename (sid may include or omit the .md extension)

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

@@ -8,6 +8,7 @@ import { randomUUID } from "node:crypto";
 import { appendErrorTrace, previewText } from "#core/logging.js";
 import { readAgents } from "#core/apc/parser.js";
 import { agentMemoryPath } from "#core/agent/memory.js";
+import { apcMemoryFile } from "#core/apc/paths.js";
 import { CHANNELS } from "#core/constants/channels.js";
 
 export const nowIso = () =>
@@ -117,7 +118,7 @@ export function makeTopProjectResolver(projects) {
 export function resolveMemoryPath(p) {
   const firstAgent = readAgents(p.path)[0];
   if (firstAgent) return agentMemoryPath(p, firstAgent.slug);
-  return path.join(p.path, ".apc", "memory.md");
+  return apcMemoryFile(p.path);
 }
 
 // Channel context passed to the super-agent loop. `api` is the default when

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

@@ -39,17 +39,7 @@ import {
   removeRole,
 } from "#core/config/index.js";
 
-function redactChannel(channel) {
-  if (!channel?.bot_token) return channel;
-  return {
-    ...channel,
-    bot_token: `*** set *** (...${String(channel.bot_token).slice(-5)})`,
-  };
-}
-
-function isSecretMarker(value) {
-  return typeof value === "string" && value.startsWith("*** set ***");
-}
+import { redactChannel, isSecretMarker } from "#core/config/redact.js";
 
 export function register(app, { telegram }) {
   app.get("/telegram/status", (_req, res) => {

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

@@ -4,12 +4,12 @@
 //   search / glob / grep                    → filesystem-bounded
 //   registry                                → /:name wildcard, MOUNT LAST so it
 //                                             doesn't shadow the specific paths
-import { buildBrowserRouter } from "#core/tools/browser.js";
-import { buildFetchRouter } from "#core/tools/fetch.js";
-import { buildSearchRouter } from "#core/tools/search.js";
-import { buildRegistryRouter } from "#core/tools/registry.js";
-import { buildGlobRouter } from "#core/tools/glob.js";
-import { buildGrepRouter } from "#core/tools/grep.js";
+import { buildBrowserRouter } from "#core/http-tools/browser.js";
+import { buildFetchRouter } from "#core/http-tools/fetch.js";
+import { buildSearchRouter } from "#core/http-tools/search.js";
+import { buildRegistryRouter } from "#core/http-tools/registry.js";
+import { buildGlobRouter } from "#core/http-tools/glob.js";
+import { buildGrepRouter } from "#core/http-tools/grep.js";
 
 export function register(app, { express, projects, registries }) {
   app.use("/tools/fetch", buildFetchRouter(express));

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

@@ -11,7 +11,7 @@ export function register(app) {
   // the first real utterance doesn't pay the cold-load cost.
   app.get("/transcribe/warmup", async (_req, res) => {
     try {
-      const { warmupWhisper } = await import("../transcription.js");
+      const { warmupWhisper } = await import("../whisper-server.js");
       res.json(await warmupWhisper());
     } catch (e) {
       res.status(500).json({ ok: false, error: e.message });
@@ -29,7 +29,7 @@ export function register(app) {
       const language = req.headers["x-language"] || "auto";
       const provider = req.headers["x-provider"];
       try {
-        const { transcribeBuffer } = await import("../transcription.js");
+        const { transcribeBuffer } = await import("#core/voice/transcription.js");
         const result = await transcribeBuffer(buf, format, {
           language: language === "auto" ? undefined : language,
           beam_size: 3,

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

@@ -0,0 +1,137 @@
+// Variable management per project. Reads/writes the two APX-owned scopes
+// (project = <storagePath>/vars.json, global = ~/.apx/vars.json) and
+// surfaces a merged effective view with sources annotated.
+//
+//   GET    /projects/:pid/vars              -> { project, global, effective, sources }
+//                                              values masked unless ?reveal=1
+//   GET    /projects/:pid/vars/:name        -> { name, scope, value, masked }
+//                                              ?reveal=1 unmasks
+//   POST   /projects/:pid/vars              -> { ok, name, scope }
+//                                              body { name, value, scope }
+//                                              scope defaults to "project" (or
+//                                              "global" if pid=0).
+//   DELETE /projects/:pid/vars/:name?scope=… 204
+//
+// pid=0 (base project) is the conventional bucket for editing global vars
+// from the web UI; project scope is rejected there because there is no
+// storagePath that belongs to a real project.
+import {
+  loadAllVars,
+  readGlobalVars,
+  readProjectVars,
+  setVar,
+  deleteVar,
+  maskValue,
+} from "#core/vars/index.js";
+
+function normalizeScope(raw, { isBase }) {
+  if (!raw) return isBase ? "global" : "project";
+  const s = String(raw).toLowerCase();
+  if (s === "project" || s === "global") return s;
+  return null;
+}
+
+function maskAll(obj) {
+  const out = {};
+  for (const [k, v] of Object.entries(obj)) out[k] = maskValue(v);
+  return out;
+}
+
+export function register(app, { project }) {
+  app.get("/projects/:pid/vars", (req, res) => {
+    const p = project(req, res);
+    if (!p) return;
+    const reveal = req.query?.reveal === "1" || req.query?.reveal === "true";
+    const { project: proj, global, effective, sources } = loadAllVars({
+      storagePath: p.storagePath,
+    });
+    res.json({
+      scope_hint: String(p.id) === "0" ? "global" : "project",
+      project: reveal ? proj : maskAll(proj),
+      global: reveal ? global : maskAll(global),
+      effective: reveal ? effective : maskAll(effective),
+      sources,
+    });
+  });
+
+  app.get("/projects/:pid/vars/:name", (req, res) => {
+    const p = project(req, res);
+    if (!p) return;
+    const name = req.params.name;
+    const proj = p.storagePath ? readProjectVars(p.storagePath) : {};
+    const global = readGlobalVars();
+    let scope = null;
+    let value = null;
+    if (Object.prototype.hasOwnProperty.call(proj, name)) {
+      scope = "project";
+      value = proj[name];
+    } else if (Object.prototype.hasOwnProperty.call(global, name)) {
+      scope = "global";
+      value = global[name];
+    } else {
+      return res.status(404).json({ error: `variable "${name}" not found` });
+    }
+    const reveal = req.query?.reveal === "1" || req.query?.reveal === "true";
+    res.json({
+      name,
+      scope,
+      value: reveal ? value : maskValue(value),
+      masked: !reveal,
+    });
+  });
+
+  app.post("/projects/:pid/vars", (req, res) => {
+    const p = project(req, res);
+    if (!p) return;
+    const { name, value } = req.body || {};
+    if (!name || typeof name !== "string") {
+      return res.status(400).json({ error: "name required" });
+    }
+    if (value === undefined || value === null) {
+      return res.status(400).json({ error: "value required" });
+    }
+    const isBase = String(p.id) === "0";
+    const scope = normalizeScope(req.body?.scope, { isBase });
+    if (scope === null) {
+      return res
+        .status(400)
+        .json({ error: `unknown scope "${req.body?.scope}" (use project|global)` });
+    }
+    if (scope === "project" && (!p.storagePath || isBase)) {
+      return res.status(400).json({
+        error: "project scope is not available for the base workspace — use scope=global",
+      });
+    }
+    try {
+      setVar({ storagePath: p.storagePath, scope, name, value });
+    } catch (e) {
+      return res.status(400).json({ error: e.message });
+    }
+    res.status(201).json({ ok: true, name, scope });
+  });
+
+  app.delete("/projects/:pid/vars/:name", (req, res) => {
+    const p = project(req, res);
+    if (!p) return;
+    const isBase = String(p.id) === "0";
+    const scope = normalizeScope(req.query?.scope, { isBase });
+    if (scope === null) {
+      return res
+        .status(400)
+        .json({ error: `unknown scope "${req.query?.scope}" (use project|global)` });
+    }
+    if (scope === "project" && (!p.storagePath || isBase)) {
+      return res.status(400).json({
+        error: "project scope is not available for the base workspace",
+      });
+    }
+    let removed;
+    try {
+      removed = deleteVar({ storagePath: p.storagePath, scope, name: req.params.name });
+    } catch (e) {
+      return res.status(400).json({ error: e.message });
+    }
+    if (!removed) return res.status(404).end();
+    res.status(204).end();
+  });
+}