intentdna 1.8.7 → 1.9.0-rc.2

package/dist/cli/commands/setup.js

@@ -79,21 +79,32 @@ async function resolvePackagePath() {
     }
     return null;
 }
-/**
- * Check if intentdna is already registered as a plugin.
- */
-function isPluginRegistered() {
+export function parseInstalledPluginInfo(output) {
+    const pluginId = "intentdna@intentdna";
+    const pluginStart = output.indexOf(pluginId);
+    if (pluginStart === -1)
+        return null;
+    const block = output.slice(pluginStart).split(/\n\s*\n/, 1)[0];
+    return {
+        version: block.match(/Version:\s*([^\s]+)/)?.[1] ?? null,
+        enabled: /Status:\s*.*\benabled\b/i.test(block),
+    };
+}
+function getInstalledPluginInfo() {
     try {
         const result = execSync("claude plugin list 2>/dev/null", {
             encoding: "utf-8",
             timeout: 5000,
         });
-        return result.includes("intentdna");
+        return parseInstalledPluginInfo(result);
     }
     catch {
-        return false;
+        return null;
     }
 }
+function isPluginRegistered() {
+    return getInstalledPluginInfo() !== null;
+}
 // ── Main ──────────────────────────────────────────────────
 /**
  * Get the currently installed version of intentdna.
@@ -111,12 +122,10 @@ function getInstalledVersion() {
         return null;
     }
 }
-/**
- * Get the latest published version from npm registry.
- */
-function getLatestVersion() {
+/** Get the version currently published on an npm dist-tag. */
+function getPublishedVersion(channel) {
     try {
-        return execSync("npm view intentdna version 2>/dev/null", {
+        return execSync(`npm view intentdna@${channel} version 2>/dev/null`, {
             encoding: "utf-8",
             timeout: 10000,
         }).trim();
@@ -125,8 +134,63 @@ function getLatestVersion() {
         return null;
     }
 }
+function parseReleaseVersion(version) {
+    const match = version.trim().match(/^(\d+)\.(\d+)\.(\d+)(?:-([0-9A-Za-z.-]+))?(?:\+[0-9A-Za-z.-]+)?$/);
+    if (!match)
+        return null;
+    return {
+        core: [Number(match[1]), Number(match[2]), Number(match[3])],
+        prerelease: match[4]?.split(".") ?? null,
+    };
+}
+function comparePrerelease(left, right) {
+    if (left === null && right === null)
+        return 0;
+    if (left === null)
+        return 1;
+    if (right === null)
+        return -1;
+    const length = Math.max(left.length, right.length);
+    for (let index = 0; index < length; index += 1) {
+        const leftPart = left[index];
+        const rightPart = right[index];
+        if (leftPart === undefined)
+            return -1;
+        if (rightPart === undefined)
+            return 1;
+        if (leftPart === rightPart)
+            continue;
+        const leftNumeric = /^\d+$/.test(leftPart);
+        const rightNumeric = /^\d+$/.test(rightPart);
+        if (leftNumeric && rightNumeric)
+            return Number(leftPart) < Number(rightPart) ? -1 : 1;
+        if (leftNumeric !== rightNumeric)
+            return leftNumeric ? -1 : 1;
+        return leftPart < rightPart ? -1 : 1;
+    }
+    return 0;
+}
+export function releaseChannelForVersion(version) {
+    if (!version)
+        return "latest";
+    return parseReleaseVersion(version)?.prerelease ? "next" : "latest";
+}
+export function shouldInstallLatestVersion(installedVersion, latestVersion) {
+    if (installedVersion === latestVersion)
+        return false;
+    const installed = parseReleaseVersion(installedVersion);
+    const latest = parseReleaseVersion(latestVersion);
+    if (!installed || !latest)
+        return true;
+    for (let index = 0; index < installed.core.length; index += 1) {
+        if (installed.core[index] === latest.core[index])
+            continue;
+        return installed.core[index] < latest.core[index];
+    }
+    return comparePrerelease(installed.prerelease, latest.prerelease) < 0;
+}
 /**
- * Upgrade flow: npm update → re-register marketplace → re-install plugin.
+ * Upgrade flow: install from the current release channel → refresh marketplace → update and verify plugin.
  */
 async function runUpgrade(opts) {
     // Step 1: Detect claude CLI
@@ -138,20 +202,26 @@ async function runUpgrade(opts) {
     log(`Claude Code detected: ${claudeVersion}`);
     // Step 2: Check versions
     const currentVer = getInstalledVersion();
-    const latestVer = getLatestVersion();
+    const releaseChannel = releaseChannelForVersion(currentVer);
+    const publishedVer = getPublishedVersion(releaseChannel);
     if (currentVer)
         log(`Current version: ${currentVer}`);
-    if (latestVer)
-        log(`Latest version:  ${latestVer}`);
-    if (currentVer && latestVer && currentVer === latestVer) {
-        log("Already at latest version.");
+    log(`Target channel:  ${releaseChannel}`);
+    if (publishedVer)
+        log(`Target version:  ${publishedVer}`);
+    if (!publishedVer) {
+        log(`Upgrade failed: could not resolve intentdna@${releaseChannel} from npm.`);
+        return 1;
+    }
+    if (currentVer && !shouldInstallLatestVersion(currentVer, publishedVer)) {
+        log(`Already at the ${releaseChannel} channel version or newer; refusing to downgrade.`);
     }
     else {
         // Step 3: npm update
         log("");
-        log("Updating intentdna...");
+        log(`Updating intentdna from the ${releaseChannel} channel...`);
         try {
-            execSync("npm update -g intentdna", {
+            execSync(`npm install -g intentdna@${releaseChannel}`, {
                 encoding: "utf-8",
                 timeout: 60000,
                 stdio: ["inherit", "pipe", "pipe"],
@@ -162,10 +232,19 @@ async function runUpgrade(opts) {
         catch (err) {
             const msg = err instanceof Error ? err.message : String(err);
             log(`npm update failed: ${msg}`);
-            log("Try manually: npm update -g intentdna");
+            log(`Try manually: npm install -g intentdna@${releaseChannel}`);
             return 1;
         }
     }
+    const upgradedVersion = getInstalledVersion();
+    if (!upgradedVersion) {
+        log("Upgrade failed: could not verify the installed npm package version.");
+        return 1;
+    }
+    if (shouldInstallLatestVersion(upgradedVersion, publishedVer)) {
+        log(`Upgrade failed: installed npm version ${upgradedVersion} is older than ${releaseChannel} channel version ${publishedVer}.`);
+        return 1;
+    }
     // Step 4: Re-resolve package path
     const pkgPath = await resolvePackagePath();
     if (!pkgPath) {
@@ -173,11 +252,11 @@ async function runUpgrade(opts) {
         return 1;
     }
     log(`Package path: ${pkgPath}`);
-    // Step 5: Re-register marketplace (picks up new plugin.json version)
+    // Step 5: Refresh marketplace (picks up new plugin.json version)
     try {
         log("");
-        log(`Re-registering marketplace: ${pkgPath}`);
-        execSync(`claude plugin marketplace add "${pkgPath}"`, {
+        log("Refreshing marketplace: intentdna");
+        execSync("claude plugin marketplace update intentdna", {
             encoding: "utf-8",
             timeout: 30000,
             stdio: ["inherit", "pipe", "pipe"],
@@ -186,35 +265,49 @@ async function runUpgrade(opts) {
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        log(`Warning: marketplace re-register failed: ${msg}`);
+        log(`Marketplace refresh failed: ${msg}`);
+        log(`Try manually: claude plugin marketplace add "${pkgPath}"`);
+        return 1;
     }
-    // Step 6: Re-install plugin (picks up new hooks.json)
+    // Step 6: Update plugin (picks up new hooks.json and MCP runtime)
     try {
-        const installCmd = `claude plugin install intentdna@intentdna --scope ${opts.scope}`;
-        log(`Re-installing plugin: ${installCmd}`);
-        execSync(installCmd, {
+        const updateCmd = "claude plugin update intentdna@intentdna";
+        log(`Updating plugin: ${updateCmd}`);
+        execSync(updateCmd, {
             encoding: "utf-8",
             timeout: 30000,
             stdio: ["inherit", "pipe", "pipe"],
         });
-        log("Plugin re-installed.");
+        log("Plugin updated.");
     }
     catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
-        log(`Warning: plugin re-install failed: ${msg}`);
+        log(`Plugin update failed: ${msg}`);
+        log(`Try manually: claude plugin install intentdna@intentdna --scope ${opts.scope}`);
+        return 1;
     }
     // Step 7: Verify
-    if (isPluginRegistered()) {
+    const plugin = getInstalledPluginInfo();
+    if (!plugin?.version) {
         log("");
-        log("Upgrade complete. Run 'dna sync' to recompile your DNA templates.");
-        return 0;
+        log("Upgrade failed: the IntentDNA Claude plugin version could not be verified.");
+        log("Try: claude plugin list");
+        return 1;
     }
-    else {
+    if (plugin.version !== upgradedVersion) {
         log("");
-        log("Upgrade completed but plugin verification failed.");
-        log("Try: claude plugin list");
+        log(`Upgrade failed: Claude plugin version ${plugin.version} does not match npm version ${upgradedVersion}.`);
+        return 1;
+    }
+    if (!plugin.enabled) {
+        log("");
+        log("Upgrade failed: the version-matched IntentDNA Claude plugin is disabled.");
         return 1;
     }
+    log("");
+    log(`Upgrade complete: npm and Claude plugin are both ${upgradedVersion}.`);
+    log("Restart Claude Code, then run 'dna sync' in each project before resuming workflows.");
+    return 0;
 }
 export async function runSetup(opts) {
     // Upgrade mode

package/dist/cli/commands/source-assets.d.ts

@@ -0,0 +1,32 @@
+import type { DiscoveredSkillSource, SourceSnapshot } from "../../sources/types.js";
+export interface SourceAssetsOptions {
+    homeDir?: string;
+    projectDir?: string;
+    sourceDirs?: readonly string[];
+    customRoots?: readonly string[];
+    sourceId?: string;
+    snapshot?: boolean;
+    packet?: boolean;
+    write?: string;
+    json?: boolean;
+    generatedAt?: string;
+}
+export interface SourceAssetsCatalog {
+    schema_version: "intentdna.source_catalog.v1";
+    generated_at: string;
+    sources: DiscoveredSkillSource[];
+    network_performed: false;
+    mutation_performed: false;
+    runtime_authority: false;
+}
+export interface SourceSnapshotCollection {
+    schema_version: "intentdna.source_snapshot_collection.v1";
+    generated_at: string;
+    snapshots: SourceSnapshot[];
+    network_performed: false;
+    mutation_performed: false;
+    runtime_authority: false;
+}
+export declare function buildSourceAssetsCatalog(options?: SourceAssetsOptions): Promise<SourceAssetsCatalog>;
+export declare function buildSourceAssetsSnapshots(options?: SourceAssetsOptions): Promise<SourceSnapshotCollection>;
+export declare function runSourceAssets(options?: SourceAssetsOptions): Promise<number>;

package/dist/cli/commands/source-assets.js

@@ -0,0 +1,154 @@
+import { lstat, mkdir, writeFile } from "node:fs/promises";
+import { dirname, isAbsolute, relative, resolve, sep } from "node:path";
+import { buildSourceAuthoringPacket } from "../../sources/authoring-packet.js";
+import { discoverSkillSources } from "../../sources/discovery.js";
+import { createSourceSnapshot } from "../../sources/manifest.js";
+function unique(values) {
+    return [...new Set(values)];
+}
+function inside(root, target) {
+    const rel = relative(root, target);
+    return rel !== "" && !rel.startsWith("..") && !isAbsolute(rel);
+}
+function selectSource(sources, selector, preferredRoots = []) {
+    const exact = sources.find((source) => source.source_id === selector);
+    if (exact)
+        return exact;
+    const named = sources.filter((source) => source.name === selector);
+    for (const preferredRoot of preferredRoots) {
+        const root = resolve(preferredRoot);
+        const preferred = named.find((source) => {
+            const skillDir = resolve(source.skill_dir);
+            return skillDir === root || inside(root, skillDir);
+        });
+        if (preferred)
+            return preferred;
+    }
+    return named[0];
+}
+async function assertNoSymlinkedParents(root, target) {
+    const parentRelative = relative(root, dirname(target));
+    let current = root;
+    for (const segment of parentRelative.split(sep)) {
+        if (!segment)
+            continue;
+        current = resolve(current, segment);
+        try {
+            const metadata = await lstat(current);
+            if (metadata.isSymbolicLink()) {
+                throw new Error(`Source artifact parent must not be a symbolic link: ${current}`);
+            }
+        }
+        catch (error) {
+            if (error.code === "ENOENT")
+                break;
+            throw error;
+        }
+    }
+}
+async function writePacketOrSnapshot(payload, projectDir, destination) {
+    const authoringRoot = resolve(projectDir, ".dna", "authoring");
+    const target = resolve(projectDir, destination);
+    if (!inside(authoringRoot, target)) {
+        throw new Error(`Source artifacts may only be written inside ${authoringRoot}`);
+    }
+    await assertNoSymlinkedParents(projectDir, target);
+    await mkdir(dirname(target), { recursive: true });
+    await assertNoSymlinkedParents(projectDir, target);
+    await writeFile(target, `${JSON.stringify(payload, null, 2)}\n`, { encoding: "utf8", flag: "wx" });
+    return target;
+}
+export async function buildSourceAssetsCatalog(options = {}) {
+    const generatedAt = options.generatedAt ?? new Date().toISOString();
+    const sources = await discoverSkillSources({
+        homeDir: options.homeDir,
+        projectDir: options.projectDir,
+        customRoots: unique([...(options.sourceDirs ?? []), ...(options.customRoots ?? [])]),
+    });
+    return {
+        schema_version: "intentdna.source_catalog.v1",
+        generated_at: generatedAt,
+        sources,
+        network_performed: false,
+        mutation_performed: false,
+        runtime_authority: false,
+    };
+}
+export async function buildSourceAssetsSnapshots(options = {}) {
+    const catalog = await buildSourceAssetsCatalog(options);
+    const snapshots = await Promise.all(catalog.sources.map((source) => createSourceSnapshot({
+        sourceId: source.source_id,
+        skillDir: source.skill_dir,
+        generatedAt: catalog.generated_at,
+    })));
+    return {
+        schema_version: "intentdna.source_snapshot_collection.v1",
+        generated_at: catalog.generated_at,
+        snapshots,
+        network_performed: false,
+        mutation_performed: false,
+        runtime_authority: false,
+    };
+}
+export async function runSourceAssets(options = {}) {
+    const projectDir = resolve(options.projectDir ?? process.cwd());
+    try {
+        const catalog = await buildSourceAssetsCatalog({ ...options, projectDir });
+        let payload = catalog;
+        if (options.sourceId) {
+            const source = selectSource(catalog.sources, options.sourceId, options.sourceDirs);
+            if (!source) {
+                process.stderr.write(`Unknown source asset: ${options.sourceId}\n`);
+                return 2;
+            }
+            if (!options.packet) {
+                process.stderr.write("Error: selecting a source requires --packet.\n");
+                return 2;
+            }
+            payload = await buildSourceAuthoringPacket({
+                skillDir: source.skill_dir,
+                projectDir,
+                generatedAt: catalog.generated_at,
+                sourceId: source.source_id,
+            });
+        }
+        else if (options.packet) {
+            process.stderr.write("Error: --packet requires a source ID or source name.\n");
+            return 2;
+        }
+        else if (options.snapshot) {
+            payload = await buildSourceAssetsSnapshots({ ...options, projectDir, generatedAt: catalog.generated_at });
+        }
+        if (options.write) {
+            if (payload.schema_version === "intentdna.source_catalog.v1") {
+                process.stderr.write("Error: --write requires --snapshot or --packet.\n");
+                return 2;
+            }
+            const written = await writePacketOrSnapshot(payload, projectDir, options.write);
+            if (options.json) {
+                process.stdout.write(`${JSON.stringify({ written, payload }, null, 2)}\n`);
+            }
+            else {
+                process.stderr.write(`Wrote source artifact: ${written}\n`);
+            }
+            return 0;
+        }
+        if (options.json) {
+            process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+        }
+        else if (payload.schema_version === "intentdna.source_catalog.v1") {
+            process.stderr.write(`Source assets: ${payload.sources.length}\n`);
+            for (const source of payload.sources) {
+                process.stderr.write(`  - ${source.source_id} (${source.skill_markdown_path})\n`);
+            }
+        }
+        else {
+            process.stdout.write(`${JSON.stringify(payload, null, 2)}\n`);
+        }
+        return 0;
+    }
+    catch (error) {
+        process.stderr.write(`${error instanceof Error ? error.message : String(error)}\n`);
+        return 2;
+    }
+}

package/dist/cli/commands/sync.js

@@ -28,6 +28,8 @@ import { removeWorkflowScripts } from "../../runtime/workflow-runner.js";
 import { compileWorkflowToSkill, compileControllerToSkill, writeSkillFiles, removeSkillFiles } from "../../runtime/skill-adapter.js";
 import { getControllerKindMetadata } from "../../schema/controller-registry.js";
 import { createCodexSyncTargetPlan, executeCodexSyncTargetPlan, formatCodexSyncTargetPlanSummary, removeCodexSyncTargetArtifacts } from "../../runtime/codex-sync-target.js";
+import { createWorkflowRuntimeManifest } from "../../runtime/workflow-runtime-manifest.js";
+import { flattenResolvedVariableScopes, indexWorkflowVariableScopes, resolvedVariablesForNamespace, } from "../../runtime/workflow-variable-scopes.js";
 import { trackedOutputsForSyncTargetPlan } from "../../runtime/sync-target-plan.js";
 import { getPackageVersion } from "../util/version.js";
 import { cascadeDNA } from "../../compiler/cascade.js";
@@ -167,6 +169,24 @@ async function resolveVariables(rawVars, configPath, options) {
     }
     return resolved;
 }
+async function resolveVariableScopes(dnas, configPath, options) {
+    const index = indexWorkflowVariableScopes(dnas);
+    const variableNamespaces = [...index.rawByNamespace.entries()]
+        .filter(([, raw]) => Object.keys(raw).length > 0)
+        .map(([namespace]) => namespace);
+    const resolvedByNamespace = new Map();
+    for (const [namespace, raw] of index.rawByNamespace) {
+        const writableConfigPath = variableNamespaces.length === 1 ? configPath : null;
+        resolvedByNamespace.set(namespace, await resolveVariables(raw, writableConfigPath, options));
+    }
+    return {
+        flat: flattenResolvedVariableScopes(index, resolvedByNamespace),
+        workflowNamespaces: index.workflowNamespaces,
+        workflowAssets: index.workflowAssets,
+        controllerNamespaces: index.controllerNamespaces,
+        forNamespace: (namespace) => resolvedVariablesForNamespace(resolvedByNamespace, namespace),
+    };
+}
 /**
  * Auto-detect DNA config file in current directory (legacy single-config).
  * Priority: .dna/config.yaml > .dna/config.yml > .dna/config.json > .dna.yaml > .dna.yml > .dna.json
@@ -783,13 +803,39 @@ export async function runSync(opts) {
                 trackedByLock: true,
             });
         }
+        const cascadedForRuntime = cascadeDNA(loadedDNAs);
+        const variableConfigPath = opts.files.length === 1 ? opts.files[0] : null;
+        const variableScopes = await resolveVariableScopes(loadedDNAs, variableConfigPath, { dryRun: opts.dryRun });
+        const variables = variableScopes.flat;
+        const workflowPlans = [];
+        for (const [workflowKey, workflowDef] of Object.entries(cascadedForRuntime.workflows)) {
+            const result = compileWorkflow(workflowDef, { workflow_key: workflowKey });
+            if (!result.ok || !result.plan) {
+                throw new Error(`Workflow '${workflowKey}' compilation failed:\n${result.errors.map((error) => `  ${error.path}: ${error.message}`).join("\n")}`);
+            }
+            workflowPlans.push(result.plan);
+        }
+        if (!ir.compiled_ir_hash) {
+            throw new Error("Compiled IR hash is required for workflow runtime bindings");
+        }
+        const workflowRuntime = createWorkflowRuntimeManifest({
+            plans: workflowPlans.map((plan) => ({
+                plan,
+                resolvedVariables: variableScopes.forNamespace(variableScopes.workflowNamespaces.get(plan.workflow_key ?? plan.source_workflow) ?? ""),
+                workflowAsset: variableScopes.workflowAssets.get(plan.workflow_key ?? plan.source_workflow),
+                additionalRuntimeValues: ir.verifier_specs?.filter((spec) => spec.workflow_name === (plan.workflow_key ?? plan.source_workflow)) ?? [],
+            })),
+            compiledAt: ir.compiled_at,
+            compiledIrHash: ir.compiled_ir_hash,
+            sourceDnaIds: ir.source_dna_ids,
+        });
         // Step 3.5: Execute Claude Code core target plan (compiled IR, MCP, settings hooks)
         {
-            const cascadedForCore = cascadeDNA(loadedDNAs);
             const claudeCorePlan = createClaudeCoreSyncTargetPlan({
                 projectDir,
                 ir,
-                roles: cascadedForCore.roles,
+                roles: cascadedForRuntime.roles,
+                workflowRuntime,
                 mode: opts.plugin ? "plugin" : "bin",
                 settingsPath: opts.settingsPath,
             });
@@ -913,14 +959,6 @@ export async function runSync(opts) {
             const workflows = cascadedForSkills.workflows;
             const controllers = cascadedForSkills.controllers;
             const roles = cascadedForSkills.roles;
-            // Collect and resolve variables from all DNA files
-            const rawVars = {};
-            for (const d of dnas) {
-                if (d.variables)
-                    Object.assign(rawVars, d.variables);
-            }
-            const configPath = opts.files.length === 1 ? opts.files[0] : null;
-            const variables = await resolveVariables(rawVars, configPath, { dryRun: opts.dryRun });
             // Step 8: Generate project-root .mcp.json only for Claude Code skills.
             if (skillSurface === "claude_code") {
                 const mcpDeps = {};
@@ -947,14 +985,16 @@ export async function runSync(opts) {
                 for (const [name, wfDef] of Object.entries(workflows)) {
                     const result = compileWorkflow(wfDef, { workflow_key: name });
                     if (result.ok) {
-                        skillResults.push(compileWorkflowToSkill(result.plan, roles, ir, variables, { surface: skillSurface }));
+                        const workflowVariables = variableScopes.forNamespace(variableScopes.workflowNamespaces.get(name) ?? "");
+                        skillResults.push(compileWorkflowToSkill(result.plan, roles, ir, workflowVariables, { surface: skillSurface }));
                     }
                 }
                 if (skillSurface === "claude_code") {
                     for (const [name, controllerDef] of Object.entries(controllers)) {
                         const controllerKind = getControllerKindMetadata(controllerDef.kind);
                         if (controllerKind?.supportsSkillGeneration) {
-                            skillResults.push(compileControllerToSkill(name, controllerDef, variables, workflows));
+                            const controllerVariables = variableScopes.forNamespace(variableScopes.controllerNamespaces.get(name) ?? "");
+                            skillResults.push(compileControllerToSkill(name, controllerDef, controllerVariables, workflows));
                         }
                     }
                 }