@ran-sh/dsh-crew 0.4.2 → 0.5.1

package/src/client/surface-detection.mjs

@@ -0,0 +1,30 @@
+export const CREW_UI_SURFACES = Object.freeze({
+  OFFICIAL: 'official-bridge',
+  NATIVE: 'native-crew-harness',
+  UNKNOWN: 'unknown',
+});
+
+/**
+ * Classify the current same-origin UI from explicit backend contracts. The
+ * official bridge signal wins because its proxied runtime response correctly
+ * describes the 3210 backend, not the browser-facing 3080 surface.
+ */
+export function classifyCrewSurface({ bridgeStatus, runtime } = {}) {
+  if (bridgeStatus?.ok === true
+    && (bridgeStatus.surface === CREW_UI_SURFACES.OFFICIAL
+      || bridgeStatus.mode === 'official-3080-isolated-3210')) {
+    return CREW_UI_SURFACES.OFFICIAL;
+  }
+  if (runtime?.ok === true
+    && runtime.service === 'dsh-crew-hub'
+    && (runtime.surface === CREW_UI_SURFACES.NATIVE || runtime.surface === undefined)) {
+    return CREW_UI_SURFACES.NATIVE;
+  }
+  return CREW_UI_SURFACES.UNKNOWN;
+}
+
+export function surfaceResponsibilities(surface) {
+  const fullControlPlane = surface === CREW_UI_SURFACES.OFFICIAL;
+  return { fullControlPlane, minimalDiagnostics: !fullControlPlane };
+}
+

package/src/client/task-telemetry.mjs

@@ -0,0 +1,72 @@
+function clean(value, fallback) {
+  const text = typeof value === 'string' ? value.trim() : '';
+  return text || fallback;
+}
+
+function validTimestamp(value) {
+  if (typeof value !== 'string' || !Number.isFinite(Date.parse(value))) return null;
+  return value;
+}
+
+function sorted(values) {
+  return [...values].sort((left, right) => left.localeCompare(right));
+}
+
+export const MAX_MODEL_INVOCATION_JOBS = 500;
+export const MAX_MODEL_ACTIVITY_ROWS = 50;
+
+function hasInvocationEvidence(job) {
+  const tokenCount = Number(job?.tokens?.input ?? 0) + Number(job?.tokens?.output ?? 0);
+  return Number(job?.turn ?? 0) > 0 || Number(job?.toolCalls ?? 0) > 0 || tokenCount > 0;
+}
+
+/**
+ * Build a bounded, presentation-only model activity summary from the jobs the
+ * Hub already exposes. No prompts, results, credentials, or new persistence
+ * are introduced here.
+ */
+export function aggregateModelInvocations(jobs = []) {
+  const groups = new Map();
+  const recentJobs = Array.isArray(jobs) ? jobs.slice(-MAX_MODEL_INVOCATION_JOBS) : [];
+  for (const job of recentJobs) {
+    const provider = clean(job?.provider, '');
+    const model = clean(job?.model, '');
+    if (!provider || !model || !hasInvocationEvidence(job)) continue;
+    const key = `${provider}\0${model}`;
+    const current = groups.get(key) ?? {
+      provider,
+      model,
+      count: 0,
+      taskSources: new Set(),
+      selectionSources: new Set(),
+      roles: new Set(),
+      lastCalledAt: null,
+    };
+    current.count += 1;
+    current.taskSources.add(clean(job?.source, 'api'));
+    current.selectionSources.add(clean(job?.selection_source, 'unknown'));
+    current.roles.add(job?.role === 'reviewer' ? 'reviewer' : 'worker');
+    const calledAt = validTimestamp(job?.startedAt);
+    if (calledAt && (!current.lastCalledAt || Date.parse(calledAt) > Date.parse(current.lastCalledAt))) {
+      current.lastCalledAt = calledAt;
+    }
+    groups.set(key, current);
+  }
+
+  return [...groups.values()]
+    .sort((left, right) => {
+      const timeDelta = (right.lastCalledAt ? Date.parse(right.lastCalledAt) : -1)
+        - (left.lastCalledAt ? Date.parse(left.lastCalledAt) : -1);
+      return timeDelta || `${left.provider}/${left.model}`.localeCompare(`${right.provider}/${right.model}`);
+    })
+    .slice(0, MAX_MODEL_ACTIVITY_ROWS)
+    .map((entry) => ({
+      provider: entry.provider,
+      model: entry.model,
+      count: entry.count,
+      task_sources: sorted(entry.taskSources),
+      selection_sources: sorted(entry.selectionSources),
+      roles: sorted(entry.roles),
+      last_called_at: entry.lastCalledAt,
+    }));
+}

package/src/install/install-legacy.mjs

