@opencode-cockpit/client 0.1.1 → 0.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-cockpit/client",
-  "version": "0.1.1",
+  "version": "0.1.3",
   "description": "Auto-spawning, reconnecting, typed client for cockpitd",
   "type": "module",
   "license": "MIT",
@@ -31,10 +31,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@opencode-cockpit/protocol": "0.1.1"
+    "@opencode-cockpit/protocol": "0.1.3"
   },
   "devDependencies": {
-    "@opencode-cockpit/daemon": "0.1.1"
+    "@opencode-cockpit/daemon": "0.1.3"
   },
   "engines": {
     "bun": ">=1.3.5"

package/src/client.ts

@@ -39,6 +39,38 @@ export interface OutdatedDaemon {
   expected: string
 }
 
+/**
+ * Orders build ids (`<semver>+<hash>`, see daemonBuildId). Higher semver wins; equal versions with
+ * different hashes are local development builds, where the client's code counts as newer. A
+ * daemon without a build id predates build ids and is always older.
+ */
+export function compareBuilds(client: string, daemon: string | undefined): number {
+  if (!daemon) return 1
+  if (client === daemon) return 0
+  const [cv = "", ch = ""] = client.split("+")
+  const [dv = "", dh = ""] = daemon.split("+")
+  const order = compareSemver(cv, dv)
+  if (order !== 0) return order
+  return ch === dh ? 0 : 1
+}
+
+function compareSemver(a: string, b: string): number {
+  const parse = (v: string) => {
+    const [core = "", pre] = v.split("-", 2)
+    return { nums: core.split(".").map((n) => Number.parseInt(n, 10) || 0), pre }
+  }
+  const x = parse(a)
+  const y = parse(b)
+  for (let i = 0; i < 3; i++) {
+    const d = (x.nums[i] ?? 0) - (y.nums[i] ?? 0)
+    if (d !== 0) return Math.sign(d)
+  }
+  if (x.pre === y.pre) return 0
+  if (x.pre === undefined) return 1 // 1.0.0 > 1.0.0-beta
+  if (y.pre === undefined) return -1
+  return x.pre < y.pre ? -1 : 1
+}
+
 const IDEMPOTENT = new Set<string>([
   "daemon.hello",
   "daemon.status",
@@ -199,7 +231,9 @@ export class CockpitClient {
     }
 
     const expected = this.options.expectedBuild
-    if (expected && this.hello.build !== expected) {
+    // Only move forward: several plugins at different versions share one daemon, and letting an
+    // older one replace a newer daemon would make them take turns replacing each other.
+    if (expected && compareBuilds(expected, this.hello.build) > 0) {
       const status = (await conn.request("daemon.status", {})) as { modules: { busy: boolean }[] }
       const busy = status.modules.some((m) => m.busy)
       if (!busy && this.options.spawn && !replaced) {

package/src/feature.ts

@@ -0,0 +1,55 @@
+/**
+ * Guards against loading the same cockpit feature twice, e.g. when both `opencode-cockpit` and
+ * `@opencode-cockpit/shell` are configured. OpenCode does not deduplicate plugin tools, and
+ * duplicate tool names make model requests fail, so the first copy loaded wins and later copies
+ * stay inactive.
+ *
+ * Claims are scoped to an object that all plugins of one OpenCode instance share: the plugin
+ * input on the server side, the renderer in the TUI. Separate instances claim independently.
+ */
+
+const REGISTRY = Symbol.for("opencode-cockpit.features")
+
+type Registry = WeakMap<object, Map<string, string>>
+
+function registry(): Registry {
+  const host = globalThis as { [REGISTRY]?: Registry }
+  host[REGISTRY] ??= new WeakMap()
+  return host[REGISTRY]
+}
+
+export interface FeatureClaim {
+  /** True when this copy owns the feature and should register itself. */
+  active: boolean
+  /** Source label of the copy that owns the feature. */
+  owner: string
+  /** Give up ownership, so a reloaded plugin can claim again. No-op for inactive claims. */
+  release(): void
+}
+
+export function claimFeature(scope: object, feature: string, source: string): FeatureClaim {
+  const reg = registry()
+  let claims = reg.get(scope)
+  if (!claims) {
+    claims = new Map()
+    reg.set(scope, claims)
+  }
+  const owner = claims.get(feature)
+  if (owner !== undefined) return { active: false, owner, release() {} }
+
+  claims.set(feature, source)
+  let released = false
+  return {
+    active: true,
+    owner: source,
+    release() {
+      if (released) return
+      released = true
+      if (claims.get(feature) === source) claims.delete(feature)
+    },
+  }
+}
+
+export function duplicateFeatureMessage(feature: string, owner: string, skipped: string): string {
+  return `${feature} is configured twice (${owner} and ${skipped}). Using ${owner}; remove one of them from your OpenCode config.`
+}

package/src/index.ts

@@ -1,2 +1,9 @@
-export { type ClientOptions, CockpitClient, type ConnectionState, type OutdatedDaemon } from "./client.ts"
+export {
+  type ClientOptions,
+  CockpitClient,
+  type ConnectionState,
+  compareBuilds,
+  type OutdatedDaemon,
+} from "./client.ts"
+export { claimFeature, duplicateFeatureMessage, type FeatureClaim } from "./feature.ts"
 export type { SpawnOptions } from "./spawn.ts"