@aiwg/cli 2026.10.11 → 2026.10.12

package/tools/agents/providers/rule-delivery.mjs

@@ -12,7 +12,7 @@ import {
   addManagedMarker, contentHash, replaceBoundRulesBlock, deployEmulatedBehaviors, filterAgentFiles,
 } from './base.mjs';
 
-const { parseRuleFrontmatter, inferRuleActivation, RULE_BINDING_TYPES, readCoreBody, validateCoreSet, CORE_RULES_START, CORE_RULES_END } = await importImpl(import.meta.url, 'rules/activation.mjs');
+const { parseRuleFrontmatter, inferRuleActivation, readCoreBody, validateCoreSet, CORE_RULES_START, CORE_RULES_END } = await importImpl(import.meta.url, 'rules/activation.mjs');
 const { resolveDeployVersion } = await importImpl(import.meta.url, 'providers/deploy-version.mjs');
 const { trackTemporaryDirectory } = await importImpl(import.meta.url, 'utils/temporary-directory.js');
 const { loadRulePinConfigs, installedRuleCapabilities, resolveRulePins } = await importImpl(import.meta.url, 'rules/pins.mjs');
@@ -20,6 +20,8 @@ const { guardRulesInlineBudget } = await importImpl(import.meta.url, 'rules/inli
 const { userConfigFile } = await importImpl(import.meta.url, 'config/user-config-dir.mjs');
 const { resolveProjectAiwgDir } = await importImpl(import.meta.url, 'config/project-artifacts-runtime.mjs');
 import { writeContextFileSync, CONTEXT_STAGE_ENV } from './context-write.mjs';
+import { captureProviderPathDescriptors, setStagedProviderPath, restoreProviderPaths } from './provider-paths-staging.mjs';
+import { resolveDeliveryRuleBindings } from './rule-binding-targets.mjs';
 import { projectOnDemandReferences, renderRuleKernelIndex } from './rule-presentation.mjs';
 export { renderRuleKernelIndex } from './rule-presentation.mjs';
 const PREPARATION_HOOK = Symbol.for('aiwg.provider-preparation-hook.v1');
@@ -175,128 +177,7 @@ export async function prepareRuleDelivery(opts) {
     // All pins use native kernel projection, including legacy untagged rules.
     rule.tagged = true;
   }
-  const bindings = new Map();
-  const targets = [];
-  const targetKeys = new Set();
-  if (rules.some(rule => Object.values(rule.bound_to).some(ids => ids.length))) {
-    const { loadLocalCapabilityEntries, loadLocalOverrideCapabilityEntries, createRuleBindingTargetResolver } = await importImpl(import.meta.url, 'artifacts/query-engine.js');
-    const root = resolveAiwgRoot(opts.srcRoot) || opts.srcRoot;
-    // Framework graph paths are package-relative; project graph paths belong
-    // to the queried project. Normalize before merging so one source cannot
-    // become two apparently ambiguous targets after a source-index rebuild.
-    const indexEntries = new Map();
-    const entryPaths = new Map();
-    const loadEntries = (cwd, overridesOnly = false) => (overridesOnly
-      ? loadLocalOverrideCapabilityEntries(cwd)
-      : loadLocalCapabilityEntries(cwd, undefined, indexEntries)).map(entry => {
-      const anchor = entry.path.startsWith('agentic/code/') ? root : cwd;
-      const key = `${anchor}\0${entry.path}`;
-      if (!entryPaths.has(key)) entryPaths.set(key, path.resolve(anchor, entry.path));
-      const resolvedPath = entryPaths.get(key);
-      // Canonical IDs hash the indexed package-relative path. Keep it through
-      // resolution; the selected target is anchored to root below.
-      return { ...entry, path: entry.path.startsWith('agentic/code/') ? entry.path
-        : opts.mapInputPath ? opts.mapInputPath(resolvedPath) : resolvedPath };
-    });
-    let rebuilt = false;
-    const cacheDir = process.env.AIWG_RULE_BINDING_INDEX_CACHE;
-    const cacheFile = cacheDir && path.join(cacheDir, `${contentHash(opts.logicalInputPath ? opts.logicalInputPath(root) : root)}.json`);
-    const buildSourceEntries = async (refresh = false) => {
-      if (!refresh && cacheFile) {
-        try { return JSON.parse(fs.readFileSync(cacheFile, 'utf8')).map(entry => ({ ...entry, path: path.isAbsolute(entry.path) && opts.mapInputPath ? opts.mapInputPath(entry.path) : entry.path })); }
-        catch (error) {
-          if (error.code !== 'ENOENT' && !(error instanceof SyntaxError)) throw error;
-        }
-      }
-      const { collectRuleBindingEntries } = await importImpl(import.meta.url, 'artifacts/index-builder.js');
-      const sourceEntries = await collectRuleBindingEntries(root,
-        root === opts.srcRoot && !fs.existsSync(path.join(root, 'agentic')) ? '.' : 'agentic/code');
-      rebuilt = true;
-      const entries = sourceEntries.map(entry => ({ ...entry, path: entry.path.startsWith('agentic/code/')
-        ? entry.path : path.resolve(root, entry.path) }));
-      if (cacheFile) {
-        fs.mkdirSync(cacheDir, { recursive: true });
-        // Workers may publish the same immutable source snapshot concurrently.
-        const temporary = `${cacheFile}.${process.pid}.tmp`;
-        fs.writeFileSync(temporary, JSON.stringify(entries.map(entry => ({ ...entry, path: opts.logicalInputPath ? opts.logicalInputPath(entry.path) : entry.path }))));
-        fs.renameSync(temporary, cacheFile);
-      }
-      return entries;
-    };
-    const localEntries = opts.bindingEntries || loadEntries(opts.target, Boolean(packageRelations));
-    let entries = [...localEntries];
-    if (!opts.bindingEntries) {
-      // The validated package table is authoritative for its exact source digest.
-      // Keep the canonical resolver for aliases, local overrides and ambiguity.
-      const sourceEntries = packageRelations
-        ? Object.values(packageRelations.index.artifacts).map(entry => ({ ...entry,
-          indexScope: 'packaged', indexGraph: 'framework' }))
-        : loadEntries(root);
-      // A relocated project graph may also be visible while querying the
-      // package root. Keep its project-anchored instance only.
-      const uniqueSources = sourceEntries.filter(entry => !(opts.sharedProjectGraph &&
-        entry.path.startsWith(path.join(root, '.aiwg') + path.sep) &&
-        localEntries.some(local => local.type === entry.type && local.name === entry.name)));
-      entries.push(...uniqueSources);
-      if (!sourceEntries.length) entries.push(...await buildSourceEntries());
-    }
-    // Project-local installed bundles are outside the package source index.
-    // Reuse the existing binding index builder only for those source roots.
-    if (!opts.bindingEntries) {
-      for (const entry of Object.values(configs.project.installed || {})) {
-        if (!entry.localPath) continue;
-        const localRoot = path.resolve(opts.target, entry.localPath);
-        if (localRoot === root || !fs.existsSync(localRoot)) continue;
-        const temp = fs.mkdtempSync(path.join(os.tmpdir(), 'aiwg-local-rule-index-'));
-        try {
-          const { buildIndex } = await importImpl(import.meta.url, 'artifacts/index-builder.js');
-          await buildIndex(localRoot, { scope: '.', outputDir: temp, force: true, quiet: true });
-          const index = JSON.parse(read(path.join(temp, '.aiwg', '.index', 'metadata.json')));
-          const scoped = Object.values(index.entries).map(entry => ({ ...entry, path: path.resolve(localRoot, entry.path) }));
-          localEntries.push(...scoped);
-          entries.push(...scoped);
-        } finally { fs.rmSync(temp, { recursive: true, force: true }); }
-      }
-    }
-    // A stored index can predate the source tree (edge/dev checkouts). Rebuild once from source
-    // before reporting a binding target as missing.
-    const resolvedTargets = new Map();
-    let resolveBinding = createRuleBindingTargetResolver(entries);
-    const resolveTarget = async (type, id) => {
-      const key = `${type}:${id}`;
-      if (resolvedTargets.has(key)) return resolvedTargets.get(key);
-      let target;
-      try { target = resolveBinding(type, id); }
-      catch (error) {
-        if (packageRelations || rebuilt || opts.bindingEntries || !/^Missing /.test(error.message)) throw error;
-        indexEntries.clear();
-        entryPaths.clear();
-        entries = [...localEntries, ...await buildSourceEntries(true)];
-        rebuilt = true;
-        resolveBinding = createRuleBindingTargetResolver(entries);
-        target = resolveBinding(type, id);
-        // A rebuild replaces the input set for every lookup.
-        resolvedTargets.clear();
-      }
-      resolvedTargets.set(key, target);
-      return target;
-    };
-    for (const rule of rules.filter(rule => rule.tagged)) {
-      for (const [key, type] of Object.entries(RULE_BINDING_TYPES)) {
-        for (const id of rule.bound_to[key]) {
-          const target = await resolveTarget(type, id);
-          const source = path.isAbsolute(target.path) ? target.path : path.resolve(target.path.startsWith('agentic/code/') ? root : opts.target, target.path);
-          if (!fs.existsSync(source)) throw new Error(`${rule.file}: binding target content missing: ${source}`);
-          bindings.set(source, [...(bindings.get(source) || []), rule]);
-          const key = `${target.type}:${source}`;
-          if (!targetKeys.has(key)) {
-            targetKeys.add(key);
-            targets.push({ ...target, source });
-          }
-        }
-      }
-    }
-  }
+  const { bindings, targets } = await resolveDeliveryRuleBindings(opts, rules, configs, root, packageRelations);
   return { rules, bindings, targets, pins: pinned.rules, pinWarnings: pinned.warnings };
 }
 
