@deftai/directive-core 0.59.0 → 0.61.0

package/dist/verify-env/toolchain-check.js

@@ -1,6 +1,6 @@
 import * as childProcess from "node:child_process";
 import { nodeRuntimeRemediationLines } from "./node-runtime.js";
-export const TOOLS = [
+export const MAINTAINER_TOOLS = [
     { name: "go", command: ["go", "version"] },
     { name: "uv", command: ["uv", "--version"] },
     { name: "git", command: ["git", "--version"] },
@@ -8,6 +8,16 @@ export const TOOLS = [
     { name: "node", command: ["node", "--version"] },
     { name: "pnpm", command: ["pnpm", "--version"] },
 ];
+/** Consumer npm-deposit toolchain (#2022 Phase 3) -- no Python/go/uv maintainer tools. */
+export const CONSUMER_TOOLS = [
+    { name: "git", command: ["git", "--version"] },
+    { name: "gh", command: ["gh", "--version"] },
+    { name: "node", command: ["node", "--version"] },
+    { name: "pnpm", command: ["pnpm", "--version"] },
+    { name: "task", command: ["task", "--version"] },
+];
+/** @deprecated use MAINTAINER_TOOLS */
+export const TOOLS = MAINTAINER_TOOLS;
 const DEFAULT_TIMEOUT_MS = 10_000;
 export function defaultCommandRunner(command, timeoutMs) {
     try {
@@ -30,11 +40,12 @@ export function defaultCommandRunner(command, timeoutMs) {
         };
     }
 }
-/** Run maintainer toolchain probe (mirrors scripts/toolchain-check.py). */
-export function runToolchainCheck(runner = defaultCommandRunner, tools = TOOLS) {
+/** Run maintainer or consumer toolchain probe (mirrors scripts/toolchain-check.py). */
+export function runToolchainCheck(runner = defaultCommandRunner, options = {}, tools) {
+    const selectedTools = tools ?? (options.consumer ? CONSUMER_TOOLS : MAINTAINER_TOOLS);
     const lines = [];
     const failed = [];
-    for (const tool of tools) {
+    for (const tool of selectedTools) {
         const result = runner(tool.command, DEFAULT_TIMEOUT_MS);
         if ("error" in result) {
             if (result.error === "not-found") {

package/dist/verify-env/verify-hooks-installed.d.ts

@@ -5,9 +5,9 @@ export interface EvaluateResult {
     readonly stream: OutputStream;
 }
 export declare const REQUIRED_HOOKS: readonly ["pre-commit", "pre-push"];
-export declare const SCRIPTS_PROBE = "preflight_branch.py";
-export declare const GATE_SCRIPTS: readonly ["preflight_branch.py", "verify_encoding.py", "preflight_gh.py"];
-export declare const SCRIPTS_DIR_CANDIDATES: readonly ["scripts", ".deft/core/scripts", "deft/scripts"];
+/** Substrings each hook must contain when it dispatches through the deft CLI (#2049). */
+export declare const PRE_COMMIT_DEFT_COMMANDS: readonly ["verify:branch", "verify:encoding"];
+export declare const PRE_PUSH_DEFT_COMMANDS: readonly ["preflight-gh"];
 export type GitConfigReader = (projectRoot: string) => {
     hooksPath: string | null;
     error: string | null;

package/dist/verify-env/verify-hooks-installed.js

@@ -1,14 +1,18 @@
 import * as childProcess from "node:child_process";
-import { accessSync, constants, statSync } from "node:fs";
+import { accessSync, constants, readFileSync, statSync } from "node:fs";
 import { join, resolve } from "node:path";
 export const REQUIRED_HOOKS = ["pre-commit", "pre-push"];
-export const SCRIPTS_PROBE = "preflight_branch.py";
-export const GATE_SCRIPTS = [
-    "preflight_branch.py",
-    "verify_encoding.py",
-    "preflight_gh.py",
+/** Substrings each hook must contain when it dispatches through the deft CLI (#2049). */
+export const PRE_COMMIT_DEFT_COMMANDS = ["verify:branch", "verify:encoding"];
+export const PRE_PUSH_DEFT_COMMANDS = ["preflight-gh"];
+/** Patterns that indicate legacy Python-dispatched hooks (pre-#2049). */
+const LEGACY_HOOK_PATTERNS = [
+    /\.py\b/i,
+    /\bpython\b/i,
+    /\bdeft_py\b/,
+    /\bSCRIPTS_DIR\b/,
+    /\bpreflight_branch\.py\b/,
 ];
-export const SCRIPTS_DIR_CANDIDATES = ["scripts", ".deft/core/scripts", "deft/scripts"];
 function defaultGitConfigReader(projectRoot) {
     try {
         const stdout = childProcess.execFileSync("git", ["-C", projectRoot, "config", "--get", "core.hooksPath"], {
@@ -45,15 +49,6 @@ function isDirectory(path) {
         return false;
     }
 }
-function resolveScriptsDir(projectRoot) {
-    for (const rel of SCRIPTS_DIR_CANDIDATES) {
-        const candidate = join(projectRoot, rel);
-        if (isFile(join(candidate, SCRIPTS_PROBE))) {
-            return candidate;
-        }
-    }
-    return null;
-}
 function isPosix(platform) {
     return platform !== "win32";
 }
@@ -66,6 +61,36 @@ function hookExecutable(hookPath) {
         return false;
     }
 }
+function readHookContent(hookPath) {
+    try {
+        return readFileSync(hookPath, "utf8");
+    }
+    catch {
+        return null;
+    }
+}
+function usesLegacyPythonDispatch(content) {
+    return LEGACY_HOOK_PATTERNS.some((pattern) => pattern.test(content));
+}
+function hookInvokesDeftCli(content, requiredCommands) {
+    if (!/\bdeft\b/.test(content))
+        return false;
+    if (usesLegacyPythonDispatch(content))
+        return false;
+    return requiredCommands.every((cmd) => content.includes(cmd));
+}
+function validateHookContent(hookName, content, requiredCommands) {
+    if (content === null) {
+        return `${hookName}: unreadable hook file`;
+    }
+    if (usesLegacyPythonDispatch(content)) {
+        return `${hookName}: still dispatches through Python scripts (expected deft CLI only, #2049)`;
+    }
+    if (!hookInvokesDeftCli(content, requiredCommands)) {
+        return `${hookName}: missing required deft CLI gate(s): ${requiredCommands.join(", ")}`;
+    }
+    return null;
+}
 /** Pure evaluator mirroring scripts/verify_hooks_installed.py::evaluate. */
 export function evaluate(projectRoot, options = {}) {
     const root = resolve(projectRoot);
@@ -132,30 +157,37 @@ export function evaluate(projectRoot, options = {}) {
             };
         }
     }
-    const scriptsDir = resolveScriptsDir(root);
-    if (scriptsDir === null) {
+    const preCommitIssue = validateHookContent("pre-commit", readHookContent(join(hooksDir, "pre-commit")), PRE_COMMIT_DEFT_COMMANDS);
+    if (preCommitIssue) {
+        return {
+            code: 1,
+            message: `❌ deft hooks wired but NON-FUNCTIONAL: ${preCommitIssue} (#2049).\n` +
+                "  Recovery: re-run the deft installer / `task setup` to refresh .githooks/.",
+            stream: "stderr",
+        };
+    }
+    const prePushContent = readHookContent(join(hooksDir, "pre-push"));
+    const prePushIssue = validateHookContent("pre-push", prePushContent, PRE_PUSH_DEFT_COMMANDS);
+    if (prePushIssue) {
         return {
             code: 1,
-            message: "❌ deft hooks wired but NON-FUNCTIONAL: the gate scripts cannot be resolved.\n" +
-                `  Looked for ${SCRIPTS_PROBE} under: ${SCRIPTS_DIR_CANDIDATES.join(", ")} (relative to ${root}).\n` +
-                "  Recovery: re-run the deft installer so the payload is present.",
+            message: `❌ deft hooks wired but NON-FUNCTIONAL: ${prePushIssue} (#2049).\n` +
+                "  Recovery: re-run the deft installer / `task setup` to refresh .githooks/.",
             stream: "stderr",
         };
     }
-    const missingScripts = GATE_SCRIPTS.filter((s) => !isFile(join(scriptsDir, s)));
-    if (missingScripts.length > 0) {
+    if (prePushContent?.includes("verify:branch")) {
         return {
             code: 1,
-            message: `❌ deft hooks wired but NON-FUNCTIONAL: ${scriptsDir} is missing ` +
-                `gate script(s): ${missingScripts.join(", ")} (#1463 false-green).\n` +
-                "  Recovery: re-run the deft installer to restore the payload.",
+            message: "❌ deft hooks wired but NON-FUNCTIONAL: pre-push must not invoke verify:branch (#1814).\n" +
+                "  Recovery: re-run the deft installer / `task setup` to refresh .githooks/.",
             stream: "stderr",
         };
     }
     return {
         code: 0,
         message: `✓ deft hooks installed and functional: core.hooksPath=${hooksPath}, ` +
-            `hooks ${REQUIRED_HOOKS.join(", ")} present, gate scripts resolve under ${scriptsDir}.`,
+            `hooks ${REQUIRED_HOOKS.join(", ")} present and dispatch via deft CLI (#2049).`,
         stream: "stdout",
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deftai/directive-core",
-  "version": "0.59.0",
+  "version": "0.61.0",
   "description": "TypeScript engine core for the Directive framework.",
   "type": "module",
   "main": "./dist/index.js",
@@ -190,6 +190,18 @@
       "types": "./dist/init-deposit/index.d.ts",
       "default": "./dist/init-deposit/index.js"
     },
+    "./migrate-preflight": {
+      "types": "./dist/migrate-preflight/index.d.ts",
+      "default": "./dist/migrate-preflight/index.js"
+    },
+    "./install-upgrade": {
+      "types": "./dist/install-upgrade/index.d.ts",
+      "default": "./dist/install-upgrade/index.js"
+    },
+    "./task-surface": {
+      "types": "./dist/task-surface/index.d.ts",
+      "default": "./dist/task-surface/index.js"
+    },
     "./dist/*.js": {
       "types": "./dist/*.d.ts",
       "default": "./dist/*.js"
@@ -209,8 +221,8 @@
     "provenance": true
   },
   "dependencies": {
-    "@deftai/directive-content": "^0.59.0",
-    "@deftai/directive-types": "^0.59.0"
+    "@deftai/directive-content": "^0.61.0",
+    "@deftai/directive-types": "^0.61.0"
   },
   "scripts": {
     "build": "tsc -b",