@ran-sh/dsh-crew 0.3.6 → 0.3.7

package/scripts/smoke-real.mjs

@@ -1,110 +1,110 @@
-// Real DSH smoke for the v0.3 runtime path. Spawns this branch's MCP server
-// (src/server.mjs) over stdio and drives it with the MCP SDK.
-//   run|spawn : against a LIVE, Crew-owned DSH hub. The hub URL comes from the
-//               DSH_CREW_HUB environment variable and defaults to the dedicated
-//               Crew port 3210; the official ~/.dsh home / web profile is never
-//               read or touched.
-//   standalone: standalone worker path (jobs.mjs) using ONLY explicitly
-//               supplied process-environment credentials
-//               (DEEPSEEK_API_KEY / DEEPSEEK_BASE_URL). This script never reads
-//               ~/.dsh, any official credential/settings store, or key files.
-//               If the credential environment is absent it exits BLOCKED-style.
-// Uses a throwaway temp git repo; never touches the web profile or user repos.
-// Usage: node scripts/smoke-real.mjs <tempGitRepo> [run|spawn|standalone]
-import { Client } from '@modelcontextprotocol/sdk/client/index.js';
-import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
-
-/** Session descriptor for the MCP child. NEVER logs the key. */
-function serverTransport(extraEnv = {}) {
-  return new StdioClientTransport({
-    command: 'node',
-    args: ['src/server.mjs'],
-    cwd: process.cwd(),
-    env: {
-      ...process.env,
-      // Crew-owned hub default; an explicit DSH_CREW_HUB overrides it.
-      DSH_CREW_HUB: process.env.DSH_CREW_HUB ?? 'http://127.0.0.1:3210',
-      ...extraEnv,
-    },
-    stderr: process.stderr,
-  });
-}
-
-const repo = process.argv[2];
-const mode = process.argv[3] ?? 'run';
-const effort = process.argv[4] ?? 'max';
-if (!repo) { console.error('usage: node scripts/smoke-real.mjs <tempGitRepo> [run|spawn|standalone] [effort]'); process.exit(2); }
-
-const TASK = [
-  'In this git repository, create the file src/answer.mjs with exactly the content: `export const answer = 40 + 2;`',
-  'Then run the single-line check: node -e \'const a = require("./src/answer.mjs"); if (a.answer !== 42) process.exit(1); console.log("answer ok");\' (ESM note: use import("./src/answer.mjs") or write .cjs — pick whatever works and run it).',
-  'End your final message with the required Delivery Report:',
-  '## Diff',
-  '- src/answer.mjs — added answer',
-  '## Tests',
-  'PASS — node check — answer is 42',
-  '## Risks',
-  'none',
-].join('\n');
-
-// For standalone mode, use ONLY explicitly supplied process-environment
-// credentials (DEEPSEEK_API_KEY / DEEPSEEK_BASE_URL). This script never reads
-// ~/.dsh or any official credential/settings store. Absent credentials are a
-// BLOCKED outcome, not an excuse to invent or read credentials.
-const standaloneEnv = {};
-if (mode === 'standalone') {
-  const apiKey = process.env.DEEPSEEK_API_KEY;
-  if (!apiKey) {
-    console.error('[smoke] BLOCKED: standalone requires DEEPSEEK_API_KEY in the process environment; credential: ABSENT (no official store will be read)');
-    process.exit(2);
-  }
-  standaloneEnv.DEEPSEEK_API_KEY = apiKey;
-  if (process.env.DEEPSEEK_BASE_URL) standaloneEnv.DEEPSEEK_BASE_URL = process.env.DEEPSEEK_BASE_URL;
-  standaloneEnv.DSH_SANDBOX_MODE = 'workspace-write';
-  console.log('[smoke] standalone: using process-environment credentials (not shown)');
-}
-const transport = serverTransport(standaloneEnv);
-const client = new Client({ name: 'dsh-crew-smoke', version: '1.0.0', requestTimeout: 600 * 1000 });
-
-async function call(name, args, timeoutMs) {
-  const res = await client.callTool({ name, arguments: args }, undefined, timeoutMs ? { timeout: timeoutMs } : undefined);
-  return JSON.parse(res.content.find((c) => c.type === 'text').text);
-}
-
-try {
-  await client.connect(transport);
-  console.log(`[smoke] connected; mode=${mode} cwd=${repo}`);
-  if (mode === 'standalone') {
-    // Force the standalone execution path (session mode) so jobs.mjs handles it.
-    await call('dsh_worker_config', { mode: 'standalone' });
-  }
-
-  if (mode === 'spawn') {
-    const spawnView = await call('dsh_spawn_worker', { task: TASK, role: 'worker', cwd: repo });
-    console.log('[smoke] spawn view:', JSON.stringify(spawnView, null, 2));
-    const wfId = spawnView.workflow_id ?? spawnView.id;
-    // poll a few times for the final result (workflow continues in background)
-    for (let i = 0; i < 24; i++) {
-      await new Promise((r) => setTimeout(r, 5000));
-      const v = await call('dsh_worker_result', { job_id: wfId, wait_seconds: 0 });
-      if (v.status !== 'running') {
-        console.log('[smoke] final (spawn):', JSON.stringify({ id: v.id, role: v.role, phase: v.phase, status: v.status, isolation: v.isolation, attempt: v.attempt, review: v.review?.verdict ?? null, candidate: v.candidate?.changed_files ?? null, error: v.error }, null, 2));
-        await client.close();
-        process.exit(v.status === 'done' ? 0 : 1);
-      }
-      if (i === 23) console.log('[smoke] still running after poll window: ', JSON.stringify(v));
-    }
-    await client.close();
-    process.exit(2);
-  }
-
-    const view = await call('dsh_run_worker', { task: TASK, role: 'worker', cwd: repo, effort, timeout_seconds: 540 }, 560 * 1000);
-  const k = (o) => ({ id: o.id, role: o.role, phase: o.phase, status: o.status, isolation: o.isolation, execution_cwd: o.execution_cwd, base_revision: o.base_revision, attempt: o.attempt, decision: o.decision, review: o.review?.verdict ?? null, candidate_available: o.candidate_available, candidate_changed: o.candidate?.changed_files ?? null, outcome_task: o.outcome?.task_status ?? null, tests: o.outcome?.tests_status ?? null, error: o.error, error_code: o.error_code, cleanup_warning: o.cleanup_warning, primary_dirty_hint: o.primary_workspace_dirty });
-  console.log('[smoke] final (run):', JSON.stringify(k(view), null, 2));
-  await client.close();
-  process.exit(view.status === 'done' ? 0 : 1);
-} catch (err) {
-  console.error('[smoke] ERROR:', err?.message ?? err);
-  try { await client.close(); } catch {}
-  process.exit(3);
-}
+// Real DSH smoke for the v0.3 runtime path. Spawns this branch's MCP server
+// (src/server.mjs) over stdio and drives it with the MCP SDK.
+//   run|spawn : against a LIVE, Crew-owned DSH hub. The hub URL comes from the
+//               DSH_CREW_HUB environment variable and defaults to the dedicated
+//               Crew port 3210; the official ~/.dsh home / web profile is never
+//               read or touched.
+//   standalone: standalone worker path (jobs.mjs) using ONLY explicitly
+//               supplied process-environment credentials
+//               (DEEPSEEK_API_KEY / DEEPSEEK_BASE_URL). This script never reads
+//               ~/.dsh, any official credential/settings store, or key files.
+//               If the credential environment is absent it exits BLOCKED-style.
+// Uses a throwaway temp git repo; never touches the web profile or user repos.
+// Usage: node scripts/smoke-real.mjs <tempGitRepo> [run|spawn|standalone]
+import { Client } from '@modelcontextprotocol/sdk/client/index.js';
+import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
+
+/** Session descriptor for the MCP child. NEVER logs the key. */
+function serverTransport(extraEnv = {}) {
+  return new StdioClientTransport({
+    command: 'node',
+    args: ['src/server.mjs'],
+    cwd: process.cwd(),
+    env: {
+      ...process.env,
+      // Crew-owned hub default; an explicit DSH_CREW_HUB overrides it.
+      DSH_CREW_HUB: process.env.DSH_CREW_HUB ?? 'http://127.0.0.1:3210',
+      ...extraEnv,
+    },
+    stderr: process.stderr,
+  });
+}
+
+const repo = process.argv[2];
+const mode = process.argv[3] ?? 'run';
+const effort = process.argv[4] ?? 'max';
+if (!repo) { console.error('usage: node scripts/smoke-real.mjs <tempGitRepo> [run|spawn|standalone] [effort]'); process.exit(2); }
+
+const TASK = [
+  'In this git repository, create the file src/answer.mjs with exactly the content: `export const answer = 40 + 2;`',
+  'Then run the single-line check: node -e \'const a = require("./src/answer.mjs"); if (a.answer !== 42) process.exit(1); console.log("answer ok");\' (ESM note: use import("./src/answer.mjs") or write .cjs — pick whatever works and run it).',
+  'End your final message with the required Delivery Report:',
+  '## Diff',
+  '- src/answer.mjs — added answer',
+  '## Tests',
+  'PASS — node check — answer is 42',
+  '## Risks',
+  'none',
+].join('\n');
+
+// For standalone mode, use ONLY explicitly supplied process-environment
+// credentials (DEEPSEEK_API_KEY / DEEPSEEK_BASE_URL). This script never reads
+// ~/.dsh or any official credential/settings store. Absent credentials are a
+// BLOCKED outcome, not an excuse to invent or read credentials.
+const standaloneEnv = {};
+if (mode === 'standalone') {
+  const apiKey = process.env.DEEPSEEK_API_KEY;
+  if (!apiKey) {
+    console.error('[smoke] BLOCKED: standalone requires DEEPSEEK_API_KEY in the process environment; credential: ABSENT (no official store will be read)');
+    process.exit(2);
+  }
+  standaloneEnv.DEEPSEEK_API_KEY = apiKey;
+  if (process.env.DEEPSEEK_BASE_URL) standaloneEnv.DEEPSEEK_BASE_URL = process.env.DEEPSEEK_BASE_URL;
+  standaloneEnv.DSH_SANDBOX_MODE = 'workspace-write';
+  console.log('[smoke] standalone: using process-environment credentials (not shown)');
+}
+const transport = serverTransport(standaloneEnv);
+const client = new Client({ name: 'dsh-crew-smoke', version: '1.0.0', requestTimeout: 600 * 1000 });
+
+async function call(name, args, timeoutMs) {
+  const res = await client.callTool({ name, arguments: args }, undefined, timeoutMs ? { timeout: timeoutMs } : undefined);
+  return JSON.parse(res.content.find((c) => c.type === 'text').text);
+}
+
+try {
+  await client.connect(transport);
+  console.log(`[smoke] connected; mode=${mode} cwd=${repo}`);
+  if (mode === 'standalone') {
+    // Force the standalone execution path (session mode) so jobs.mjs handles it.
+    await call('dsh_worker_config', { mode: 'standalone' });
+  }
+
+  if (mode === 'spawn') {
+    const spawnView = await call('dsh_spawn_worker', { task: TASK, role: 'worker', cwd: repo });
+    console.log('[smoke] spawn view:', JSON.stringify(spawnView, null, 2));
+    const wfId = spawnView.workflow_id ?? spawnView.id;
+    // poll a few times for the final result (workflow continues in background)
+    for (let i = 0; i < 24; i++) {
+      await new Promise((r) => setTimeout(r, 5000));
+      const v = await call('dsh_worker_result', { job_id: wfId, wait_seconds: 0 });
+      if (v.status !== 'running') {
+        console.log('[smoke] final (spawn):', JSON.stringify({ id: v.id, role: v.role, phase: v.phase, status: v.status, isolation: v.isolation, attempt: v.attempt, review: v.review?.verdict ?? null, candidate: v.candidate?.changed_files ?? null, error: v.error }, null, 2));
+        await client.close();
+        process.exit(v.status === 'done' ? 0 : 1);
+      }
+      if (i === 23) console.log('[smoke] still running after poll window: ', JSON.stringify(v));
+    }
+    await client.close();
+    process.exit(2);
+  }
+
+    const view = await call('dsh_run_worker', { task: TASK, role: 'worker', cwd: repo, effort, timeout_seconds: 540 }, 560 * 1000);
+  const k = (o) => ({ id: o.id, role: o.role, phase: o.phase, status: o.status, isolation: o.isolation, execution_cwd: o.execution_cwd, base_revision: o.base_revision, attempt: o.attempt, decision: o.decision, review: o.review?.verdict ?? null, candidate_available: o.candidate_available, candidate_changed: o.candidate?.changed_files ?? null, outcome_task: o.outcome?.task_status ?? null, tests: o.outcome?.tests_status ?? null, error: o.error, error_code: o.error_code, cleanup_warning: o.cleanup_warning, primary_dirty_hint: o.primary_workspace_dirty });
+  console.log('[smoke] final (run):', JSON.stringify(k(view), null, 2));
+  await client.close();
+  process.exit(view.status === 'done' ? 0 : 1);
+} catch (err) {
+  console.error('[smoke] ERROR:', err?.message ?? err);
+  try { await client.close(); } catch {}
+  process.exit(3);
+}