@@ -1010,7 +891,7 @@ export async function prepareRuleDeployment(original, provider, deploy) {
   const mappings = [];
   const preimages = [...initialPreimages];
   let retained = false;
-  const originals = { ...provider.paths };
+  const originals = captureProviderPathDescriptors(provider);
   const logicalTarget = original.target;
   const priorAiwgRoot = process.env.AIWG_ROOT;
   const priorRegistry = process.env.AIWG_USER_REGISTRY_PATH;
@@ -1148,7 +1029,7 @@ export async function prepareRuleDeployment(original, provider, deploy) {
       if (!path.isAbsolute(dir)) continue;
       const to = path.join(temp, 'native', key);
       mount(dir, to);
-      provider.paths[key] = to;
+      setStagedProviderPath(provider, key, to);
     }
     let kernel = provider.kernelSkillsPath;
     if (kernel && path.isAbsolute(kernel)) {
@@ -1344,7 +1225,7 @@ export async function prepareRuleDeployment(original, provider, deploy) {
     return plan;
   } finally {
     if (priorContextStage === undefined) delete process.env[CONTEXT_STAGE_ENV]; else process.env[CONTEXT_STAGE_ENV] = priorContextStage;
-    Object.assign(provider.paths, originals);
+    restoreProviderPaths(provider, originals);
     if (priorAiwgRoot === undefined) delete process.env.AIWG_ROOT; else process.env.AIWG_ROOT = priorAiwgRoot;
     if (priorRegistry === undefined) delete process.env.AIWG_USER_REGISTRY_PATH; else process.env.AIWG_USER_REGISTRY_PATH = priorRegistry;
     if (priorArtifacts === undefined) delete process.env.AIWG_ARTIFACTS_PATH; else process.env.AIWG_ARTIFACTS_PATH = priorArtifacts;

package/vscode-extension/schemas/aiwg.config.v1.json

@@ -1813,6 +1813,182 @@
         }
       }
     },
