@simulatte/doppler 0.1.3 → 0.1.5

package/tools/doppler-cli.js

@@ -13,6 +13,8 @@ import { createToolingErrorEnvelope } from '../src/tooling/command-envelope.js';
 
 const NODE_WEBGPU_INCOMPLETE_MESSAGE = 'node command: WebGPU runtime is incomplete in Node';
 const CLI_POLICY_PATH = fileURLToPath(new URL('./configs/cli/doppler-cli-policy.json', import.meta.url));
+const DEFAULT_EXTERNAL_MODELS_ROOT = process.env.DOPPLER_EXTERNAL_MODELS_ROOT || '/media/x/models';
+const DEFAULT_EXTERNAL_RDRR_ROOT = path.join(DEFAULT_EXTERNAL_MODELS_ROOT, 'rdrr');
 const DEFAULT_CLI_POLICY = {
   defaults: {
     surface: {
@@ -413,6 +415,37 @@ async function resolveBrowserModelUrl(request, browserOptions = {}) {
   };
 }
 
+export async function resolveNodeModelUrl(request, options = {}) {
+  if (request.modelUrl || !request.modelId) {
+    return request;
+  }
+
+  const modelId = String(request.modelId);
+  const rdrrRoot = path.resolve(asStringOrNull(options.rdrrRoot) || DEFAULT_EXTERNAL_RDRR_ROOT);
+  const manifestPath = path.join(rdrrRoot, modelId, 'manifest.json');
+  if (!await pathExists(manifestPath)) {
+    return request;
+  }
+
+  const modelDir = path.dirname(manifestPath);
+  try {
+    const files = await fs.readdir(modelDir, { withFileTypes: true });
+    const hasShards = files.some((entry) =>
+      entry.isFile() && /^shard_\d+\.bin$/u.test(entry.name)
+    );
+    if (!hasShards) {
+      return request;
+    }
+  } catch {
+    return request;
+  }
+
+  return {
+    ...request,
+    modelUrl: pathToFileURL(modelDir).href.replace(/\/$/, ''),
+  };
+}
+
 function parseSurface(value, command, policy = DEFAULT_CLI_POLICY) {
   const normalizedInput = asStringOrNull(value);
   const normalizedSurface = policy.defaults && policy.defaults.surface && policy.defaults.surface.default
@@ -616,10 +649,14 @@ function isTrainingCommandFlow(request) {
 
 async function runCommandOnSurface(request, surface, runConfig, jsonOutput) {
   if (surface === 'node') {
+    const nodeRequest = await resolveNodeModelUrl(request);
     if (!jsonOutput) {
       console.error('[surface] running on: node');
+      if (nodeRequest.modelUrl && nodeRequest.modelUrl !== request.modelUrl) {
+        console.error(`[surface] node resolved modelUrl=${nodeRequest.modelUrl}`);
+      }
     }
-    return runNodeCommand(request, buildNodeRunOptions(jsonOutput));
+    return runNodeCommand(nodeRequest, buildNodeRunOptions(jsonOutput));
   }
 
   const browserOptions = buildBrowserRunOptions(runConfig, jsonOutput, request);
@@ -676,7 +713,17 @@ function toSummary(result) {
   }
 
   if (result.manifest?.modelId) {
-    return `converted ${result.manifest.modelId} (${result.tensorCount} tensors, ${result.shardCount} shards)`;
+    const contractStatus = result.executionContractArtifact?.ok === true
+      ? ' contract=pass'
+      : result.executionContractArtifact
+        ? ' contract=fail'
+        : '';
+    const graphStatus = result.executionV0GraphContractArtifact?.ok === true
+      ? ' graph=pass'
+      : result.executionV0GraphContractArtifact
+        ? ' graph=fail'
+        : '';
+    return `converted ${result.manifest.modelId} (${result.tensorCount} tensors, ${result.shardCount} shards)${contractStatus}${graphStatus}`;
   }
 
   const suite = result.suite || result.report?.suite || 'suite';
@@ -977,6 +1024,102 @@ function printMemoryReport(result) {
   console.log(`[memory] ${parts.join(' ')}`);
 }
 
+function printExecutionContractSummary(result) {
+  const artifact = result?.metrics?.executionContractArtifact;
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const session = artifact.session && typeof artifact.session === 'object'
+    ? artifact.session
+    : null;
+  const attentionPhases = artifact.steps?.attentionPhases && typeof artifact.steps.attentionPhases === 'object'
+    ? artifact.steps.attentionPhases
+    : null;
+  const parts = [
+    `status=${artifact.ok === true ? 'pass' : 'fail'}`,
+    checks.length > 0 ? `checks=${passedChecks}/${checks.length}` : 'checks=n/a',
+  ];
+  if (session?.layout) {
+    parts.push(`layout=${session.layout}`);
+  }
+  if (attentionPhases) {
+    parts.push(
+      `attn(prefill=${attentionPhases.prefill ?? 'n/a'},decode=${attentionPhases.decode ?? 'n/a'},both=${attentionPhases.both ?? 'n/a'})`
+    );
+  }
+  console.log(`[contract] ${parts.join(' ')}`);
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[contract] error=${quoteOneLine(error)}`);
+    }
+  }
+}
+
+function printExecutionV0GraphSummary(artifact) {
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const stats = artifact.stats && typeof artifact.stats === 'object' ? artifact.stats : null;
+  const parts = [
+    `status=${artifact.ok === true ? 'pass' : 'fail'}`,
+    checks.length > 0 ? `checks=${passedChecks}/${checks.length}` : 'checks=n/a',
+  ];
+  if (Number.isFinite(stats?.prefillSteps) || Number.isFinite(stats?.decodeSteps)) {
+    parts.push(`steps(prefill=${stats?.prefillSteps ?? 'n/a'},decode=${stats?.decodeSteps ?? 'n/a'})`);
+  }
+  console.log(`[graph] ${parts.join(' ')}`);
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[graph] error=${quoteOneLine(error)}`);
+    }
+  }
+}
+
+function printSimpleArtifactSummary(label, artifact) {
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  console.log(
+    `[${label}] status=${artifact.ok === true ? 'pass' : 'fail'} ` +
+    `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'}`
+  );
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 2)) {
+      console.log(`[${label}] error=${quoteOneLine(error)}`);
+    }
+  }
+}
+
+function printConvertContractSummary(result) {
+  const artifact = result?.executionContractArtifact;
+  if (!artifact || typeof artifact !== 'object') return;
+  const checks = Array.isArray(artifact.checks) ? artifact.checks : [];
+  const passedChecks = checks.filter((entry) => entry?.ok === true).length;
+  const session = artifact.session && typeof artifact.session === 'object'
+    ? artifact.session
+    : null;
+  console.log(
+    `[contract] status=${artifact.ok === true ? 'pass' : 'fail'} ` +
+    `checks=${checks.length > 0 ? `${passedChecks}/${checks.length}` : 'n/a'} ` +
+    `layout=${session?.layout ?? 'n/a'}`
+  );
+  if (artifact.ok !== true && Array.isArray(artifact.errors)) {
+    for (const error of artifact.errors.slice(0, 3)) {
+      console.log(`[contract] error=${quoteOneLine(error)}`);
+    }
+  }
+  printExecutionV0GraphSummary(result?.executionV0GraphContractArtifact);
+  printSimpleArtifactSummary('layer-pattern', result?.layerPatternContractArtifact);
+  printSimpleArtifactSummary('required-inference', result?.requiredInferenceFieldsArtifact);
+}
+
+function printConvertReportSummary(result) {
+  const reportInfo = result?.reportInfo;
+  if (!reportInfo || typeof reportInfo !== 'object') return;
+  if (typeof reportInfo.path !== 'string' || reportInfo.path.length === 0) return;
+  console.log(`[report] ${reportInfo.path}`);
+}
+
 function printMetricsSummary(result) {
   if (!result || typeof result !== 'object') return;
   const suite = String(result.suite || '');
@@ -1001,6 +1144,8 @@ function printMetricsSummary(result) {
       `prefill=${formatNumber(metrics.prefillTokensPerSec)} ` +
       `decode=${formatNumber(metrics.decodeTokensPerSec)}`
     );
+    printExecutionContractSummary(result);
+    printExecutionV0GraphSummary(metrics.executionV0GraphContractArtifact);
     return;
   }
 
