@scrylog/cli 0.1.0 → 0.1.2

package/README.md

@@ -452,9 +452,14 @@ Setup:
 bun install -g @scrylog/opencode-plugin
 ```
 
-2. Set `opencode.mode` to `hooks`.
+2. Set `opencode.mode` to `hooks` and register the plugin.
 
-3. Add the plugin to `~/.config/opencode/opencode.json`:
+```bash
+scrylog setup
+scrylog opencode hooks install
+```
+
+   Alternatively, add the plugin to `~/.config/opencode/opencode.json` manually:
 
 ```json
 {
@@ -462,7 +467,7 @@ bun install -g @scrylog/opencode-plugin
 }
 ```
 
-4. Start `scrylogd` or install the service.
+3. Start `scrylogd` or install the service.
 
 Recommended command flow:
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@scrylog/cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Terminal dashboard for monitoring tmux sessions running AI coding agents",
   "license": "MIT",
   "type": "module",
@@ -54,7 +54,9 @@
     "start": "bun run src/tui/index.ts",
     "check-types": "tsc --noEmit",
     "test": "bun test",
-    "pack:dry-run": "npm pack --dry-run"
+    "prepublishOnly": "bun run ../../scripts/resolve-catalogs.ts",
+    "postpublish": "bun run ../../scripts/restore-catalogs.ts",
+    "pack:dry-run": "bun run ../../scripts/resolve-catalogs.ts && npm pack --dry-run && bun run ../../scripts/restore-catalogs.ts"
   },
   "dependencies": {
     "@hono/zod-openapi": "^1.3.0",
@@ -64,12 +66,12 @@
     "@scalar/openapi-to-markdown": "^0.5.9",
     "hono": "^4.12.15",
     "neo-blessed": "^0.2.0",
-    "zod": "catalog:"
+    "zod": "^4.3.6"
   },
   "devDependencies": {
     "@types/blessed": "^0.1.27",
-    "@types/bun": "catalog:",
-    "@types/node": "catalog:",
-    "typescript": "catalog:"
+    "@types/bun": "^1.3.14",
+    "@types/node": "^24.3.0",
+    "typescript": "5.9.3"
   }
 }

package/src/cli/commands.ts

@@ -1,4 +1,4 @@
-import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
+import { existsSync, mkdirSync, readFileSync, renameSync, writeFileSync, copyFileSync } from "node:fs";
 import { randomBytes } from "node:crypto";
 import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
@@ -187,7 +187,20 @@ export async function runDoctor(options: GlobalCliOptions): Promise<void> {
 
   if (config.opencode.mode === "hooks") {
     process.stdout.write("OpenCode mode: hooks\n");
-    process.stdout.write(`OpenCode plugin config present: ${existsSync(join(homedir(), ".config", "opencode", "opencode.json"))}\n`);
+    const opencodeSettingsPath = join(homedir(), ".config", "opencode", "opencode.json");
+    process.stdout.write(`OpenCode plugin config present: ${existsSync(opencodeSettingsPath)}\n`);
+    let pluginRegistered = false;
+    if (existsSync(opencodeSettingsPath)) {
+      try {
+        const opencodeSettings = JSON.parse(readFileSync(opencodeSettingsPath, "utf8")) as OpenCodeSettings;
+        pluginRegistered = (opencodeSettings.plugin ?? []).some(
+          (plugin) => typeof plugin === "string" && plugin.includes(OPENCODE_PLUGIN_NAME),
+        );
+      } catch {
+        // ignore parse errors; pluginRegistered stays false
+      }
+    }
+    process.stdout.write(`OpenCode plugin registered: ${pluginRegistered}\n`);
   } else {
     process.stdout.write(`OpenCode mode: sse\nOpenCode auto-discover: ${config.opencode.autoDiscover}\nConfigured instances: ${config.opencode.instances.length}\n`);
   }
@@ -227,6 +240,10 @@ export async function runSetupWizard(options: GlobalCliOptions): Promise<void> {
           .filter(Boolean);
       } else {
         process.stdout.write("Hooks mode requires the @scrylog/opencode-plugin plugin in your OpenCode config.\n");
+        const installPlugin = await prompt.yesNo("Run scrylog opencode hooks install now?", false);
+        if (installPlugin) {
+          await runOpenCodeHooksInstall(options);
+        }
       }
     }
 
@@ -307,6 +324,19 @@ function parseOptionalInt(value: string, fallback: number): number {
   return Number.isNaN(parsed) ? fallback : parsed;
 }
 
+const OPENCODE_PLUGIN_NAME = "@scrylog/opencode-plugin";
+
+function backupBeforeWrite(path: string): void {
+  if (!existsSync(path)) return;
+  const bak = `${path}.bak`;
+  copyFileSync(path, bak);
+}
+
+interface OpenCodeSettings {
+  plugin?: string[];
+  [key: string]: unknown;
+}
+
 // ── Claude hooks setup ────────────────────────────────────────────────────────
 
 const CLAUDE_HOOK_EVENTS = [
@@ -374,7 +404,7 @@ export async function runClaudeHooksInstall(options: GlobalCliOptions): Promise<
   for (const event of CLAUDE_HOOK_EVENTS) {
     const existing = updatedHooks[event] ?? [];
     const alreadyInstalled = existing.some((rule) =>
-      rule.hooks.some((h) => h.command === hookBin || h.command === "scrylog-claude-hook"),
+      rule.hooks.some((h) => typeof h.command === "string" && h.command.includes("scrylog-claude-hook")),
     );
     if (!alreadyInstalled) {
       updatedHooks[event] = [
@@ -386,7 +416,8 @@ export async function runClaudeHooksInstall(options: GlobalCliOptions): Promise<
 
   settings.hooks = updatedHooks;
 
-  // Write atomically
+  // Write atomically with backup
+  backupBeforeWrite(settingsPath);
   const tmp = `${settingsPath}.tmp`;
   writeFileSync(tmp, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
   renameSync(tmp, settingsPath);
@@ -466,7 +497,7 @@ export async function runCodexHooksInstall(options: GlobalCliOptions): Promise<v
   for (const event of CODEX_HOOK_EVENTS) {
     const existing = updatedHooks[event] ?? [];
     const alreadyInstalled = existing.some((rule) =>
-      rule.hooks.some((h) => h.command === hookBin || h.command === "scrylog-codex-hook"),
+      rule.hooks.some((h) => typeof h.command === "string" && h.command.includes("scrylog-codex-hook")),
     );
     if (!alreadyInstalled) {
       const entry: CodexHookRule = {
@@ -479,7 +510,8 @@ export async function runCodexHooksInstall(options: GlobalCliOptions): Promise<v
 
   config.hooks = updatedHooks;
 
-  // Write atomically
+  // Write atomically with backup
+  backupBeforeWrite(hooksPath);
   const tmp = `${hooksPath}.tmp`;
   writeFileSync(tmp, `${JSON.stringify(config, null, 2)}\n`, "utf8");
   renameSync(tmp, hooksPath);
@@ -496,3 +528,43 @@ export async function runCodexHooksInstall(options: GlobalCliOptions): Promise<v
   process.stdout.write(`Enabled codex.hooksEnabled in scrylog config: ${configPath}\n`);
   process.stdout.write("Done. Restart the scrylog daemon to apply changes.\n");
 }
+
+// ── OpenCode hooks setup ──────────────────────────────────────────────────────
+
+export async function runOpenCodeHooksInstall(options: GlobalCliOptions): Promise<void> {
+  const opencodeDir = join(homedir(), ".config", "opencode");
+  const settingsPath = join(opencodeDir, "opencode.json");
+
+  // Load or create opencode.json
+  let settings: OpenCodeSettings = {};
+  if (existsSync(settingsPath)) {
+    try {
+      settings = JSON.parse(readFileSync(settingsPath, "utf8")) as OpenCodeSettings;
+    } catch {
+      process.stderr.write(`Warning: could not parse ${settingsPath} — starting with empty settings.\n`);
+    }
+  } else {
+    mkdirSync(opencodeDir, { recursive: true });
+  }
+
+  // Merge plugin entry without removing existing ones
+  const existingPlugins = settings.plugin ?? [];
+  const alreadyInstalled = existingPlugins.some(
+    (plugin) => typeof plugin === "string" && plugin.includes(OPENCODE_PLUGIN_NAME),
+  );
+
+  if (!alreadyInstalled) {
+    settings.plugin = [...existingPlugins, OPENCODE_PLUGIN_NAME];
+
+    // Write atomically with backup
+    backupBeforeWrite(settingsPath);
+    const tmp = `${settingsPath}.tmp`;
+    writeFileSync(tmp, `${JSON.stringify(settings, null, 2)}\n`, "utf8");
+    renameSync(tmp, settingsPath);
+    process.stdout.write(`Registered ${OPENCODE_PLUGIN_NAME} in ${settingsPath}\n`);
+  } else {
+    process.stdout.write(`${OPENCODE_PLUGIN_NAME} is already registered in ${settingsPath}\n`);
+  }
+
+  process.stdout.write("Done. Make sure the plugin is installed globally and restart OpenCode.\n");
+}

package/src/service/manager.ts

@@ -9,7 +9,7 @@ import {
   getSystemdUnitPath,
   getUserUid,
 } from "../shared/paths";
-import { IS_LINUX, IS_MAC, IS_WSL } from "../shared/platform";
+import { IS_LINUX, IS_MAC, IS_WSL, whichCommand } from "../shared/platform";
 import { maybeRunCommand } from "../shared/utils";
 
 export interface ServiceStatus {
@@ -52,13 +52,17 @@ function daemonScriptPath(): string {
   return join(import.meta.dir, "../daemon/index.ts");
 }
 
-function daemonExec(configPath?: string): string[] {
+export function resolveDaemonExec(configPath?: string, daemonPath = whichCommand("scrylogd")): string[] {
   const resolvedConfigPath = getResolvedConfigPath(configPath);
+  if (daemonPath) {
+    return [daemonPath, "--config", resolvedConfigPath];
+  }
   return [process.execPath, "run", daemonScriptPath(), "--config", resolvedConfigPath];
 }
 
 export function renderLaunchAgentPlist(configPath?: string): string {
-  const [execPath, runArg, scriptPath, configFlag, resolvedConfigPath] = daemonExec(configPath);
+  const args = resolveDaemonExec(configPath);
+  const programArguments = args.map((arg) => `      <string>${xmlEscape(arg)}</string>`).join("\n");
   return `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