+    "HitlProfile": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "categories",
+        "repos",
+        "environments",
+        "resources",
+        "reversible",
+        "maxImpact",
+        "expiresAt"
+      ],
+      "properties": {
+        "categories": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": [
+              "repo.read",
+              "repo.edit",
+              "docs.edit",
+              "test.run",
+              "testnet.configure"
+            ]
+          }
+        },
+        "repos": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "pattern": "^[A-Za-z0-9][A-Za-z0-9_.:/@-]{0,255}$"
+          }
+        },
+        "environments": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "enum": [
+              "local",
+              "development",
+              "test",
+              "testnet"
+            ]
+          }
+        },
+        "resources": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 512,
+            "pattern": "^(?![A-Za-z]:)(?!/)(?!.*(?:^|/)\\.{1,2}(?:/|$))(?!.*[\\\\\\x00-\\x20]).+$"
+          }
+        },
+        "reversible": {
+          "const": true
+        },
+        "maxImpact": {
+          "enum": [
+            "low",
+            "medium"
+          ]
+        },
+        "expiresAt": {
+          "type": "string",
+          "format": "date-time"
+        }
+      }
+    },
+    "HitlSelector": {
+      "type": "object",
+      "additionalProperties": false,
+      "minProperties": 1,
+      "properties": {
+        "categories": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "pattern": "^[A-Za-z0-9][A-Za-z0-9_.:/@-]{0,255}$"
+          }
+        },
+        "repos": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "pattern": "^[A-Za-z0-9][A-Za-z0-9_.:/@-]{0,255}$"
+          }
+        },
+        "environments": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "pattern": "^[A-Za-z0-9][A-Za-z0-9_.:/@-]{0,255}$"
+          }
+        },
+        "resources": {
+          "type": "array",
+          "minItems": 1,
+          "uniqueItems": true,
+          "items": {
+            "type": "string",
+            "minLength": 1,
+            "maxLength": 512,
+            "pattern": "^(?![A-Za-z]:)(?!/)(?!.*(?:^|/)\\.{1,2}(?:/|$))(?!.*[\\\\\\x00-\\x20]).+$"
+          }
+        }
+      }
+    },
+    "HitlPolicy": {
+      "type": "object",
+      "additionalProperties": false,
+      "required": [
+        "version",
+        "enabled",
+        "reviewedAt",
+        "maxAgeSeconds",
+        "expiresAt",
+        "profiles",
+        "deny",
+        "requireReview"
+      ],
+      "properties": {
+        "version": {
+          "const": "1"
+        },
+        "enabled": {
+          "type": "boolean"
+        },
+        "reviewedAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "maxAgeSeconds": {
+          "type": "integer",
+          "minimum": 1,
+          "maximum": 2592000
+        },
+        "expiresAt": {
+          "type": "string",
+          "format": "date-time"
+        },
+        "profiles": {
+          "type": "object",
+          "propertyNames": {
+            "pattern": "^[A-Za-z0-9][A-Za-z0-9_-]{0,63}$"
+          },
+          "additionalProperties": {
+            "$ref": "#/definitions/HitlProfile"
+          }
+        },
+        "deny": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/HitlSelector"
+          }
+        },
+        "requireReview": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/HitlSelector"
+          }
+        }
+      }
+    },
     "Authorization": {
       "type": "object",
       "additionalProperties": false,
@@ -1825,6 +2001,7 @@
         "assignments"
       ],
       "properties": {
+        "hitl": { "$ref": "#/definitions/HitlPolicy" },
         "version": {
           "const": "1"
         },