package/scripts/smoke.mjs

@@ -1,78 +1,78 @@
-// Smoke test: dispatch one cheap flash job to verify the installation.
-// Probes the hub first (if DSH web instance is running); falls back to
-// standalone mode. Always exercises the path the user actually installed.
-
-import { hubAvailable, hub } from '../src/hub-client.mjs';
-import { readGlobalConfig } from '../src/install/install.mjs';
-
-try {
-  const hubUrl = process.env.DSH_CREW_HUB ?? readGlobalConfig().hub_url;
-  const isHubUp = await hubAvailable();
-
-  if (isHubUp) {
-    // Dispatch through the hub
-    console.log(`hub at ${hubUrl} is reachable, using hub mode`);
-    const job = await hub.spawn({
-      task: 'Reply with exactly the word: ok',
-      tier: 'flash',
-      effort: 'off',
-      cwd: process.cwd(),
-      source: 'smoke',
-    });
-    console.log(`spawned ${job.id} ...`);
-    const result = await hub.get(job.id, 120);
-    if (result.status === 'done') {
-      console.log(`worker replied: ${result.result}`);
-      console.log('smoke test passed — configuration OK');
-    } else if (result.status === 'running') {
-      // The wait returns early once the job settles, so this is a real timeout.
-      console.error(`smoke test failed: job ${job.id} still running after 120s`);
-      console.error('Hint: it is still live in the DSH instance — check its session for what is stuck');
-      process.exit(1);
-    } else {
-      console.error(`smoke test failed: status=${result.status} error=${result.error}`);
-      console.error('Hint: check the DSH instance logs and verify DeepSeek provider credentials');
-      process.exit(1);
-    }
-  } else {
-    // Fall back to standalone mode
-    console.log(`no hub at ${hubUrl}, falling back to standalone mode`);
-
-    try {
-      const { startJob, waitJob, jobView } = await import('../src/jobs.mjs');
-      const job = startJob({
-        task: 'Reply with exactly the word: ok',
-        tier: 'flash',
-        effort: 'off',
-        cwd: process.cwd(),
-      });
-      console.log(`spawned ${job.id} (deepseek-v4-flash) ...`);
-      await waitJob(job.id, 120_000);
-      const v = jobView(job, { withResult: true });
-      if (v.status === 'done') {
-        console.log(`worker replied: ${v.result}`);
-        console.log('smoke test passed — configuration OK');
-      } else {
-        console.error(`smoke test failed: status=${v.status} error=${v.error}`);
-        console.error('Hint: DEEPSEEK_API_KEY missing or invalid in env or ~/.config/dsh-crew/.env, or runtime not installed');
-        process.exit(1);
-      }
-    } catch (err) {
-      // The standalone runtime lives in this package's own node_modules; the
-      // @deepseek-ai/* packages are peerDependencies, so an installed copy of
-      // the plugin has none of them and the dynamic import above is what tells
-      // us so. Anything else here is a dispatch failure, not a missing runtime.
-      if (err.code === 'ERR_MODULE_NOT_FOUND' || err.code === 'MODULE_NOT_FOUND') {
-        console.error('smoke test failed: the standalone runtime is not installed in this copy');
-        console.error('Hint: run "pnpm install" from a source checkout, or start a DSH instance to use hub mode');
-      } else {
-        console.error(`smoke test failed: ${err.message}`);
-        console.error('Hint: DEEPSEEK_API_KEY missing or invalid in env or ~/.config/dsh-crew/.env');
-      }
-      process.exit(1);
-    }
-  }
-} catch (err) {
-  console.error(`smoke test failed: ${err.message}`);
-  process.exit(1);
-}
+// Smoke test: dispatch one cheap flash job to verify the installation.
+// Probes the hub first (if DSH web instance is running); falls back to
+// standalone mode. Always exercises the path the user actually installed.
+
+import { hubAvailable, hub } from '../src/hub-client.mjs';
+import { readGlobalConfig } from '../src/install/install.mjs';
+
+try {
+  const hubUrl = process.env.DSH_CREW_HUB ?? readGlobalConfig().hub_url;
+  const isHubUp = await hubAvailable();
+
+  if (isHubUp) {
+    // Dispatch through the hub
+    console.log(`hub at ${hubUrl} is reachable, using hub mode`);
+    const job = await hub.spawn({
+      task: 'Reply with exactly the word: ok',
+      tier: 'flash',
+      effort: 'off',
+      cwd: process.cwd(),
+      source: 'smoke',
+    });
+    console.log(`spawned ${job.id} ...`);
+    const result = await hub.get(job.id, 120);
+    if (result.status === 'done') {
+      console.log(`worker replied: ${result.result}`);
+      console.log('smoke test passed — configuration OK');
+    } else if (result.status === 'running') {
+      // The wait returns early once the job settles, so this is a real timeout.
+      console.error(`smoke test failed: job ${job.id} still running after 120s`);
+      console.error('Hint: it is still live in the DSH instance — check its session for what is stuck');
+      process.exit(1);
+    } else {
+      console.error(`smoke test failed: status=${result.status} error=${result.error}`);
+      console.error('Hint: check the DSH instance logs and verify DeepSeek provider credentials');
+      process.exit(1);
+    }
+  } else {
+    // Fall back to standalone mode
+    console.log(`no hub at ${hubUrl}, falling back to standalone mode`);
+
+    try {
+      const { startJob, waitJob, jobView } = await import('../src/jobs.mjs');
+      const job = startJob({
+        task: 'Reply with exactly the word: ok',
+        tier: 'flash',
+        effort: 'off',
+        cwd: process.cwd(),
+      });
+      console.log(`spawned ${job.id} (deepseek-v4-flash) ...`);
+      await waitJob(job.id, 120_000);
+      const v = jobView(job, { withResult: true });
+      if (v.status === 'done') {
+        console.log(`worker replied: ${v.result}`);
+        console.log('smoke test passed — configuration OK');
+      } else {
+        console.error(`smoke test failed: status=${v.status} error=${v.error}`);
+        console.error('Hint: DEEPSEEK_API_KEY missing or invalid in env or ~/.config/dsh-crew/.env, or runtime not installed');
+        process.exit(1);
+      }
+    } catch (err) {
+      // The standalone runtime lives in this package's own node_modules; the
+      // @deepseek-ai/* packages are peerDependencies, so an installed copy of
+      // the plugin has none of them and the dynamic import above is what tells
+      // us so. Anything else here is a dispatch failure, not a missing runtime.
+      if (err.code === 'ERR_MODULE_NOT_FOUND' || err.code === 'MODULE_NOT_FOUND') {
+        console.error('smoke test failed: the standalone runtime is not installed in this copy');
+        console.error('Hint: run "pnpm install" from a source checkout, or start a DSH instance to use hub mode');
+      } else {
+        console.error(`smoke test failed: ${err.message}`);
+        console.error('Hint: DEEPSEEK_API_KEY missing or invalid in env or ~/.config/dsh-crew/.env');
+      }
+      process.exit(1);
+    }
+  }
+} catch (err) {
+  console.error(`smoke test failed: ${err.message}`);
+  process.exit(1);
+}