@@ -67,11 +71,7 @@ export function renderLaunchAgentPlist(configPath?: string): string {
     <string>${getServiceLabel()}</string>
     <key>ProgramArguments</key>
     <array>
-      <string>${execPath}</string>
-      <string>${runArg}</string>
-      <string>${scriptPath}</string>
-      <string>${configFlag}</string>
-      <string>${resolvedConfigPath}</string>
+${programArguments}
     </array>
     <key>RunAtLoad</key>
     <true/>
@@ -83,13 +83,13 @@ export function renderLaunchAgentPlist(configPath?: string): string {
 }
 
 export function renderSystemdUserUnit(configPath?: string): string {
-  const [execPath, runArg, scriptPath, configFlag, resolvedConfigPath] = daemonExec(configPath);
+  const args = resolveDaemonExec(configPath);
   return `[Unit]
 Description=scrylog daemon
 After=default.target
 
 [Service]
-ExecStart=${shellQuote(execPath)} ${shellQuote(runArg)} ${shellQuote(scriptPath)} ${shellQuote(configFlag)} ${shellQuote(resolvedConfigPath)}
+ExecStart=${args.map(shellQuote).join(" ")}
 Restart=on-failure
 RestartSec=3
 
@@ -240,3 +240,12 @@ class UnsupportedServiceManager implements ServiceManager {
 function shellQuote(value: string): string {
   return `'${value.replace(/'/g, `'"'"'`)}'`;
 }
