@papercraneai/cli 1.8.0 → 1.8.1

package/bin/papercrane.js

@@ -8,7 +8,7 @@ import path from 'path';
 import os from 'os';
 import http from 'http';
 import { http as httpClient } from '../lib/axios-client.js';
-import { setApiKey, clearConfig, isLoggedIn, setDefaultWorkspace, getDefaultWorkspace, setOrgId, getOrgId } from '../lib/config.js';
+import { setApiKey, clearConfig, isLoggedIn, setOrgId, getOrgId } from '../lib/config.js';
 import { validateApiKey } from '../lib/cloud-client.js';
 import { listFunctions, getFunction, runFunction, formatDescribe, formatDescribeRoot, formatFlat, formatResult, formatUnconnected } from '../lib/function-client.js';
 import { listWorkspaces, resolveWorkspaceId, getLocalWorkspacePath, pullWorkspace, pushWorkspace } from '../lib/environment-client.js';
@@ -22,15 +22,18 @@ async function requireWorkspace() {
     console.error(chalk.red('Not logged in. Run: papercrane login'));
     process.exit(1);
   }
-  const defaultWs = await getDefaultWorkspace();
-  if (!defaultWs) {
-    console.error(chalk.red('No workspace selected.'));
-    console.error(chalk.dim('\nRun these commands first:'));
-    console.error(chalk.dim('  papercrane workspaces list'));
-    console.error(chalk.dim('  papercrane workspaces use <id>'));
-    process.exit(1);
-  }
-  return defaultWs;
+  // Resolve current workspace from ~/.papercrane/current symlink
+  const currentLink = path.join(os.homedir(), '.papercrane', 'current');
+  try {
+    const target = await fs.readlink(currentLink);
+    const match = target.match(/workspaces\/(\d+)/);
+    if (match) return parseInt(match[1], 10);
+  } catch {}
+  console.error(chalk.red('No workspace selected.'));
+  console.error(chalk.dim('\nRun these commands first:'));
+  console.error(chalk.dim('  papercrane workspaces list'));
+  console.error(chalk.dim('  papercrane workspaces use <id>'));
+  process.exit(1);
 }
 
 /**
@@ -47,7 +50,6 @@ async function showPostLoginHelp() {
     if (workspaces.length === 1) {
       // Auto-select the only workspace
       const ws = workspaces[0];
-      await setDefaultWorkspace(ws.id);
 
       const workspaceDir = getLocalWorkspacePath(ws.id);
       const { generateScaffolding } = await import('../lib/dev-server.js');
@@ -451,7 +453,7 @@ program
       console.log(chalk.cyan(`Scaffolding workspace in ${dir}...`));
 
       const { generateScaffolding } = await import('../lib/dev-server.js');
-      await generateScaffolding(dir, { skipInstall: !options.npmInstall });
+      await generateScaffolding(dir, { npmInstall: options.npmInstall });
 
       // Set ~/.papercrane/current symlink → scaffolded dir
       const currentLink = path.join(os.homedir(), '.papercrane', 'current');
@@ -800,7 +802,15 @@ workspacesCmd
       }
 
       const workspaces = await listWorkspaces();
-      const defaultWs = await getDefaultWorkspace();
+
+      // Resolve current workspace from ~/.papercrane/current symlink
+      let currentWsId = null;
+      try {
+        const currentLink = path.join(os.homedir(), '.papercrane', 'current');
+        const target = await fs.readlink(currentLink);
+        const match = target.match(/workspaces\/(\d+)/);
+        if (match) currentWsId = parseInt(match[1], 10);
+      } catch {}
 
       if (!workspaces || workspaces.length === 0) {
         console.log(chalk.yellow('No workspaces found.'));
@@ -809,12 +819,12 @@ workspacesCmd
 
       console.log(chalk.bold('\nWorkspaces:\n'));
       for (const ws of workspaces) {
-        const isDefault = ws.id === defaultWs;
+        const isCurrent = ws.id === currentWsId;
         const status = ws.status === 'ready' ? chalk.green('ready') : chalk.yellow(ws.status);
-        const defaultMarker = isDefault ? chalk.cyan(' (default)') : '';
+        const currentMarker = isCurrent ? chalk.cyan(' (current)') : '';
         const typeLabel = ws.type === 'external' ? chalk.dim('external') : chalk.dim('managed');
         const createdDate = ws.createdAt ? new Date(ws.createdAt).toLocaleDateString() : '';
-        console.log(`  ${chalk.bold(ws.id)}  ${ws.name || '(unnamed)'}  ${typeLabel}  ${status}  ${chalk.dim(createdDate)}${defaultMarker}`);
+        console.log(`  ${chalk.bold(ws.id)}  ${ws.name || '(unnamed)'}  ${typeLabel}  ${status}  ${chalk.dim(createdDate)}${currentMarker}`);
       }
       console.log();
     } catch (error) {
@@ -825,7 +835,7 @@ workspacesCmd
 
 workspacesCmd
   .command('use <id>')
-  .description('Set the default workspace')
+  .description('Set the current workspace')
   .option('--reset-scaffolding', 'Regenerate scaffolding files (layout.tsx, globals.css, configs)')
   .action(async (id, options) => {
     try {
@@ -841,8 +851,6 @@ workspacesCmd
         process.exit(1);
       }
 
-      await setDefaultWorkspace(wsId);
-
       const { generateScaffolding, resetScaffolding } = await import('../lib/dev-server.js');
       const workspaceDir = getLocalWorkspacePath(wsId);
 
@@ -884,7 +892,7 @@ workspacesCmd
         await fs.symlink(workspaceDir, currentLink);
       }
 
-      console.log(chalk.green(`✓ Default workspace set to ${wsId}`));
+      console.log(chalk.green(`✓ Current workspace set to ${wsId}`));
       console.log(chalk.dim(`  ${currentLink} → ${workspaceDir}`));
       console.log(chalk.dim(`  Dashboards: ${workspaceDir}/app/\n`));
     } catch (error) {
@@ -940,20 +948,16 @@ program
         console.log(chalk.dim('Build cache cleared.'));
       }
 
-      await generateScaffolding(workspaceDir, { skipInstall: true });
+      await generateScaffolding(workspaceDir, { npmInstall: options.npmInstall });
 
-      // npm install — dev server won't work without node_modules
+      // Check node_modules exists — fail fast if missing
       const nmDir = path.join(workspaceDir, 'node_modules');
-      if (options.npmInstall) {
-        console.log(chalk.dim('Running npm install...'));
-        execSync('npm install --prefer-offline', { cwd: workspaceDir, stdio: 'inherit' });
-      } else {
-        try {
-          await fs.access(nmDir);
-        } catch {
-          console.log(chalk.dim('node_modules not found, running npm install...'));
-          execSync('npm install --prefer-offline', { cwd: workspaceDir, stdio: 'inherit' });
-        }
+      try {
+        await fs.access(nmDir);
+      } catch {
+        console.error(chalk.red('Error: node_modules not found.'));
+        console.error(chalk.dim('Run: papercrane dev --npm-install'));
+        process.exit(1);
       }
 
       const port = parseInt(options.port, 10);

package/lib/dev-server.js

@@ -257,9 +257,9 @@ export async function resetScaffolding(workspaceDir) {
 /**
  * Generate the project structure inside the workspace.
  * Creates package.json, tsconfig.json, postcss.config.mjs, app/layout.tsx, app/globals.css.
- * Runs npm install if node_modules doesn't exist.
+ * Pass { npmInstall: true } to also run npm install if node_modules doesn't exist.
  */
-export async function generateScaffolding(workspaceDir, { skipInstall = false } = {}) {
+export async function generateScaffolding(workspaceDir, { npmInstall = false } = {}) {
   const appDir = path.join(workspaceDir, 'app');
   await fs.mkdir(appDir, { recursive: true });
 
@@ -345,8 +345,8 @@ export default nextConfig;
 `;
   await fs.writeFile(nextConfigPath, nextConfig, 'utf-8');
 
-  // npm install — only if node_modules doesn't exist yet
-  if (!skipInstall) {
+  // npm install — only when explicitly requested and node_modules doesn't exist
+  if (npmInstall) {
     const nmDir = path.join(workspaceDir, 'node_modules');
     if (!fsSync.existsSync(nmDir)) {
       console.log('Installing dependencies...');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papercraneai/cli",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "description": "CLI tool for managing OAuth credentials for LLM integrations",
   "main": "index.js",
   "type": "module",