@@ -2,7 +2,7 @@
 // render Codex agent roles with real paths. Called from the CLI entry or the
 // DSH settings page. All edits are backed up and idempotent.
 
-import { readFileSync, writeFileSync, mkdirSync, copyFileSync, existsSync, readdirSync, rmSync } from 'node:fs';
+import { readFileSync, writeFileSync, mkdirSync, copyFileSync, existsSync, readdirSync, rmSync, statSync } from 'node:fs';
 import { dirname, join, resolve, relative } from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { homedir } from 'node:os';
@@ -25,9 +25,76 @@ function backup(file) {
   return null;
 }
 
-function readJson(file, fallback) {
-  try { return JSON.parse(readFileSync(file, 'utf8')); } catch { return fallback; }
-}
+function readJson(file, fallback) {
+  try { return JSON.parse(readFileSync(file, 'utf8')); } catch { return fallback; }
+}
+
+function readText(file) {
+  try { return readFileSync(file, 'utf8'); } catch { return null; }
+}
+
+function tomlSection(text, name) {
+  if (typeof text !== 'string') return null;
+  const escaped = name.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+  const header = new RegExp(`^\\s*\\[${escaped}\\]\\s*(?:#.*)?$`, 'm').exec(text);
+  if (!header) return null;
+  const rest = text.slice(header.index + header[0].length);
+  const nextHeader = rest.search(/^\s*\[[^\]\r\n]+\]\s*(?:#.*)?$/m);
+  return nextHeader === -1 ? rest : rest.slice(0, nextHeader);
+}
+
+function existingServerTarget(block) {
+  if (typeof block !== 'string' || !/^\s*command\s*=\s*"node"\s*$/m.test(block)) return null;
+  const match = /^\s*args\s*=\s*\[\s*"([^"\r\n]*server\.mjs)"\s*\]\s*$/m.exec(block);
+  if (!match) return null;
+  try {
+    if (!statSync(match[1]).isFile()) return null;
+    const target = resolve(match[1]);
+    return process.platform === 'win32' ? target.toLowerCase() : target;
+  } catch { return null; }
+}
+
+function codexRoleTarget(file, expectedName) {
+  const text = readText(file);
+  if (typeof text !== 'string'
+    || !new RegExp(`^\\s*name\\s*=\\s*"${expectedName}"\\s*$`, 'm').test(text)) return null;
+  return existingServerTarget(tomlSection(text, 'mcp_servers.dsh-crew'));
+}
+
+function codexMcpTarget(configText) {
+  const section = tomlSection(configText, 'mcp_servers');
+  if (!section) return null;
+  const entry = /^\s*dsh-crew\s*=\s*\{\s*command\s*=\s*"node"\s*,\s*args\s*=\s*\[\s*"([^"\r\n]*server\.mjs)"\s*\]\s*\}\s*(?:#.*)?$/m.exec(section);
+  if (!entry) return null;
+  try {
+    if (!statSync(entry[1]).isFile()) return null;
+    const target = resolve(entry[1]);
+    return process.platform === 'win32' ? target.toLowerCase() : target;
+  } catch { return null; }
+}
+
+function isFile(file) {
+  try { return statSync(file).isFile(); } catch { return false; }
+}
+
+function claudePluginRootReady(root) {
+  return typeof root === 'string' && root.trim() !== ''
+    && isFile(join(root, '.claude-plugin', 'plugin.json'))
+    && isFile(join(root, '.mcp.json'))
+    && isFile(join(root, 'src', 'server.mjs'));
+}
+
+function claudeSnapshotReady(home) {
+  const installed = readJson(join(home, '.claude', 'plugins', 'installed_plugins.json'), {});
+  const record = installed?.plugins?.[PLUGIN_KEY];
+  const entries = Array.isArray(record) ? record : [record];
+  return entries.some((entry) => claudePluginRootReady(entry?.installPath));
+}
+
+function claudePermissionsReady(settings) {
+  const allowed = Array.isArray(settings?.permissions?.allow) ? settings.permissions.allow : [];
+  return MCP_TOOLS.every((tool) => allowed.includes(`mcp__plugin_dsh-crew_dsh-crew__${tool}`));
+}
 
 // One-time migration from the pre-rename config dir (dsh-workers → dsh-crew).
 try {
@@ -189,16 +256,48 @@ export function writeGlobalConfig(patch) {
 }
 
 /** What is currently installed where — drives the settings-page buttons. */
-export function installStatus({ home = homedir() } = {}) {
-  const settings = readJson(join(home, '.claude', 'settings.json'), {});
-  const enabled = settings.enabledPlugins;
-  const claudeInstalled = !!(enabled && !Array.isArray(enabled) && enabled[PLUGIN_KEY]);
-  const hudWired = typeof settings.statusLine?.command === 'string'
-    && settings.statusLine.command.includes('worker-segment.sh');
-  const codexInstalled = existsSync(join(home, '.codex', 'agents', 'ds-flash.toml'))
-    || existsSync(join(home, '.codex', 'agents', 'ds-worker.toml'));
-  return { claude: { installed: claudeInstalled, hud: hudWired }, codex: { installed: codexInstalled } };
-}
+export function installStatus({ home = homedir() } = {}) {
+  const settings = readJson(join(home, '.claude', 'settings.json'), {});
+  const enabled = settings.enabledPlugins;
+  const claudeInstalled = !!(enabled && !Array.isArray(enabled) && enabled[PLUGIN_KEY]);
+  const hudWired = typeof settings.statusLine?.command === 'string'
+    && settings.statusLine.command.includes('worker-segment.sh');
+  const claudeComponents = {
+    enabled: claudeInstalled,
+    marketplace: claudePluginRootReady(settings?.extraKnownMarketplaces?.[MARKETPLACE_NAME]?.source?.path),
+    snapshot: claudeSnapshotReady(home),
+    permissions: claudePermissionsReady(settings),
+  };
+  const claudeMissing = Object.entries(claudeComponents).filter(([, present]) => !present).map(([key]) => key);
+  const codexRoot = join(home, '.codex');
+  const configFile = join(codexRoot, 'config.toml');
+  const configText = readText(configFile) ?? '';
+  const workerTarget = codexRoleTarget(join(codexRoot, 'agents', 'ds-worker.toml'), 'ds-worker');
+  const reviewerTarget = codexRoleTarget(join(codexRoot, 'agents', 'ds-reviewer.toml'), 'ds-reviewer');
+  const mcpTarget = codexMcpTarget(configText);
+  const components = {
+    worker_role: !!workerTarget,
+    reviewer_role: !!reviewerTarget,
+    config_prompt: !!readText(join(codexRoot, 'prompts', 'dsh-config.md'))?.trim(),
+    status_prompt: !!readText(join(codexRoot, 'prompts', 'dsh-status.md'))?.trim(),
+    mcp: !!mcpTarget,
+    target_alignment: !!workerTarget && workerTarget === reviewerTarget && workerTarget === mcpTarget,
+  };
+  const codexInstalled = Object.values(components).some(Boolean)
+    || existsSync(join(codexRoot, 'agents', 'ds-flash.toml'))
+    || existsSync(join(codexRoot, 'agents', 'ds-pro.toml'));
+  const missing = Object.entries(components).filter(([, present]) => !present).map(([key]) => key);
+  return {
+    claude: {
+      installed: claudeInstalled,
+      ready: claudeMissing.length === 0,
+      hud: hudWired,
+      components: claudeComponents,
+      missing: claudeMissing,
+    },
+    codex: { installed: codexInstalled, ready: missing.length === 0, components, missing },
+  };
+}
 
 export function uninstallCodex({ home = homedir() } = {}) {
   const actions = [];

package/src/official-web-bridge.mjs

@@ -194,7 +194,12 @@ export function registerOfficialWebBridge(ctx, options = {}) {
       path: `${CREW_BRIDGE_PREFIX}/bridge-status`,
       handler: (req, res) => {
         if (!isTrustedLocalRequest(req)) return sendJson(res, 403, { ok: false, code: 'LOCAL_SAME_ORIGIN_ONLY' });
-        return sendJson(res, 200, { ok: true, mode: 'official-3080-isolated-3210' });
+        return sendJson(res, 200, {
+          ok: true,
+          mode: 'official-3080-isolated-3210',
+          surface: 'official-bridge',
+          ui_role: 'control-plane',
+        });
       },
     });
     const disposeProxy = webCtx.webServer.register({

package/src/runtime-identity.mjs

@@ -8,7 +8,7 @@
 // Keep this module pure and dependency-free so Hub, MCP and tests all use the
 // exact same compatibility rules.
 
-export const RUNTIME_VERSION = '0.4.2';
+export const RUNTIME_VERSION = '0.5.1';
 export const HUB_PROTOCOL_VERSION = 1;
 
 export const HUB_CAPABILITIES = Object.freeze([
@@ -54,9 +54,11 @@ function normalizedCapabilities(value) {
 }
 
 export function getHubRuntimeIdentity() {
-  return {
-    service: 'dsh-crew-hub',
-    runtime_version: RUNTIME_VERSION,
+  return {
+    service: 'dsh-crew-hub',
+    surface: 'native-crew-harness',
+    ui_role: 'runtime',
+    runtime_version: RUNTIME_VERSION,
     protocol_version: HUB_PROTOCOL_VERSION,
     capabilities: [...HUB_CAPABILITIES],
   };