studiograph 1.2.0-beta.9 → 1.2.0

package/dist/cli/commands/resolve.js

@@ -0,0 +1,85 @@
+/**
+ * studiograph resolve — retry conflict resolution for repos stuck mid-rebase.
+ *
+ * Scans all workspace repos, finds those with an in-progress rebase,
+ * and runs the conflict resolver on them.
+ */
+import { Command } from 'commander';
+import { log, outro } from '@clack/prompts';
+import { existsSync } from 'fs';
+import { join } from 'path';
+import { Workspace } from '../../core/workspace.js';
+import { isInRebase, gitStashPop } from '../../utils/git.js';
+import { resolveConflicts } from '../../utils/merge-resolver.js';
+export const resolveCommand = new Command('resolve')
+    .description('Retry conflict resolution for repos stuck mid-rebase')
+    .action(async () => {
+    const workspace = new Workspace();
+    if (!workspace.isWorkspace()) {
+        console.error('❌ Not a Studiograph workspace. Run `studiograph init` first.');
+        process.exit(1);
+        return;
+    }
+    const workspaceRoot = workspace.getWorkspacePath();
+    // Gather all repo paths
+    const repoPaths = [];
+    const studioPath = join(workspaceRoot, '.studiograph');
+    if (existsSync(studioPath)) {
+        repoPaths.push({ name: '.studiograph', path: studioPath });
+    }
+    const config = await workspace.loadConfig();
+    for (const repo of config.repos) {
+        const repoPath = join(workspaceRoot, repo.path);
+        if (existsSync(repoPath)) {
+            repoPaths.push({ name: repo.name, path: repoPath });
+        }
+    }
+    // Find repos mid-rebase
+    const rebasingRepos = repoPaths.filter(r => isInRebase(r.path));
+    if (rebasingRepos.length === 0) {
+        log.info('No collections are mid-rebase. Nothing to resolve.');
+        return;
+    }
+    log.info(`Found ${rebasingRepos.length} collection${rebasingRepos.length === 1 ? '' : 's'} mid-rebase.`);
+    let hasFailure = false;
+    for (const repo of rebasingRepos) {
+        log.info(`\nResolving conflicts in ${repo.name}...`);
+        const resolution = await resolveConflicts(repo.path, (msg) => log.info(msg));
+        gitStashPop(repo.path);
+        if (resolution.success) {
+            const count = resolution.resolutions.filter(r => r.resolved).length;
+            log.success(`${repo.name}: resolved (${count} conflict${count === 1 ? '' : 's'})`);
+            for (const r of resolution.resolutions) {
+                if (r.resolved) {
+                    log.info(`     ${r.file} — ${r.summary}`);
+                }
+            }
+        }
+        else {
+            const failed = resolution.resolutions.filter(r => !r.resolved);
+            if (failed.length > 0) {
+                log.warn(`${repo.name}: ${failed.length} conflict${failed.length === 1 ? '' : 's'} could not be resolved`);
+                for (const r of failed) {
+                    log.info(`     ${r.file} — ${r.summary ?? 'unresolved'}`);
+                }
+            }
+            else {
+                log.warn(`${repo.name}: resolution failed (no conflicts found — rebase may need manual intervention)`);
+            }
+            log.info('');
+            log.info('   To resolve manually:');
+            log.info(`     cd ${repo.path}`);
+            log.info('     git status');
+            log.info('     # edit conflicted files, then: git add <file> && git rebase --continue');
+            hasFailure = true;
+        }
+    }
+    if (hasFailure) {
+        outro('⚠️  Some conflicts remain. Resolve them manually, then run `studiograph push`.');
+        process.exit(1);
+    }
+    else {
+        outro('All conflicts resolved.');
+    }
+});
+//# sourceMappingURL=resolve.js.map

package/dist/cli/commands/resolve.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../../src/cli/commands/resolve.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/serve.js

@@ -16,13 +16,16 @@
 import { Command } from 'commander';
 import { join } from 'path';
 import { existsSync } from 'fs';
