@automagik/genie 0.260202.453 → 0.260202.1607

package/src/term-commands/exec.ts

@@ -1,6 +1,16 @@
 import * as tmux from '../lib/tmux.js';
+import { getTerminalConfig } from '../lib/genie-config.js';
 
-export async function executeInSession(target: string, command: string): Promise<void> {
+export interface ExecOptions {
+  quiet?: boolean;
+  timeout?: number;
+}
+
+export async function executeInSession(
+  target: string,
+  command: string,
+  options: ExecOptions = {}
+): Promise<void> {
   // Parse target: "session:window" or just "session"
   const [sessionName, windowName] = target.includes(':')
     ? target.split(':')
@@ -10,7 +20,9 @@ export async function executeInSession(target: string, command: string): Promise
     // Find or create session
     let session = await tmux.findSessionByName(sessionName);
     if (!session) {
-      console.error(`Session "${sessionName}" not found, creating...`);
+      if (!options.quiet) {
+        console.error(`Session "${sessionName}" not found, creating...`);
+      }
       session = await tmux.createSession(sessionName);
       if (!session) {
         console.error(`Failed to create session "${sessionName}"`);
@@ -22,7 +34,9 @@ export async function executeInSession(target: string, command: string): Promise
     let windows = await tmux.listWindows(session.id);
     let targetWindow = windows.find(w => w.name === windowName);
     if (!targetWindow) {
-      console.error(`Window "${windowName}" not found, creating...`);
+      if (!options.quiet) {
+        console.error(`Window "${windowName}" not found, creating...`);
+      }
       targetWindow = await tmux.createWindow(session.id, windowName);
       if (!targetWindow) {
         console.error(`Failed to create window "${windowName}"`);
@@ -37,11 +51,19 @@ export async function executeInSession(target: string, command: string): Promise
       process.exit(1);
     }
 
+    // Use config default if no timeout specified
+    const termConfig = getTerminalConfig();
+    const timeout = options.timeout ?? termConfig.execTimeout;
+
     // Run command synchronously using wait-for (no polling, no ugly markers)
-    const { output, exitCode } = await tmux.runCommandSync(panes[0].id, command);
+    const { output, exitCode } = await tmux.runCommandSync(
+      panes[0].id,
+      command,
+      timeout
+    );
 
-    // Output the result
-    if (output) {
+    // Output the result (unless quiet mode)
+    if (output && !options.quiet) {
       console.log(output);
     }
 

package/src/term-commands/read.ts

@@ -1,4 +1,5 @@
 import * as logReader from '../lib/log-reader.js';
+import { getTerminalConfig } from '../lib/genie-config.js';
 
 export interface ReadOptions {
   lines?: string;
@@ -15,9 +16,13 @@ export interface ReadOptions {
 
 export async function readSessionLogs(sessionName: string, options: ReadOptions): Promise<void> {
   try {
+    // Use config default if no lines specified
+    const termConfig = getTerminalConfig();
+    const defaultLines = termConfig.readLines;
+
     // Parse options
     const readOptions: logReader.ReadOptions = {
-      lines: options.lines ? parseInt(options.lines, 10) : 100,
+      lines: options.lines ? parseInt(options.lines, 10) : defaultLines,
       from: options.from ? parseInt(options.from, 10) : undefined,
       to: options.to ? parseInt(options.to, 10) : undefined,
       range: options.range,

package/src/term-commands/shortcuts.ts

@@ -15,13 +15,13 @@ export function generateTmuxConfig(): string {
 # To use: add to ~/.tmux.conf or source this file
 
 # Ctrl+T: New window (tab) in current session
-bind-key -n C-t new-window
+bind-key -n C-t new-window -c "#{pane_current_path}"
 
 # Ctrl+S: Vertical split (requires stty -ixon in shell rc)
-bind-key -n C-s split-window -v
+bind-key -n C-s split-window -v -c "#{pane_current_path}"
 
-# Alt+S: Horizontal split
-bind-key -n M-s split-window -h
+# Ctrl+Shift+S: Horizontal split
+bind-key -n C-S split-window -h -c "#{pane_current_path}"
 `;
 }
 
@@ -49,7 +49,7 @@ genie-new-tab() {
   local session
   session=$(tmux display-message -p '#S' 2>/dev/null)
   if [ -n "$session" ]; then
-    tmux new-window
+    tmux new-window -c "#{pane_current_path}"
   else
     echo "Not in a tmux session"
   fi
@@ -57,7 +57,7 @@ genie-new-tab() {
 
 genie-vsplit() {
   if tmux display-message -p '#S' >/dev/null 2>&1; then
-    tmux split-window -v
+    tmux split-window -v -c "#{pane_current_path}"
   else
     echo "Not in a tmux session"
   fi
@@ -65,7 +65,7 @@ genie-vsplit() {
 
 genie-hsplit() {
   if tmux display-message -p '#S' >/dev/null 2>&1; then
-    tmux split-window -h
+    tmux split-window -h -c "#{pane_current_path}"
   else
     echo "Not in a tmux session"
   fi
@@ -83,13 +83,13 @@ export function displayShortcuts(): void {
   console.log(`
 Warp-like Terminal Shortcuts for tmux + Termux
 
-┌────────────┬────────────────────────────────────────┐
-│ Shortcut   │ Action                                 │
-├────────────┼────────────────────────────────────────┤
-│ Ctrl+T     │ New tab (window) in current session    │
-│ Ctrl+S     │ Vertical split in current session      │
-│ Alt+S      │ Horizontal split in current session    │
-└────────────┴────────────────────────────────────────┘
+┌──────────────────┬────────────────────────────────────────┐
+│ Shortcut         │ Action                                 │
+├──────────────────┼────────────────────────────────────────┤
+│ Ctrl+T           │ New tab (window) in current session    │
+│ Ctrl+S           │ Vertical split in current session      │
+│ Ctrl+Shift+S     │ Horizontal split in current session    │
+└──────────────────┴────────────────────────────────────────┘
 
 Termux Extra Keys (F1-F3):
   F1 → New tab       F2 → Vertical split

package/src/term.ts

@@ -22,6 +22,11 @@ program
   .name('term')
   .description(`AI-friendly terminal orchestration (tmux wrapper)
 
+Collaborative Usage:
+  AI runs:    term exec genie:shell '<command>'
+  Human watches: tmux attach -t genie
+  AI reads:   term read genie
+
 Workflow: new → exec → read → rm
 Full control: window new/ls/rm, pane ls/rm, split, status`)
   .version(VERSION);
@@ -81,8 +86,13 @@ program
 program
   .command('exec <session> <command...>')
   .description('Execute command in a tmux session')
-  .action(async (session: string, command: string[]) => {
-    await execCmd.executeInSession(session, command.join(' '));
+  .option('-q, --quiet', 'Suppress stdout output')
+  .option('-t, --timeout <ms>', 'Timeout in milliseconds (default: 120000)')
+  .action(async (session: string, command: string[], options: { quiet?: boolean; timeout?: string }) => {
+    await execCmd.executeInSession(session, command.join(' '), {
+      quiet: options.quiet,
+      timeout: options.timeout ? parseInt(options.timeout, 10) : undefined,
+    });
   });
 
 program

package/src/types/genie-config.ts

@@ -1,112 +1,80 @@
 import { z } from 'zod';
 
 /**
- * Genie Configuration Schema
+ * Genie Configuration Schema v2
  *
  * Stored at ~/.genie/config.json
- * Manages hook presets and session configuration for the genie CLI.
+ * Manages session configuration, terminal defaults, and shortcuts for the genie CLI.
  */
 
-// Sandboxed preset configuration
-export const SandboxedConfigSchema = z.object({
-  allowedPaths: z.array(z.string()).default(['~/projects', '/tmp']),
-});
-
-// Audited preset configuration
-export const AuditedConfigSchema = z.object({
-  logPath: z.string().default('~/.genie/audit.log'),
-});
-
-// Supervised preset configuration
-export const SupervisedConfigSchema = z.object({
-  alwaysAsk: z.array(z.string()).default(['Write', 'Edit']),
+// Session configuration
+export const SessionConfigSchema = z.object({
+  name: z.string().default('genie'),
+  defaultWindow: z.string().default('shell'),
+  autoCreate: z.boolean().default(true),
 });
 
-// Collaborative preset configuration
-export const CollaborativeConfigSchema = z.object({
-  sessionName: z.string().default('genie'),
-  windowName: z.string().default('shell'),
+// Terminal configuration
+export const TerminalConfigSchema = z.object({
+  execTimeout: z.number().default(120000),
+  readLines: z.number().default(100),
+  worktreeBase: z.string().default('.worktrees'),
 });
 
 // Logging configuration
 export const LoggingConfigSchema = z.object({
   tmuxDebug: z.boolean().default(false),
+  verbose: z.boolean().default(false),
 });
 
-// Hook presets configuration
-export const HooksConfigSchema = z.object({
-  enabled: z.array(z.enum(['collaborative', 'supervised', 'sandboxed', 'audited'])).default([]),
-  collaborative: CollaborativeConfigSchema.optional(),
-  supervised: SupervisedConfigSchema.optional(),
-  sandboxed: SandboxedConfigSchema.optional(),
-  audited: AuditedConfigSchema.optional(),
+// Shell configuration
+export const ShellConfigSchema = z.object({
+  preference: z.enum(['auto', 'zsh', 'bash', 'fish']).default('auto'),
 });
 
-// Session configuration
-export const SessionConfigSchema = z.object({
-  name: z.string().default('genie'),
-  defaultWindow: z.string().default('shell'),
+// Shortcuts configuration
+export const ShortcutsConfigSchema = z.object({
+  tmuxInstalled: z.boolean().default(false),
+  shellInstalled: z.boolean().default(false),
+});
+
+// Claudio integration configuration
+export const ClaudioConfigSchema = z.object({
+  enabled: z.boolean().default(false),
 });
 
 // Full genie configuration
 export const GenieConfigSchema = z.object({
-  hooks: HooksConfigSchema.default({}),
+  version: z.number().default(2),
   session: SessionConfigSchema.default({}),
+  terminal: TerminalConfigSchema.default({}),
   logging: LoggingConfigSchema.default({}),
+  shell: ShellConfigSchema.default({}),
+  shortcuts: ShortcutsConfigSchema.default({}),
+  claudio: ClaudioConfigSchema.optional(),
+  installMethod: z.enum(['source', 'npm', 'bun']).optional(),
+  setupComplete: z.boolean().default(false),
+  lastSetupAt: z.string().optional(),
+});
+
+// Legacy v1 config schema (for migration)
+export const GenieConfigV1Schema = z.object({
+  session: z.object({
+    name: z.string().default('genie'),
+    defaultWindow: z.string().default('shell'),
+  }).default({}),
+  logging: z.object({
+    tmuxDebug: z.boolean().default(false),
+  }).default({}),
   installMethod: z.enum(['source', 'npm', 'bun']).optional(),
 });
 
 // Inferred types
-export type SandboxedConfig = z.infer<typeof SandboxedConfigSchema>;
-export type AuditedConfig = z.infer<typeof AuditedConfigSchema>;
-export type SupervisedConfig = z.infer<typeof SupervisedConfigSchema>;
-export type CollaborativeConfig = z.infer<typeof CollaborativeConfigSchema>;
-export type HooksConfig = z.infer<typeof HooksConfigSchema>;
 export type SessionConfig = z.infer<typeof SessionConfigSchema>;
+export type TerminalConfig = z.infer<typeof TerminalConfigSchema>;
 export type LoggingConfig = z.infer<typeof LoggingConfigSchema>;
+export type ShellConfig = z.infer<typeof ShellConfigSchema>;
+export type ShortcutsConfig = z.infer<typeof ShortcutsConfigSchema>;
+export type ClaudioConfig = z.infer<typeof ClaudioConfigSchema>;
 export type GenieConfig = z.infer<typeof GenieConfigSchema>;
-
-// Preset names type
-export type PresetName = 'collaborative' | 'supervised' | 'sandboxed' | 'audited';
-
-// Preset description for UI
-export interface PresetDescription {
-  name: PresetName;
-  title: string;
-  what: string;
-  why: string;
-  how: string;
-  recommended?: boolean;
-}
-
-export const PRESET_DESCRIPTIONS: PresetDescription[] = [
-  {
-    name: 'collaborative',
-    title: 'Collaborative',
-    what: 'All terminal commands run through tmux',
-    why: 'You can watch AI work in real-time',
-    how: 'Bash commands → term exec genie:shell',
-    recommended: true,
-  },
-  {
-    name: 'supervised',
-    title: 'Supervised',
-    what: 'File changes require your approval',
-    why: 'Prevents accidental overwrites',
-    how: 'Write/Edit tools always ask permission',
-  },
-  {
-    name: 'sandboxed',
-    title: 'Sandboxed',
-    what: 'Restrict file access to specific directories',
-    why: 'Protects sensitive areas of your system',
-    how: 'Operations outside sandbox are blocked',
-  },
-  {
-    name: 'audited',
-    title: 'Audited',
-    what: 'Log all AI tool usage to a file',
-    why: 'Review what the AI did after a session',
-    how: 'Every tool call → ~/.genie/audit.log',
-  },
-];
+export type GenieConfigV1 = z.infer<typeof GenieConfigV1Schema>;

package/src/genie-commands/hooks.ts

@@ -1,317 +0,0 @@
-/**
- * Genie Hooks Commands
- *
- * Commands to install, uninstall, and test hooks in Claude Code.
- * Bridges the gap between genie config and Claude Code settings.
- */
-
-import {
-  loadClaudeSettings,
-  saveClaudeSettings,
-  isGenieHookInstalled,
-  addGenieHook,
-  removeGenieHook,
-  getClaudeSettingsPath,
-  contractClaudePath,
-} from '../lib/claude-settings.js';
-import {
-  hookScriptExists,
-  writeHookScript,
-  removeHookScript,
-  testHookScript,
-  getHookScriptDisplayPath,
-} from '../lib/hook-script.js';
-import {
-  loadGenieConfig,
-  getGenieConfigPath,
-} from '../lib/genie-config.js';
-import { describeEnabledHooks, hasEnabledHooks } from '../lib/hooks/index.js';
-import { checkCommand } from '../lib/system-detect.js';
-
-/**
- * Print a boxed success message
- */
-function printSuccessBox(lines: string[]): void {
-  const maxLen = Math.max(...lines.map((l) => l.length));
-  const width = maxLen + 4;
-
-  console.log();
-  console.log('\x1b[32m' + '+' + '-'.repeat(width) + '+' + '\x1b[0m');
-  for (const line of lines) {
-    const padding = ' '.repeat(maxLen - line.length);
-    console.log('\x1b[32m' + '|  ' + '\x1b[0m' + line + padding + '\x1b[32m  |' + '\x1b[0m');
-  }
-  console.log('\x1b[32m' + '+' + '-'.repeat(width) + '+' + '\x1b[0m');
-  console.log();
-}
-
-/**
- * Check required dependencies
- */
-async function checkDependencies(): Promise<{
-  jq: boolean;
-  tmux: boolean;
-  term: boolean;
-  errors: string[];
-}> {
-  const errors: string[] = [];
-
-  const jqCheck = await checkCommand('jq');
-  const tmuxCheck = await checkCommand('tmux');
-  const termCheck = await checkCommand('term');
-
-  if (!jqCheck.exists) {
-    errors.push('jq is required but not installed. Install with: brew install jq (or apt install jq)');
-  }
-
-  return {
-    jq: jqCheck.exists,
-    tmux: tmuxCheck.exists,
-    term: termCheck.exists,
-    errors,
-  };
-}
-
-/**
- * Install hooks into Claude Code
- */
-export async function installHooksCommand(options: { force?: boolean } = {}): Promise<void> {
-  console.log();
-  console.log('\x1b[1m Installing Genie Hooks\x1b[0m');
-  console.log();
-
-  // Step 1: Check dependencies
-  console.log('\x1b[2mChecking dependencies...\x1b[0m');
-  const deps = await checkDependencies();
-
-  if (deps.jq) {
-    console.log('  \x1b[32m+\x1b[0m jq');
-  } else {
-    console.log('  \x1b[31m-\x1b[0m jq (required)');
-  }
-
-  if (deps.tmux) {
-    console.log('  \x1b[32m+\x1b[0m tmux');
-  } else {
-    console.log('  \x1b[33m-\x1b[0m tmux (recommended for collaborative mode)');
-  }
-
-  if (deps.term) {
-    console.log('  \x1b[32m+\x1b[0m term');
-  } else {
-    console.log('  \x1b[33m-\x1b[0m term (required for collaborative mode)');
-  }
-
-  if (deps.errors.length > 0) {
-    console.log();
-    for (const error of deps.errors) {
-      console.log('\x1b[31mError:\x1b[0m ' + error);
-    }
-    process.exit(1);
-  }
-
-  console.log();
-
-  // Step 2: Load genie config and check presets
-  console.log('\x1b[2mLoading configuration...\x1b[0m');
-  const config = await loadGenieConfig();
-
-  if (!hasEnabledHooks(config)) {
-    console.log();
-    console.log('\x1b[33mNo hook presets are enabled.\x1b[0m');
-    console.log('Run \x1b[36mgenie setup\x1b[0m to configure hook presets first.');
-    console.log();
-    process.exit(1);
-  }
-
-  const descriptions = describeEnabledHooks(config);
-  console.log('  \x1b[32m+\x1b[0m Enabled presets: ' + config.hooks.enabled.join(', '));
-  console.log();
-
-  // Step 3: Check if collaborative preset needs tmux
-  if (config.hooks.enabled.includes('collaborative')) {
-    if (!deps.tmux) {
-      console.log('\x1b[33mWarning:\x1b[0m Collaborative mode enabled but tmux not found.');
-      console.log('Install tmux for the best experience: brew install tmux (or apt install tmux)');
-      console.log();
-    }
-    if (!deps.term) {
-      console.log('\x1b[33mWarning:\x1b[0m Collaborative mode enabled but term not found.');
-      console.log('The term command is required for collaborative mode to work.');
-      console.log();
-    }
-  }
-
-  // Step 4: Check if already installed
-  const settings = await loadClaudeSettings();
-  if (isGenieHookInstalled(settings) && !options.force) {
-    console.log('\x1b[33mGenie hooks are already installed.\x1b[0m');
-    console.log('Use \x1b[36m--force\x1b[0m to reinstall.');
-    console.log();
-    return;
-  }
-
-  // Step 5: Write the hook script
-  console.log('\x1b[2mWriting hook script...\x1b[0m');
-  await writeHookScript();
-  console.log('  \x1b[32m+\x1b[0m ' + getHookScriptDisplayPath());
-  console.log();
-
-  // Step 6: Update Claude settings
-  console.log('\x1b[2mUpdating Claude Code settings...\x1b[0m');
-  const updatedSettings = addGenieHook(settings);
-  await saveClaudeSettings(updatedSettings);
-  console.log('  \x1b[32m+\x1b[0m Hook registered in ' + contractClaudePath(getClaudeSettingsPath()));
-  console.log();
-
-  // Step 7: Print success
-  const sessionName = config.hooks.collaborative?.sessionName || 'genie';
-  printSuccessBox([
-    '\x1b[32m+\x1b[0m Installation complete!',
-    '',
-    'Restart Claude Code for changes to take effect.',
-    '',
-    'After restart, all Bash commands will run in tmux.',
-    `Watch with: tmux attach -t ${sessionName}`,
-  ]);
-}
-
-/**
- * Uninstall hooks from Claude Code
- */
-export async function uninstallHooksCommand(options: { keepScript?: boolean } = {}): Promise<void> {
-  console.log();
-  console.log('\x1b[1m Uninstalling Genie Hooks\x1b[0m');
-  console.log();
-
-  // Step 1: Remove from Claude settings
-  console.log('\x1b[2mRemoving from Claude Code settings...\x1b[0m');
-  const settings = await loadClaudeSettings();
-
-  if (!isGenieHookInstalled(settings)) {
-    console.log('  \x1b[33m-\x1b[0m No genie hooks found in settings');
-  } else {
-    const updatedSettings = removeGenieHook(settings);
-    await saveClaudeSettings(updatedSettings);
-    console.log('  \x1b[32m+\x1b[0m Hook removed from ' + contractClaudePath(getClaudeSettingsPath()));
-  }
-  console.log();
-
-  // Step 2: Remove hook script (unless --keep-script)
-  if (!options.keepScript) {
-    console.log('\x1b[2mRemoving hook script...\x1b[0m');
-    if (hookScriptExists()) {
-      removeHookScript();
-      console.log('  \x1b[32m+\x1b[0m Deleted ' + getHookScriptDisplayPath());
-    } else {
-      console.log('  \x1b[33m-\x1b[0m Hook script not found');
-    }
-    console.log();
-  } else {
-    console.log('\x1b[2mKeeping hook script (--keep-script)\x1b[0m');
-    console.log();
-  }
-
-  // Step 3: Print success
-  printSuccessBox([
-    '\x1b[32m+\x1b[0m Uninstallation complete!',
-    '',
-    'Restart Claude Code for changes to take effect.',
-  ]);
-}
-
-/**
- * Test the hook script
- */
-export async function testHooksCommand(): Promise<void> {
-  console.log();
-  console.log('\x1b[1m Testing Genie Hooks\x1b[0m');
-  console.log();
-
-  // Check if script exists
-  if (!hookScriptExists()) {
-    console.log('\x1b[31mError:\x1b[0m Hook script not found.');
-    console.log('Run \x1b[36mgenie hooks install\x1b[0m first.');
-    console.log();
-    process.exit(1);
-  }
-
-  console.log('Script location: ' + getHookScriptDisplayPath());
-  console.log();
-
-  // Run test
-  console.log('\x1b[2mTesting with sample Bash input...\x1b[0m');
-  const result = await testHookScript();
-
-  if (result.success) {
-    console.log('\x1b[32m+\x1b[0m Hook script works correctly!');
-    console.log();
-    console.log('\x1b[2mSample output:\x1b[0m');
-    try {
-      const parsed = JSON.parse(result.output || '{}');
-      console.log(JSON.stringify(parsed, null, 2));
-    } catch {
-      console.log(result.output);
-    }
-  } else {
-    console.log('\x1b[31m-\x1b[0m Hook script test failed!');
-    console.log();
-    console.log('\x1b[31mError:\x1b[0m ' + result.error);
-    if (result.output) {
-      console.log();
-      console.log('\x1b[2mOutput:\x1b[0m');
-      console.log(result.output);
-    }
-    process.exit(1);
-  }
-
-  console.log();
-}
-
-/**
- * Show current hook configuration (moved from setup.ts)
- */
-export async function showHooksCommand(): Promise<void> {
-  const config = await loadGenieConfig();
-  const descriptions = describeEnabledHooks(config);
-
-  console.log();
-  console.log('\x1b[1m Current Hook Configuration\x1b[0m');
-  console.log(`   Genie config: ${contractClaudePath(getGenieConfigPath())}`);
-  console.log(`   Claude settings: ${contractClaudePath(getClaudeSettingsPath())}`);
-  console.log();
-
-  // Show enabled presets
-  if (descriptions.length === 0) {
-    console.log('\x1b[33m   No hook presets enabled.\x1b[0m');
-    console.log('   Run \x1b[36mgenie setup\x1b[0m to configure hooks.');
-  } else {
-    console.log('\x1b[2m   Enabled presets:\x1b[0m');
-    for (const desc of descriptions) {
-      console.log(`   \x1b[32m+\x1b[0m ${desc}`);
-    }
-  }
-  console.log();
-
-  // Show installation status
-  const settings = await loadClaudeSettings();
-  const installed = isGenieHookInstalled(settings);
-  const scriptExists = hookScriptExists();
-
-  console.log('\x1b[2m   Installation status:\x1b[0m');
-  if (installed && scriptExists) {
-    console.log('   \x1b[32m+\x1b[0m Hooks installed in Claude Code');
-    console.log('   \x1b[32m+\x1b[0m Hook script exists');
-  } else if (installed && !scriptExists) {
-    console.log('   \x1b[33m!\x1b[0m Hook registered but script missing');
-    console.log('   Run \x1b[36mgenie hooks install --force\x1b[0m to fix');
-  } else if (!installed && scriptExists) {
-    console.log('   \x1b[33m!\x1b[0m Script exists but hook not registered');
-    console.log('   Run \x1b[36mgenie hooks install\x1b[0m to register');
-  } else {
-    console.log('   \x1b[33m-\x1b[0m Hooks not installed');
-    console.log('   Run \x1b[36mgenie hooks install\x1b[0m to install');
-  }
-
-  console.log();
-}