phewsh 0.8.0 → 0.9.0

package/bin/phewsh.js

@@ -117,23 +117,9 @@ function exitAfterUpdate(code = 0) {
 }
 
 if (!command) {
-  // Bare `phewsh` — drop into persistent session
-  // If no API key, fall back to help
-  const fs = require('fs');
-  const path = require('path');
-  const os = require('os');
-  const configPath = path.join(os.homedir(), '.phewsh', 'config.json');
-  let hasKey = false;
-  try {
-    const cfg = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-    hasKey = !!cfg.apiKey;
-  } catch {}
-  if (hasKey) {
-    COMMANDS.session();
-  } else {
-    showHelp();
-    exitAfterUpdate(0);
-  }
+  // Bare `phewsh` — always drop into persistent session
+  // Session handles missing API key gracefully with /login and /key commands
+  COMMANDS.session();
 } else if (command === 'help' || command === '--help' || command === '-h') {
   showHelp();
   exitAfterUpdate(0);

package/commands/session.js

@@ -8,21 +8,36 @@ const os = require('os');
 const readline = require('readline');
 const { trackSap } = require('../lib/supabase');
 
-const CONFIG_PATH = path.join(os.homedir(), '.phewsh', 'config.json');
+const CONFIG_DIR = path.join(os.homedir(), '.phewsh');
+const CONFIG_PATH = path.join(CONFIG_DIR, 'config.json');
 const INTENT_DIR = path.join(process.cwd(), '.intent');
-const HISTORY_PATH = path.join(os.homedir(), '.phewsh', 'session_history.json');
 
 const b = (s) => `\x1b[1m${s}\x1b[0m`;
 const d = (s) => `\x1b[2m${s}\x1b[0m`;
+const w = (s) => `\x1b[97m${s}\x1b[0m`;
 const g = (s) => `\x1b[90m${s}\x1b[0m`;
 const green = (s) => `\x1b[32m${s}\x1b[0m`;
 const cyan = (s) => `\x1b[36m${s}\x1b[0m`;
+const yellow = (s) => `\x1b[33m${s}\x1b[0m`;
+
+const MODELS = {
+  'claude-sonnet': { id: 'claude-sonnet-4-6', name: 'Claude Sonnet 4.6', provider: 'anthropic' },
+  'claude-opus': { id: 'claude-opus-4-6', name: 'Claude Opus 4.6', provider: 'anthropic' },
+  'claude-haiku': { id: 'claude-haiku-4-5-20251001', name: 'Claude Haiku 4.5', provider: 'anthropic' },
+};
+
+const DEFAULT_MODEL = 'claude-sonnet';
 
 function loadConfig() {
   if (!fs.existsSync(CONFIG_PATH)) return null;
   try { return JSON.parse(fs.readFileSync(CONFIG_PATH, 'utf-8')); } catch { return null; }
 }
 
+function saveConfig(config) {
+  fs.mkdirSync(CONFIG_DIR, { recursive: true });
+  fs.writeFileSync(CONFIG_PATH, JSON.stringify(config, null, 2));
+}
+
 function loadIntentContext() {
   const files = ['vision.md', 'plan.md', 'next.md'];
   const loaded = [];
@@ -49,9 +64,8 @@ function buildSystemPrompt(intentFiles) {
   return `${base}\n\nThe user has structured intent artifacts for this project. Use them as primary context — stay aligned with their vision, plan, and next actions.\n\n${sections}`;
 }
 
-async function streamChat(apiKey, messages, systemPrompt, config) {
-  const model = 'claude-sonnet-4-6';
-  const body = { model, max_tokens: 2048, messages, stream: true };
+async function streamChat(apiKey, messages, systemPrompt, modelId) {
+  const body = { model: modelId, max_tokens: 2048, messages, stream: true };
   if (systemPrompt) body.system = systemPrompt;
 
   const response = await fetch('https://api.anthropic.com/v1/messages', {
@@ -97,42 +111,45 @@ async function streamChat(apiKey, messages, systemPrompt, config) {
 
   process.stdout.write('\n');
 
-  // SAP tracking (fire-and-forget)
-  trackSap({
-    userId: config.supabaseUserId,
-    source: 'cli',
-    model,
-    promptTokens,
-    completionTokens,
-    accessToken: config.supabaseAccessToken,
-  });
-
-  return { content: fullResponse, promptTokens, completionTokens };
+  return { content: fullResponse, promptTokens, completionTokens, model: modelId };
 }
 
 async function main() {
-  const config = loadConfig();
-
-  if (!config?.apiKey) {
-    console.log('\n  No API key found. Run `phewsh login --set-key` first.');
-    console.log('  Or start at: `phewsh login`\n');
-    process.exit(1);
-  }
-
-  const intentFiles = loadIntentContext();
-  const systemPrompt = buildSystemPrompt(intentFiles);
+  let config = loadConfig();
+  let intentFiles = loadIntentContext();
+  let systemPrompt = buildSystemPrompt(intentFiles);
   const messages = []; // conversation history
   const projectName = path.basename(process.cwd());
+  let currentModel = DEFAULT_MODEL;
+  let totalPromptTokens = 0;
+  let totalCompletionTokens = 0;
 
-  // Session banner
+  // Session banner with PHEWSH branding
   console.log('');
   console.log(`  ${d('😮‍💨')} ${d('🤫')}`);
   console.log('');
+  console.log(`  ${b(w('█▀█ █░█ █▀▀ █░█ █▀ █░█'))}`);
+  console.log(`  ${b(w('█▀▀ █▀█ ██▄ ▀▄▀ ▄█ █▀█'))}`);
+  console.log('');
+
+  if (!config?.apiKey) {
+    console.log(`  ${yellow('⚠')} No API key configured.`);
+    console.log(`  ${g('Run')} /login ${g('to set up identity + API key')}`);
+    console.log(`  ${g('Or')}  /key ${g('to add an API key directly')}`);
+    console.log('');
+  }
+
   if (intentFiles.length > 0) {
-    console.log(`  ${green('●')} Session started ${g('·')} ${cyan(projectName)} ${g('·')} ${intentFiles.map(f => f.file).join(', ')}`);
+    console.log(`  ${green('●')} ${cyan(projectName)} ${g('·')} ${intentFiles.map(f => f.file).join(', ')}`);
   } else {
-    console.log(`  ${green('●')} Session started ${g('·')} ${cyan(projectName)} ${g('·')} no .intent/ context`);
+    console.log(`  ${green('●')} ${cyan(projectName)} ${g('·')} no .intent/ context`);
+    console.log(`  ${g('  run /init to create .intent/ artifacts')}`);
+  }
+  console.log(`  ${g('  model:')} ${MODELS[currentModel].name}`);
+  if (config?.email) {
+    console.log(`  ${g('  user:')} ${config.email}`);
   }
+  console.log('');
   console.log(`  ${g('type naturally · /help for commands · /quit to exit')}`);
   console.log('');
 
@@ -155,23 +172,40 @@ async function main() {
 
     // Slash commands
     if (input.startsWith('/')) {
-      const cmd = input.slice(1).split(' ')[0].toLowerCase();
+      const parts = input.slice(1).split(/\s+/);
+      const cmd = parts[0].toLowerCase();
+      const cmdArg = parts.slice(1).join(' ');
 
       if (cmd === 'quit' || cmd === 'exit' || cmd === 'q') {
-        console.log(`\n  ${g('Session ended · ' + messages.length / 2 + ' exchanges')}\n`);
+        const turns = messages.length / 2;
+        console.log(`\n  ${g('Session ended · ' + turns + ' exchanges · ' + (totalPromptTokens + totalCompletionTokens) + ' tokens')}\n`);
         process.exit(0);
       }
 
-      if (cmd === 'help') {
+      if (cmd === 'help' || cmd === 'h') {
         console.log(`
   ${b('Session commands')}
 
-    ${g('/quit')}        End session
+  ${w('conversation')}
     ${g('/clear')}       Clear conversation history
+    ${g('/run')} ${d('<prompt>')} One-shot prompt (doesn't add to conversation)
+    ${g('/quit')}        End session
+
+  ${w('project')}
+    ${g('/init')}        Create .intent/ artifacts in this directory
     ${g('/context')}     Show loaded .intent/ files
+    ${g('/reload')}      Reload .intent/ context from disk
     ${g('/status')}      Show session stats
-    ${g('/reload')}      Reload .intent/ context
-    ${g('/system')}      Show system prompt (debug)
+
+  ${w('configuration')}
+    ${g('/login')}       Set up identity + cloud sync
+    ${g('/key')}         Set or update your API key
+    ${g('/model')} ${d('<name>')} Switch model (sonnet, opus, haiku)
+    ${g('/models')}      List available models
+    ${g('/provider')}    Show current provider info
+
+  ${w('debug')}
+    ${g('/system')}      Show current system prompt
 `);
         rl.prompt();
         return;
@@ -190,7 +224,7 @@ async function main() {
           intentFiles.forEach(f => console.log(`    ${green('●')} ${f.file} ${g('(' + f.content.length + ' chars)')}`));
         } else {
           console.log(`\n  ${g('No .intent/ context found in')} ${process.cwd()}`);
-          console.log(`  ${g('Run')} phewsh clarify ${g('to create one')}`);
+          console.log(`  ${g('Run')} /init ${g('to create one')}`);
         }
         console.log('');
         rl.prompt();
@@ -199,21 +233,25 @@ async function main() {
 
       if (cmd === 'status') {
         const turns = messages.length / 2;
+        config = loadConfig(); // refresh
         console.log(`\n  ${b('Session')}`);
         console.log(`    Turns      ${turns}`);
+        console.log(`    Tokens     ${totalPromptTokens}→${totalCompletionTokens} (in→out)`);
         console.log(`    Project    ${projectName}`);
         console.log(`    Context    ${intentFiles.length > 0 ? intentFiles.map(f => f.file).join(', ') : 'none'}`);
-        console.log(`    Provider   anthropic (claude-sonnet-4-6)`);
+        console.log(`    Model      ${MODELS[currentModel].name}`);
+        console.log(`    Provider   ${MODELS[currentModel].provider}`);
+        if (config?.email) console.log(`    User       ${config.email}`);
+        console.log(`    API key    ${config?.apiKey ? config.apiKey.slice(0, 8) + '...' : yellow('not set')}`);
         console.log('');
         rl.prompt();
         return;
       }
 
       if (cmd === 'reload') {
-        const reloaded = loadIntentContext();
-        intentFiles.length = 0;
-        intentFiles.push(...reloaded);
-        console.log(`  ${green('●')} Reloaded ${reloaded.length} artifact${reloaded.length !== 1 ? 's' : ''}`);
+        intentFiles = loadIntentContext();
+        systemPrompt = buildSystemPrompt(intentFiles);
+        console.log(`  ${green('●')} Reloaded ${intentFiles.length} artifact${intentFiles.length !== 1 ? 's' : ''}`);
         rl.prompt();
         return;
       }
@@ -224,22 +262,182 @@ async function main() {
         return;
       }
 
-      // Unknown slash command — treat as normal input
+      if (cmd === 'init') {
+        if (fs.existsSync(path.join(INTENT_DIR, 'vision.md'))) {
+          console.log(`\n  ${g('.intent/ already exists in')} ${process.cwd()}`);
+          console.log(`  ${g('Use /reload to refresh context')}\n`);
+        } else {
+          try {
+            // Delegate to the intent --init command
+            const { execSync } = require('child_process');
+            execSync('node ' + path.join(__dirname, 'intent.js') + ' --init', { stdio: 'inherit' });
+            // Reload context after init
+            intentFiles = loadIntentContext();
+            systemPrompt = buildSystemPrompt(intentFiles);
+            if (intentFiles.length > 0) {
+              console.log(`  ${green('●')} Context loaded: ${intentFiles.map(f => f.file).join(', ')}`);
+            }
+          } catch (err) {
+            console.error(`  ${g('Init failed:')} ${err.message}`);
+          }
+        }
+        console.log('');
+        rl.prompt();
+        return;
+      }
+
+      if (cmd === 'login') {
+        try {
+          const { execSync } = require('child_process');
+          execSync('node ' + path.join(__dirname, 'login.js'), { stdio: 'inherit' });
+          config = loadConfig(); // refresh after login
+        } catch (err) {
+          console.error(`  ${g('Login failed:')} ${err.message}`);
+        }
+        rl.prompt();
+        return;
+      }
+
+      if (cmd === 'key') {
+        const keyRl = readline.createInterface({ input: process.stdin, output: process.stdout });
+        keyRl.question(`\n  Anthropic API key\n  > `, (apiKey) => {
+          keyRl.close();
+          apiKey = apiKey.trim();
+          if (apiKey) {
+            config = loadConfig() || {};
+            config.apiKey = apiKey;
+            saveConfig(config);
+            console.log(`  ${green('●')} API key saved\n`);
+          } else {
+            console.log(`  ${g('Cancelled')}\n`);
+          }
+          rl.prompt();
+        });
+        return;
+      }
+
+      if (cmd === 'models') {
+        console.log(`\n  ${b('Available models')}\n`);
+        for (const [key, model] of Object.entries(MODELS)) {
+          const active = key === currentModel ? ` ${green('●')}` : '';
+          console.log(`    ${w(key.padEnd(16))} ${g(model.name)}${active}`);
+        }
+        console.log(`\n  ${g('Switch with:')} /model <name>\n`);
+        rl.prompt();
+        return;
+      }
+
+      if (cmd === 'model') {
+        if (!cmdArg) {
+          console.log(`  ${g('Current:')} ${MODELS[currentModel].name}`);
+          console.log(`  ${g('Usage:')} /model <sonnet|opus|haiku>`);
+          rl.prompt();
+          return;
+        }
+        // Fuzzy match model name
+        const query = cmdArg.toLowerCase().replace('claude-', '').replace('claude', '');
+        const match = Object.keys(MODELS).find(k =>
+          k.includes(query) || MODELS[k].name.toLowerCase().includes(query)
+        );
+        if (match) {
+          currentModel = match;
+          console.log(`  ${green('●')} Switched to ${MODELS[match].name}`);
+        } else {
+          console.log(`  ${g('Unknown model. Available:')} ${Object.keys(MODELS).join(', ')}`);
+        }
+        rl.prompt();
+        return;
+      }
+
+      if (cmd === 'provider') {
+        const model = MODELS[currentModel];
+        console.log(`\n  ${b('Provider')}`);
+        console.log(`    API        Anthropic (direct)`);
+        console.log(`    Model      ${model.name}`);
+        console.log(`    Endpoint   api.anthropic.com/v1/messages`);
+        console.log(`    Key        ${config?.apiKey ? config.apiKey.slice(0, 8) + '...' : yellow('not set')}`);
+        console.log('');
+        rl.prompt();
+        return;
+      }
+
+      if (cmd === 'run') {
+        if (!cmdArg) {
+          console.log(`  ${g('Usage:')} /run <prompt>`);
+          rl.prompt();
+          return;
+        }
+        if (!config?.apiKey) {
+          console.log(`  ${yellow('⚠')} No API key. Run /key to set one.`);
+          rl.prompt();
+          return;
+        }
+        // One-shot: don't add to conversation history
+        console.log('');
+        try {
+          const result = await streamChat(
+            config.apiKey,
+            [{ role: 'user', content: cmdArg }],
+            systemPrompt,
+            MODELS[currentModel].id
+          );
+          if (result.promptTokens || result.completionTokens) {
+            console.log(g(`  ${result.promptTokens || '?'}→${result.completionTokens || '?'} tokens`));
+          }
+          trackSap({
+            userId: config.supabaseUserId,
+            source: 'cli',
+            model: MODELS[currentModel].id,
+            promptTokens: result.promptTokens,
+            completionTokens: result.completionTokens,
+            accessToken: config.supabaseAccessToken,
+          });
+        } catch (err) {
+          console.error(`\n  ${err.message}\n`);
+        }
+        console.log('');
+        rl.prompt();
+        return;
+      }
+
+      // Unknown slash command
+      console.log(`  ${g('Unknown command:')} /${cmd} ${g('— type /help for available commands')}`);
+      rl.prompt();
+      return;
     }
 
     // Regular input → send to AI
-    messages.push({ role: 'user', content: input });
+    if (!config?.apiKey) {
+      console.log(`\n  ${yellow('⚠')} No API key configured. Run /key to set one.\n`);
+      rl.prompt();
+      return;
+    }
 
+    messages.push({ role: 'user', content: input });
     console.log('');
 
     try {
-      const result = await streamChat(config.apiKey, messages, systemPrompt, config);
+      const result = await streamChat(config.apiKey, messages, systemPrompt, MODELS[currentModel].id);
       messages.push({ role: 'assistant', content: result.content });
 
+      // Track totals
+      if (result.promptTokens) totalPromptTokens += result.promptTokens;
+      if (result.completionTokens) totalCompletionTokens += result.completionTokens;
+
       // Token count footer
       if (result.promptTokens || result.completionTokens) {
-        console.log(g(`  ${result.promptTokens || '?'}→${result.completionTokens || '?'} tokens`));
+        console.log(g(`  ${result.promptTokens || '?'}→${result.completionTokens || '?'} tokens · ${MODELS[currentModel].name}`));
       }
+
+      // SAP tracking (fire-and-forget)
+      trackSap({
+        userId: config.supabaseUserId,
+        source: 'cli',
+        model: MODELS[currentModel].id,
+        promptTokens: result.promptTokens,
+        completionTokens: result.completionTokens,
+        accessToken: config.supabaseAccessToken,
+      });
     } catch (err) {
       console.error(`\n  ${err.message}\n`);
       // Remove the failed user message

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phewsh",
-  "version": "0.8.0",
+  "version": "0.9.0",
   "description": "Turn intent into action. Structure your thinking, execute your next step.",
   "bin": {
     "phewsh": "bin/phewsh.js"