-import { spawnSync } from 'child_process';
+import { exec, spawnSync } from 'child_process';
 import { Workspace } from '../../core/workspace.js';
 import { WorkspaceManager } from '../../core/workspace-manager.js';
-import { loadUserConfig } from '../../core/user-config.js';
+import { loadUserConfig, resolveApiKey, propagateApiKeyToEnv } from '../../core/user-config.js';
+import { promptLLMSetupIfNeeded } from '../setup-wizard.js';
 import { runPreflight } from '../../utils/preflight.js';
 import { createServer } from '../../server/index.js';
 import { gitClone } from '../../utils/git.js';
+import { box } from 'consola/utils';
+import { header, dimText } from '../colors.js';
 /**
  * Pull latest changes for a git repo. Non-fatal — logs warnings on failure.
  */
@@ -112,9 +115,12 @@ async function bootstrapWorkspace(workspacePath) {
 }
 export const serveCommand = new Command('serve')
     .description('Start the Studiograph HTTP server')
-    .option('-p, --port <port>', 'Port to listen on', '3000')
+    .option('-p, --port <port>', 'Port to listen on', '4800')
     .option('-H, --host <host>', 'Host to bind to', '0.0.0.0')
+    .option('--verbose', 'Show detailed startup info (tools, etc.)')
     .action(async (opts) => {
+    if (opts.verbose)
+        process.env.STUDIOGRAPH_VERBOSE = '1';
     // Bootstrap from STUDIOGRAPH_CONFIG_REPO if repos are not present (e.g. Railway first boot)
     await bootstrapWorkspace(process.cwd());
     const workspace = new Workspace();
@@ -128,29 +134,28 @@ export const serveCommand = new Command('serve')
         return;
     }
     const config = await workspace.loadConfig();
-    // Propagate API key from user config to env (orchestrator reads ANTHROPIC_API_KEY)
-    const userConfig = loadUserConfig();
-    if (userConfig.api_key && !process.env.ANTHROPIC_API_KEY) {
-        process.env.ANTHROPIC_API_KEY = userConfig.api_key;
+    // Prompt for model setup if not configured (non-blocking — server works without it, but chat won't)
+    const isRemote = !!process.env.STUDIOGRAPH_CONFIG_REPO;
+    if (!isRemote) {
+        await promptLLMSetupIfNeeded();
     }
+    // Propagate API key from user config to env (orchestrator reads provider env vars)
+    const userConfig = loadUserConfig();
+    propagateApiKeyToEnv(userConfig, config);
+    const llmApiKey = resolveApiKey(userConfig, config);
     // Build GitUser from workspace config
     const gitUser = {
         id: 'serve',
         name: config.team_name || 'Studiograph Server',
         email: 'noreply@studiograph.local',
     };
-    // Admin user for WorkspaceManager (server has full access)
-    const serverUser = { ...gitUser, role: 'admin' };
-    const workspaceManager = new WorkspaceManager(process.cwd(), config, gitUser, serverUser);
+    const workspaceManager = new WorkspaceManager(process.cwd(), config, gitUser);
     // Read API keys from environment (semicolon-separated)
     const apiKeysEnv = process.env.API_KEYS || '';
     const apiKeys = apiKeysEnv
         .split(';')
         .map(k => k.trim())
         .filter(k => k.length > 0);
-    if (apiKeys.length === 0) {
-        console.warn('Warning: No API_KEYS configured — server is open (dev mode)');
-    }
     const webhookSecret = process.env.WEBHOOK_SECRET;
     const port = parseInt(process.env.PORT || opts.port, 10);
     const host = process.env.HOST || opts.host;
@@ -166,17 +171,42 @@ export const serveCommand = new Command('serve')
         apiKeys,
         webhookSecret,
     });
