@cotal-ai/connector-opencode 0.55.0 → 0.56.0

package/dist/plugin.d.ts

@@ -1,3 +1,4 @@
+import { MeshAgent } from "@cotal-ai/connector-core";
 import type { Plugin } from "@opencode-ai/plugin";
 /** The machine-stable half of the retirement line. The suite asserts on THIS, never on the sentence
  *  around it: a guard keyed on human prose dies the first time someone rewords a log message, and it
@@ -13,6 +14,28 @@ export declare const WAL_REAPED = "opencode-wal-reaped";
  *  This is the token the reaping cell grades, because the lifetime is the claim and the deletion is
  *  only the easy half of it. */
 export declare const WAL_KEPT = "opencode-wal-kept";
+/** The shared shape of a pre-join model refusal: `"<model>: <detail>. Refusing before join"`.
+ *  Exported so the 2.x adapter's own check (a different route, `/api/model`) produces the same
+ *  sentence shape as `verifyServerModel` below without duplicating it. */
+export declare function modelRefusalSentence(selectedModel: string, detail: string): string;
 export declare function verifyServerModel(serverUrl: string, serverAuth: string, selectedModel: string): Promise<void>;
+/**
+ * Races `work` against a `ms` timeout so a stuck settle is abandoned out loud rather than waited on
+ * forever (see the note at its call sites in `quiesce`). Exported: the 2.x adapter's own teardown
+ * uses the same bounded-settle shape rather than a second copy of it.
+ */
+declare function settleWithin(work: Promise<unknown> | undefined, ms: number, what: string): Promise<boolean>;
+export { settleWithin };
+/**
+ * The buffered-inbox + pending-run-turn composition that goes out ahead of a native prompt. Shared
+ * by the 1.x text-part mutator (`injectIntoPrompt` below) and the 2.x `session.hook("prompt")`
+ * mutator, so the two callers cannot drift on what "inject" means. Returns `undefined` when there is
+ * nothing to prepend.
+ */
+export declare function computeInjection(agent: MeshAgent): {
+    prefix: string;
+    surfacedIds: string[];
+    turnIds: string[];
+} | undefined;
 export declare const cotal: Plugin;
 //# sourceMappingURL=plugin.d.ts.map

package/dist/plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAoEA,OAAO,KAAK,EAAE,MAAM,EAAyB,MAAM,qBAAqB,CAAC;AAgBzE;;;0EAG0E;AAC1E,eAAO,MAAM,eAAe,6BAA6B,CAAC;AAC1D,gGAAgG;AAChG,eAAO,MAAM,gBAAgB,8BAA8B,CAAC;AAC5D;iEACiE;AACjE,eAAO,MAAM,UAAU,wBAAwB,CAAC;AAChD;;gCAEgC;AAChC,eAAO,MAAM,QAAQ,sBAAsB,CAAC;AAC5C,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYnH;AA8BD,eAAO,MAAM,KAAK,EAAE,MA0yCnB,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../src/plugin.ts"],"names":[],"mappings":"AAuCA,OAAO,EAGL,SAAS,EAoBV,MAAM,0BAA0B,CAAC;AAMlC,OAAO,KAAK,EAAE,MAAM,EAAyB,MAAM,qBAAqB,CAAC;AAgBzE;;;0EAG0E;AAC1E,eAAO,MAAM,eAAe,6BAA6B,CAAC;AAC1D,gGAAgG;AAChG,eAAO,MAAM,gBAAgB,8BAA8B,CAAC;AAC5D;iEACiE;AACjE,eAAO,MAAM,UAAU,wBAAwB,CAAC;AAChD;;gCAEgC;AAChC,eAAO,MAAM,QAAQ,sBAAsB,CAAC;AAC5C;;0EAE0E;AAC1E,wBAAgB,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAElF;AACD,wBAAsB,iBAAiB,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAYnH;AA8BD;;;;GAIG;AACH,iBAAe,YAAY,CAAC,IAAI,EAAE,OAAO,CAAC,OAAO,CAAC,GAAG,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqB1G;AACD,OAAO,EAAE,YAAY,EAAE,CAAC;AAExB;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,GAAG;IAClD,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,EAAE,MAAM,EAAE,CAAC;IACtB,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB,GAAG,SAAS,CAQZ;AAED,eAAO,MAAM,KAAK,EAAE,MAixCnB,CAAC"}

package/dist/plugin.entry.d.ts

