@ai-matrx/coding-sessions 0.1.85 → 0.1.87

package/dist/server/index.cjs

@@ -117,8 +117,25 @@ function createRawBackupScheduler(options) {
 // src/engine/agent-attach.ts
 var import_promises2 = __toESM(require("fs/promises"), 1);
 var import_node_path = __toESM(require("path"), 1);
+
+// src/normalize/agent-block.ts
+var AGENT_BLOCK_MARKER = "<ai_matrx_agent ";
+function stripAgentBlock(text) {
+  const removed = text.match(/^<ai_matrx_agent_removed>[\s\S]*?<\/ai_matrx_agent_removed>\s*/);
+  if (removed) return text.slice(removed[0].length);
+  if (!text.startsWith(AGENT_BLOCK_MARKER)) return text;
+  const end = text.indexOf("</ai_matrx_agent>");
+  if (end < 0) return text;
+  let rest = text.slice(end + "</ai_matrx_agent>".length);
+  const skills = rest.match(/^\s*<skills_instructions>[\s\S]*?<\/skills_instructions>/);
+  if (skills) rest = rest.slice(skills[0].length);
+  return rest.replace(/^\s+/, "");
+}
+
+// src/engine/agent-attach.ts
 var AGENT_MCP_SERVER_NAME = "matrx-agent";
 var AGENT_PLUGIN_NAME = "matrx-agent";
+var CODEX_REPLACEMENT_CLAUSE = "If a later message in this chat begins with an <ai_matrx_agent> block, that block replaces these AI Matrx agent instructions from then on; an <ai_matrx_agent_removed> block withdraws them.";
 function escapeAttr(value) {
   return value.replace(/&/g, "&amp;").replace(/"/g, "&quot;").replace(/</g, "&lt;");
 }
@@ -167,6 +184,20 @@ function renderCodexSkillsList(bundle, skillsRoot) {
   ];
   return lines.join("\n");
 }
+function renderFallbackBlock(bundle, skillsRoot, options = {}) {
+  const skills = renderCodexSkillsList(bundle, skillsRoot);
+  const lead = options.replaces ? `These instructions REPLACE the earlier AI Matrx agent "${options.replaces}" from this message on. Where they differ from anything said before \u2014 including how earlier replies ended \u2014 follow these.` : "The instructions below are your AI Matrx agent for this chat from now on; they replace any AI Matrx agent instructions given earlier.";
+  const body = renderAgentInstructions(bundle).trim().replace(/^(<ai_matrx_agent [^>]*>)/, `$1
+
+${lead}`);
+  return skills ? `${body}
+
+${skills}
+
+` : `${body}
+
+`;
+}
 function tomlString(value) {
   const scalar = value.replace(/[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]/g, "\uFFFD");
   return JSON.stringify(scalar).replace(/\u007f/g, "\\u007f");
@@ -227,10 +258,16 @@ async function writeAgentAttachment(dir, bundle, options) {
     pluginDir,
     mcpConfigFile,
     mcpUrl,
-    // Same order as Claude's: the skills list first, the agent's words last.
-    codexInstructions: skillsList ? `${skillsList}
+    // Same order as Claude's: the skills list first, the agent's words last —
+    // then the one sentence that lets a later block replace them. Codex ranks
+    // developer instructions above a user message, so without this permission
+    // a mid-chat switch or update is ignored (measured live: the v2 block was
+    // delivered and Codex kept ending with v1's line).
+    codexInstructions: `${skillsList ? `${skillsList}
 
-${instructions}` : instructions
+` : ""}${instructions}
+${CODEX_REPLACEMENT_CLAUSE}
+`
   };
 }
 function agentArgsFor(provider, attachment, options) {
@@ -282,9 +319,29 @@ function sessionAgentRecord(bundle, options) {
     name: bundle.name,
     definitionHash: bundle.definition_hash,
     loaded,
-    unavailable
+    unavailable,
+    skills: bundle.skills.map((skill) => skill.label),
+    tools: options.toolsServed ? bundle.tools.map((tool) => tool.canonical_name) : [],
+    ...options.variables ? { variables: options.variables } : {}
   };
 }
+var AGENT_REMOVED_BLOCK = "<ai_matrx_agent_removed>The AI Matrx agent instructions given earlier in this chat no longer apply \u2014 including any rule about how replies end. Answer normally from this message on.</ai_matrx_agent_removed>\n\n";
+async function codexCompactionDroppedAgent(rolloutFile, sinceIso) {
+  const text = await import_promises2.default.readFile(rolloutFile, "utf8").catch(() => "");
+  if (!text.includes('"type":"compacted"')) return false;
+  let latest = null;
+  for (const line of text.split("\n")) {
+    if (!line.includes('"type":"compacted"')) continue;
+    try {
+      const entry = JSON.parse(line);
+      if (entry.type === "compacted") latest = entry;
+    } catch {
+    }
+  }
+  if (!latest) return false;
+  if (sinceIso && latest.timestamp && latest.timestamp <= sinceIso) return false;
+  return !JSON.stringify(latest.payload?.replacement_history ?? "").includes(AGENT_BLOCK_MARKER.trim());
+}
 
 // src/engine/agents.ts
 var import_node_crypto2 = require("crypto");
@@ -292,6 +349,7 @@ var import_promises3 = __toESM(require("fs/promises"), 1);
 var import_node_path2 = __toESM(require("path"), 1);
 var DEFAULT_SERVER_URL = "https://server.app.matrxserver.com";
 var DEFAULT_SUPABASE_URL = "https://db.matrxserver.com";
+var DEFAULT_SUPABASE_KEY = "sb_publishable_scm0jzEJiFUB5ItiqOx5Fg_8BOjB6oA";
 var AGENT_CATALOG_RPCS = /* @__PURE__ */ new Set([
   "agx_get_list_full",
   "agx_search",
@@ -309,6 +367,10 @@ var agentsClient = async () => {
   ]);
   return { ...matrx, ...portable, ...mcp };
 };
+function sortedValues(values) {
+  return Object.keys(values).sort().map((key) => [key, values[key]]);
+}
+var BUNDLE_CACHE_MS = 24 * 60 * 60 * 1e3;
 var SIGNED_OUT_AGENT_MESSAGE = "Sign in to AI Matrx to use your agents.";
 function userIdOf(credential) {
   if (!credential || credential.kind !== "user") return null;
@@ -325,21 +387,26 @@ function createAgentConnection(options, dataDir) {
   const credentials = options?.credentials ?? null;
   const serverUrl = (options?.serverUrl ?? DEFAULT_SERVER_URL).replace(/\/+$/, "");
   const supabaseUrl = (options?.supabaseUrl ?? DEFAULT_SUPABASE_URL).replace(/\/+$/, "");
-  const supabaseKey = options?.supabaseKey ?? null;
+  const supabaseKey = options?.supabaseKey ?? (options?.supabaseUrl ? null : DEFAULT_SUPABASE_KEY);
   const root = import_node_path2.default.join(dataDir, "agents");
   let mcpBaseUrl = null;
   const handlers = /* @__PURE__ */ new Map();
   const secretToSession = /* @__PURE__ */ new Map();
-  const organizationId = () => {
-    const raw = typeof options?.organizationId === "function" ? options.organizationId() : options?.organizationId;
+  const organizationId = async () => {
+    const raw = typeof options?.organizationId === "function" ? await options.organizationId() : options?.organizationId;
     return raw && raw.trim() ? raw.trim() : null;
   };
-  const transport = async () => (await agentsClient()).createMatrxTransport({
-    baseUrl: serverUrl,
-    ...credentials ? { credentials } : {},
-    ...organizationId() ? { organizationId: () => organizationId() } : {},
-    source: "codingSessionsAgents"
-  });
+  const transport = async () => {
+    const org = await organizationId();
+    return (await agentsClient()).createMatrxTransport({
+      baseUrl: serverUrl,
+      ...credentials ? { credentials } : {},
+      ...org ? { organizationId: org } : {},
+      source: "codingSessionsAgents"
+    });
+  };
+  const cacheDir = import_node_path2.default.join(dataDir, "agents", ".bundles");
+  const cacheKey = (definitionHash, selection, surface) => (0, import_node_crypto2.createHash)("sha256").update(JSON.stringify([definitionHash, sortedValues(selection.variables ?? {}), surface])).digest("hex");
   const credential = async () => credentials ? credentials.get() : null;
   const requireSignedIn = async () => {
     if (!await credential()) throw new Error(SIGNED_OUT_AGENT_MESSAGE);
@@ -375,7 +442,7 @@ function createAgentConnection(options, dataDir) {
         configured: credentials !== null && supabaseKey !== null,
         signedIn: userId !== null,
         userId,
-        organizationId: organizationId()
+        organizationId: await organizationId().catch(() => null)
       };
     },
     async catalogRpc(request) {
@@ -422,27 +489,39 @@ function createAgentConnection(options, dataDir) {
     },
     async details(agentId) {
       await requireSignedIn();
-      const { fetchPortableAgent, fetchPortableAgentVersions } = await agentsClient();
-      const [bundle, versions] = await Promise.all([
-        fetchPortableAgent(await transport(), { agentId }),
-        fetchPortableAgentVersions(await transport(), agentId).catch(() => [])
-      ]);
+      const summary = await (await agentsClient()).fetchPortableAgentSummary(await transport(), agentId);
       return {
-        agentId: bundle.agent_id,
-        name: bundle.name,
-        variables: bundle.variables,
-        versions: versions.map((v) => ({ id: v.id, versionNumber: v.version_number, changedAt: v.changed_at })).sort((a, b) => b.versionNumber - a.versionNumber),
-        latestVersionNumber: bundle.version_number
+        agentId: summary.agent_id,
+        name: summary.name,
+        variables: summary.variables,
+        versions: summary.versions.map((v) => ({ id: v.id, versionNumber: v.version_number, changedAt: v.changed_at })),
+        latestVersionNumber: summary.version_number,
+        latestVersionId: summary.version_id
       };
     },
     async loadBundle(selection) {
       await requireSignedIn();
-      const { fetchPortableAgent } = await agentsClient();
-      return fetchPortableAgent(
+      const client = await agentsClient();
+      const summary = await client.fetchPortableAgentSummary(await transport(), selection.agentId);
+      const versionId = selection.versionId ?? summary.version_id;
+      const definitionHash = versionId ? summary.versions.find((v) => v.id === versionId)?.definition_hash ?? null : summary.definition_hash;
+      const surface = "matrx-user/code-editor";
+      const file = definitionHash ? import_node_path2.default.join(cacheDir, `${cacheKey(definitionHash, selection, surface)}.json`) : null;
+      if (file) {
+        const cached = await import_promises3.default.readFile(file, "utf8").then((text) => JSON.parse(text)).catch(() => null);
+        const fresh = await import_promises3.default.stat(file).then((st) => Date.now() - st.mtimeMs < BUNDLE_CACHE_MS).catch(() => false);
+        if (cached && fresh && cached.definition_hash === definitionHash) return cached;
+      }
+      const bundle = await client.fetchPortableAgent(
         await transport(),
-        selection.versionId ? { versionId: selection.versionId } : { agentId: selection.agentId },
-        { variables: selection.variables ?? {} }
+        versionId ? { versionId } : { agentId: selection.agentId },
+        { variables: selection.variables ?? {}, surface }
       );
+      if (file && bundle.definition_hash === definitionHash) {
+        await import_promises3.default.mkdir(cacheDir, { recursive: true, mode: 448 });
+        await import_promises3.default.writeFile(file, JSON.stringify(bundle), { mode: 384 });
+      }
+      return bundle;
     },
     async saveSessionBundle(sessionId, bundle) {
       await import_promises3.default.mkdir(sessionDir(sessionId), { recursive: true, mode: 448 });
@@ -578,7 +657,7 @@ function createClaudeNormalizer() {
     if (typeof content === "string") {
       if (isSyntheticClaudeUserText(content) || content.trim().length === 0) return [];
       userCounter += 1;
-      return [{ kind: "user", id: str(entry.uuid) ?? `user-${userCounter}`, text: content, at }];
+      return [{ kind: "user", id: str(entry.uuid) ?? `user-${userCounter}`, text: stripAgentBlock(content), at }];
     }
     if (!Array.isArray(content)) return [];
     const items = [];
@@ -602,7 +681,7 @@ function createClaudeNormalizer() {
       items.unshift({
         kind: "user",
         id: str(entry.uuid) ?? `user-${userCounter}`,
-        text: typed.join("\n\n"),
+        text: stripAgentBlock(typed.join("\n\n")),
         at
       });
     }
@@ -857,7 +936,7 @@ function rolloutItem(item, fallbackId, at) {
   const id = str2(item.id) ?? fallbackId;
   switch (item.type) {
     case "UserMessage": {
-      const text = stripCodexInjectedContext(itemText(item.content));
+      const text = stripCodexInjectedContext(stripAgentBlock(itemText(item.content)));
       return text.trim() ? [{ kind: "user", id, text, at }] : [];
     }
     case "AgentMessage": {
@@ -940,7 +1019,7 @@ function createCodexRolloutNormalizer() {
           return rolloutItem(payload.item, fallbackId, at);
         }
         if (payload.type === "user_message" && !appItems) {
-          const text = stripCodexInjectedContext(str2(payload.message) ?? "");
+          const text = stripCodexInjectedContext(stripAgentBlock(str2(payload.message) ?? ""));
           return text.trim() ? [{ kind: "user", id: fallbackId, text, at }] : [];
         }
         return [];
@@ -2418,6 +2497,12 @@ async function createCodingSessionsEngine(options = {}) {
       if (file) fileOffset = (await import_promises8.default.stat(file).catch(() => null))?.size ?? null;
     }
     let agentArgs = [];
+    let cliPrompt = prompt;
+    let delivered = null;
+    if (!session.agent && session.agentRemovedDue) {
+      cliPrompt = `${AGENT_REMOVED_BLOCK}${prompt}`;
+      delivered = { agentRemovedDue: false };
+    }
     if (session.agent) {
       const bundle = await agents.readSessionBundle(session.id);
       if (!bundle) {
@@ -2435,6 +2520,10 @@ async function createCodingSessionsEngine(options = {}) {
         mcpUrl: await agents.mcpUrlFor(session.id)
       });
       agentArgs = agentArgsFor(provider, attachment, { resuming: session.providerSessionId !== null });
+      if (session.agent.blockDue) {
+        cliPrompt = `${renderFallbackBlock(bundle, import_node_path9.default.join(attachment.dir, "skills"), { replaces: session.agent.replaces })}${prompt}`;
+      }
+      delivered = { agent: { ...session.agent, blockDue: false, deliveredAt: run.startedAt } };
     }
     const child = forkWorker();
     const liveRun = {
@@ -2450,6 +2539,10 @@ async function createCodingSessionsEngine(options = {}) {
     };
     live.set(runId, liveRun);
     emitItem(liveRun, { kind: "user", id: `run-${runId}`, text: prompt, at: run.startedAt });
+    if (delivered) {
+      const current = index.session(session.id);
+      if (current) saveSession({ ...current, ...delivered });
+    }
     const splitter = createLineSplitter();
     const claude = provider === "claude" ? createClaudeNormalizer() : null;
     const codex = provider === "codex" ? createCodexStreamNormalizer(runId.slice(0, 8)) : null;
@@ -2488,6 +2581,7 @@ async function createCodingSessionsEngine(options = {}) {
         }
       }
       void pruneDriverScratch();
+      if (provider === "codex" && final.status === "completed") void checkCompaction(session.id);
     };
     let settled = false;
     child.on("message", (raw) => {
@@ -2602,7 +2696,7 @@ async function createCodingSessionsEngine(options = {}) {
       provider,
       runId,
       cwd: session.cwd,
-      prompt,
+      prompt: cliPrompt,
       model,
       effort: session.effort ?? null,
       resumeSessionId: session.providerSessionId,
@@ -2613,6 +2707,29 @@ async function createCodingSessionsEngine(options = {}) {
     });
     return run;
   }
+  async function checkCompaction(sessionId) {
+    const session = index.session(sessionId);
+    if (!session?.agent || session.agent.blockDue || !session.providerSessionId) return;
+    const file = await findSessionFile("codex", session.providerSessionId, homes);
+    if (!file || !await codexCompactionDroppedAgent(file, session.agent.deliveredAt ?? null)) return;
+    const current = index.session(sessionId);
+    if (current?.agent) {
+      saveSession({ ...current, agent: { ...current.agent, blockDue: true } });
+    }
+  }
+  async function attachAgent(sessionId, selection, options2) {
+    const bundle = await agents.loadBundle(selection);
+    await agents.saveSessionBundle(sessionId, bundle);
+    return {
+      ...sessionAgentRecord(bundle, {
+        toolsServed: await agents.mcpUrlFor(sessionId) !== null,
+        variables: selection.variables ?? {}
+      }),
+      blockDue: options2.blockDue,
+      deliveredAt: null,
+      replaces: options2.replaces ?? null
+    };
+  }
   function killGroup(liveRun) {
     const target = liveRun.pgid;
     if (target === null) return;
@@ -2869,7 +2986,6 @@ async function createCodingSessionsEngine(options = {}) {
       const prompt = input.prompt.trim();
       if (!prompt) throw new Error("Type what you want done before starting.");
       const cwd = await assertFolder(input.cwd);
-      const bundle = input.agent ? await agents.loadBundle(input.agent) : null;
       const draft = newSession({
         provider: input.provider,
         cwd,
@@ -2879,28 +2995,43 @@ async function createCodingSessionsEngine(options = {}) {
         origin: "started",
         providerSessionId: null
       });
-      if (bundle) {
-        await agents.saveSessionBundle(draft.id, bundle);
-        draft.agent = sessionAgentRecord(bundle, { toolsServed: await agents.mcpUrlFor(draft.id) !== null });
-      }
+      if (input.agent) draft.agent = await attachAgent(draft.id, input.agent, { blockDue: false });
       const session = saveSession(draft);
       const run = await startRun(session, prompt);
       return { session: index.session(session.id) ?? session, run, queued: false };
     },
     async takeover(input) {
       const existing = index.session(input.providerSessionId);
-      if (existing) return existing;
+      if (existing) {
+        if (!input.agent) return existing;
+        return engine.setAgent(existing.id, input.agent);
+      }
       const cwd = await assertFolder(input.cwd);
-      return saveSession(
-        newSession({
-          provider: input.provider,
-          cwd,
-          title: input.title?.trim() || "Taken-over chat",
-          model: null,
-          origin: "takeover",
-          providerSessionId: input.providerSessionId
-        })
-      );
+      const draft = newSession({
+        provider: input.provider,
+        cwd,
+        title: input.title?.trim() || "Taken-over chat",
+        model: null,
+        origin: "takeover",
+        providerSessionId: input.providerSessionId
+      });
+      if (input.agent) draft.agent = await attachAgent(draft.id, input.agent, { blockDue: input.provider === "codex" });
+      return saveSession(draft);
+    },
+    async setAgent(sessionId, selection) {
+      const session = index.session(String(sessionId ?? ""));
+      if (!session) throw new Error("This session is not in the list anymore.");
+      if (!selection) {
+        const told = session.agent?.deliveredAt != null;
+        return saveSession({ ...session, agent: null, agentRemovedDue: told });
+      }
+      const previous = session.agent && session.agent.deliveredAt != null ? session.agent : null;
+      const started = session.providerSessionId !== null;
+      const agent = await attachAgent(session.id, selection, {
+        blockDue: started,
+        replaces: previous ? `${previous.name}${previous.versionNumber !== null ? ` v${previous.versionNumber}` : ""}` : null
+      });
+      return saveSession({ ...session, agent, agentRemovedDue: false });
     },
     async send(sessionId, rawPrompt) {
       const prompt = rawPrompt.trim();
@@ -3039,7 +3170,8 @@ var BRIDGE_METHODS = [
   "setSessionOptions",
   "agentAccess",
   "agentCatalogRpc",
-  "agentDetails"
+  "agentDetails",
+  "setAgent"
 ];
 var BridgeError = class extends Error {
   constructor(message, code) {