-    await server.listen({ port, host });
-    console.log(`\nStudiograph server running at http://${host}:${port}`);
-    console.log('\nRoutes:');
-    console.log('  GET  /api/repos');
-    console.log('  GET  /api/repos/:repo/entities/:type');
-    console.log('  GET  /api/repos/:repo/entities/:type/:id');
-    console.log('  GET  /api/repos/:repo/search');
-    console.log('  GET  /api/search');
-    console.log('  POST /api/chat');
-    console.log('  GET  /api/chat/stream');
-    console.log('  POST /webhooks/github');
-    console.log('\nApp plugins loaded from:', appsDir);
+    // Try to listen, auto-incrementing port if in use
+    let actualPort = port;
+    const maxRetries = 10;
+    for (let attempt = 0; attempt < maxRetries; attempt++) {
+        try {
+            await server.listen({ port: actualPort, host });
+            break;
+        }
+        catch (err) {
+            if (err.code === 'EADDRINUSE' && attempt < maxRetries - 1) {
+                actualPort++;
+                continue;
+            }
+            console.error(`\nFailed to start server: ${err.message}`);
+            process.exit(1);
+        }
+    }
+    const collections = config.repos.length;
+    const hasChat = !!llmApiKey;
+    const url = `http://localhost:${actualPort}`;
+    console.log(box([
+        `URL:          ${header(url)}`,
+        `Collections:  ${collections}`,
+        `Chat:         ${hasChat ? 'enabled' : dimText('disabled (run studiograph config to add an AI model)')}`,
+    ].join('\n'), {
+        title: `Studiograph — ${config.team_name}`,
+        style: { borderColor: 'cyan', padding: 1 },
+    }));
+    if (actualPort !== port) {
+        console.log(dimText(`  Port ${port} was in use, using ${actualPort} instead.\n`));
+    }
+    // Open browser on local dev (not on Railway/remote deployments)
+    if (!isRemote) {
+        const openUrl = process.platform === 'darwin' ? 'open' : process.platform === 'win32' ? 'start' : 'xdg-open';
+        exec(`${openUrl} ${url}`);
+    }
+    console.log(dimText('Press Ctrl+C to stop the server.\n'));
 });
 //# sourceMappingURL=serve.js.map

package/dist/cli/commands/serve.js.map

@@ -1 +1 @@
-{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/cli/commands/serve.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"serve.js","sourceRoot":"","sources":["../../../src/cli/commands/serve.ts"],"names":[],"mappings":"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"}

package/dist/cli/commands/start.js

@@ -19,9 +19,10 @@ import { createLoadSkillTool } from '../../agent/tools/load-skill.js';
 import { loadCustomTools } from '../../agent/tools/tool-loader.js';
 import { ConnectorManager } from '../../mcp/connector-manager.js';
 import { buildConnectorRegistry, createConnectorTools } from '../../agent/tools/connector-tools.js';
-import { intro, select, text, outro, spinner } from '@clack/prompts';
+import { spinner } from '@clack/prompts';
 import { runPreflight } from '../../utils/preflight.js';
-import { loadUserConfig, saveUserConfig, getAnthropicCredential } from '../../core/user-config.js';
+import { promptLLMSetupIfNeeded } from '../setup-wizard.js';
+import { loadUserConfig, resolveApiKey, resolveProvider, resolveModelId } from '../../core/user-config.js';
 import { notifyUpdateAvailable } from '../../utils/version-checker.js';
 import { PluginLoader } from '../../server/plugin-loader.js';
 import { join, dirname } from 'path';
@@ -35,71 +36,12 @@ import { info, dimText, header, warn, toolRef, renderUserPrompt } from '../color
 import { box } from 'consola/utils';
 import ora from 'ora';
 import { markdownTheme } from '../theme.js';