+
+function xmlEscape(value: string): string {
+  return value
+    .replace(/&/g, "&amp;")
+    .replace(/</g, "&lt;")
+    .replace(/>/g, "&gt;")
+    .replace(/"/g, "&quot;")
+    .replace(/'/g, "&apos;");
+}

package/src/tui/index.ts

@@ -8,6 +8,7 @@ import type { ServiceStatus } from "../service/manager";
 import {
   runClaudeHooksInstall,
   runCodexHooksInstall,
+  runOpenCodeHooksInstall,
   runConfigCommand,
   runDaemonCommand,
   runDoctor,
@@ -28,6 +29,7 @@ Usage:
   scrylog token <mcp|api|both> <generate|rotate|clear> [--config <path>]
   scrylog claude hooks install [--config <path>]
   scrylog codex hooks install [--config <path>]
+  scrylog opencode hooks install [--config <path>]
   scrylog logs
 
 Options:
@@ -40,6 +42,8 @@ Notes:
   hooks that scrylog uses for real-time session state tracking.
   'scrylog codex hooks install' configures Codex CLI to emit lifecycle
   hooks that scrylog uses for real-time session state tracking.
+  'scrylog opencode hooks install' registers the scrylog plugin in
+  OpenCode configuration for real-time session state tracking.
 `);
 }
 
@@ -170,6 +174,14 @@ async function main(): Promise<void> {
     throw new Error(`Unknown codex subcommand: ${subcommand ?? "(none)"}`);
   }
 
+  if (command === "opencode") {
+    if (subcommand === "hooks" && args[2] === "install") {
+      await runOpenCodeHooksInstall(options);
+      return;
+    }
+    throw new Error(`Unknown opencode subcommand: ${subcommand ?? "(none)"}`);
+  }
+
   throw new Error(`Unknown command: ${command}`);
 }