@ai-matrx/coding-sessions 0.1.86 → 0.1.88

package/dist/server/index.cjs

@@ -135,6 +135,7 @@ function stripAgentBlock(text) {
 // 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;");
 }
@@ -183,9 +184,12 @@ function renderCodexSkillsList(bundle, skillsRoot) {
   ];
   return lines.join("\n");
 }
-function renderFallbackBlock(bundle, skillsRoot) {
+function renderFallbackBlock(bundle, skillsRoot, options = {}) {
   const skills = renderCodexSkillsList(bundle, skillsRoot);
-  const body = renderAgentInstructions(bundle).trim().replace(/^(<ai_matrx_agent [^>]*>)/, "$1\n\nThe instructions below are your AI Matrx agent for this chat from now on; they replace any AI Matrx agent instructions given earlier.");
+  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}
@@ -254,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) {
@@ -315,7 +325,7 @@ function sessionAgentRecord(bundle, options) {
     ...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.</ai_matrx_agent_removed>\n\n";
+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;
@@ -647,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 = [];
@@ -671,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
       });
     }
@@ -2490,7 +2500,7 @@ async function createCodingSessionsEngine(options = {}) {
     let cliPrompt = prompt;
     let delivered = null;
     if (!session.agent && session.agentRemovedDue) {
-      if (provider === "codex") cliPrompt = `${AGENT_REMOVED_BLOCK}${prompt}`;
+      cliPrompt = `${AGENT_REMOVED_BLOCK}${prompt}`;
       delivered = { agentRemovedDue: false };
     }
     if (session.agent) {
@@ -2510,8 +2520,8 @@ async function createCodingSessionsEngine(options = {}) {
         mcpUrl: await agents.mcpUrlFor(session.id)
       });
       agentArgs = agentArgsFor(provider, attachment, { resuming: session.providerSessionId !== null });
-      if (provider === "codex" && session.agent.blockDue) {
-        cliPrompt = `${renderFallbackBlock(bundle, import_node_path9.default.join(attachment.dir, "skills"))}${prompt}`;
+      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 } };
     }
@@ -2716,7 +2726,8 @@ async function createCodingSessionsEngine(options = {}) {
         variables: selection.variables ?? {}
       }),
       blockDue: options2.blockDue,
-      deliveredAt: null
+      deliveredAt: null,
+      replaces: options2.replaces ?? null
     };
   }
   function killGroup(liveRun) {
@@ -3011,11 +3022,14 @@ async function createCodingSessionsEngine(options = {}) {
       const session = index.session(String(sessionId ?? ""));
       if (!session) throw new Error("This session is not in the list anymore.");
       if (!selection) {
-        const told = session.provider === "codex" && session.agent?.deliveredAt != null;
+        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: session.provider === "codex" && session.providerSessionId !== null
+        blockDue: started,
+        replaces: previous ? `${previous.name}${previous.versionNumber !== null ? ` v${previous.versionNumber}` : ""}` : null
       });
       return saveSession({ ...session, agent, agentRemovedDue: false });
     },