feat(ocm-cli): add session move with local history export and TUI plugin (#304)

* loop: ocm-session-move completed after 7 iterations

* feat(ocm-cli): add session move with local history export and TUI plugin

* docs(ocm-cli): update plugin config to tui-only entry and clarify session history source

* fix(ocm-cli): replace raw postinstall output with TUI toast notification

Author: chriswritescode-dev

docs/ocm-cli.md

@@ -29,29 +29,25 @@ The CLI is published as `@opencode-manager/ocm-cli`. There are two install paths
 
 ### Option A — install via OpenCode's plugin loader (recommended)
 
-Add the package to your OpenCode config and OpenCode will fetch it on next start. The package's plugin entry self-installs a `~/.local/bin/ocm` symlink, so the `ocm` binary becomes available on your PATH automatically.
+Add the TUI plugin entry to your OpenCode config and OpenCode will fetch the package on next start. The package `postinstall` script self-installs a `~/.local/bin/ocm` symlink for local plugin installs, so the `ocm` binary becomes available on your PATH automatically.
 
 ```jsonc
 // ~/.config/opencode/opencode.json
 {
   "$schema": "https://opencode.ai/config.json",
-  "plugin": ["@opencode-manager/ocm-cli"]
+  "plugin": ["@opencode-manager/ocm-cli/tui"]
 }
 ```
 
-The next time OpenCode starts it will run `bun install` for the plugin and import it once. You'll see:
+The next time OpenCode starts it will run `bun install` for the plugin. The installer stays quiet so it does not break the TUI layout; after the plugin loads, OpenCode shows a one-time toast confirming where `ocm` was linked.
 
-```
-ocm-cli: installed `ocm` at /Users/you/.local/bin/ocm
-```
-
-If `~/.local/bin` is not on your PATH, the message will tell you. Add this to your shell rc:
+If `~/.local/bin` is not on your PATH, add this to your shell rc:
 
 ```bash
 export PATH="$HOME/.local/bin:$PATH"
 ```
 
-The plugin itself is a no-op — it does not register tools, commands, or hooks. Its only side effect is the bin symlink, so all real work happens through the `ocm` CLI.
+The `./tui` entry registers `/ocm-move`, a TUI command that keeps the local session and copies the active session to the Manager after pushing the current repo state. Run it from inside a local OpenCode session after `ocm login` and after the repo exists on the Manager (`ocm push --create` if needed).
 
 ### Option B — global package manager install
 
@@ -129,6 +125,10 @@ The child takes over the terminal (`stdio: inherit`); closing the TUI exits `ocm
 
 `ocm pull` uses a fast git bundle + working-tree patch by default to sync the matching Manager repo over `$PWD`. Pass `--full` to use the legacy tarball mirror. If the fast path fails, `ocm` prompts before reverting to the tarball mirror (and proceeds automatically when there is no TTY to prompt).
 
+### TUI `/ocm-move`
+
+When the TUI plugin entry is installed, `/ocm-move` is available in local OpenCode sessions. It checks that the matching Manager repo has not diverged, pushes the local git state with the fast bundle + working-tree patch path, reads the active session history from the local OpenCode SQLite event database, rewrites local repo directories to the Manager repo directory, and replays the session through `/api/opencode-proxy/sync/replay`. The local session is retained.
+
 - `--force` skips the dirty-working-tree check on `pull` and the safety bail on `push`.
 - `--create` (on `push`) creates a new Manager repo when no `origin` match is found.
 - `--yes` skips the interactive create confirmation.

ocm-cli/README.md

@@ -61,18 +61,26 @@ tarball mirror. If the fast path fails, `ocm` prompts before reverting to the
 tarball mirror (and proceeds automatically when there is no TTY to prompt). It
 refuses to overwrite uncommitted local changes unless `--force` is passed.
 
-## OpenCode plugin
+## OpenCode TUI plugin
 
-The package default export is an OpenCode plugin entrypoint. Importing the
-plugin performs a best-effort local `ocm` symlink install and then returns an
-empty plugin object.
+The package exposes an OpenCode TUI plugin at
+`@opencode-manager/ocm-cli/tui`. It registers `/ocm-move`, which keeps the
+local session and copies the active session to the Manager after pushing the
+current repo state. Use it from inside an OpenCode session after `ocm login`
+and after the repo already exists on the Manager (`ocm push --create` if
+needed).
 
-```ts
-import ocm from '@opencode-manager/ocm-cli'
+Enable it in `tui.json`:
 
-export default [ocm]
+```jsonc
+{
+  "plugin": ["@opencode-manager/ocm-cli/tui"]
+}
 ```
 
+The `ocm` binary is installed via the package `postinstall` (or `bin` field on
+global installs); the plugin surface is TUI-only.
+
 ## Requirements
 
 - `opencode` available on `PATH`

ocm-cli/bin/ocm.ts

@@ -9,6 +9,7 @@ import { createProgressReporter } from '../src/progress.js'
 import { getBranchName, getOriginUrl } from '../src/local-repo.js'
 import { resolveOpenCodeProjectId } from '@opencode-manager/shared/project-id'
 import { resolveTarget } from '../src/resolve-target.js'
+import { type ManagerRepo, fetchRepos, toRemoteRepoSummaries } from '../src/manager-repos.js'
 import packageJson from '../package.json' with { type: 'json' }
 
 const VERSION = packageJson.version
@@ -30,16 +31,6 @@ Usage:
   ocm --help                Show this help
 `
 
-interface ManagerRepo {
-  repoId: number
-  name: string
-  branch: string | null
-  cloneStatus: string
-  directory: string
-  projectId?: string | null
-  extra: { repoId: number; localPath: string; fullPath: string }
-}
-
 function die(msg: string, code = 1): never {
   process.stderr.write(`ocm: ${msg}\n`)
   process.exit(code)
@@ -124,18 +115,24 @@ function requireToken(state: OcmState): string {
   return token
 }
 
-async function fetchRepos(managerUrl: string, token: string): Promise<ManagerRepo[]> {
-  const res = await fetch(`${managerUrl}/api/internal/opencode-workspaces`, {
-    headers: { Authorization: `Bearer ${token}` },
-  })
-  if (!res.ok) {
-    throw new Error(`manager responded ${res.status} ${res.statusText}`)
+async function warmUpInstance(managerUrl: string, token: string, directory: string): Promise<void> {
+  const url = `${managerUrl}/api/opencode-proxy/session?directory=${encodeURIComponent(directory)}`
+  for (let attempt = 1; attempt <= 3; attempt++) {
+    try {
+      const res = await fetch(url, { headers: { Authorization: `Bearer ${token}` } })
+      if (res.ok) {
+        await res.text()
+        return
+      }
+    } catch {
+      /* retry */
+    }
+    await new Promise((resolve) => setTimeout(resolve, attempt * 500))
   }
-  const data = (await res.json()) as { workspaces: ManagerRepo[] }
-  return data.workspaces
 }
 
-function attach(managerUrl: string, token: string, repo: ManagerRepo): never {
+async function attach(managerUrl: string, token: string, repo: ManagerRepo): Promise<never> {
+  await warmUpInstance(managerUrl, token, repo.directory)
   const proxyUrl = `${managerUrl}/api/opencode-proxy`
   const args = [
     'attach',
@@ -271,7 +268,7 @@ async function cmdUse(args: string[]): Promise<void> {
     lastRepoBranch: repo.branch,
   })
 
-  attach(state.managerUrl, token, repo)
+  await attach(state.managerUrl, token, repo)
 }
 
 async function cmdDefault(): Promise<void> {
@@ -304,13 +301,13 @@ async function cmdDefault(): Promise<void> {
         lastRepoDir: repo.directory,
         lastRepoBranch: repo.branch,
       })
-      attach(state.managerUrl, token, toManagerRepo(repo))
+      await attach(state.managerUrl, token, toManagerRepo(repo))
       return
     }
     case 'last': {
       const repo = result.repo
       info(`attaching to ${repo.name} (last used)`)
-      attach(state.managerUrl, token, toManagerRepo(repo))
+      await attach(state.managerUrl, token, toManagerRepo(repo))
       return
     }
     case 'cwd-ambiguous': {
@@ -364,12 +361,7 @@ export async function cmdPush(args: string[]): Promise<void> {
   const api = new ManagerApi(state.managerUrl, token)
   const repos = await fetchRepos(state.managerUrl, token)
 
-  const remotes: RemoteRepoSummary[] = repos.map((r) => ({
-    repoId: r.repoId,
-    name: r.name,
-    projectId: r.projectId ?? null,
-    branch: r.branch,
-  }))
+  const remotes: RemoteRepoSummary[] = toRemoteRepoSummaries(repos)
 
   const plan = await prepareMirror(process.cwd(), remotes)
 
@@ -447,12 +439,7 @@ async function cmdPull(args: string[]): Promise<void> {
   const api = new ManagerApi(state.managerUrl, token)
   const repos = await fetchRepos(state.managerUrl, token)
 
-  const remotes: RemoteRepoSummary[] = repos.map((r) => ({
-    repoId: r.repoId,
-    name: r.name,
-    projectId: r.projectId ?? null,
-    branch: r.branch,
-  }))
+  const remotes: RemoteRepoSummary[] = toRemoteRepoSummaries(repos)
 
   const plan = await prepareMirror(process.cwd(), remotes)
 

ocm-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opencode-manager/ocm-cli",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "OpenCode Manager CLI: attach a local OpenCode TUI to a Manager-hosted repo.",
   "license": "MIT",
   "repository": {
@@ -9,10 +9,12 @@
     "directory": "ocm-cli"
   },
   "type": "module",
-  "main": "./dist/plugin.js",
+  "oc-plugin": [
+    "tui"
+  ],
   "exports": {
-    ".": {
-      "import": "./dist/plugin.js"
+    "./tui": {
+      "import": "./dist/tui.js"
     }
   },
   "bin": {
@@ -32,10 +34,10 @@
     "test:watch": "vitest",
     "prepublishOnly": "bun scripts/build.ts"
   },
-  "dependencies": {},
   "devDependencies": {
     "@eslint/js": "^9.36.0",
     "@opencode-manager/shared": "workspace:*",
+    "@types/bun": "^1.3.14",
     "@types/node": "^22.0.0",
     "eslint": "^9.39.1",
     "typescript": "^5.5.0",

ocm-cli/scripts/build.ts

@@ -6,37 +6,27 @@ const dist = join(root, 'dist')
 
 rmSync(dist, { recursive: true, force: true })
 
-console.log('Bundling ocm CLI...')
-const cliResult = await Bun.build({
-  entrypoints: [join(root, 'bin', 'ocm.ts')],
-  outdir: dist,
-  target: 'node',
-  format: 'esm',
-  naming: { entry: 'ocm.js' },
-})
-
-if (!cliResult.success) {
-  for (const log of cliResult.logs) {
+async function bundleEntry(label: string, entrypoint: string, outputName: string): Promise<void> {
+  console.log(`Bundling ${label}...`)
+  const result = await Bun.build({
+    entrypoints: [join(root, entrypoint)],
+    outdir: dist,
+    target: 'node',
+    format: 'esm',
+    external: ['bun:sqlite'],
+    naming: { entry: outputName },
+  })
+
+  if (result.success) return
+
+  for (const log of result.logs) {
     console.error(log)
   }
   process.exit(1)
 }
 
-console.log('Bundling opencode plugin entry...')
-const pluginResult = await Bun.build({
-  entrypoints: [join(root, 'src', 'plugin.ts')],
-  outdir: dist,
-  target: 'node',
-  format: 'esm',
-  naming: { entry: 'plugin.js' },
-})
-
-if (!pluginResult.success) {
-  for (const log of pluginResult.logs) {
-    console.error(log)
-  }
-  process.exit(1)
-}
+await bundleEntry('ocm CLI', join('bin', 'ocm.ts'), 'ocm.js')
+await bundleEntry('TUI plugin entry', join('src', 'tui-plugin.ts'), 'tui.js')
 
 const ocmJsPath = join(dist, 'ocm.js')
 const ocmJsContent = readFileSync(ocmJsPath, 'utf-8')

ocm-cli/scripts/postinstall.mjs

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { existsSync, mkdirSync, symlinkSync, unlinkSync, lstatSync, readlinkSync, chmodSync } from 'node:fs'
+import { existsSync, mkdirSync, symlinkSync, unlinkSync, lstatSync, readlinkSync, chmodSync, writeFileSync } from 'node:fs'
 import { homedir } from 'node:os'
 import { join, resolve, dirname } from 'node:path'
 import { fileURLToPath } from 'node:url'
@@ -26,16 +26,24 @@ if (process.env.npm_config_global === 'true' || process.env.npm_config_global ==
 }
 
 const binDir = join(homedir(), '.local', 'bin')
+const link = join(binDir, 'ocm')
+const noticeDir = join(homedir(), '.config', 'opencode-manager')
+const noticeFile = join(noticeDir, 'install-notice.json')
+
+function writeInstallNotice(pathMissing) {
+  try {
+    mkdirSync(noticeDir, { recursive: true })
+    writeFileSync(noticeFile, JSON.stringify({ link, binDir, pathMissing }, null, 2), { mode: 0o600 })
+  } catch {
+  }
+}
 
 try {
   mkdirSync(binDir, { recursive: true })
-} catch (err) {
-  process.stderr.write(`ocm-cli: cannot create ${binDir}: ${err.message}\n`)
+} catch {
   process.exit(0)
 }
 
-const link = join(binDir, 'ocm')
-
 try {
   const stat = lstatSync(link)
   if (stat.isSymbolicLink()) {
@@ -44,7 +52,6 @@ try {
     }
     unlinkSync(link)
   } else {
-    process.stderr.write(`ocm-cli: ${link} exists and is not a symlink; leaving alone\n`)
     process.exit(0)
   }
 } catch {
@@ -53,15 +60,9 @@ try {
 
 try {
   symlinkSync(target, link)
-} catch (err) {
-  process.stderr.write(`ocm-cli: failed to symlink ${link}: ${err.message}\n`)
+} catch {
   process.exit(0)
 }
 
-process.stdout.write(`ocm installed at ${link}\n`)
-
 const path = process.env.PATH ?? ''
-if (!path.split(':').includes(binDir)) {
-  process.stdout.write(`note: ${binDir} is not on your PATH. Add to your shell rc:\n`)
-  process.stdout.write(`  export PATH="${binDir}:$PATH"\n`)
-}
+writeInstallNotice(!path.split(':').includes(binDir))