@automagik/genie 4.260331.6 → 4.260331.8

package/openclaw.plugin.json

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

package/package.json

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

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

@@ -1,6 +1,6 @@
 {
   "name": "genie",
-  "version": "4.260331.6",
+  "version": "4.260331.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"

package/plugins/genie/package.json

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

package/src/db/migrations/015_agent_archived_state.sql

@@ -33,26 +33,6 @@ ALTER TABLE agents ADD CONSTRAINT agents_state_check
     'done', 'error', 'suspended', 'archived'
   ));
 
--- ============================================================================
--- App store: add 'archived' to approval_status CHECK constraint
--- ============================================================================
-
-DO $$
-BEGIN
-  EXECUTE (
-    SELECT string_agg('ALTER TABLE app_store DROP CONSTRAINT ' || quote_ident(conname), '; ')
-    FROM pg_constraint
-    WHERE conrelid = 'app_store'::regclass
-      AND contype = 'c'
-      AND pg_get_constraintdef(oid) LIKE '%approval_status%'
-  );
-EXCEPTION WHEN OTHERS THEN
-  NULL;
-END $$;
-
-ALTER TABLE app_store ADD CONSTRAINT app_store_approval_status_check
-  CHECK (approval_status IN ('local', 'pending', 'approved', 'rejected', 'archived'));
-
 -- ============================================================================
 -- Index: fast lookup for non-archived agents in directory listings
 -- ============================================================================

package/src/db/migrations/018_drop_app_store.sql

@@ -0,0 +1,4 @@
+-- 018: Drop app_store tables — feature belongs in genie-os, not genie CLI.
+DROP TABLE IF EXISTS app_versions CASCADE;
+DROP TABLE IF EXISTS installed_apps CASCADE;
+DROP TABLE IF EXISTS app_store CASCADE;

package/src/genie.ts

@@ -53,16 +53,12 @@ import { registerExportCommands } from './term-commands/export.js';
 import * as historyCmd from './term-commands/history.js';
 import { registerImportCommands } from './term-commands/import.js';
 import { registerInitCommands } from './term-commands/init.js';
-import { registerInstallCommand } from './term-commands/install.js';
-import { registerItemUninstallCommand } from './term-commands/item-uninstall.js';
-import { registerItemUpdateCommand } from './term-commands/item-update.js';
 import { type LogOptions, logCommand } from './term-commands/log.js';
 import { registerMetricsCommands } from './term-commands/metrics.js';
 import { registerSendInboxCommands } from './term-commands/msg.js';
 import { registerNotifyCommands } from './term-commands/notify.js';
 import * as orchestrateCmd from './term-commands/orchestrate.js';
 import { registerProjectCommands } from './term-commands/project.js';
-import { registerPublishCommand } from './term-commands/publish.js';
 import {
   type QaCheckOptions,
   type QaOptions,
@@ -219,13 +215,6 @@ registerImportCommands(program);
 registerTemplateCommands(program);
 registerBriefCommands(program);
 
-// Item registry commands — install, publish (top-level), item uninstall/update (namespaced)
-registerInstallCommand(program);
-registerPublishCommand(program);
-const itemCmd = program.command('item').description('Item registry management');
-registerItemUninstallCommand(itemCmd);
-registerItemUpdateCommand(itemCmd);
-
 // ============================================================================
 // CLI audit hooks — record every command execution to audit_events
 // ============================================================================

package/src/lib/agent-sync.ts

@@ -3,13 +3,12 @@
  *
  * Scans {workspace}/agents/ for directories containing AGENTS.md (the discovery marker).
  * For each found agent, reads the git remote to derive repo_path, then registers or
- * updates the entry in the app_store.
+ * updates the entry in the agent directory.
  *
  * Handles lifecycle:
- *   - New agent dir → register in app_store + agents table
+ *   - New agent dir → register in agent directory
  *   - Existing agent with stale data → update
- *   - Archived agent reappearing → reactivate with full backfill
- *   - Missing agent dir → archive (never delete — preserves history)
+ *   - Missing agent dir → remove
  *
  * Used by:
  *   - `genie serve` (startup sync + file watcher)
@@ -20,13 +19,7 @@
 import { execSync } from 'node:child_process';
 import { existsSync, watch as fsWatch, readdirSync, realpathSync } from 'node:fs';
 import { join } from 'node:path';
-import {
-  getItemFromStore,
-  listItemsFromStore,
-  regenerateAgentCache,
-  registerItemInStore,
-  updateItemInStore,
-} from './agent-cache.js';
+import * as directory from './agent-directory.js';
 
 // ============================================================================
 // Types
@@ -128,98 +121,6 @@ function discoverSingleAgent(workspaceRoot: string, agentName: string): AgentInf
   };
 }
 
