chore: rolling promotion dev -> main

.claude-plugin/marketplace.json

@@ -10,7 +10,7 @@
   "plugins": [
     {
       "name": "genie",
-      "version": "3.260310.5",
+      "version": "3.260314.8",
       "source": "./plugins/genie",
       "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, wish them into plans, make with parallel agents, ship as one team. A coding genie that grows with your project."
     }

.github/workflows/version.yml

@@ -81,3 +81,18 @@ jobs:
 
           git tag "v${VERSION}"
           git push --atomic origin HEAD:refs/heads/dev "refs/tags/v${VERSION}"
+
+      - name: Build CLI
+        run: bun run build
+
+      - name: Publish dev release to npm
+        env:
+          NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NPM_CONFIG_TOKEN: ${{ secrets.NPM_TOKEN }}
+          HUSKY: "0"
+        run: |
+          if [ -z "$NPM_TOKEN" ]; then
+            echo "⚠️ NPM_TOKEN not set — skipping dev publish"
+            exit 0
+          fi
+          bun publish --access public --tag next

openclaw.plugin.json

@@ -2,7 +2,7 @@
   "id": "genie",
   "name": "Genie",
   "description": "Skills, agents, and hooks for the Genie CLI terminal orchestration toolkit",
-  "version": "3.260310.5",
+  "version": "3.260314.8",
   "configSchema": {
     "type": "object",
     "additionalProperties": false,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@automagik/genie",
-  "version": "3.260310.5",
+  "version": "3.260314.8",
   "description": "Collaborative terminal toolkit for human + AI workflows",
   "type": "module",
   "bin": {

plugins/genie/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "genie",
-  "version": "3.260310.5",
+  "version": "3.260314.8",
   "description": "Human-AI partnership for Claude Code. Share a terminal, orchestrate workers, evolve together. Brainstorm ideas, turn them into wishes, execute with /work, validate with /review, and ship as one team.",
   "author": {
     "name": "Namastex Labs"

plugins/genie/package.json

@@ -1,6 +1,6 @@
 {
   "name": "genie-plugin",
-  "version": "3.260310.5",
+  "version": "3.260314.8",
   "private": true,
   "description": "Runtime dependencies for genie bundled CLIs",
   "type": "module",

src/genie-commands/update.ts

@@ -1,9 +1,9 @@
 import { spawn } from 'node:child_process';
-import { existsSync } from 'node:fs';
+import { copyFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { chmod, copyFile, mkdir, unlink } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
-import { genieConfigExists, loadGenieConfig } from '../lib/genie-config.js';
+import { genieConfigExists, loadGenieConfig, saveGenieConfig } from '../lib/genie-config.js';
 
 const GENIE_HOME = process.env.GENIE_HOME || join(homedir(), '.genie');
 const GENIE_SRC = join(GENIE_HOME, 'src');
@@ -144,26 +144,26 @@ async function detectInstallationType(): Promise<InstallationType> {
   return hasBun ? 'bun' : 'npm';
 }
 
-async function updateViaBun(): Promise<void> {
-  log('Updating via bun...');
-  const result = await runCommand('bun', ['install', '-g', '@automagik/genie@latest']);
+async function updateViaBun(channel: string): Promise<void> {
+  log(`Updating via bun (channel: ${channel})...`);
+  const result = await runCommand('bun', ['install', '-g', `@automagik/genie@${channel}`]);
   if (!result.success) {
     error('Failed to update via bun');
     process.exit(1);
   }
   console.log();
-  success('Genie CLI updated!');
+  success(`Genie CLI updated (${channel})!`);
 }
 
-async function updateViaNpm(): Promise<void> {
-  log('Updating via npm...');
-  const result = await runCommand('npm', ['install', '-g', '@automagik/genie@latest']);
+async function updateViaNpm(channel: string): Promise<void> {
+  log(`Updating via npm (channel: ${channel})...`);
+  const result = await runCommand('npm', ['install', '-g', `@automagik/genie@${channel}`]);
   if (!result.success) {
     error('Failed to update via npm');
     process.exit(1);
   }
   console.log();
-  success('Genie CLI updated!');
+  success(`Genie CLI updated (${channel})!`);
 }
 
 async function updateSource(): Promise<void> {
@@ -286,14 +286,164 @@ async function symlinkOrCopy(src: string, dest: string): Promise<void> {
   }
 }
 
-export async function updateCommand(): Promise<void> {
+// ============================================================================
+// Plugin Sync — update Claude Code plugin cache after CLI update
+// ============================================================================
+
+function copyDirSync(src: string, dest: string): void {
+  mkdirSync(dest, { recursive: true });
+  for (const entry of readdirSync(src, { withFileTypes: true })) {
+    const srcPath = join(src, entry.name);
+    const destPath = join(dest, entry.name);
+    if (entry.isDirectory()) {
+      copyDirSync(srcPath, destPath);
+    } else {
+      copyFileSync(srcPath, destPath);
+    }
+  }
+}
+
+async function resolveGlobalPkgDir(installType: InstallationType): Promise<string | null> {
+  // Prefer the package manager that was actually used for this update
+  if (installType === 'bun') {
+    const bunPath = join(homedir(), '.bun', 'install', 'global', 'node_modules', '@automagik', 'genie');
+    if (existsSync(bunPath)) return bunPath;
+  }
+
+  if (installType === 'npm') {
+    // Dynamic resolution via npm root -g (handles nvm/fnm/volta)
+    const npmRootResult = await runCommandSilent('npm', ['root', '-g']);
+    if (npmRootResult.success) {
+      const npmPath = join(npmRootResult.output.trim(), '@automagik', 'genie');
+      if (existsSync(npmPath)) return npmPath;
+    }
+  }
+
+  // Fallback: try both regardless of installType
+  const bunFallback = join(homedir(), '.bun', 'install', 'global', 'node_modules', '@automagik', 'genie');
+  if (existsSync(bunFallback)) return bunFallback;
+
+  const npmRootFallback = await runCommandSilent('npm', ['root', '-g']);
+  if (npmRootFallback.success) {
+    const npmPath = join(npmRootFallback.output.trim(), '@automagik', 'genie');
+    if (existsSync(npmPath)) return npmPath;
+  }
+
+  return null;
+}
+
+async function syncPlugin(installType: InstallationType): Promise<void> {
+  log('Syncing Claude Code plugin...');
+
+  const globalPkgDir = await resolveGlobalPkgDir(installType);
+  if (!globalPkgDir) {
+    log('Could not find installed package — skipping plugin sync');
+    return;
+  }
+
+  const pluginSrc = join(globalPkgDir, 'plugins', 'genie');
+  if (!existsSync(pluginSrc)) {
+    log('Plugin source not found in package — skipping plugin sync');
+    return;
+  }
+
+  // Read version from installed package
+  let version: string;
+  try {
+    const pkg = JSON.parse(readFileSync(join(globalPkgDir, 'package.json'), 'utf-8'));
+    version = pkg.version;
+  } catch {
+    log('Could not read package version — skipping plugin sync');
+    return;
+  }
+
+  // Copy to Claude Code plugin cache
+  const claudePlugins = join(homedir(), '.claude', 'plugins');
+  const cacheDir = join(claudePlugins, 'cache', 'automagik', 'genie', version);
+
+  try {
+    // Clean existing cache dir if it exists (stale version)
+    if (existsSync(cacheDir)) {
+      rmSync(cacheDir, { recursive: true, force: true });
+    }
+    copyDirSync(pluginSrc, cacheDir);
+  } catch (err) {
+    error(`Failed to copy plugin: ${err}`);
+    return;
+  }
+
+  // Update installed_plugins.json registry
+  const registryPath = join(claudePlugins, 'installed_plugins.json');
+  try {
+    if (existsSync(registryPath)) {
+      const registry = JSON.parse(readFileSync(registryPath, 'utf-8'));
+      const entries = registry.plugins?.['genie@automagik'];
+      if (Array.isArray(entries)) {
+        for (const entry of entries) {
+          if (entry.scope === 'user') {
+            entry.installPath = cacheDir;
+            entry.version = version;
+            entry.lastUpdated = new Date().toISOString();
+          }
+        }
+        writeFileSync(registryPath, JSON.stringify(registry, null, 2));
+      }
+    }
+  } catch (err) {
+    log(`Registry update failed (non-fatal): ${err}`);
+  }
+
+  success(`Plugin synced to v${version}`);
+}
+
+// ============================================================================
+// Channel Management
+// ============================================================================
+
+async function resolveChannel(options: { next?: boolean; stable?: boolean }): Promise<string> {
+  // Explicit flags override everything
+  if (options.next) return 'next';
+  if (options.stable) return 'latest';
+
+  // Read saved channel from config
+  if (genieConfigExists()) {
+    try {
+      const config = await loadGenieConfig();
+      if (config.updateChannel) return config.updateChannel;
+    } catch {
+      // Ignore config errors
+    }
+  }
+
+  return 'latest';
+}
+
+async function persistChannel(channel: string): Promise<void> {
+  try {
+    const config = await loadGenieConfig();
+    config.updateChannel = channel as 'latest' | 'next';
+    await saveGenieConfig(config);
+  } catch {
+    // Non-fatal — channel preference lost but update still works
+  }
+}
+
+export async function updateCommand(options: { next?: boolean; stable?: boolean } = {}): Promise<void> {
   console.log();
   console.log('\x1b[1m🧞 Genie CLI Update\x1b[0m');
   console.log('\x1b[2m────────────────────────────────────\x1b[0m');
   console.log();
 
+  const channel = await resolveChannel(options);
+
+  // Persist channel when explicitly switching
+  if (options.next || options.stable) {
+    await persistChannel(channel);
+  }
+
   const installType = await detectInstallationType();
   log(`Detected installation: ${installType}`);
+  log(`Channel: ${channel}${channel === 'next' ? ' (dev builds)' : ' (stable)'}`);
   console.log();
 
   if (installType === 'unknown') {
@@ -312,10 +462,12 @@ export async function updateCommand(): Promise<void> {
       await updateSource();
       break;
     case 'bun':
-      await updateViaBun();
+      await updateViaBun(channel);
+      await syncPlugin(installType);
       break;
     case 'npm':
-      await updateViaNpm();
+      await updateViaNpm(channel);
+      await syncPlugin(installType);
       break;
   }
 }

src/genie.ts

@@ -92,7 +92,12 @@ program
   });
 
 program.command('doctor').description('Run diagnostic checks on genie installation').action(doctorCommand);
-program.command('update').description('Update Genie CLI to the latest version').action(updateCommand);
+program
+  .command('update')
+  .description('Update Genie CLI to the latest version')
+  .option('--next', 'Switch to dev builds (npm @next tag)')
+  .option('--stable', 'Switch to stable releases (npm @latest tag)')
+  .action(updateCommand);
 program.command('uninstall').description('Remove Genie CLI and clean up hooks').action(uninstallCommand);
 
 const shortcuts = program.command('shortcuts').description('Manage tmux keyboard shortcuts');

src/lib/agent-directory.ts

@@ -10,10 +10,11 @@
  */
 
 import { existsSync } from 'node:fs';
-import { mkdir, open, readFile, stat, unlink, writeFile } from 'node:fs/promises';
+import { mkdir, readFile, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { dirname, join } from 'node:path';
 import { BUILTIN_COUNCIL_MEMBERS, BUILTIN_ROLES, type BuiltinAgent } from './builtin-agents.js';
+import { acquireLock } from './file-lock.js';
 
 // ============================================================================
 // Types
@@ -63,73 +64,6 @@ function getDirectoryFilePath(): string {
   return join(getGlobalDir(), 'agent-directory.json');
 }
 
-// ============================================================================
-// File Locking — prevents concurrent load/modify/save races
-// ============================================================================
-
-const LOCK_TIMEOUT_MS = 5000;
-const LOCK_RETRY_MS = 50;
-const LOCK_STALE_MS = 10000;
-
-async function tryCleanStaleLock(lockPath: string): Promise<boolean> {
-  try {
-    const lockStat = await stat(lockPath);
-    if (Date.now() - lockStat.mtimeMs > LOCK_STALE_MS) {
-      try {
-        await unlink(lockPath);
-      } catch {
-        /* race with other cleanup */
-      }
-      return true;
-    }
-  } catch {
-    return true; // lock gone, retry
-  }
-  return false;
-}
-
-async function tryCreateLock(lockPath: string): Promise<(() => Promise<void>) | null> {
-  try {
-    const handle = await open(lockPath, 'wx');
-    await handle.writeFile(String(process.pid));
-    await handle.close();
-    return async () => {
-      try {
-        await unlink(lockPath);
-      } catch {
-        /* already removed */
-      }
-    };
-  } catch (err) {
-    const errCode = err instanceof Error && 'code' in err ? (err as NodeJS.ErrnoException).code : undefined;
-    if (errCode !== 'EEXIST') throw err;
-    return null;
-  }
-}
-
-async function acquireLock(): Promise<() => Promise<void>> {
-  const lockPath = `${getDirectoryFilePath()}.lock`;
-  const deadline = Date.now() + LOCK_TIMEOUT_MS;
-
-  while (true) {
-    const release = await tryCreateLock(lockPath);
-    if (release) return release;
-
-    const cleaned = await tryCleanStaleLock(lockPath);
-    if (cleaned) continue;
-
-    if (Date.now() > deadline) {
-      try {
-        await unlink(lockPath);
-      } catch {
-        throw new Error(`Directory lock timeout: could not remove stale lock at ${lockPath}`);
-      }
-      continue;
-    }
-    await new Promise((r) => setTimeout(r, LOCK_RETRY_MS));
-  }
-}
-
 // ============================================================================
 // Internal
 // ============================================================================
@@ -151,7 +85,7 @@ async function saveDirectory(data: AgentDirectoryData): Promise<void> {
 }
 
 async function withDirectory<T>(fn: (data: AgentDirectoryData) => T | Promise<T>): Promise<T> {
-  const release = await acquireLock();
+  const release = await acquireLock(getDirectoryFilePath());
   try {
     const data = await loadDirectory();
     const result = await fn(data);