package/scripts/verify-installer-fix.mjs

@@ -1,26 +1,26 @@
-// Live-verify the fixed installer against a fake home: the settings must
-// point at the repository itself as the marketplace root (no parent-dir
-// assumption), permission rules intact, CLI step skipped in test mode.
-import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
-import { join } from 'node:path';
-import { tmpdir } from 'node:os';
-import { installClaudeCode, uninstallClaudeCode } from '../src/install/install.mjs';
-
-const home = mkdtempSync(join(tmpdir(), 'dsh-crew-fix-test-'));
-try {
-  const r = await installClaudeCode({ home });
-  console.log('actions:', r.actions.slice(0, 3).join(' | '));
-  const s = JSON.parse(readFileSync(join(home, '.claude', 'settings.json'), 'utf8'));
-  const mp = s.extraKnownMarketplaces['dsh-crew'];
-  const cwd = process.cwd().replaceAll('\\', '/');
-  const mpPath = String(mp?.source?.path ?? '').replaceAll('\\', '/');
-  console.log('marketplace path is repo root:', mpPath === cwd, '->', mpPath);
-  console.log('permission rules:', (s.permissions?.allow ?? []).filter((x) => String(x).includes('dsh-crew')).length);
-  console.log('cli step skipped in test mode:', r.actions.some((a) => a.includes('test mode')));
-  if (mpPath !== cwd) throw new Error('marketplace not pointing at repo root');
-  const u = await uninstallClaudeCode({ home });
-  console.log('uninstall ok:', u.ok);
-} finally {
-  rmSync(home, { recursive: true, force: true });
-}
-console.log('INSTALLER FIX VERIFIED');
+// Live-verify the fixed installer against a fake home: the settings must
+// point at the repository itself as the marketplace root (no parent-dir
+// assumption), permission rules intact, CLI step skipped in test mode.
+import { mkdtempSync, readFileSync, rmSync } from 'node:fs';
+import { join } from 'node:path';
+import { tmpdir } from 'node:os';
+import { installClaudeCode, uninstallClaudeCode } from '../src/install/install.mjs';
+
+const home = mkdtempSync(join(tmpdir(), 'dsh-crew-fix-test-'));
+try {
+  const r = await installClaudeCode({ home });
+  console.log('actions:', r.actions.slice(0, 3).join(' | '));
+  const s = JSON.parse(readFileSync(join(home, '.claude', 'settings.json'), 'utf8'));
+  const mp = s.extraKnownMarketplaces['dsh-crew'];
+  const cwd = process.cwd().replaceAll('\\', '/');
+  const mpPath = String(mp?.source?.path ?? '').replaceAll('\\', '/');
+  console.log('marketplace path is repo root:', mpPath === cwd, '->', mpPath);
+  console.log('permission rules:', (s.permissions?.allow ?? []).filter((x) => String(x).includes('dsh-crew')).length);
+  console.log('cli step skipped in test mode:', r.actions.some((a) => a.includes('test mode')));
+  if (mpPath !== cwd) throw new Error('marketplace not pointing at repo root');
+  const u = await uninstallClaudeCode({ home });
+  console.log('uninstall ok:', u.ok);
+} finally {
+  rmSync(home, { recursive: true, force: true });
+}
+console.log('INSTALLER FIX VERIFIED');