orquesta-cli 0.2.26 → 0.2.28

package/dist/cli.js

@@ -31,6 +31,23 @@ import { PROVIDERS } from './core/config/providers.js';
 const require = createRequire(import.meta.url);
 const packageJson = require('../package.json');
 const program = new Command();
+async function resolveHookToken(explicitToken) {
+    await configManager.initialize();
+    const saved = configManager.getOrquestaConfig();
+    const token = explicitToken || saved?.token;
+    if (!token) {
+        console.error(chalk.red('Error: not connected to Orquesta.'));
+        console.error('Run ' + chalk.cyan('orquesta --login') + ' first, or pass ' + chalk.cyan('--token oat_…') + '.');
+        process.exit(1);
+    }
+    return { token: token, savedProjectId: saved?.projectId };
+}
+async function runHookEnable(opts) {
+    const { token, savedProjectId } = await resolveHookToken(opts.token);
+    const { initHooks } = await import('./orquesta/hook-init.js');
+    const preferredProjectId = opts.project || (opts.ignoreSaved || opts.token ? undefined : savedProjectId);
+    await initHooks(token, undefined, preferredProjectId);
+}
 program
     .name('orquesta')
     .description('Orquesta CLI - AI-powered coding assistant with local LLM support')
@@ -53,7 +70,8 @@ program
     .option('--sync', 'Sync configurations with Orquesta and exit')
     .option('--scan', 'Scan for available LLM providers (env vars + local ports)')
     .option('--add-provider <providerId>', 'Add a specific provider by ID (e.g., openai, anthropic, ollama)')
-    .option('--init', 'Initialize Claude Code hook integration for this project (requires --token)')
+    .option('--init', 'Enable the Claude Code hook in this directory (reuses your login; or pass --token)')
+    .option('--disable-hook', 'Disable the Claude Code hook in this directory')
     .action(async (options) => {
     if (options.appendSystemPrompt) {
         setAppendedSystemPrompt(options.appendSystemPrompt);
@@ -63,17 +81,12 @@ program
         return;
     }
     if (options.init) {
-        await configManager.initialize();
-        const saved = configManager.getOrquestaConfig();
-        const token = options.token || saved?.token;
-        if (!token) {
-            console.error(chalk.red('Error: not connected to Orquesta.'));
-            console.error('Run ' + chalk.cyan('orquesta --login') + ' first, or pass ' + chalk.cyan('orquesta --init --token oat_…') + '.');
-            process.exit(1);
-        }
-        const { initHooks } = await import('./orquesta/hook-init.js');
-        const preferredProjectId = options.token ? undefined : saved?.projectId;
-        await initHooks(token, undefined, preferredProjectId);
+        await runHookEnable({ token: options.token, project: options.project });
+        return;
+    }
+    if (options.disableHook) {
+        const { disableHooks } = await import('./orquesta/hook-init.js');
+        disableHooks();
         return;
     }
     await configManager.initialize();
@@ -299,6 +312,42 @@ program
         }
     }
 });
