@ran-sh/dsh-crew 2.0.4 → 2.0.6

package/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-crew",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "description": "Dispatch subtasks to DeepSeek Harness (DSH) agents as native subagents with live progress",
   "author": {
     "name": "ZSeven-W"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ran-sh/dsh-crew",
-  "version": "2.0.4",
+  "version": "2.0.6",
   "type": "module",
   "main": "./src/hub/entry.mjs",
   "bin": {

package/scripts/setup.mjs

@@ -11,7 +11,7 @@ import { fileURLToPath } from 'node:url';
 import { dirname, join, resolve } from 'node:path';
 import { homedir } from 'node:os';
 import * as realInstaller from '../src/install/install.mjs';
-import { crewDshHome, crewProfileDir, CREW_PROFILE_NAME } from '../src/install/install.mjs';
+import { crewDshHome, crewProfileDir, CREW_PROFILE_NAME, claudeIntegrationLine } from '../src/install/install.mjs';
 import {
   ensureCrewDshRuntime,
   ensureCrewPluginRegistration,
@@ -136,6 +136,30 @@ function mark(log, ok, text) {
   return ok;
 }
 
+/**
+ * The Claude Code step of a checkout install.
+ *
+ * Extracted so it can be exercised directly: the rest of setupInstall runs a real
+ * dependency install and client build, which a unit test must not do. Both
+ * install entries render the same result through `claudeIntegrationLine`, so a
+ * result one entry learned to handle cannot be silently checkmarked by the other.
+ */
+export async function runClaudeIntegrationStep({
+  dryRun = false,
+  log = console.log,
+  root = ROOT,
+  home = homedir(),
+  installer = realInstaller,
+} = {}) {
+  if (dryRun) { mark(log, true, 'Claude Code integration (dry-run)'); return { ok: true }; }
+  const r = installer.installClaudeCode
+    ? await installer.installClaudeCode({ home, root })
+    : await realInstaller.installClaudeCode({ home, root });
+  log(claudeIntegrationLine(r));
+  if (r.ok === false) return { ok: false, error: 'Claude Code integration failed' };
+  return { ok: true };
+}
+
 export async function setupInstall({
   dryRun = false,
   log = console.log,
@@ -250,13 +274,8 @@ export async function setupInstall({
   }
 
   if (commandExists('claude')) {
-    if (dryRun) mark(log, true, 'Claude Code integration (dry-run)');
-    else {
-      const r = installer.installClaudeCode ? await installer.installClaudeCode({ home, root }) : await realInstaller.installClaudeCode({ home, root });
-      const ok = r.ok !== false;
-      mark(log, ok, ok ? 'Claude Code integration' : 'Claude Code integration failed');
-      if (!ok) return { ok: false, error: 'Claude Code integration failed' };
-    }
+    const r = await runClaudeIntegrationStep({ dryRun, log, root, home, installer });
+    if (!r.ok) return r;
   } else log('- Claude Code not detected, skipped');
 
   log('');

package/src/install/install-legacy.mjs

@@ -492,6 +492,24 @@ export function uninstallCodex({ home = homedir(), env = process.env } = {}) {
   return { ok: true, actions: actions.length ? actions : ['nothing to remove'] };
 }
 
+/**
+ * The one line both install entries print for a Claude Code integration result.
+ *
+ * A missing `claude` CLI is a supported install, so `installClaudeCode` stays
+ * best-effort and keeps `ok: true`. A CLI that is present and fails or times out
+ * is a different thing: it leaves Claude Code without the plugin snapshot while
+ * the settings still name it, which is the state `installStatus` later reads as
+ * "needs repair". This used to be rendered separately in each entry — and only
+ * one of them learned about `degraded`, so the other kept printing a checkmark.
+ */
+export function claudeIntegrationLine(result) {
+  if (result?.ok === false) return '✗ Claude Code integration failed';
+  if (result?.degraded === true) {
+    return `- Claude Code integration registered, but not loaded: ${result.reason ?? 'plugin snapshot not refreshed'}`;
+  }
+  return '✓ Claude Code integration';
+}
+
 export async function installClaudeCode({ home = homedir(), statusline = false, root = ROOT } = {}) {
   const actions = [];
 
@@ -600,7 +618,20 @@ export async function installClaudeCode({ home = homedir(), statusline = false,
   } catch (err) {
     actions.push(`cli: plugin install failed — run manually: claude plugin install ${PLUGIN_KEY} (${String(err?.message ?? err).slice(0, 120)})`);
   }
-  return { ok: true, actions };
+  // Report the state that resulted, not the step that was attempted. The CLI is
+  // best-effort — a machine without `claude` is a supported install, and its
+  // settings alone are correct — but a CLI that is present and slow, timed out,
+  // or failed leaves the snapshot exactly as stale as it was, and it is the
+  // snapshot that `installStatus` reads. Saying so here is what lets the caller
+  // stop printing a checkmark for a state it never verified.
+  if (claudeSnapshotReady(home, root)) return { ok: true, actions };
+  return {
+    ok: true,
+    degraded: true,
+    code: 'CLAUDE_PLUGIN_SNAPSHOT_STALE',
+    reason: `Claude Code has not loaded the plugin; run: claude plugin install ${PLUGIN_KEY}`,
+    actions,
+  };
 }
 
 export function installCodex({ home = homedir(), scope, root = ROOT, env = process.env } = {}) {

package/src/install/npx-lifecycle.mjs

@@ -41,7 +41,7 @@ import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
 import * as realInstaller from './install.mjs';
 import { samePayloadContent, capturePayloadContent } from './payload-content.mjs';
-import { crewDshHome, crewProfileDir } from './install.mjs';
+import { crewDshHome, crewProfileDir, claudeIntegrationLine } from './install.mjs';
 import { releaseClaimsState } from '../release-in-use.mjs';
 import { compareProcessToken, processStartToken } from '../process-identity.mjs';
 import { renameTree } from './tree-move.mjs';
@@ -2668,10 +2668,10 @@ async function activateRelease({ home, releaseDir, manifest, log, installer, sup
 
   const claude = await installer.installClaudeCode({ home, root: integrationRoot });
   if (claude.ok === false) {
-    log(`✗ Claude Code integration failed`);
+    log(claudeIntegrationLine(claude));
     return false;
   }
-  log('✓ Claude Code integration');
+  log(claudeIntegrationLine(claude));
 
   // The official ~/.dsh/profiles/web tree is read-only: activation never
   // repairs or mutates the official bridge. The isolated 3210 Crew backend

package/src/runtime-identity.mjs

@@ -36,7 +36,7 @@ export {
 // included in the identity contract.
 const RUNTIME_ID = randomUUID();
 
-export const RUNTIME_VERSION = '2.0.4';
+export const RUNTIME_VERSION = '2.0.6';
 export const HUB_PROTOCOL_VERSION = 1;
 
 export const HUB_CAPABILITIES = Object.freeze([