@clwnd/opencode 0.18.5 → 0.18.7

package/dist/index.js

@@ -1462,6 +1462,23 @@ var clwndPlugin = async (input) => {
         }
       }
     },
+    // Suppress OC's builtin tools that clwnd has replaced. We can't remove
+    // them from OC's registry, but we can rewrite their descriptions so the
+    // model never picks them. Without this, the model sees "edit", "write",
+    // "glob", "grep" in the active tool list, tries to call them, and gets
+    // an invalid-tool bounce because Claude CLI has --disallowedTools'd them.
+    "tool.definition": async (input2, output) => {
+      const replaced = {
+        edit: "DISABLED \u2014 use do_code instead.",
+        write: "DISABLED \u2014 use do_code for code files, do_noncode for non-code files.",
+        glob: "DISABLED \u2014 use read with a glob pattern or directory path instead.",
+        grep: "DISABLED \u2014 use read with the pattern parameter instead."
+      };
+      if (replaced[input2.toolID]) {
+        output.description = replaced[input2.toolID];
+        output.parameters = { type: "object", properties: {} };
+      }
+    },
     "chat.headers": async (ctx, output) => {
       output.headers["x-clwnd-agent"] = typeof ctx.agent === "string" ? ctx.agent : ctx.agent?.name ?? JSON.stringify(ctx.agent);
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@clwnd/opencode",
-  "version": "0.18.5",
+  "version": "0.18.7",
   "description": "clwnd for opencode",
   "type": "module",
   "main": "dist/index.js",
@@ -9,11 +9,12 @@
       "import": "./dist/index.js"
     },
     "./tui": {
-      "import": "./dist/tui.js"
+      "import": "./tui.tsx"
     }
   },
   "files": [
-    "dist/"
+    "dist/",
+    "tui.tsx"
   ],
   "scripts": {
     "build": "tsup",
@@ -40,7 +41,10 @@
     "@ai-sdk/provider-utils": "^4.0.21"
   },
   "peerDependencies": {
-    "@opencode-ai/plugin": ">=1.3.5"
+    "@opencode-ai/plugin": ">=1.3.5",
+    "@opentui/core": "^0.1.97",
+    "@opentui/solid": "^0.1.97",
+    "solid-js": "^1.9.12"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.3.5",

package/tui.tsx

@@ -0,0 +1,123 @@
+/** @jsxImportSource @opentui/solid */
+import type { TuiPlugin, TuiPluginModule } from "@opencode-ai/plugin/tui"
+import { createSignal, onCleanup, createMemo, Show } from "solid-js"
+
+const VERSION = (() => {
+  try {
+    const fs = require("fs")
+    const path = require("path")
+    const pkg = JSON.parse(fs.readFileSync(path.join(__dirname, "package.json"), "utf8"))
+    return pkg.version ?? "?"
+  } catch {
+    return "?"
+  }
+})()
+
+interface DaemonData {
+  status: "connected" | "disconnected"
+  procs: number
+  sessions: number
+  uptimeMin: number
+  readDedup: number
+  bashCapped: number
+  contextWarnings: number
+}
+
+const SOCK_PATH = (() => {
+  const runtime = process.env.XDG_RUNTIME_DIR
+  const sock = process.env.CLWND_SOCKET ?? (runtime ? `${runtime}/clwnd/clwnd.sock` : "/tmp/clwnd/clwnd.sock")
+  return sock + ".http"
+})()
+
+async function fetchDaemon(): Promise<DaemonData> {
+  try {
+    const [statusResp, savingsResp] = await Promise.all([
+      fetch("http://localhost/status", { unix: SOCK_PATH } as RequestInit),
+      fetch("http://localhost/savings", { unix: SOCK_PATH } as RequestInit),
+    ])
+    const status = (await statusResp.json()) as any
+    const savings = (await savingsResp.json()) as any
+    const c = savings.counters ?? {}
+    return {
+      status: "connected",
+      procs: (status.procs ?? []).length,
+      sessions: status.sessions ?? 0,
+      uptimeMin: Math.round((savings.uptimeMs ?? 0) / 60_000),
+      readDedup: c.readDedupHits ?? 0,
+      bashCapped: c.bashTruncated ?? 0,
+      contextWarnings: c.contextOverThreshold ?? 0,
+    }
+  } catch {
+    return {
+      status: "disconnected", procs: 0, sessions: 0, uptimeMin: 0,
+      readDedup: 0, bashCapped: 0, contextWarnings: 0,
+    }
+  }
+}
+
+function SidebarView(props: { api: any; session_id: string }) {
+  const theme = () => props.api.theme.current
+  const [data, setData] = createSignal<DaemonData>({
+    status: "disconnected", procs: 0, sessions: 0, uptimeMin: 0,
+    readDedup: 0, bashCapped: 0, contextWarnings: 0,
+  })
+
+  const poll = () => fetchDaemon().then(setData).catch(() => {})
+  poll()
+  const timer = setInterval(poll, 10_000)
+  onCleanup(() => clearInterval(timer))
+
+  const statusLine = createMemo(() => {
+    const d = data()
+    const dot = d.status === "connected" ? "●" : "○"
+    return `${dot} ${d.status} · ${String(d.uptimeMin)}m`
+  })
+
+  const procsLine = createMemo(() => {
+    const d = data()
+    return `${String(d.procs)} proc${d.procs !== 1 ? "s" : ""} · ${String(d.sessions)} session${d.sessions !== 1 ? "s" : ""}`
+  })
+
+  const savingsLine = createMemo(() => {
+    const d = data()
+    if (d.readDedup === 0 && d.bashCapped === 0) return ""
+    return `saved: ${String(d.readDedup)} dedup · ${String(d.bashCapped)} capped`
+  })
+
+  // green = active procs, secondary = idle (connected, nothing running), muted = disconnected
+  const dotColor = createMemo(() => {
+    const d = data()
+    if (d.status === "disconnected") return theme().textMuted
+    if (d.procs > 0) return theme().success
+    return theme().secondary
+  })
+
+  return (
+    <box>
+      <text fg={theme().textMuted}>
+        <span style={{ fg: dotColor() }}>{"•"}</span>
+        {" "}
+        <b>{"clwnd"}</b>
+        {" "}
+        <span>{VERSION}</span>
+      </text>
+      <text fg={theme().textMuted}>{procsLine()}</text>
+      <Show when={savingsLine() !== ""}>
+        <text fg={theme().textMuted}>{savingsLine()}</text>
+      </Show>
+    </box>
+  )
+}
+
+const tui: TuiPlugin = async (api) => {
+  api.slots.register({
+    order: 150,
+    slots: {
+      sidebar_content(_ctx, props) {
+        return <SidebarView api={api} session_id={props.session_id} />
+      },
+    },
+  })
+}
+
+export default { id: "@clwnd/opencode", tui } satisfies TuiPluginModule & { id: string }

package/dist/tui.js

@@ -1,92 +0,0 @@
-// tui.tsx
-import { createSignal, onCleanup, createMemo } from "solid-js";
-var SOCK_PATH = (() => {
-  const runtime = process.env.XDG_RUNTIME_DIR;
-  const sock = process.env.CLWND_SOCKET ?? (runtime ? `${runtime}/clwnd/clwnd.sock` : "/tmp/clwnd/clwnd.sock");
-  return sock + ".http";
-})();
-async function fetchDaemon() {
-  try {
-    const [statusResp, savingsResp] = await Promise.all([
-      fetch("http://localhost/status", { unix: SOCK_PATH }),
-      fetch("http://localhost/savings", { unix: SOCK_PATH })
-    ]);
-    const status = await statusResp.json();
-    const savings = await savingsResp.json();
-    const c = savings.counters ?? {};
-    return {
-      status: "connected",
-      procs: (status.procs ?? []).length,
-      sessions: status.sessions ?? 0,
-      uptimeMin: Math.round((savings.uptimeMs ?? 0) / 6e4),
-      readDedup: c.readDedupHits ?? 0,
-      bashCapped: c.bashTruncated ?? 0,
-      contextWarnings: c.contextOverThreshold ?? 0
-    };
-  } catch {
-    return {
-      status: "disconnected",
-      procs: 0,
-      sessions: 0,
-      uptimeMin: 0,
-      readDedup: 0,
-      bashCapped: 0,
-      contextWarnings: 0
-    };
-  }
-}
-function View(props) {
-  const theme = () => props.api.theme.current;
-  const [data, setData] = createSignal({
-    status: "disconnected",
-    procs: 0,
-    sessions: 0,
-    uptimeMin: 0,
-    readDedup: 0,
-    bashCapped: 0,
-    contextWarnings: 0
-  });
-  const poll = () => fetchDaemon().then(setData).catch(() => {
-  });
-  poll();
-  const timer = setInterval(poll, 1e4);
-  onCleanup(() => clearInterval(timer));
-  const dot = createMemo(() => data().status === "connected" ? "\u25CF" : "\u25CB");
-  const dotColor = createMemo(() => data().status === "connected" ? theme().success : theme().error);
-  return <box>
-      <text fg={theme().text}>
-        <b>clwnd</b>
-      </text>
-      <text>
-        <text fg={dotColor()}>{dot()}</text>
-        <text fg={theme().textMuted}> {data().status} · {data().uptimeMin}m uptime</text>
-      </text>
-      <text fg={theme().textMuted}>
-        {data().procs} proc{data().procs !== 1 ? "s" : ""} · {data().sessions} session{data().sessions !== 1 ? "s" : ""}
-      </text>
-      {data().readDedup > 0 || data().bashCapped > 0 ? <text fg={theme().textMuted}>
-          saved: {data().readDedup} dedup · {data().bashCapped} capped
-        </text> : null}
-      {data().contextWarnings > 0 ? <text fg={theme().warning}>
-          ⚠ {data().contextWarnings} context warning{data().contextWarnings !== 1 ? "s" : ""}
-        </text> : null}
-    </box>;
-}
-var tui = async (api) => {
-  api.slots.register({
-    order: 200,
-    // after OC's built-in Context (100), before Footer
-    slots: {
-      sidebar_content(_ctx, props) {
-        return <View api={api} session_id={props.session_id} />;
-      }
-    }
-  });
-};
-var plugin = {
-  tui
-};
-var tui_default = plugin;
-export {
-  tui_default as default
-};