devflow-kit 2.5.0 → 3.0.1

package/dist/cli/commands/proxy.js

@@ -24,7 +24,7 @@ import * as p from '@clack/prompts';
 import color from 'picocolors';
 import { readProxyState, writeProxyState, buildProxyState, buildRoutingConfigJson, proxyBaseUrl, proxyJsonExists, resolveProxyBin, DEFAULT_PROXY_PORT, } from '../../core/proxy-state.js';
 import { syncManifestFeature, readManifest } from '../../core/manifest.js';
-import { writeFileAtomicExclusive } from '../../core/fs-atomic.js';
+import { writeSettingsFileAtomic } from '../../core/fs-atomic.js';
 import { scrubChildEnv, openProxyLog, rotateProxyLogIfLarge } from '../../core/proxy-log.js';
 import { inspectCodexAuth, classifyCodexAuthReadError } from '../../core/codex-auth-inspect.js';
 import { stripAnsi } from '../../hud/colors.js';
@@ -32,6 +32,7 @@ import { reapplyAgentMapping, revertExternalAgents, countExternalMappedAgents, r
 import { getExternalModelsCached, discoverExternalModels, } from '../../core/model-discovery.js';
 import { modelCacheDir } from '../../core/cache.js';
 import { getClaudeDirectory, getDevFlowDirectory, getHomeDirectory, } from '../../targets/claude-code/claude-paths.js';
+import { devflowHookOwner, ensureHook, hasHook, removeHooks, runHookCommand, } from '../../targets/claude-code/hooks.js';
 function Ok(value) {
     return { ok: true, value };
 }
@@ -39,8 +40,17 @@ function Err(error) {
     return { ok: false, error };
 }
 // ─── Constants ────────────────────────────────────────────────────────────────
-/** Marker used to identify ensure-proxy hook entries. */
+/** The run-hook marker of the ensure-proxy hook. */
 const PROXY_HOOK_MARKER = 'ensure-proxy';
+/**
+ * D-EXACT-HOOK-OWNER: the ensure-proxy hook is devflow's only when its command ends
+ * in `/scripts/hooks/run-hook ensure-proxy` (hooks.ts), under any directory — the one
+ * form it has ever been registered in. A user's hook that merely mentions the word
+ * is theirs.
+ */
+const isProxyHook = devflowHookOwner([PROXY_HOOK_MARKER]);
+/** The events the ensure-proxy hook is registered on. */
+const PROXY_HOOK_EVENTS = ['SessionStart', 'UserPromptSubmit'];
 /** Pattern matching our relay's ANTHROPIC_BASE_URL value. */
 const OUR_BASE_URL_PATTERN = /^http:\/\/127\.0\.0\.1:\d+$/;
 /** Timeout for individual TCP connect probes and HTTP health checks (ms). */
@@ -166,34 +176,6 @@ function _stripProxyEnvFromObject(settings, managedPort) {
         delete s.env;
     return removedUrl || hadWindowVar; // OR the locals — never compose with || inline (PF-015)
 }
-/** Internal: add ensure-proxy hook to one event. Returns true when added. */
-function _ensureProxyHook(settings, eventName, hookCmd) {
-    const existing = settings.hooks?.[eventName];
-    if (existing?.some((m) => m.hooks.some((h) => h.command.includes(PROXY_HOOK_MARKER)))) {
-        return false;
-    }
-    settings.hooks ??= {};
-    settings.hooks[eventName] ??= [];
-    const entry = {
-        hooks: [{ type: 'command', command: hookCmd, timeout: 15 }],
-    };
-    settings.hooks[eventName].push(entry);
-    return true;
-}
-/** Internal: remove ensure-proxy hooks from one event. Returns true when removed. */
-function _filterProxyHooks(settings, eventName) {
-    if (!settings.hooks?.[eventName])
-        return false;
-    const before = settings.hooks[eventName].length;
-    settings.hooks[eventName] = settings.hooks[eventName].filter((m) => !m.hooks.some((h) => h.command.includes(PROXY_HOOK_MARKER)));
-    if (settings.hooks[eventName].length === before)
-        return false;
-    if (settings.hooks[eventName].length === 0)
-        delete settings.hooks[eventName];
-    if (Object.keys(settings.hooks).length === 0)
-        delete settings.hooks;
-    return true;
-}
 // ─── Pure env functions (exported for testing and cross-module reuse) ─────────
 /**
  * Apply ANTHROPIC_BASE_URL=http://127.0.0.1:<port> to settings JSON.
@@ -251,20 +233,21 @@ export function readProxyEnvState(settingsJson, port) {
  * Mutates settings in place. Returns true when any hook was added.
  */
 export function addProxyHooks(settings, devflowDir) {
-    const hookCmd = path.join(devflowDir, 'scripts', 'hooks', 'run-hook') + ' ' + PROXY_HOOK_MARKER;
-    const addedSession = _ensureProxyHook(settings, 'SessionStart', hookCmd);
-    const addedPrompt = _ensureProxyHook(settings, 'UserPromptSubmit', hookCmd);
+    const command = runHookCommand(devflowDir, PROXY_HOOK_MARKER);
+    // Evaluate each event into its own local — never short-circuit (PF-015).
+    const [addedSession, addedPrompt] = PROXY_HOOK_EVENTS.map((event) => ensureHook(settings, event, isProxyHook, { hooks: [{ type: 'command', command, timeout: 15 }] }));
     return addedSession || addedPrompt;
 }
 /**
  * Remove ensure-proxy hooks from all events.
  * Idempotent — no-op when hooks are not present.
- * Preserves other hooks. Cleans empty arrays/objects.
+ * Removes single hooks, so the other hooks of a shared matcher group stay in place
+ * (D-EXACT-HOOK-OWNER). Cleans empty arrays/objects.
  * Mutates settings in place. Returns true when any hook was removed.
  */
 export function removeProxyHooks(settings) {
-    const removedSession = _filterProxyHooks(settings, 'SessionStart');
-    const removedPrompt = _filterProxyHooks(settings, 'UserPromptSubmit');
+    // Evaluate each event into its own local — never short-circuit (PF-015).
+    const [removedSession, removedPrompt] = PROXY_HOOK_EVENTS.map((event) => removeHooks(settings, event, isProxyHook));
     return removedSession || removedPrompt;
 }
 /**
@@ -319,8 +302,7 @@ export function applyProxyTeardownToSettings(settings, managedPort) {
  */
 export function hasProxyHooks(input) {
     const settings = typeof input === 'string' ? JSON.parse(input) : input;
-    const check = (eventName) => settings.hooks?.[eventName]?.some((m) => m.hooks.some((h) => h.command.includes(PROXY_HOOK_MARKER))) === true;
-    return check('SessionStart') || check('UserPromptSubmit');
+    return PROXY_HOOK_EVENTS.some((event) => hasHook(settings, event, isProxyHook));
 }
 // ─── Health-check identity helper ────────────────────────────────────────────
 /**
@@ -747,7 +729,7 @@ export async function runPostSpawnVerification(binPath, configPath, logPath, spa
  * Perform the single atomic settings.json pass for enable:
  * strip old hooks + env, then apply new hooks + env in one write.
  *
- * The writeFileAtomicExclusive call is guarded — ENOSPC/EACCES returns Err
+ * The writeSettingsFileAtomic call is guarded — ENOSPC/EACCES returns Err
  * instead of crashing with an unhandled rejection.
  *
  * Returns Ok(undefined) on success, Err(reason) on hard failure.
@@ -777,7 +759,7 @@ async function applyEnableSettingsPass(settingsPath, devflowDir, port) {
     addProxyHooks(parsedSettings, devflowDir);
     _applyProxyEnvToObject(parsedSettings, port);
     try {
-        await writeFileAtomicExclusive(settingsPath, JSON.stringify(parsedSettings, null, 2) + '\n');
+        await writeSettingsFileAtomic(settingsPath, JSON.stringify(parsedSettings, null, 2) + '\n');
     }
     catch (err) {
         return Err(`Could not write settings.json: ${err instanceof Error ? err.message : String(err)}`);
@@ -1465,7 +1447,7 @@ async function runDisable() {
     if (changed) {
         // Guard ENOSPC/EACCES — unhandled rejection leaves proxy in partial state
         try {
-            await writeFileAtomicExclusive(settingsPath, JSON.stringify(parsedSettings, null, 2) + '\n');
+            await writeSettingsFileAtomic(settingsPath, JSON.stringify(parsedSettings, null, 2) + '\n');
         }
         catch (err) {
             p.log.error(`Could not write settings.json: ${err instanceof Error ? err.message : String(err)}`);

package/dist/cli/commands/security.js

@@ -4,8 +4,8 @@ import * as p from '@clack/prompts';
 import color from 'picocolors';
 import { getClaudeDirectory, getDevFlowDirectory, getManagedSettingsPath } from '../../targets/claude-code/claude-paths.js';
 import { readManifest, syncManifestFeature } from '../../core/manifest.js';
-import { mergeDenyList, stripUserDenyList, detectDenyState, DEVFLOW_HISTORICAL_DENY, removeManagedSettings, installManagedSettings, loadTemplateDenyEntries, stripUserSecurityDenyList, } from '../../targets/claude-code/post-install.js';
-import { writeFileAtomicExclusive } from '../../core/fs-atomic.js';
+import { applyUserSecurityDenyList, stripUserDenyList, detectDenyState, DEVFLOW_HISTORICAL_DENY, removeManagedSettings, installManagedSettings, loadTemplateDenyEntries, stripUserSecurityDenyList, } from '../../targets/claude-code/post-install.js';
+import { writeSettingsFileAtomic } from '../../core/fs-atomic.js';
 import { promises as fs } from 'fs';
 import { getPackageRoot } from '../../core/paths.js';
 // ─── Pure helpers ─────────────────────────────────────────────────────────────
@@ -183,16 +183,8 @@ export const securityCommand = new Command('security')
             }
         }
         else {
-            // User mode: merge into ~/.claude/settings.json
-            let existing;
-            try {
-                existing = await fs.readFile(userSettingsPath, 'utf-8');
-            }
-            catch {
-                existing = '{}';
-            }
-            const merged = mergeDenyList(existing, templateDeny);
-            await writeFileAtomicExclusive(userSettingsPath, merged);
+            // User mode: merge into ~/.claude/settings.json, converging retired entries
+            const merged = await applyUserSecurityDenyList(userSettingsPath, templateDeny);
             const count = countDenyEntries(merged);
             p.log.success(`Security deny list applied to user settings (${count} entries)`);
             p.log.info(`  Location: ${color.dim(userSettingsPath)}`);
@@ -214,7 +206,7 @@ export const securityCommand = new Command('security')
             }
             const { json: stripped, removed } = stripUserDenyList(userSettingsJson, DEVFLOW_HISTORICAL_DENY);
             if (removed.length > 0) {
-                await writeFileAtomicExclusive(userSettingsPath, stripped);
+                await writeSettingsFileAtomic(userSettingsPath, stripped);
                 p.log.success(`Removed ${removed.length} entries from user settings:`);
                 for (const entry of removed) {
                     p.log.info(`  ${color.dim(entry)}`);

package/dist/cli/commands/skills.js

@@ -25,6 +25,23 @@ async function dirExists(dirPath) {
 function getShadowDir(devflowDir, skillName) {
     return path.join(devflowDir, 'skills', unprefixSkillName(skillName));
 }
+/**
+ * The directory a new shadow of `bareName` is copied from.
+ *
+ * D-COMPLIANCE-SHADOW-SOURCE (mirrors seedRuleShadow's Tier-1 skip in rules.ts):
+ * a FEATURE_OWNED skill always seeds from the shipped SOURCE. Its installed copy
+ * is composed — every `${DEVFLOW_COMPLIANCE_*}` token already replaced with the
+ * frameworks of that moment — and a token-free shadow passes through composition
+ * byte-identical (C1), so seeding from it would freeze that stamp: a later
+ * `devflow compliance --set` could never re-stamp the skill. Every other skill
+ * seeds from its installed copy when there is one, else from source.
+ */
+export function shadowSeedDir(bareName, installedDir) {
+    const sourceDir = path.join(skillsDir(), bareName);
+    if (FEATURE_OWNED_SKILLS.includes(bareName))
+        return sourceDir;
+    return installedDir ?? sourceDir;
+}
 /**
  * Check if a skill has a shadow (personal override).
  */
@@ -40,13 +57,14 @@ export async function hasShadow(skillName, devflowDir) {
  * names one plugin out of several that would each do (D-ALL-OWNERS).
  * FEATURE_OWNED skills have no plugin owner at all and say so, because telling
  * a user to select a plugin for `compliance` would send them looking for one
- * that does not exist.
+ * that does not exist. Compliance is installed on every machine
+ * (D-COMPLIANCE-INSTALL-ALWAYS), so its feature is the whole answer.
  */
 function describeOwners(bareName, owners) {
     const declarers = owners ?? skillOwners(bareName);
     if (declarers.length === 0) {
         return FEATURE_OWNED_SKILLS.includes(bareName)
-            ? 'its feature (devflow compliance --enable)'
+            ? 'the compliance feature (every install)'
             : 'no plugin';
     }
     return declarers.join(' or ');
@@ -99,7 +117,7 @@ export const skillsCommand = new Command('skills')
         // The shadow is seeded from the shipped source instead and reported as
         // DORMANT — it exists, it is preserved by every future install, and it
         // applies to nothing until the plugin that uses it is selected.
-        const seedDir = installed ? installedSkillDir : path.join(skillsDir(), bareName);
+        const seedDir = shadowSeedDir(bareName, installed ? installedSkillDir : null);
         if (!await dirExists(seedDir)) {
             p.log.error(`No source for ${bareName} — reinstall devflow, then try again.`);
             process.exit(1);