@ericrisco/rsc 3.0.1 → 3.0.2

package/manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.0.1",
+  "version": "3.0.2",
   "counts": {
     "skills": 270,
     "agents": 33,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ericrisco/rsc",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "A guided harness builder that turns your goal into a minimal, verified AI-agent setup using strict best practices.",
   "type": "module",
   "bin": {

package/scripts/doctor.js

@@ -256,16 +256,38 @@ export function doctor({ target, home, cwd }) {
     missingCommands,
     commandOrphans,
     commandCollisions: state.commandCollisions || [],
+    // #289 — OpenCode 2.x only loads a plugin from a default export with an id and setup(ctx); the
+    // V1-only files older versions wrote fail to load and nothing on rsc's side noticed. A plugin
+    // without the V2 entry point is a problem, and `sync` rewrites it.
+    opencodePluginsOutdated: target === 'opencode' ? opencodePluginsOutdated(root) : [],
   };
   // #277 — the three "missing" lists share one shape, { id, path, action }, so whoever builds on top
   // of doctor reads them the same way; and `healthy` is what the exit code says.
   for (const [id, e] of Object.entries(state.skills)) {
     for (const f of e.files) if (!existsSync(f)) report.missing.push({ id, path: f, action: 'Run `npx @ericrisco/rsc sync` to restore this managed skill.' });
   }
-  report.healthy = report.hookWired && !report.missing.length && !missingAgents.length && !missingCommands.length;
+  report.healthy = report.hookWired && !report.missing.length && !missingAgents.length && !missingCommands.length
+    && !report.opencodePluginsOutdated.length;
   return report;
 }
 
+/** rsc's OpenCode plugins that OpenCode 2.x cannot load (no default export with id + setup). */
+export function opencodePluginsOutdated(root) {
+  const dir = join(root, '.opencode', 'plugins');
+  const out = [];
+  for (const name of ['rsc-update.js', 'rsc-knowledge.js', 'rsc-memory.js']) {
+    const path = join(dir, name);
+    if (!existsSync(path)) continue;
+    let body = '';
+    try { body = readFileSync(path, 'utf8'); } catch { continue; }
+    if (!/:managed/.test(body)) continue; // hand-written: not ours to judge
+    if (!/export default\s*\{/.test(body) || !/\bsetup\s*\(/.test(body)) {
+      out.push({ path, action: 'OpenCode 2.x cannot load this plugin (V1 API only). Run `npx @ericrisco/rsc@latest sync` to rewrite it.' });
+    }
+  }
+  return out;
+}
+
 // ---------------------------------------------------------------------------------------
 // Context budget — what the harness costs in tokens before the user has typed anything.
 //

package/targets/knowledge-wiring.js

@@ -83,24 +83,48 @@ const PLUGIN = `// ${PLUGIN_MARKER}
 // rsc knowledge sync for OpenCode. OpenCode has no prompt event and no channel to the person, so what
 // sync has to say goes to the model, to be relayed. Cheap on every call: the fetch is throttled and
 // every notice is said once. Turn it off with \`rsc knowledge-sync off\`.
+// One file for both plugin APIs (issue #289): V1 calls the named export or server(); V2 reads id + setup.
 import { onRequest, onTurn } from '../../.rsc/knowledge-sync.mjs';
 
+const local = () => process.env.RSC_REMOTE_AGENT !== '1' && process.env.OPENCODE_REMOTE !== '1';
+const tell = (cwd) => {
+  if (!local()) return '';
+  try { const said = onRequest(cwd); return said ? \`Cuéntale esto al usuario en una línea:\\n\${said}\` : ''; } catch { return ''; }
+};
+const turn = (cwd) => { if (local()) { try { onTurn(cwd); } catch { /* fail open */ } } };
+
 export const RscKnowledgePlugin = async ({ directory, worktree }) => {
   const cwd = worktree || directory;
-  const local = () => process.env.RSC_REMOTE_AGENT !== '1' && process.env.OPENCODE_REMOTE !== '1';
   return {
     'experimental.chat.system.transform': async (_input, output) => {
-      if (!local()) return;
-      try {
-        const said = onRequest(cwd);
-        if (said && Array.isArray(output?.system)) output.system.push(\`Cuéntale esto al usuario en una línea:\\n\${said}\`);
-      } catch { /* fail open */ }
-    },
-    event: async ({ event }) => {
-      if (event?.type === 'session.idle' && local()) { try { onTurn(cwd); } catch { /* fail open */ } }
+      const text = tell(cwd);
+      if (text && Array.isArray(output?.system)) output.system.push(text);
     },
+    event: async ({ event }) => { if (event?.type === 'session.idle') turn(cwd); },
   };
 };
+
+// V2 has no session.idle: a turn ends with session.execution.succeeded (or .failed).
+export default {
+  id: 'rsc.knowledge',
+  server: RscKnowledgePlugin,
+  async setup(ctx) {
+    const cwd = ctx.location?.project?.directory || ctx.location?.directory || process.cwd();
+    await ctx.session.hook('context', async (event) => {
+      const text = tell(cwd);
+      if (text && Array.isArray(event?.system)) event.system.push({ type: 'text', text });
+    });
+    const stop = new AbortController();
+    (async () => {
+      try {
+        for await (const event of ctx.event.subscribe({ signal: stop.signal })) {
+          if (event?.type === 'session.execution.succeeded' || event?.type === 'session.execution.failed') turn(cwd);
+        }
+      } catch { /* unloading, or the stream ended: fail open */ }
+    })();
+    return () => stop.abort();
+  },
+};
 `;
 
 export function knowledgeManagedPaths(target, cwd = process.cwd()) {

package/targets/opencode-memory-plugin.js

@@ -1,4 +1,6 @@
 // rsc-memory:managed
+// One file for both OpenCode plugin APIs (issue #289). V1 (1.x) calls the named export, or the default
+// export's server(); V2 (2.x) reads the default export's id + setup(ctx) and ignores the rest.
 import { readFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { capture, resume } from '../../.rsc/session-memory-core.mjs';
@@ -15,51 +17,94 @@ function memorySettings(cwd) {
 
 function sessionId(input) {
   return input?.sessionID || input?.session_id || input?.event?.properties?.info?.id
-    || input?.event?.properties?.sessionID || null;
+    || input?.event?.properties?.sessionID || input?.event?.data?.sessionID || null;
 }
 
-export const RscMemoryPlugin = async ({ directory, worktree }) => {
-  const cwd = worktree || directory;
+/** What the plugin does, whichever API delivers the moment. `put(text)` adds to the system prompt. */
+function memory(cwd) {
   const injected = new Set();
   const local = () => process.env.RSC_REMOTE_AGENT !== '1' && process.env.OPENCODE_REMOTE !== '1';
   const save = (id, event, editDelta = 0) => {
     if (!id || !local()) return;
     try { capture({ cwd, sessionId: id, target: 'opencode', event, editDelta, settings: memorySettings(cwd) }); } catch { /* fail open */ }
   };
-
   return {
-    'experimental.chat.system.transform': async (input, output) => {
-      const id = sessionId(input);
+    save,
+    context(id, put) {
       if (!id || injected.has(id) || !local()) return;
       injected.add(id);
       try {
-        const config = memorySettings(cwd);
         save(id, 'start');
-        const result = resume({ cwd, target: 'opencode', settings: config });
-        if (!result.context || !Array.isArray(output?.system)) return;
-        if (output.system.length === 0) output.system.push(result.context);
-        else output.system[0] = `${output.system[0]}\n\n${result.context}`;
+        const result = resume({ cwd, target: 'opencode', settings: memorySettings(cwd) });
+        if (result.context) put(result.context);
       } catch { /* fail open */ }
     },
-    'tool.execute.after': async (input) => {
-      const tool = String(input?.tool || '').toLowerCase();
-      save(sessionId(input), 'boundary', /write|edit|patch/u.test(tool) ? 1 : 0);
+    tool(id, name) {
+      save(id, 'boundary', /write|edit|patch/u.test(String(name || '').toLowerCase()) ? 1 : 0);
     },
-    'experimental.session.compacting': async (input, output) => {
-      const id = sessionId(input);
+    compact(id, put) {
       save(id, 'compact');
       try {
         const result = resume({ cwd, target: 'opencode', settings: memorySettings(cwd) });
-        if (result.context && Array.isArray(output?.context)) output.context.push(result.context);
+        if (result.context) put(result.context);
       } catch { /* fail open */ }
     },
+  };
+}
+
+// ---------------------------------------------------------------- OpenCode 1.x (V1 plugin API)
+
+export const RscMemoryPlugin = async ({ directory, worktree }) => {
+  const m = memory(worktree || directory);
+  return {
+    'experimental.chat.system.transform': async (input, output) => {
+      if (!Array.isArray(output?.system)) return;
+      m.context(sessionId(input), (text) => {
+        if (output.system.length === 0) output.system.push(text);
+        else output.system[0] = `${output.system[0]}\n\n${text}`;
+      });
+    },
+    'tool.execute.after': async (input) => m.tool(sessionId(input), input?.tool),
+    'experimental.session.compacting': async (input, output) => {
+      m.compact(sessionId(input), (text) => { if (Array.isArray(output?.context)) output.context.push(text); });
+    },
     event: async ({ event }) => {
       const id = sessionId({ event });
-      if (event?.type === 'session.created') save(id, 'start');
-      else if (event?.type === 'file.edited') save(id, 'edit', 1);
-      else if (event?.type === 'session.compacted') save(id, 'compact');
-      else if (event?.type === 'session.idle') save(id, 'turn');
-      else if (event?.type === 'session.deleted') save(id, 'sessionEnd');
+      if (event?.type === 'session.created') m.save(id, 'start');
+      else if (event?.type === 'file.edited') m.save(id, 'edit', 1);
+      else if (event?.type === 'session.compacted') m.save(id, 'compact');
+      else if (event?.type === 'session.idle') m.save(id, 'turn');
+      else if (event?.type === 'session.deleted') m.save(id, 'sessionEnd');
     },
   };
 };
+
+// ---------------------------------------------------------------- OpenCode 2.x (V2 plugin API)
+// Hooks register through the context; the end of a turn is `session.execution.*` (there is no
+// `session.idle`), and every event carries its session in `data.sessionID`.
+
+const TURN_END = new Set(['session.execution.succeeded', 'session.execution.failed']);
+
+export default {
+  id: 'rsc.memory',
+  server: RscMemoryPlugin,
+  async setup(ctx) {
+    const m = memory(ctx.location?.project?.directory || ctx.location?.directory || process.cwd());
+    const part = (event) => (text) => { if (Array.isArray(event?.system)) event.system.push({ type: 'text', text }); };
+    await ctx.session.hook('context', async (event) => m.context(event?.sessionID, part(event)));
+    await ctx.session.hook('compaction', async (event) => m.compact(event?.sessionID, part(event)));
+    await ctx.tool.hook('execute.after', async (event) => m.tool(event?.sessionID, event?.tool));
+    const stop = new AbortController();
+    (async () => {
+      try {
+        for await (const event of ctx.event.subscribe({ signal: stop.signal })) {
+          const id = event?.data?.sessionID;
+          if (event?.type === 'session.created') m.save(id, 'start');
+          else if (TURN_END.has(event?.type)) m.save(id, 'turn');
+          else if (event?.type === 'session.deleted') m.save(id, 'sessionEnd');
+        }
+      } catch { /* unloading, or the stream ended: fail open */ }
+    })();
+    return () => stop.abort();
+  },
+};

package/targets/update-wiring.js

@@ -78,19 +78,34 @@ const PLUGIN = `// ${PLUGIN_MARKER}
 // rsc update check for OpenCode: checked once per OpenCode run, and the notice goes to the model to be
 // relayed. It rides on EVERY system prompt of the run, not just the first: OpenCode's first call is
 // its title generator, which would swallow a once-only notice before the agent ever sees it.
+// One file for both plugin APIs (issue #289): V1 calls the named export or server(); V2 reads id + setup.
 // Turn auto-update off with .rsc/.no-auto-update.
 import { updateNotice } from '../../.rsc/auto-update.mjs';
 
+const NOTE = '\\nMention this only in your first reply of the session.';
+const check = (cwd) => (process.env.RSC_NO_UPDATE_CHECK ? Promise.resolve('') : updateNotice(cwd).catch(() => ''));
+
 export const RscUpdatePlugin = async ({ directory, worktree }) => {
-  const cwd = worktree || directory;
-  const pending = process.env.RSC_NO_UPDATE_CHECK ? Promise.resolve('') : updateNotice(cwd).catch(() => '');
+  const pending = check(worktree || directory);
   return {
     'experimental.chat.system.transform': async (_input, output) => {
       const said = (await pending).trim();
-      if (said && Array.isArray(output?.system)) output.system.push(said + '\\nMention this only in your first reply of the session.');
+      if (said && Array.isArray(output?.system)) output.system.push(said + NOTE);
     },
   };
 };
+
+export default {
+  id: 'rsc.update',
+  server: RscUpdatePlugin,
+  async setup(ctx) {
+    const pending = check(ctx.location?.project?.directory || ctx.location?.directory || process.cwd());
+    await ctx.session.hook('context', async (event) => {
+      const said = (await pending).trim();
+      if (said && Array.isArray(event?.system)) event.system.push({ type: 'text', text: said + NOTE });
+    });
+  },
+};
 `;
 
 export function updateManagedPaths(target, cwd = process.cwd()) {