@@ -1,6 +1,8 @@
-/** The plugin *bundle* entry (esbuild → `dist/plugin.bundle.js`). OpenCode's loader treats every
- *  export of a plugin module as a plugin factory and calls it, so the bundle must export exactly
- *  one symbol: the plugin. The log-marker constants stay exported from `./plugin.ts` for the
- *  smokes, which import the source — they must never reach this surface. */
-export { cotal } from "./plugin.js";
+import { setupCotal } from "./plugin2.js";
+declare const _default: {
+    id: string;
+    server: import("@opencode-ai/plugin").Plugin;
+    setup: typeof setupCotal;
+};
+export default _default;
 //# sourceMappingURL=plugin.entry.d.ts.map

package/dist/plugin.entry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"plugin.entry.d.ts","sourceRoot":"","sources":["../src/plugin.entry.ts"],"names":[],"mappings":"AAAA;;;4EAG4E;AAC5E,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC"}
+{"version":3,"file":"plugin.entry.d.ts","sourceRoot":"","sources":["../src/plugin.entry.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;;;;;;AAC1C,wBAAiE"}

package/dist/plugin2.d.ts

@@ -0,0 +1,12 @@
+import type { OpenCode2Context } from "./opencode2-types.js";
+/** 2.x model check: `GET /api/model` lists the configured model directly (no `/provider.all`
+ *  nesting to walk, unlike 1.x's `verifyServerModel`). Same refusal sentence shape, different
+ *  route and body — measured in fx105/measurements.md (routes). The server answers `/api/model`
+ *  with an empty listing for up to about a second after the location boot its first `/api/config`
+ *  triggers (fx105/brief-g.md measurement), so an empty listing is polled every 200 ms until the
+ *  provider appears rather than refused on the first read. The wait is bounded: a server that
+ *  never lists anything within the deadline is a real refusal, not a hang. */
+export declare const MODEL_LIST_SETTLE_MS = 10000;
+/** The 2.x `setup(context)` entry point. */
+export declare function setupCotal(ctx: OpenCode2Context): Promise<(() => Promise<void>) | void>;
+//# sourceMappingURL=plugin2.d.ts.map

package/dist/plugin2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin2.d.ts","sourceRoot":"","sources":["../src/plugin2.ts"],"names":[],"mappings":"AA2BA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAiB7D;;;;;;8EAM8E;AAC9E,eAAO,MAAM,oBAAoB,QAAS,CAAC;AAoC3C,4CAA4C;AAC5C,wBAAsB,UAAU,CAAC,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI,CAAC,CAmR7F"}

package/dist/serve.js

@@ -5,6 +5,18 @@ import { once } from "node:events";
 import { randomBytes } from "node:crypto";
 import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from "node:fs";
 import { delimiter, join } from "node:path";
+
+// src/opencode-line.ts
+function opencodeLine(raw, bin) {
+  const m = raw.match(/(?:^|v)(\d+)\.\d+/);
+  const major = m ? Number(m[1]) : NaN;
+  if (major === 1 || major === 2) return major;
+  throw new Error(
+    `opencode connector: unsupported OpenCode version "${raw}" from ${bin}; this connector supports the 1.x (opencode-ai) and 2.x (@opencode/cli) lines`
+  );
+}
+
+// src/serve.ts
 function resolveOpencodeBin() {
   const override = process.env.COTAL_OPENCODE_BIN?.trim() || process.env.COTAL_OPENCODE_RESOLVED_BIN?.trim();
   if (override) return override;
@@ -84,11 +96,14 @@ async function main() {
       throw new Error(`agent "${name}" is already running (opencode serve pid ${pid}) \u2014 kill it first`);
     rmSync(pidFile);
   }
+  const versionRaw = execFileSync(BIN, ["--version"], { encoding: "utf8" }).trim();
+  const line = opencodeLine(versionRaw, BIN);
   mkdirSync(agentHome, { recursive: true });
   const serve = spawn(BIN, ["serve", "--hostname", "127.0.0.1", "--port", port], {
     env: {
       ...process.env,
       COTAL_OPENCODE_SERVER_URL: url,
+      COTAL_OPENCODE_LINE: String(line),
       OPENCODE_SERVER_USERNAME: USERNAME,
       OPENCODE_SERVER_PASSWORD: SECRET,
       OPENCODE_DB: dbPath
@@ -116,10 +131,11 @@ async function main() {
     if (!attached) process.exit(code ?? (signal ? 1 : 0));
   });
   const auth = `Basic ${Buffer.from(`${USERNAME}:${SECRET}`).toString("base64")}`;
+  const pokePath = line === 2 ? "/api/config" : "/session";
   void (async () => {
     for (let i = 0; i < 300 && !sessionId; i++) {
       try {
-        await fetch(`${url}/session`, { headers: { authorization: auth }, signal: AbortSignal.timeout(1500) });
+        await fetch(`${url}${pokePath}`, { headers: { authorization: auth }, signal: AbortSignal.timeout(1500) });
       } catch {
       }
       await new Promise((r) => setTimeout(r, 200));
@@ -154,10 +170,7 @@ async function main() {
   delete tuiEnv.OPENCODE_CONFIG_CONTENT;
   for (const k of Object.keys(tuiEnv)) if (k.startsWith("COTAL_")) delete tuiEnv[k];
   attached = true;
-  const tui = spawn(BIN, ["attach", url, "--session", id, "--password", SECRET], {
-    env: tuiEnv,
-    stdio: "inherit"
-  });
+  const tui = line === 2 ? spawn(BIN, ["--server", url, "--session", id], { env: tuiEnv, stdio: "inherit" }) : spawn(BIN, ["attach", url, "--session", id, "--password", SECRET], { env: tuiEnv, stdio: "inherit" });
   for (const sig of ["SIGINT", "SIGTERM"])
     process.on(sig, () => {
       tui.kill(sig);

package/dist/tools.d.ts

@@ -15,6 +15,15 @@
  */
 import type { ToolDefinition } from "@opencode-ai/plugin";
 import { type MeshAgent, type AgentConfig } from "@cotal-ai/connector-core";
+import type { OpenCode2ToolEditor } from "./opencode2-types.js";
 /** Build the cotal_* tool map wired to one mesh agent, rendered from the shared specs. */
 export declare function buildCotalTools(agent: MeshAgent, config: AgentConfig): Record<string, ToolDefinition>;
+/** Build the cotal_* tool list for OpenCode 2.x's `ctx.tool.transform(ed => ed.add(...))`, from
+ *  the SAME shared specs {@link buildCotalTools} renders for 1.x. 2.x's `Tool.Info.input` accepts
+ *  a zod 4 object directly (a StandardSchema — measured, `fx105/measurements.md`), so the closed
+ *  schema goes across unmodified; there is no 1.x-style raw-shape flattening needed here. The
+ *  closed-object refusal at dispatch is the same guard as {@link buildCotalTools} keeps: this host
+ *  also hands `execute` the caller's object UNVALIDATED, so a stray `owner`/`actor` is refused by
+ *  name here too, never silently reaching `run`. */
+export declare function buildCotalTools2(agent: MeshAgent, config: AgentConfig): Parameters<OpenCode2ToolEditor["add"]>[0][];
 //# sourceMappingURL=tools.d.ts.map

package/dist/tools.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAgD,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAE1H,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA2CrG"}
+{"version":3,"file":"tools.d.ts","sourceRoot":"","sources":["../src/tools.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,EAAgD,KAAK,SAAS,EAAE,KAAK,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC1H,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE,0FAA0F;AAC1F,wBAAgB,eAAe,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CA2CrG;AAED;;;;;;oDAMoD;AACpD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,GAAG,UAAU,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAmCnH"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cotal-ai/connector-opencode",
   "description": "Cotal connector for OpenCode: a native in-process plugin that joins a session to the mesh.",
-  "version": "0.55.0",
+  "version": "0.56.0",
   "license": "Apache-2.0",
   "repository": {
     "type": "git",
@@ -21,11 +21,12 @@
     "@cotal-ai/core": ">=0.1.0"
   },
   "devDependencies": {
+    "@nats-io/transport-node": "^3.4.0",
     "@opencode-ai/plugin": "^1.16.2",
     "esbuild": "^0.28.0",
     "tsx": "^4.22.4",
-    "@cotal-ai/connector-core": "0.55.0",
-    "@cotal-ai/core": "0.55.0",
+    "@cotal-ai/connector-core": "0.56.0",
+    "@cotal-ai/core": "0.56.0",
     "@cotal-ai/smoke-kit": "0.0.0"
   },
   "files": [
@@ -36,8 +37,8 @@
   },
   "scripts": {
     "test": "tsx smoke/tool-input-closed.smoke.ts",
-    "typecheck": "tsc -p tsconfig.json --noEmit",
+    "typecheck": "tsc -p tsconfig.json --noEmit && tsc -p tsconfig.smoke.json",
     "build": "node -e \"require('node:fs').rmSync('dist',{recursive:true,force:true})\" && tsc -p tsconfig.json --emitDeclarationOnly && pnpm run bundle",
-    "bundle": "esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/index.js --external:@cotal-ai/core && esbuild src/plugin.entry.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/plugin.bundle.js && esbuild src/serve.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/serve.js"
+    "bundle": "esbuild src/index.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/index.js --external:@cotal-ai/core && esbuild src/plugin.entry.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/plugin/index.js && esbuild src/serve.ts --bundle --platform=node --format=esm --target=node20 --outfile=dist/serve.js"
   }
 }