-// ============================================================================
-// Archive / Reactivation helpers
-// ============================================================================
-
-/** Archive an agent in both agents table and app_store. Never deletes rows. */
-async function archiveAgent(name: string): Promise<boolean> {
-  let archived = false;
-  try {
-    const { getConnection } = await import('./db.js');
-    const sql = await getConnection();
-    // Archive in agents table (set state='archived')
-    const result = await sql`
-      UPDATE agents SET state = 'archived', updated_at = now()
-      WHERE (custom_name = ${name} OR role = ${name})
-        AND (state IS NULL OR state != 'archived')
-    `;
-    if (result.count > 0) archived = true;
-  } catch {
-    // DB may not be available
-  }
-
-  // Archive in app_store (set approval_status='archived')
-  try {
-    const existing = await getItemFromStore(name).catch(() => null);
-    if (existing && existing.approval_status !== 'archived') {
-      await updateItemInStore(name, {
-        manifest: {
-          ...(existing.manifest as Record<string, unknown>),
-          archived: true,
-          archivedAt: new Date().toISOString(),
-        },
-      });
-      archived = true;
-    }
-  } catch {
-    // Best-effort
-  }
-
-  return archived;
-}
-
-/** Reactivate an archived agent with full backfill. */
-async function reactivateAgent(agent: AgentInfo): Promise<void> {
-  const orgRepo = agent.repoUrl ? extractOrgRepo(agent.repoUrl) : null;
-  const repoPath = orgRepo ?? agent.repoUrl ?? agent.dir;
-
-  // Update app_store entry — clear archived flag, refresh paths
-  const existing = await getItemFromStore(agent.name).catch(() => null);
-  if (existing) {
-    const manifest = { ...(existing.manifest as Record<string, unknown>) };
-    manifest.archived = undefined;
-    manifest.archivedAt = undefined;
-    manifest.repo = repoPath;
-    manifest.productRepo = agent.productRepo;
-    manifest.source = 'auto-sync';
-    await updateItemInStore(agent.name, {
-      installPath: agent.dir,
-      gitUrl: agent.repoUrl ?? undefined,
-      manifest,
-    });
-  }
-
-  // Reactivate in agents table
-  try {
-    const { getConnection } = await import('./db.js');
-    const sql = await getConnection();
-    await sql`
-      UPDATE agents SET state = 'idle', repo_path = ${repoPath}, updated_at = now()
-      WHERE (custom_name = ${agent.name} OR role = ${agent.name})
-        AND state = 'archived'
-    `;
-  } catch {
-    // DB may not be available
-  }
-
-  // Trigger session backfill for conversation history recovery
-  await triggerSessionBackfill(agent).catch(() => {});
-}
-
-/** Trigger session backfill for a reactivated agent. */
-async function triggerSessionBackfill(_agent: AgentInfo): Promise<void> {
-  try {
-    const { getConnection, isAvailable } = await import('./db.js');
-    if (!(await isAvailable())) return;
-    const sql = await getConnection();
-    const { startBackfill } = await import('./session-backfill.js');
-    await startBackfill(sql);
-  } catch {
-    // Best-effort — backfill may not be ready
-  }
-}
-
 // ============================================================================
 // Sync
 // ============================================================================
@@ -227,9 +128,8 @@ async function triggerSessionBackfill(_agent: AgentInfo): Promise<void> {
 /**
  * Sync all agents from {workspaceRoot}/agents/ into the directory.
  * - New agents → registered
- * - Existing agents with stale repo_path → updated
- * - Archived agents reappearing → reactivated with backfill
- * - Agents in store whose dirs are gone → archived
+ * - Existing agents with stale data → updated
+ * - Agents whose dirs are gone → removed
  *
  * Idempotent — safe to run repeatedly.
  */
@@ -249,15 +149,8 @@ export async function syncAgentDirectory(workspaceRoot: string): Promise<SyncRes
     }
   }
 
-  // Archive agents in store whose dirs no longer exist
-  await archiveMissingAgents(workspaceRoot, discoveredNames, result);
-
-  // Regenerate cache after mutations
-  const hasMutations =
-    result.registered.length + result.updated.length + result.archived.length + result.reactivated.length;
-  if (hasMutations > 0) {
-    await regenerateAgentCache().catch(() => {});
-  }
+  // Remove agents whose dirs no longer exist
+  await removeMissingAgents(discoveredNames, result);
 
   return result;
 }