@@ -1015,6 +1160,8 @@ function printMetricsSummary(result) {
         `median=${formatMs(metrics.medianEmbeddingMs)} avg=${formatMs(metrics.avgEmbeddingMs)} ` +
         `eps=${formatNumber(metrics.avgEmbeddingsPerSec)}`
       );
+      printExecutionContractSummary(result);
+      printExecutionV0GraphSummary(metrics.executionV0GraphContractArtifact);
       return;
     }
 
@@ -1036,6 +1183,8 @@ function printMetricsSummary(result) {
       `[metrics] latency first=${formatMs(metrics.firstTokenMs)} ` +
       `prefill=${formatMs(metrics.prefillMs)} decode=${formatMs(metrics.decodeMs)}`
     );
+    printExecutionContractSummary(result);
+    printExecutionV0GraphSummary(metrics.executionV0GraphContractArtifact);
     printDeviceInfo(result);
     printGpuPhases(metrics);
     printMemoryReport(result);
@@ -1153,6 +1302,8 @@ async function main() {
     }
 
     console.log(`[ok] ${toSummary(response.result)}`);
+    printConvertContractSummary(response.result);
+    printConvertReportSummary(response.result);
     printMetricsSummary(response.result);
   } catch (error) {
     if (jsonOutputRequested) {
@@ -1164,7 +1315,17 @@ async function main() {
   }
 }
 
-main().catch((error) => {
-  console.error(`[error] ${error?.message || String(error)}`);
-  process.exit(1);
-});
+function isMainModule(metaUrl) {
+  const entryPath = process.argv[1];
+  if (!entryPath) {
+    return false;
+  }
+  return path.resolve(fileURLToPath(metaUrl)) === path.resolve(entryPath);
+}
+
+if (isMainModule(import.meta.url)) {
+  main().catch((error) => {
+    console.error(`[error] ${error?.message || String(error)}`);
+    process.exit(1);
+  });
+}