clickroom 0.3.3 → 0.3.4

package/cli/agents.js

@@ -1,8 +1,8 @@
 import fs from 'node:fs';
 import os from 'node:os';
 import path from 'node:path';
-import { execFile } from 'node:child_process';
 import { HOME, ROOT } from './config.js';
+import { execCmd } from './run.js';
 
 // `npx clickroom` also connects the coding agents on the computer to clickroom's feedback (the MCP
 // server, `clickroom mcp`, signed in with this computer's key): Claude Code for the project being
@@ -24,7 +24,7 @@ const SERVER = ['npx', '-y', VERSION ? `clickroom@${VERSION}` : 'clickroom', 'mc
 const DONE = path.join(HOME, 'agents.json');
 
 const run = (cmd, args, cwd) =>
-  new Promise((resolve) => execFile(cmd, args, { cwd, timeout: 20000, windowsHide: true }, (err, stdout) => resolve({ ok: !err, missing: err?.code === 'ENOENT', out: String(stdout || '') })));
+  new Promise((resolve) => execCmd(cmd, args, { cwd, timeout: 20000 }, (err, stdout) => resolve({ ok: !err, missing: err?.code === 'ENOENT', out: String(stdout || '') })));
 
 const AGENTS = [
   {

package/cli/gaps.js

@@ -1,9 +1,11 @@
 // "Find gaps with Claude" (Clarify): the project's clickroom terminal runs Claude Code headless in
 // the project folder. It may only read files and ask through clickroom's MCP server, so each gap it
 // finds lands in Clarify as a draft, live, while nothing in the folder changes.
+import fs from 'node:fs';
+import os from 'node:os';
 import path from 'node:path';
-import { spawn, spawnSync } from 'node:child_process';
-import { ROOT } from './config.js';
+import { ROOT, credentials, isTeammate } from './config.js';
+import { onPath, spawnCmd } from './run.js';
 import { call } from './client.js';
 import { gapsPrompt } from '../worker/handoff.js';
 
@@ -11,25 +13,33 @@ const TOOLS = ['Read', 'Glob', 'Grep', 'mcp__clickroom__clickroom_ask', 'mcp__cl
 const NEVER = ['Edit', 'Write', 'MultiEdit', 'NotebookEdit', 'Bash', 'WebFetch', 'WebSearch'];
 const LIMIT = 10 * 60 * 1000; // a run that hangs is stopped
 
-export const hasClaude = () => spawnSync(process.platform === 'win32' ? 'where' : 'which', ['claude'], { stdio: 'ignore' }).status === 0;
+export const hasClaude = () => onPath('claude');
+
+// Whose computer this is, for the review: the run is asked for from someone else's browser.
+const computer = () => (isTeammate() && credentials()?.name ? `${credentials().name}’s computer` : 'the computer');
 
 const questionCount = async (name) =>
   (await call('GET', `/__ps/api/projects/${encodeURIComponent(name)}/threads`)).threads.filter((t) => t.kind === 'question').length;
 
 // Resolves to the number of questions it added (drafts), or throws.
 export async function findGaps(name, root) {
-  if (!hasClaude()) throw new Error('Claude Code (`claude`) is not installed on the computer running `clickroom` for this project');
+  if (!hasClaude()) throw new Error(`Claude Code (\`claude\`) isn’t installed on ${computer()}, which runs \`clickroom\` for this project.`);
   const before = await questionCount(name);
-  const mcp = JSON.stringify({ mcpServers: { clickroom: { command: process.execPath, args: [path.join(ROOT, 'bin', 'clickroom.js'), 'mcp'] } } });
-  const args = ['-p', gapsPrompt(name), '--mcp-config', mcp, '--strict-mcp-config', '--tools', 'Read,Glob,Grep', '--allowedTools', TOOLS.join(','), '--disallowedTools', NEVER.join(','), '--no-session-persistence'];
+  // The MCP config as a file and the prompt through stdin: both survive Windows' shell.
+  const mcp = path.join(fs.mkdtempSync(path.join(os.tmpdir(), 'clickroom-gaps-')), 'mcp.json');
+  fs.writeFileSync(mcp, JSON.stringify({ mcpServers: { clickroom: { command: process.execPath, args: [path.join(ROOT, 'bin', 'clickroom.js'), 'mcp'] } } }));
+  const args = ['-p', '--mcp-config', mcp, '--strict-mcp-config', '--tools', 'Read,Glob,Grep', '--allowedTools', TOOLS.join(','), '--disallowedTools', NEVER.join(','), '--no-session-persistence'];
   await new Promise((resolve, reject) => {
-    const child = spawn('claude', args, { cwd: root, stdio: ['ignore', 'ignore', 'pipe'] });
+    const child = spawnCmd('claude', args, { cwd: root, stdio: ['pipe', 'ignore', 'pipe'] });
+    child.stdin.on('error', () => {});
+    child.stdin.end(gapsPrompt(name));
     let err = '';
     child.stderr.on('data', (d) => (err = (err + d).slice(-2000)));
     const timer = setTimeout(() => child.kill('SIGTERM'), LIMIT);
     child.on('error', reject);
     child.on('exit', (code) => {
       clearTimeout(timer);
+      fs.rmSync(path.dirname(mcp), { recursive: true, force: true });
       code === 0 ? resolve() : reject(new Error(err.trim().split('\n').pop() || `claude exited with ${code}`));
     });
   });

package/cli/note.js

@@ -1,4 +1,4 @@
-import { spawn } from 'node:child_process';
+import { spawnCmd } from './run.js';
 import { call } from './client.js';
 import { changedSource, folderChanges } from './changes.js';
 
@@ -55,7 +55,7 @@ function askClaude(input) {
     let out = '';
     let child;
     try {
-      child = spawn('claude', ['-p', '--model', 'haiku', '--tools', '', '--no-session-persistence', '--setting-sources', '', '--system-prompt', PROMPT], { stdio: ['pipe', 'pipe', 'ignore'] });
+      child = spawnCmd('claude', ['-p', '--model', 'haiku', '--tools', '', '--no-session-persistence', '--setting-sources', '', '--system-prompt', PROMPT], { stdio: ['pipe', 'pipe', 'ignore'] });
     } catch {
       return resolve(null);
     }

package/cli/process.js

@@ -2,7 +2,7 @@
 // answers to questions), writes one brief into the project and starts Claude Code on it.
 import fs from 'node:fs';
 import path from 'node:path';
-import { spawn, spawnSync } from 'node:child_process';
+import { onPath, spawnCmd } from './run.js';
 import { call } from './client.js';
 import { buildBrief } from '../worker/handoff.js';
 
@@ -33,14 +33,14 @@ export function writeBrief(root, text) {
 }
 
 export function hasClaude() {
-  return spawnSync(process.platform === 'win32' ? 'where' : 'which', ['claude'], { stdio: 'ignore' }).status === 0;
+  return onPath('claude');
 }
 
 // Interactive Claude Code in the project, so the person watches and approves the changes.
 export function startClaude(root, name) {
   const prompt = `Process the clickroom feedback in ${BRIEF} for project "${name}". Read it first, then work through every item.`;
   return new Promise((resolve, reject) => {
-    const child = spawn('claude', [prompt], { cwd: root, stdio: 'inherit' });
+    const child = spawnCmd('claude', [prompt], { cwd: root, stdio: 'inherit' });
     child.on('error', reject);
     child.on('exit', (code) => resolve(code ?? 0));
   });

package/cli/run.js

@@ -0,0 +1,24 @@
+import { spawn, execFile, spawnSync } from 'node:child_process';
+
+// Starting the coding agents' commands (claude, codex) on every OS. On Windows they are often
+// npm's `.cmd` launchers, which Node only starts through the shell (cmd.exe): there each argument
+// is quoted, double quotes become single ones and line breaks spaces (cmd can't take them), so
+// anything long or multi-line goes in through stdin or a file instead.
+
+const WIN = process.platform === 'win32';
+const quote = (a) => {
+  const s = String(a).replace(/\r?\n/g, ' ').replace(/"/g, "'");
+  return s === '' || /[\s&|<>^()%!,;=]/.test(s) ? `"${s}"` : s;
+};
+const shellArgs = (args) => (WIN ? args.map(quote) : args);
+
+// Is the command there? (On Windows the shell can't tell us: a missing command just fails.)
+export const onPath = (cmd) => spawnSync(WIN ? 'where' : 'which', [cmd], { stdio: 'ignore', windowsHide: true }).status === 0;
+
+export const spawnCmd = (cmd, args, opts = {}) => spawn(cmd, shellArgs(args), { windowsHide: true, ...opts, shell: WIN });
+
+// execFile's callback, with `missing` when the command isn't installed (ENOENT elsewhere).
+export function execCmd(cmd, args, opts, cb) {
+  if (WIN && !onPath(cmd)) return cb(Object.assign(new Error(`${cmd} not found`), { code: 'ENOENT' }), '');
+  return execFile(cmd, shellArgs(args), { windowsHide: true, ...opts, shell: WIN }, cb);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "clickroom",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "Share prototype builds for review: pins, region comments, threads, versions, and agent hand-off (MCP). Teammates push builds to their team’s clickroom with `clickroom login`.",
   "type": "module",
   "bin": {