@@ -267,58 +160,30 @@ export function printSyncResult(result: SyncResult): void {
   if (result.registered.length > 0) console.log(`  Registered: ${result.registered.join(', ')}`);
   if (result.updated.length > 0) console.log(`  Updated: ${result.updated.join(', ')}`);
   if (result.reactivated.length > 0) console.log(`  Reactivated: ${result.reactivated.join(', ')}`);
-  if (result.archived.length > 0) console.log(`  Archived: ${result.archived.join(', ')}`);
+  if (result.archived.length > 0) console.log(`  Removed: ${result.archived.join(', ')}`);
   if (result.unchanged.length > 0) console.log(`  Unchanged: ${result.unchanged.join(', ')}`);
   for (const err of result.errors) {
     console.error(`  Error (${err.name}): ${err.error}`);
   }
   const total = result.registered.length + result.updated.length + result.unchanged.length + result.reactivated.length;
-  console.log(`\nSync complete: ${total} active agent(s), ${result.archived.length} archived.`);
+  console.log(`\nSync complete: ${total} active agent(s), ${result.archived.length} removed.`);
 }
 
-/** Archive app_store agents whose directories no longer exist on disk. */
-async function archiveMissingAgents(
-  workspaceRoot: string,
-  discoveredNames: Set<string>,
-  result: SyncResult,
-): Promise<void> {
+/** Remove directory entries whose agent dirs no longer exist on disk. */
+async function removeMissingAgents(discoveredNames: Set<string>, result: SyncResult): Promise<void> {
   try {
-    const storeItems = await listItemsFromStore('agent');
-    const agentsDir = join(workspaceRoot, 'agents');
-
-    for (const item of storeItems) {
-      if (discoveredNames.has(item.name)) continue;
-      const manifest = (item.manifest ?? {}) as Record<string, unknown>;
-      if (manifest.archived) continue; // already archived
-      if (manifest.source !== 'auto-sync') continue; // only archive auto-synced agents
-
-      // Verify the agent was from this workspace
-      if (item.install_path && !item.install_path.startsWith(agentsDir)) continue;
+    const entries = await directory.ls();
+    for (const entry of entries) {
+      if (discoveredNames.has(entry.name)) continue;
+      if (entry.scope === 'built-in') continue;
+      if (!entry.dir || !entry.dir.includes('/agents/')) continue; // only remove auto-synced
 
-      const archived = await archiveAgent(item.name);
-      if (archived) result.archived.push(item.name);
+      const removed = await directory.rm(entry.name);
+      if (removed) result.archived.push(entry.name);
     }
   } catch {
-    // Best-effort — don't block sync on archive failures
-  }
-}
-
-/** Sync a single agent by name from the workspace (used by file watcher). */
-async function syncSingleAgentByName(workspaceRoot: string, agentName: string): Promise<string> {
-  const agent = discoverSingleAgent(workspaceRoot, agentName);
-  if (!agent) return 'not-found';
-
-  const result: SyncResult = { registered: [], updated: [], unchanged: [], archived: [], reactivated: [], errors: [] };
-  await syncSingleAgent(agent, result);
-
-  if (result.registered.length > 0 || result.updated.length > 0 || result.reactivated.length > 0) {
-    await regenerateAgentCache().catch(() => {});
+    // Best-effort
   }
-
-  if (result.reactivated.length > 0) return 'reactivated';
-  if (result.registered.length > 0) return 'registered';
-  if (result.updated.length > 0) return 'updated';
-  return 'unchanged';
 }
 
 /** Core sync logic for a single agent. */
@@ -326,39 +191,26 @@ async function syncSingleAgent(agent: AgentInfo, result: SyncResult): Promise<vo
   const orgRepo = agent.repoUrl ? extractOrgRepo(agent.repoUrl) : null;
   const repoPath = orgRepo ?? agent.repoUrl ?? agent.dir;
 
-  const existing = await getItemFromStore(agent.name).catch(() => null);
+  const existing = await directory.get(agent.name);
 
   if (!existing) {
-    await registerItemInStore({
+    await directory.add({
       name: agent.name,
-      itemType: 'agent',
-      installPath: agent.dir,
-      gitUrl: agent.repoUrl ?? undefined,
-      manifest: { promptMode: 'append', repo: repoPath, productRepo: agent.productRepo, source: 'auto-sync' },
+      dir: agent.dir,
+      repo: repoPath,
+      promptMode: 'append',
     });
     result.registered.push(agent.name);
     return;
   }
 
-  // Check if this is a reactivation (was archived)
-  const manifest = (existing.manifest ?? {}) as Record<string, unknown>;
-  if (manifest.archived) {
-    await reactivateAgent(agent);
-    result.reactivated.push(agent.name);
-    return;
-  }
-
   // Check if update needed
-  const needsUpdate =
-    (manifest.repo as string) !== repoPath ||
-    existing.install_path !== agent.dir ||
-    (agent.productRepo && manifest.productRepo !== agent.productRepo);
+  const needsUpdate = existing.repo !== repoPath || existing.dir !== agent.dir;
 
   if (needsUpdate) {
-    await updateItemInStore(agent.name, {
-      installPath: agent.dir,
-      gitUrl: agent.repoUrl ?? undefined,
-      manifest: { ...manifest, repo: repoPath, productRepo: agent.productRepo, source: 'auto-sync' },
+    await directory.edit(agent.name, {
+      dir: agent.dir,
+      repo: repoPath,
     });
     result.updated.push(agent.name);
   } else {
@@ -374,21 +226,17 @@ interface AgentWatcher {
   close: () => void;
 }
 
-/** Process a single watched agent change — register, update, archive, or reactivate. */
-async function processWatchedAgent(workspaceRoot: string, agentsDir: string, name: string): Promise<string | null> {
-  const agentDir = join(agentsDir, name);
-  if (existsSync(agentDir) && existsSync(join(agentDir, 'AGENTS.md'))) {
-    const action = await syncSingleAgentByName(workspaceRoot, name);
-    return action !== 'unchanged' && action !== 'not-found' ? action : null;
-  }
-  if (!existsSync(agentDir)) {
-    const archived = await archiveAgent(name);
-    if (archived) {
-      await regenerateAgentCache().catch(() => {});
-      return 'archived';
-    }
-  }
-  return null;
+/** Sync a single agent by name from the workspace (used by file watcher). */
+async function syncSingleAgentByName(workspaceRoot: string, agentName: string): Promise<string> {
+  const agent = discoverSingleAgent(workspaceRoot, agentName);
+  if (!agent) return 'not-found';
+
+  const result: SyncResult = { registered: [], updated: [], unchanged: [], archived: [], reactivated: [], errors: [] };
+  await syncSingleAgent(agent, result);
+
+  if (result.registered.length > 0) return 'registered';
+  if (result.updated.length > 0) return 'updated';
+  return 'unchanged';
 }
 
 /**
@@ -396,8 +244,7 @@ async function processWatchedAgent(workspaceRoot: string, agentsDir: string, nam
  * Debounces changes with a 2s window.
  *
  * - New directory with AGENTS.md → auto-register
- * - Archived agent reappearing → reactivate with backfill
- * - Removed directory → archive (never delete)
+ * - Removed directory → remove from directory
  */
 export function watchAgentDirectory(
   workspaceRoot: string,
@@ -440,3 +287,17 @@ export function watchAgentDirectory(
     },
   };
 }
+
+/** Process a single watched agent change. */
+async function processWatchedAgent(workspaceRoot: string, agentsDir: string, name: string): Promise<string | null> {
+  const agentDir = join(agentsDir, name);
+  if (existsSync(agentDir) && existsSync(join(agentDir, 'AGENTS.md'))) {
+    const action = await syncSingleAgentByName(workspaceRoot, name);
+    return action !== 'unchanged' && action !== 'not-found' ? action : null;
+  }
+  if (!existsSync(agentDir)) {
+    const removed = await directory.rm(name);
+    if (removed) return 'removed';
+  }
+  return null;
+}

package/src/lib/export-format.ts

@@ -18,16 +18,7 @@ export interface ExportDocument {
   data: Record<string, unknown[]>;
 }
 
-export type ExportGroup =
-  | 'boards'
-  | 'tasks'
-  | 'tags'
-  | 'projects'
-  | 'schedules'
-  | 'agents'
-  | 'apps'
-  | 'comms'
-  | 'config';
+export type ExportGroup = 'boards' | 'tasks' | 'tags' | 'projects' | 'schedules' | 'agents' | 'comms' | 'config';
 
 /** Tables belonging to each export group */
 export const GROUP_TABLES: Record<ExportGroup, string[]> = {
@@ -37,7 +28,6 @@ export const GROUP_TABLES: Record<ExportGroup, string[]> = {
   projects: ['projects'],
   schedules: ['schedules'],
   agents: ['agents', 'agent_templates', 'agent_checkpoints'],
-  apps: ['app_store', 'installed_apps', 'app_versions'],
   comms: ['conversations', 'conversation_members', 'messages', 'mailbox', 'team_chat', 'notification_preferences'],
   config: ['os_config', 'instances', 'warm_pool', 'golden_images'],
 };
@@ -49,7 +39,6 @@ export const ALL_GROUPS: ExportGroup[] = [
   'projects',
   'schedules',
   'agents',
-  'apps',
   'comms',
   'config',
 ];

package/src/lib/import-order.ts

@@ -21,23 +21,13 @@ const IMPORT_LEVELS: string[][] = [
     'task_types',
     'notification_preferences',
     // Optional (KhalOS)
-    'app_store',
     'os_config',
     'golden_images',
     'warm_pool',
     'instances',
   ],
   // Level 1: Depend on Level 0
-  [
-    'triggers',
-    'boards',
-    'board_templates',
-    'agents',
-    'conversations',
-    // Optional (KhalOS)
-    'installed_apps',
-    'app_versions',
-  ],
+  ['triggers', 'boards', 'board_templates', 'agents', 'conversations'],
   // Level 2: Depend on Level 1
   ['tasks', 'runs', 'messages', 'conversation_members', 'mailbox', 'team_chat'],
   // Level 3: Depend on Level 2

package/src/lib/task-service.ts

@@ -48,6 +48,8 @@ export interface ProjectRow {
   name: string;
   repoPath: string | null;
   description: string | null;
+  leaderAgent: string | null;
+  tmuxSession: string | null;
   status: string;
   archivedAt: string | null;
   createdAt: string;
@@ -391,6 +393,8 @@ function mapProject(row: Record<string, unknown>): ProjectRow {
     name: row.name as string,
     repoPath: str(row.repo_path),
     description: str(row.description),
+    leaderAgent: str(row.leader_agent),
+    tmuxSession: str(row.tmux_session),
     status: strOrDefault(row.status, 'active'),
     archivedAt: str(row.archived_at),
     createdAt: String(row.created_at),

package/src/term-commands/agent/directory.ts

@@ -4,7 +4,6 @@
  */
 
 import type { Command } from 'commander';
-import { type StoreRow, listItemsFromStore, migrateAgentDirectory } from '../../lib/agent-cache.js';
 import * as directory from '../../lib/agent-directory.js';
 import { printSyncResult, syncAgentDirectory } from '../../lib/agent-sync.js';
 import { ALL_BUILTINS } from '../../lib/builtin-agents.js';
@@ -82,42 +81,8 @@ function printBuiltinAgentsTable(): void {
   console.log('');
 }
 
-function normalizeRoles(roles?: string[]): string[] | undefined {
-  if (!roles) return undefined;
-  return roles
-    .flatMap((r) => r.split(','))
-    .map((r) => r.trim())
-    .filter(Boolean);
-}
-
-async function listEntries(json?: boolean, includeBuiltins?: boolean, includeArchived?: boolean): Promise<void> {
-  await migrateAgentDirectory().catch(() => {});
-
-  let entries: directory.ScopedDirectoryEntry[];
-  try {
-    const storeItems = await listItemsFromStore('agent');
-    entries = storeItems
-      .filter((item: StoreRow) => {
-        if (includeArchived) return true;
-        const manifest = (item.manifest ?? {}) as Record<string, unknown>;
-        return !manifest.archived;
-      })
-      .map((item: StoreRow) => {
-        const manifest = (item.manifest ?? {}) as Record<string, unknown>;
-        return {
-          name: item.name,
-          dir: (item.install_path as string) ?? '',
-          repo: (manifest.repo as string) ?? '',
-          promptMode: ((manifest.promptMode as string) ?? 'append') as directory.PromptMode,
-          model: manifest.model as string | undefined,
-          roles: normalizeRoles(manifest.roles as string[] | undefined),
-          registeredAt: item.installed_at as string,
-          scope: (manifest.archived ? 'archived' : 'global') as directory.DirectoryScope,
-        };
-      });
-  } catch {
-    entries = await directory.ls();
-  }
+async function listEntries(json?: boolean, includeBuiltins?: boolean, _includeArchived?: boolean): Promise<void> {
+  const entries = await directory.ls();
 
   if (json) {
     const result: Record<string, unknown>[] = entries.map((e) => ({ ...e, builtin: false }));