-// Model provider configurations
-const MODEL_PROVIDERS = {
-    anthropic: {
-        name: 'Anthropic (Claude)',
-        models: [
-            { id: 'claude-opus-4-6', name: 'Claude Opus 4.6 (Most Capable)', hint: 'Best reasoning, can be slower' },
-            { id: 'claude-sonnet-4-5-20250929', name: 'Claude Sonnet 4.5 (Recommended)', hint: 'Great balance of speed and quality' },
-            { id: 'claude-3-7-sonnet-20250219', name: 'Claude 3.7 Sonnet', hint: 'Faster, good for most tasks' },
-            { id: 'claude-3-5-haiku-20241022', name: 'Claude 3.5 Haiku', hint: 'Fastest, lightweight tasks' },
-        ],
-        requiresApiKey: true,
-        envVar: 'ANTHROPIC_API_KEY',
-    },
-    openai: {
-        name: 'OpenAI (GPT)',
-        models: [
-            { id: 'gpt-4o', name: 'GPT-4o (Recommended)', hint: 'Latest multimodal model' },
-            { id: 'gpt-4o-mini', name: 'GPT-4o Mini', hint: 'Faster and cheaper' },
-            { id: 'gpt-4-turbo', name: 'GPT-4 Turbo', hint: 'Previous generation' },
-        ],
-        requiresApiKey: true,
-        envVar: 'OPENAI_API_KEY',
-    },
-    google: {
-        name: 'Google (Gemini)',
-        models: [
-            { id: 'gemini-2.0-flash-exp', name: 'Gemini 2.0 Flash (Experimental)', hint: 'Latest experimental model' },
-            { id: 'gemini-1.5-pro', name: 'Gemini 1.5 Pro', hint: 'Most capable' },
-            { id: 'gemini-1.5-flash', name: 'Gemini 1.5 Flash', hint: 'Fast and efficient' },
-        ],
-        requiresApiKey: true,
-        envVar: 'GOOGLE_API_KEY',
-    },
-    xai: {
-        name: 'xAI (Grok)',
-        models: [
-            { id: 'grok-2-1212', name: 'Grok 2', hint: 'Latest xAI model' },
-            { id: 'grok-2-vision-1212', name: 'Grok 2 Vision', hint: 'With vision capabilities' },
-        ],
-        requiresApiKey: true,
-        envVar: 'XAI_API_KEY',
-    },
-    groq: {
-        name: 'Groq (Fast Inference)',
-        models: [
-            { id: 'llama-3.3-70b-versatile', name: 'Llama 3.3 70B', hint: 'Very fast inference' },
-            { id: 'mixtral-8x7b-32768', name: 'Mixtral 8x7B', hint: 'Fast and capable' },
-        ],
-        requiresApiKey: true,
-        envVar: 'GROQ_API_KEY',
-    },
-    openrouter: {
-        name: 'OpenRouter (Access to many models)',
-        models: [
-            { id: 'anthropic/claude-opus-4-6', name: 'Claude Opus 4.6 (via OpenRouter)', hint: 'Access Claude without Anthropic API' },
-            { id: 'openai/gpt-4o', name: 'GPT-4o (via OpenRouter)', hint: 'Access OpenAI without direct API' },
-            { id: 'meta-llama/llama-3.3-70b-instruct', name: 'Llama 3.3 70B', hint: 'Open source model' },
-        ],
-        requiresApiKey: true,
-        envVar: 'OPENROUTER_API_KEY',
-    },
-};
 export const startCommand = new Command('start')
     .description('Start the Studiograph agent chat interface')