+const hook = program
+    .command('hook')
+    .description('Manage the Claude Code hook for the current directory');
+hook
+    .command('enable')
+    .description('Enable the hook here (asks which project if ambiguous)')
+    .option('--project <projectId>', 'Project this directory should stream into')
+    .option('--token <token>', 'Use a specific token instead of your saved login')
+    .action(async (opts) => {
+    await runHookEnable({ token: opts.token, project: opts.project });
+    process.exit(0);
+});
+hook
+    .command('switch')
+    .description('Change which project this directory streams into')
+    .option('--project <projectId>', 'Project to switch to (skips the prompt)')
+    .action(async (opts) => {
+    await runHookEnable({ project: opts.project, ignoreSaved: true });
+    process.exit(0);
+});
+hook
+    .command('disable')
+    .description('Disable the hook in this directory')
+    .action(async () => {
+    const { disableHooks } = await import('./orquesta/hook-init.js');
+    disableHooks();
+    process.exit(0);
+});
+hook
+    .command('status')
+    .description('Show the hook + target project for this directory')
+    .action(async () => {
+    await configManager.initialize();
+    showConnectionStatus();
+    process.exit(0);
+});
 program.showHelpAfterError(false);
 program.configureOutput({
     outputError: (str, write) => {
@@ -312,12 +361,16 @@ program.configureOutput({
 });
 program.on('command:*', () => {
     console.error(chalk.red('⚠️  Unknown command.'));
-    console.log(chalk.white('Usage: orquesta [options]\n'));
+    console.log(chalk.white('Usage: orquesta [options] | orquesta hook <enable|switch|disable|status>\n'));
     console.log(chalk.white('  -p, --print <prompt>    Execute a prompt and exit\n'));
     console.log(chalk.white('  --token <token>         Connect to Orquesta dashboard\n'));
     console.log(chalk.white('  --project <id>          Select project when connecting\n'));
-    console.log(chalk.white('  --switch-project [id]   Switch to a different project\n'));
-    console.log(chalk.white('  --status                Show Orquesta connection status\n'));
+    console.log(chalk.white('  --switch-project [id]   Switch the CLI to a different project\n'));
+    console.log(chalk.white('  --status                Show connection + hook status\n'));
+    console.log(chalk.white('  hook enable             Enable the Claude Code hook here\n'));
+    console.log(chalk.white('  hook switch             Move this directory to another project\n'));
+    console.log(chalk.white('  hook disable            Disable the Claude Code hook here\n'));
+    console.log(chalk.white('  hook status             Show the hook + target project here\n'));
     console.log(chalk.white('  --sync                  Sync configurations with Orquesta\n'));
     console.log(chalk.white('  --disconnect            Disconnect from Orquesta\n'));
     console.log(chalk.white('  --scan                  Scan for available LLM providers\n'));

package/dist/orquesta/hook-init.d.ts

@@ -7,4 +7,9 @@ export declare function writeHookFiles(opts: {
     agentBin?: string;
     quiet?: boolean;
 }): boolean;
+export declare function readHookConfig(cwd?: string): {
+    projectId: string;
+    apiUrl?: string;
+} | null;
+export declare function disableHooks(cwd?: string): void;
 //# sourceMappingURL=hook-init.d.ts.map

package/dist/orquesta/hook-init.js

@@ -31,12 +31,47 @@ function resolveAgentBin() {
     console.warn('  \x1b[33m  npm install -g orquesta-agent\x1b[0m\n');
     return 'orquesta-agent';
 }
+async function resolveTargetProject(projects, preferredProjectId) {
+    if (preferredProjectId) {
+        const match = projects.find((p) => p.id === preferredProjectId);
+        if (match) {
+            console.log(`  Project: ${match.name}\n`);
+            return match;
+        }
+        console.warn(`  \x1b[33m⚠ Your saved project isn't visible to this token — pick one below.\x1b[0m\n`);
+    }
+    if (projects.length === 1) {
+        console.log(`  Project: ${projects[0].name}\n`);
+        return projects[0];
+    }
+    if (!process.stdin.isTTY) {
+        console.error(`  Error: this token can reach ${projects.length} projects and none was specified.\n` +
+            `  Re-run with: orquesta --init --project <projectId>`);
+        process.exit(1);
+    }
+    console.log('  Which project should this directory report to?\n');
+    projects.forEach((p, i) => console.log(`    ${i + 1}. ${p.name}`));
+    console.log();
+    const readline = await import('readline');
+    const rl = readline.createInterface({ input: process.stdin, output: process.stdout });
+    const answer = await new Promise((resolve) => {
+        rl.question(`  Enter number (1-${projects.length}): `, (a) => { rl.close(); resolve(a.trim()); });
+    });
+    const num = parseInt(answer, 10);
+    const pick = (!isNaN(num) && num >= 1 && num <= projects.length) ? projects[num - 1] : null;
+    if (!pick) {
+        console.error('  Invalid selection.');
+        process.exit(1);
+        throw new Error();
+    }
+    console.log(`  Project: ${pick.name}\n`);
+    return pick;
+}
 export async function initHooks(token, apiUrl = 'https://getorquesta.com', preferredProjectId) {
     console.log('\n  Initializing Orquesta hook integration...\n');
     const agentBin = resolveAgentBin();
     console.log('  Validating token...');
-    let projectId;
-    let projectName;
+    let projects;
     try {
         const res = await fetch(`${apiUrl}/api/orquesta-cli/projects`, {
             headers: { 'Authorization': `Bearer ${token}` },
@@ -46,28 +81,25 @@ export async function initHooks(token, apiUrl = 'https://getorquesta.com', prefe
             console.error(`  Error: Invalid token`);
             process.exit(1);
         }
-        const chosen = (preferredProjectId && data.projects?.find((p) => p.id === preferredProjectId)) ||
-            data.projects?.[0];
-        if (!chosen) {
-            console.error('  Error: No projects found for this token');
-            process.exit(1);
-            throw new Error();
-        }
-        projectId = chosen.id;
-        projectName = chosen.name;
-        console.log(`  Connected to: ${projectName}\n`);
+        projects = data.projects ?? [];
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : 'Unknown error';
         console.error(`  Error: Could not reach ${apiUrl} (${msg})`);
         process.exit(1);
+        throw new Error();
     }
-    writeHookFiles({ projectId, token, apiUrl, agentBin });
+    if (projects.length === 0) {
+        console.error('  Error: No projects found for this token');
+        process.exit(1);
+    }
+    const chosen = await resolveTargetProject(projects, preferredProjectId);
+    writeHookFiles({ projectId: chosen.id, token, apiUrl, agentBin });
     console.log(`
-  Done! Now run \`claude\` in this directory — all activity will
-  be tracked in Orquesta automatically.
+  Done! "${chosen.name}" is wired to this directory.
+  Run \`claude\` here and every session streams into Orquesta automatically.
 
-  Dashboard: ${apiUrl}/dashboard/projects/${projectId}
+  Dashboard: ${apiUrl}/dashboard/projects/${chosen.id}
 `);
 }
 export function writeHookFiles(opts) {
@@ -124,4 +156,64 @@ export function writeHookFiles(opts) {
         return false;
     }
 }
+export function readHookConfig(cwd = process.cwd()) {
+    try {
+        const p = path.join(cwd, '.orquesta.json');
+        if (!fs.existsSync(p))
+            return null;
+        const data = JSON.parse(fs.readFileSync(p, 'utf8'));
+        if (!data.projectId)
+            return null;
+        return { projectId: data.projectId, apiUrl: data.apiUrl };
+    }
+    catch {
+        return null;
+    }
+}
+export function disableHooks(cwd = process.cwd()) {
+    console.log('\n  Disabling Orquesta hook for this directory...\n');
+    let changed = false;
+    const settingsPath = path.join(cwd, '.claude', 'settings.json');
+    if (fs.existsSync(settingsPath)) {
+        try {
+            const settings = JSON.parse(fs.readFileSync(settingsPath, 'utf8'));
+            if (settings.hooks && typeof settings.hooks === 'object') {
+                for (const event of Object.keys(settings.hooks)) {
+                    const before = settings.hooks[event];
+                    if (!Array.isArray(before))
+                        continue;
+                    const after = before.filter((e) => !e.hooks?.some((h) => h.command?.includes('orquesta-agent hook')));
+                    if (after.length !== before.length)
+                        changed = true;
+                    if (after.length === 0)
+                        delete settings.hooks[event];
+                    else
+                        settings.hooks[event] = after;
+                }
+                if (Object.keys(settings.hooks).length === 0)
+                    delete settings.hooks;
+                fs.writeFileSync(settingsPath, JSON.stringify(settings, null, 2) + '\n');
+                if (changed)
+                    console.log('  Removed Orquesta hooks from .claude/settings.json');
+            }
+        }
+        catch {
+            console.warn('  \x1b[33m⚠ Could not parse .claude/settings.json — left untouched.\x1b[0m');
+        }
+    }
+    const orquestaJson = path.join(cwd, '.orquesta.json');
+    if (fs.existsSync(orquestaJson)) {
+        try {
+            fs.unlinkSync(orquestaJson);
+            changed = true;
+            console.log('  Removed .orquesta.json');
+        }
+        catch {
+            console.warn('  \x1b[33m⚠ Could not remove .orquesta.json.\x1b[0m');
+        }
+    }
+    console.log(changed
+        ? '\n  Done. Claude Code runs in this directory no longer report to Orquesta.\n'
+        : '\n  Nothing to do — no Orquesta hook was configured here.\n');
+}
 //# sourceMappingURL=hook-init.js.map

package/dist/setup/first-run-setup.js

@@ -4,7 +4,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import { configManager } from '../core/config/config-manager.js';
 import { syncOrquestaConfigs, fetchOrquestaProjects } from '../orquesta/config-sync.js';
-import { writeHookFiles } from '../orquesta/hook-init.js';
+import { writeHookFiles, readHookConfig } from '../orquesta/hook-init.js';
 import { scanProviders, toEndpointConfig } from '../core/config/auto-detect.js';
 const ORQUESTA_API_URL = process.env['ORQUESTA_API_URL'] || 'https://getorquesta.com';
 export function needsFirstRunSetup() {
@@ -283,5 +283,20 @@ export function showConnectionStatus() {
     console.log(chalk.dim(`  Connected: ${orquestaConfig.connectedAt ? new Date(orquestaConfig.connectedAt).toLocaleString() : 'Unknown'}`));
     console.log(chalk.dim(`  Last sync: ${orquestaConfig.lastSyncAt ? new Date(orquestaConfig.lastSyncAt).toLocaleString() : 'Never'}`));
     console.log(chalk.dim(`  Auto-sync: ${orquestaConfig.autoSync !== false ? 'Enabled' : 'Disabled'}`));
+    const hook = readHookConfig();
+    console.log();
+    if (hook) {
+        const sameAsConnected = hook.projectId === orquestaConfig.projectId;
+        const name = sameAsConnected && orquestaConfig.projectName ? orquestaConfig.projectName : hook.projectId;
+        console.log(chalk.green('Claude Code hook: enabled in this directory'));
+        console.log(chalk.dim(`  Streaming into: ${name}`));
+        console.log(chalk.dim(`  Project ID: ${hook.projectId}`));
+        console.log(chalk.dim(`  Change project: orquesta hook switch`));
+        console.log(chalk.dim(`  Disable: orquesta hook disable`));
+    }
+    else {
+        console.log(chalk.yellow('Claude Code hook: not enabled in this directory'));
+        console.log(chalk.dim(`  Enable with: orquesta hook enable`));
+    }
 }
 //# sourceMappingURL=first-run-setup.js.map

package/dist/ui/components/PlanExecuteApp.js

@@ -34,6 +34,7 @@ import { processFileReferences } from '../hooks/atFileProcessor.js';
 import { executeSlashCommand, isSlashCommand, } from '../../core/slash-command-handler.js';
 import { closeJsonStreamLogger } from '../../utils/json-stream-logger.js';
 import { configManager } from '../../core/config/config-manager.js';
+import { readHookConfig } from '../../orquesta/hook-init.js';
 import { logger } from '../../utils/logger.js';
 import { usageTracker } from '../../core/usage-tracker.js';
 import { UpdateNotification } from '../UpdateNotification.js';
@@ -88,6 +89,16 @@ function getStatusText({ phase, todos, currentToolName }) {
 }
 export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
     const { exit } = useApp();
+    const hookBinding = useMemo(() => {
+        const cfg = readHookConfig(process.cwd());
+        if (!cfg)
+            return null;
+        const oc = configManager.getOrquestaConfig();
+        const name = oc?.projectId === cfg.projectId && oc?.projectName
+            ? oc.projectName
+            : cfg.projectId.slice(0, 8);
+        return { projectName: name };
+    }, []);
     const [messages, setMessages] = useState([]);
     const { input, setInput, handleHistoryPrev, handleHistoryNext, addToHistory } = useInputHistory();
     const [isProcessing, setIsProcessing] = useState(false);
@@ -1412,6 +1423,11 @@ export const PlanExecuteApp = ({ llmClient: initialLlmClient, modelInfo }) => {
                 React.createElement(Text, { color: "cyan" }, currentModelInfo.model),
                 React.createElement(Text, { color: "gray" }, " \u2502 "),
                 React.createElement(Text, { color: "gray" }, shortenPath(process.cwd())),
+                hookBinding && (React.createElement(React.Fragment, null,
+                    React.createElement(Text, { color: "gray" }, " \u2502 "),
+                    React.createElement(Text, { color: "green" },
+                        "\u2B21 hook \u2192 ",
+                        hookBinding.projectName))),
                 (planExecutionState.todos.length > 0 || batutaUsage) && (React.createElement(React.Fragment, null,
                     React.createElement(Text, { color: "gray" }, " \u2502 "),
                     React.createElement(TodoStatusBar, { todos: planExecutionState.todos, projectName: configManager.getOrquestaConfig()?.projectName, batutaUsage: batutaUsage, isProcessing: isProcessing })))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orquesta-cli",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "description": "Orquesta CLI - AI-powered coding assistant with team collaboration",
   "type": "module",
   "main": "dist/index.js",