@automagik/genie 4.260331.6 → 4.260331.8

package/src/term-commands/dir.ts

@@ -12,22 +12,11 @@
  * Commands:
  *   genie agent register <name>  — Register agent locally + auto-register in Omni
  *
- * Storage: Primary source is `app_store` table (item_type='agent').
- * Legacy `agents` table kept for backward compat with spawn.
- * JSON cache (~/.genie/agent-directory.json) regenerated after every mutation.
+ * Storage: agent-directory.json is the source of truth for registered agents.
  */
 
 import { resolve as resolvePath } from 'node:path';
 import type { Command } from 'commander';
-import {
-  type StoreRow,
-  listItemsFromStore,
-  migrateAgentDirectory,
-  regenerateAgentCache,
-  registerItemInStore,
-  removeItemFromStore,
-  updateItemInStore,
-} from '../lib/agent-cache.js';
 import * as directory from '../lib/agent-directory.js';
 import { printSyncResult, syncAgentDirectory } from '../lib/agent-sync.js';
 import { getActor, recordAuditEvent } from '../lib/audit.js';
@@ -65,9 +54,6 @@ export function registerDirNamespace(program: Command): void {
     .action(async (name: string, options: { global?: boolean }) => {
       try {
         const removed = await directory.rm(name, { global: options.global });
-        // Also remove from app_store
-        await removeItemFromStore(name).catch(() => {});
-        await regenerateAgentCache();
         recordAuditEvent('item', name, 'item_removed', getActor(), { type: 'agent', source: 'dir_rm' }).catch(() => {});
 
         if (removed) {
@@ -164,18 +150,6 @@ async function handleDirAdd(name: string, options: DirAddOptions): Promise<void>
     { global: options.global },
   );
 
-  // Also register in app_store (primary source of truth)
-  try {
-    await registerItemInStore({
-      name,
-      itemType: 'agent',
-      installPath: resolvedDir,
-      manifest: { promptMode, model: options.model, roles: normalizeRoles(options.roles), repo: options.repo },
-    });
-  } catch {
-    // Best-effort — legacy agents table is still the spawn path
-  }
-  await regenerateAgentCache();
   recordAuditEvent('item', name, 'item_registered', getActor(), { type: 'agent', source: 'dir_add' }).catch(() => {});
 
   const scope = options.global ? 'global' : 'project';
@@ -207,16 +181,6 @@ async function handleEdit(name: string, options: EditOptions): Promise<void> {
 
   const entry = await directory.edit(name, updates, { global: options.global });
 
-  // Also update app_store
-  try {
-    await updateItemInStore(name, {
-      installPath: updates.dir,
-      manifest: { promptMode: updates.promptMode, model: updates.model, roles: updates.roles, repo: updates.repo },
-    });
-  } catch {
-    // Best-effort
-  }
-  await regenerateAgentCache();
   recordAuditEvent('item', name, 'item_updated', getActor(), { type: 'agent', source: 'dir_edit' }).catch(() => {});
 
   const scope = options.global ? 'global' : 'project';
@@ -279,37 +243,8 @@ async function showEntry(name: string, json?: boolean): Promise<void> {
   console.log('');
 }
 
-async function listEntries(json?: boolean, includeBuiltins?: boolean, includeArchived?: boolean): Promise<void> {
-  // One-time migration from legacy JSON → DB (idempotent, best-effort)
-  await migrateAgentDirectory().catch(() => {});
-
-  // Try app_store first (primary), fall back to legacy agents table
-  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 {
-    // Fallback to legacy
-    entries = await directory.ls();
-  }
+async function listEntries(json?: boolean, includeBuiltins?: boolean, _includeArchived?: boolean): Promise<void> {
+  const entries = await directory.ls();
 
   if (json) {
     listEntriesJson(entries, includeBuiltins);

package/src/term-commands/export.ts

@@ -9,7 +9,6 @@
  *   genie export projects           — Projects
  *   genie export schedules [name]   — Schedules with run_spec
  *   genie export agents             — Agents, templates, checkpoints
- *   genie export apps               — App store (KhalOS, graceful skip)
  *   genie export comms              — Conversations, messages, mailbox
  *   genie export config             — OS config (KhalOS, graceful skip)
  */
@@ -374,18 +373,6 @@ export function registerExportCommands(program: Command): void {
     },
   );
 
-  // genie export apps
-  sharedOpts(exp.command('apps').description('Export app store (graceful skip if missing)')).action(
-    async (options: ExportOptions) => {
-      try {
-        await runExport(['apps'], 'partial', (sql) => exportGroup(sql, 'apps'), options);
-      } catch (error) {
-        console.error(`Error: ${error instanceof Error ? error.message : String(error)}`);
-        process.exit(1);
-      }
-    },
-  );
-
   // genie export comms
   sharedOpts(exp.command('comms').description('Export conversations, messages, mailbox')).action(
     async (options: ExportOptions) => {

package/src/term-commands/team.ts

@@ -336,8 +336,11 @@ async function spawnLeaderWithWish(
   config.tmuxSessionName = tmuxSession;
   await teamManager.updateTeamConfig(config.name, config);
 
-  // Set leader name = wish slug, spawner = caller identity
-  config.leader = slug;
+  // Resolve leader from project's leader_agent, spawner = caller identity
+  const { getProjectByRepoPath } = await import('../lib/task-service.js');
+  const project = await getProjectByRepoPath(resolvedRepo);
+  const leaderAgent = project?.leaderAgent || slug;
+  config.leader = leaderAgent;
   config.spawner = process.env.GENIE_AGENT_NAME || 'cli';
   await teamManager.updateTeamConfig(config.name, config);
 
@@ -355,21 +358,21 @@ async function spawnLeaderWithWish(
   await copyFile(sourceWishPath, destWishPath);
   console.log(`  Wish: copied ${slug}/WISH.md into worktree`);
 
-  // Hire the standard team: leader + engineer + reviewer + qa + fix
-  const leaderName = config.leader || 'team-lead';
-  const standardTeam = [leaderName, 'engineer', 'reviewer', 'qa', 'fix'];
+  // Hire the standard team: leader (by agent name) + engineer + reviewer + qa + fix
+  const standardTeam = [leaderAgent, 'engineer', 'reviewer', 'qa', 'fix'];
   for (const role of standardTeam) {
     await teamManager.hireAgent(config.name, role);
   }
   console.log(`  Team: hired ${standardTeam.join(', ')}`);
 
-  // Spawn leader — AGENTS.md comes from the built-in resolver, prompt delivered as initialPrompt
-  const members = standardTeam.filter((r) => r !== leaderName).join(', ');
+  // Spawn leader — resolve agent definition from leaderAgent, use slug as role identity
+  const members = standardTeam.filter((r) => r !== leaderAgent).join(', ');
   const spawner = config.spawner || 'cli';
   const kickoffPrompt = `Your team is "${config.name}". Repo: ${config.repo}. Branch: ${config.name}. Worktree: ${config.worktreePath}. Wish slug: ${slug}. Your team members are: ${members} (already hired — genie work will spawn them automatically). Report completion to: ${spawner} (via genie send --to ${spawner}). Read the wish at .genie/wishes/${slug}/WISH.md and execute the full lifecycle autonomously.`;
-  await handleWorkerSpawn(leaderName, {
+  await handleWorkerSpawn(leaderAgent, {
     provider: 'claude',
     team: config.name,
+    role: slug,
     cwd: config.worktreePath,
     session: tmuxSession,
     initialPrompt: kickoffPrompt,
@@ -377,11 +380,11 @@ async function spawnLeaderWithWish(
 
   // Deliver kickoff prompt via mailbox as backup (durable, queued to disk)
   const protocolRouter = await import('../lib/protocol-router.js');
-  const result = await protocolRouter.sendMessage(config.worktreePath, 'cli', leaderName, kickoffPrompt);
+  const result = await protocolRouter.sendMessage(config.worktreePath, 'cli', leaderAgent, kickoffPrompt);
   if (!result.delivered) {
-    console.warn(`⚠ Backup delivery to ${leaderName} failed: ${result.reason ?? 'unknown'}`);
+    console.warn(`⚠ Backup delivery to ${leaderAgent} failed: ${result.reason ?? 'unknown'}`);
   }
-  console.log('  Leader: spawned and working');
+  console.log(`  Leader: ${leaderAgent} spawned as ${slug}`);
 }
 
 // ============================================================================

package/src/lib/agent-cache.ts

@@ -1,282 +0,0 @@
-/**
- * Agent Cache — Maintains agent-directory.json as a cache of app_store agents.
- *
- * Also provides generic CRUD helpers for the `app_store` table (register,
- * remove, update, get, list). The cache file is a denormalised snapshot
- * written to GENIE_HOME so that non-PG consumers (hooks, shell scripts)
- * can read agent metadata without a database connection.
- *
- * Best-effort: DB failures never block the CLI.
- */
-
-import { existsSync, readFileSync, renameSync, writeFileSync } from 'node:fs';
-import { homedir } from 'node:os';
-import { join } from 'node:path';
-import { getActor, recordAuditEvent } from './audit.js';
-import { getConnection, isAvailable } from './db.js';
-
-// ============================================================================
-// Constants
-// ============================================================================
-
-const GENIE_HOME = process.env.GENIE_HOME ?? join(homedir(), '.genie');
-const CACHE_FILE = 'agent-directory.json';
-const CACHE_BACKUP = 'agent-directory.json.bak';
-
-// ============================================================================
-// Types
-// ============================================================================
-
-/** Denormalised cache entry written to agent-directory.json. */
-interface CacheEntry {
-  name: string;
-  dir: string;
-  repo?: string;
-  promptMode: string;
-  model?: string;
-  roles?: string[];
-  registeredAt: string;
-}
-
-/** Row shape returned by SELECT * FROM app_store. */
-export interface StoreRow {
-  id: string;
-  name: string;
-  item_type: string;
-  version: string;
-  description: string | null;
-  author_name: string | null;
-  author_url: string | null;
-  git_url: string | null;
-  install_path: string | null;
-  manifest: Record<string, unknown>;
-  approval_status: string;
-  tags: string[];
-  category: string | null;
-  license: string | null;
-  dependencies: string[];
-  installed_at: string;
-  updated_at: string;
-}
-
-/** Insert payload for registerItemInStore. */
-interface StoreInsert {
-  name: string;
-  itemType: string;
-  version?: string;
-  description?: string;
-  authorName?: string;
-  authorUrl?: string;
-  gitUrl?: string;
-  installPath?: string;
-  manifest?: Record<string, unknown>;
-  tags?: string[];
-  category?: string;
-  license?: string;
-  dependencies?: string[];
-}
-
-// ============================================================================
-// Cache regeneration
-// ============================================================================
-
-/**
- * Rebuild agent-directory.json from all `item_type = 'agent'` rows in app_store.
- *
- * Silently returns if the database is unavailable — the stale cache (if any)
- * remains on disk until the next successful regeneration.
- */
-export async function regenerateAgentCache(): Promise<void> {
-  try {
-    if (!(await isAvailable())) return;
-
-    const sql = await getConnection();
-    const rows = await sql`
-      SELECT name, install_path, manifest, installed_at
-      FROM app_store
-      WHERE item_type = 'agent'
-      ORDER BY name
-    `;
-
-    const entries: CacheEntry[] = rows.map((r: Record<string, unknown>) => {
-      const manifest = (r.manifest ?? {}) as Record<string, unknown>;
-      const entry: CacheEntry = {
-        name: r.name as string,
-        dir: (r.install_path as string) ?? '',
-        promptMode: (manifest.promptMode as string) ?? 'append',
-        registeredAt: r.installed_at ? new Date(r.installed_at as string).toISOString() : new Date().toISOString(),
-      };
-      if (manifest.repo) entry.repo = manifest.repo as string;
-      if (manifest.model) entry.model = manifest.model as string;
-      if (Array.isArray(manifest.roles) && manifest.roles.length > 0) {
-        entry.roles = manifest.roles as string[];
-      }
-      return entry;
-    });
-
-    writeFileSync(join(GENIE_HOME, CACHE_FILE), JSON.stringify(entries, null, 2));
-  } catch {
-    // Best effort — never block the CLI on cache regeneration failure
-  }
-}
-
-// ============================================================================
-// One-time migration from JSON → PG
-// ============================================================================
-
-/**
- * Migrate the legacy agent-directory.json into the app_store table.
- *
- * Idempotent: skips if the backup file already exists (meaning migration
- * already ran) or if the source file is missing (nothing to migrate).
- * Uses ON CONFLICT (name) DO NOTHING so partially-completed runs are safe.
- */
-export async function migrateAgentDirectory(): Promise<void> {
-  const sourcePath = join(GENIE_HOME, CACHE_FILE);
-  const backupPath = join(GENIE_HOME, CACHE_BACKUP);
-
-  // Already migrated or nothing to migrate
-  if (existsSync(backupPath) || !existsSync(sourcePath)) return;
-
-  try {
-    const raw = readFileSync(sourcePath, 'utf-8');
-    const entries: CacheEntry[] = JSON.parse(raw);
-    if (!Array.isArray(entries) || entries.length === 0) return;
-
-    const sql = await getConnection();
-
-    for (const entry of entries) {
-      const manifest: Record<string, unknown> = {};
-      if (entry.promptMode) manifest.promptMode = entry.promptMode;
-      if (entry.model) manifest.model = entry.model;
-      if (entry.roles) manifest.roles = entry.roles;
-      if (entry.repo) manifest.repo = entry.repo;
-
-      await sql`
-        INSERT INTO app_store (name, item_type, version, install_path, manifest)
-        VALUES (${entry.name}, 'agent', '0.0.0', ${entry.dir ?? null}, ${sql.json(manifest)})
-        ON CONFLICT (name) DO NOTHING
-      `;
-    }
-
-    renameSync(sourcePath, backupPath);
-
-    await recordAuditEvent('item', 'migration', 'agent_directory_migrated', getActor(), {
-      count: entries.length,
-    });
-  } catch {
-    // Best effort — migration can be retried on the next run
-  }
-}
-
-// ============================================================================
-// CRUD helpers for app_store
-// ============================================================================
-
-/**
- * Insert a new item into the app_store. Returns the generated id.
- *
- * Throws if an item with the same name already exists — callers should
- * check beforehand or use `--force` to remove + re-insert.
- */
-export async function registerItemInStore(item: StoreInsert): Promise<string> {
-  const sql = await getConnection();
-
-  const rows = await sql`
-    INSERT INTO app_store (
-      name, item_type, version, description,
-      author_name, author_url, git_url, install_path,
-      manifest, tags, category, license, dependencies
-    ) VALUES (
-      ${item.name},
-      ${item.itemType},
-      ${item.version ?? '0.0.0'},
-      ${item.description ?? null},
-      ${item.authorName ?? null},
-      ${item.authorUrl ?? null},
-      ${item.gitUrl ?? null},
-      ${item.installPath ?? null},
-      ${sql.json(item.manifest ?? {})},
-      ${item.tags ?? []},
-      ${item.category ?? null},
-      ${item.license ?? null},
-      ${item.dependencies ?? []}
-    )
-    RETURNING id
-  `;
-
-  if (rows.length === 0) {
-    throw new Error(`Failed to insert item "${item.name}" — no id returned.`);
-  }
-
-  return rows[0].id as string;
-}
-
-/**
- * Delete an item from the app_store by name.
- *
- * @returns true if an item was deleted, false if no matching item was found.
- */
-export async function removeItemFromStore(name: string): Promise<boolean> {
-  const sql = await getConnection();
-  const result = await sql`DELETE FROM app_store WHERE name = ${name}`;
-  return result.count > 0;
-}
-
-/**
- * Update an existing item in the app_store by name.
- * Only provided fields are updated; updated_at is always set to now().
- *
- * @returns true if the item was updated, false if no matching item was found.
- */
-export async function updateItemInStore(name: string, updates: Partial<StoreInsert>): Promise<boolean> {
-  const sql = await getConnection();
-
-  const s: Record<string, unknown> = {};
-  if (updates.name !== undefined) s.name = updates.name;
-  if (updates.itemType !== undefined) s.item_type = updates.itemType;
-  if (updates.version !== undefined) s.version = updates.version;
-  if (updates.description !== undefined) s.description = updates.description;
-  if (updates.authorName !== undefined) s.author_name = updates.authorName;
-  if (updates.authorUrl !== undefined) s.author_url = updates.authorUrl;
-  if (updates.gitUrl !== undefined) s.git_url = updates.gitUrl;
-  if (updates.installPath !== undefined) s.install_path = updates.installPath;
-  if (updates.manifest !== undefined) s.manifest = sql.json(updates.manifest);
-  if (updates.tags !== undefined) s.tags = updates.tags;
-  if (updates.category !== undefined) s.category = updates.category;
-  if (updates.license !== undefined) s.license = updates.license;
-  if (updates.dependencies !== undefined) s.dependencies = updates.dependencies;
-
-  if (Object.keys(s).length === 0) return false;
-
-  s.updated_at = sql`now()`;
-  const result = await sql`UPDATE app_store SET ${sql(s)} WHERE name = ${name}`;
-  return result.count > 0;
-}
-
-/**
- * Fetch a single item from the app_store by name.
- *
- * @returns the row or null if not found.
- */
-export async function getItemFromStore(name: string): Promise<StoreRow | null> {
-  const sql = await getConnection();
-  const rows = await sql`SELECT * FROM app_store WHERE name = ${name}`;
-  return rows.length > 0 ? (rows[0] as unknown as StoreRow) : null;
-}
-
-/**
- * List items from the app_store, optionally filtered by item_type.
- *
- * @param itemType - When provided, only rows matching this type are returned.
- * @returns rows ordered by name.
- */
-export async function listItemsFromStore(itemType?: string): Promise<StoreRow[]> {
-  const sql = await getConnection();
-
-  const rows = itemType
-    ? await sql`SELECT * FROM app_store WHERE item_type = ${itemType} ORDER BY name`
-    : await sql`SELECT * FROM app_store ORDER BY name`;
-
-  return rows as unknown as StoreRow[];
-}