-    .action(async () => {
+    .option('--verbose', 'Show detailed startup info (tools, etc.)')
+    .action(async (opts) => {
+    if (opts.verbose)
+        process.env.STUDIOGRAPH_VERBOSE = '1';
     const workspace = new Workspace();
     // Check if workspace is initialized
     if (!workspace.isWorkspace()) {
@@ -111,135 +53,26 @@ export const startCommand = new Command('start')
         process.exit(1);
         return;
     }
-    // Load workspace config and user config
+    // Load workspace config
     const config = await workspace.loadConfig();
     const repos = await workspace.getRepos();
+    // Model setup — shared wizard handles first-time prompts and "already configured" message
+    await promptLLMSetupIfNeeded();
+    // Re-read user config (wizard may have updated it)
     const userConfig = loadUserConfig();
-    // Check if model is configured — user config takes precedence over workspace config
-    let modelProvider = userConfig.model_provider || config.model_provider;
-    let modelId = userConfig.model_id || config.model_id;
-    // API key: user config (oauth token or api key) → workspace.json → env var (resolved below)
-    let apiKey = getAnthropicCredential(userConfig) || config.api_key;
-    if (!modelProvider || !modelId) {
-        // First-time setup
-        intro('🎨 Studiograph Setup');
-        console.log('Let\'s configure your AI model.\n');
-        // Select provider
-        const providerChoice = await select({
-            message: 'Which AI provider would you like to use?',
-            options: [
-                { value: 'anthropic', label: 'Anthropic (Claude)', hint: 'Recommended - Best reasoning' },
-                { value: 'openai', label: 'OpenAI (GPT)', hint: 'Popular, widely used' },
-                { value: 'google', label: 'Google (Gemini)', hint: 'Free tier available' },
-                { value: 'xai', label: 'xAI (Grok)', hint: 'Real-time knowledge' },
-                { value: 'groq', label: 'Groq', hint: 'Fastest inference' },
-                { value: 'openrouter', label: 'OpenRouter', hint: 'Access many models with one API key' },
-            ],
-        });
-        if (typeof providerChoice === 'symbol') {
-            outro('Cancelled');
-            process.exit(0);
-        }
-        modelProvider = providerChoice;
-        const provider = MODEL_PROVIDERS[modelProvider];
-        // Select model
-        const modelChoice = await select({
-            message: `Which ${provider.name} model?`,
-            options: provider.models.map(m => ({
-                value: m.id,
-                label: m.name,
-                hint: m.hint,
-            })),
-        });
-        if (typeof modelChoice === 'symbol') {
-            outro('Cancelled');
-            process.exit(0);
-        }
-        modelId = modelChoice;
-        // Get API key if required
-        if (provider.requiresApiKey && !apiKey) {
-            // Check environment variable first
-            const envKey = process.env[provider.envVar];
-            if (envKey) {
-                console.log(`✓ Using ${provider.envVar} from environment\n`);
-                apiKey = envKey;
-            }
-            else if (modelProvider === 'anthropic') {
-                // Anthropic requires API key from console.anthropic.com
-                const keyInput = await text({
-                    message: 'Enter your Anthropic API key:',
-                    placeholder: 'sk-ant-api03-...',
-                    validate: (value) => {
-                        if (!value || value.length < 10)
-                            return 'API key seems too short';
-                    },
-                });
-                if (typeof keyInput !== 'string') {
-                    outro('Cancelled');
-                    process.exit(0);
-                }
-                apiKey = keyInput;
-                const s = spinner();
-                s.start('Saving configuration...');
-                workspace.setModelConfig(modelProvider, modelId, apiKey);
-                s.stop('Configuration saved ✓');
-                outro(`Model configured: ${provider.name} - ${modelId}\n`);
-            }
-            else {
-                const keyInput = await text({
-                    message: `Enter your ${provider.name} API key:`,
-                    placeholder: 'sk-...',
-                    validate: (value) => {
-                        if (!value || value.length < 10)
-                            return 'API key seems too short';
-                    },
-                });
-                if (typeof keyInput !== 'string') {
-                    outro('Cancelled');
-                    process.exit(0);
-                }
-                apiKey = keyInput;
-                const s = spinner();
-                s.start('Saving configuration...');
-                workspace.setModelConfig(modelProvider, modelId, apiKey);
-                s.stop('Configuration saved ✓');
-                outro(`Model configured: ${provider.name} - ${modelId}\n`);
-            }
-        }
-        else {
-            // Save configuration (non-Anthropic or key already available)
-            const s = spinner();
-            s.start('Saving configuration...');
-            workspace.setModelConfig(modelProvider, modelId, apiKey);
-            s.stop('Configuration saved ✓');
-            outro(`Model configured: ${provider.name} - ${modelId}\n`);
-        }
-    }
-    // Validate we have all required config
-    if (!modelProvider || !modelId) {
-        console.error('❌ Model configuration incomplete');
+    const modelProvider = resolveProvider(userConfig, config);
+    const modelId = resolveModelId(userConfig, config);
+    const apiKey = resolveApiKey(userConfig, config);
+    if (!apiKey) {
+        console.error('❌ No API key configured. Run `studiograph config` to set one up.');
         process.exit(1);
     }
-    // Check if we need API key for this provider
-    const provider = MODEL_PROVIDERS[modelProvider];
-    if (provider?.requiresApiKey && !apiKey) {
-        const envKey = process.env[provider.envVar];
-        if (envKey) {
-            apiKey = envKey;
-        }
-        else {
-            console.error(`❌ API key required for ${provider.name}`);
-            console.error(`   Set ${provider.envVar} environment variable or run setup again`);
-            process.exit(1);
-        }
-    }
     // Initialize memory service
     const memoryService = new MemoryService();
     const recentMemory = memoryService.loadRecentMemory();
     // Initialize workspace manager
     const gitUser = { id: 'cli-user', name: config.team_name, email: 'noreply@studiograph.local' };
-    const cliUser = { id: 'cli-user', name: config.team_name, email: 'noreply@studiograph.local', role: 'admin' };
-    const workspaceManager = new WorkspaceManager(process.cwd(), config, gitUser, cliUser);
+    const workspaceManager = new WorkspaceManager(process.cwd(), config, gitUser);
     // Discover app-bundled skill and tool directories
     const appsDir = join(process.cwd(), '.studiograph', 'apps');
     const loader = new PluginLoader();
@@ -309,10 +142,15 @@ export const startCommand = new Command('start')
     await initSearchIndex(workspaceManager, config.repos, process.cwd());
     const totalTools = agent.state.tools.length;
     const memoryDays = memoryService.listMemoryFiles().length;
+    const hasSemanticSearch = !!loadUserConfig().voyage_api_key;
+    const searchStatus = hasSemanticSearch
+        ? 'semantic'
+        : `keyword ${dimText('(run studiograph config to enable semantic search)')}`;
     console.log(box([
         `Model:   ${header(modelProvider + '/' + modelId)}`,
         `Tools:   ${totalTools} registered${connectorSummary ? ` (${connectorSummary})` : ''}`,
         `Memory:  ${memoryDays} day${memoryDays === 1 ? '' : 's'} loaded`,
+        `Search:  ${searchStatus}`,
     ].join('\n'), {
         title: `Studiograph — ${config.team_name}`,
         style: { borderColor: 'cyan', padding: 1 },
@@ -579,27 +417,6 @@ async function initSearchIndex(workspaceManager, repos, workspacePath) {
     // First-run: no repos have been indexed yet
     const isFirstRun = repos.every(r => !vectorService.getLastIndexedTime(r.name));
     if (isFirstRun) {
-        // Prompt for Voyage AI key (optional)
-        if (!userConfig.voyage_api_key) {
-            const choice = await select({
-                message: 'Enable semantic search? (optional)',
-                options: [
-                    { value: 'skip', label: 'Skip — use FTS keyword search', hint: 'No setup required' },
-                    { value: 'voyage', label: 'Enable semantic search', hint: 'Voyage AI key required' },
-                ],
-            });
-            if (choice === 'voyage' && typeof choice === 'string') {
-                const keyInput = await text({
-                    message: 'Enter your Voyage AI API key:',
-                    placeholder: 'pa-...',
-                    validate: (v) => (!v || v.length < 10 ? 'Key seems too short' : undefined),
-                });
-                if (typeof keyInput === 'string') {
-                    userConfig.voyage_api_key = keyInput;
-                    saveUserConfig(userConfig);
-                }
-            }
-        }
         // Full index on first run
         const s = spinner();
         s.start('Indexing workspace for search...');