@tangle-network/agent-profile-materialize 0.23.0 → 0.25.2

package/dist/candidate.js

@@ -208,6 +208,7 @@ function candidateResourcesForClassicMaterializer(resources, resolvedResources)
         };
     };
     return {
+        ...resources,
         files: resources.files?.map((mount) => ({
             path: mount.path,
             resource: convert(mount.resource),

package/dist/managed-workspace-stage.d.ts

@@ -20,5 +20,5 @@ export declare function assertPrivateManagedRoot(root: string): void;
  * The caller must keep the returned tree while an admitted turn uses it and
  * dispose it after that turn, so a later binding cannot expose old secrets.
  */
-export declare function prepareManagedWorkspacePlan(plan: WorkspacePlan, managedRoot: string, sharedWorkspaceDir: string, secretProvider: AgentProfileSecretProvider, options?: Pick<ApplyWorkspacePlanOptions, "ownership" | "runtimeOnlyFiles">): Promise<PreparedManagedWorkspace>;
+export declare function prepareManagedWorkspacePlan(plan: WorkspacePlan, managedRoot: string, sharedWorkspaceDir: string, secretProvider: AgentProfileSecretProvider, options?: Pick<ApplyWorkspacePlanOptions, "ownership" | "runtimeOnlyFiles" | "secretFileSlotEnvironment">): Promise<PreparedManagedWorkspace>;
 export declare function lstatIfPresent(path: string): ReturnType<typeof lstatSync> | null;

package/dist/plan-application.js

@@ -9,7 +9,7 @@ export function applyWorkspacePlan(plan, workspaceDir, options = {}) {
  */
 export async function applyWorkspacePlanWithSecretProvider(plan, workspaceDir, secretProvider, options = {}) {
     const planDigest = hashWorkspacePlan(plan);
-    const resolved = await resolvePrivateWorkspacePlan(plan, secretProvider);
+    const resolved = await resolvePrivateWorkspacePlan(plan, secretProvider, options.secretFileSlotEnvironment);
     return applyResolvedWorkspacePlan(plan, resolved, workspaceDir, options, planDigest);
 }
 function secretRefLabel(ref) {
@@ -78,13 +78,27 @@ function resolvePublicWorkspacePlan(plan) {
         ...systemPromptBindingField(plan),
     };
 }
-async function resolvePrivateWorkspacePlan(plan, secretProvider) {
+/**
+ * OpenCode substitutes `{env:NAME}` textually into its config before parsing
+ * it, so only a value that cannot break out of a JSON string or start another
+ * substitution may be referenced; any other value is written in place.
+ */
+const SUBSTITUTABLE_SECRET_VALUE = /^[\x20-\x7e]+$/;
+const UNSUBSTITUTABLE_SECRET_CHARACTERS = /["\\{}]/;
+function secretSlotEnvironmentName(ref) {
+    const digest = createHash("sha256")
+        .update(ref.key, "utf8")
+        .digest("hex")
+        .slice(0, 24)
+        .toUpperCase();
+    return `TANGLE_PROFILE_SECRET_${digest}`;
+}
+async function resolvePrivateWorkspacePlan(plan, secretProvider, fileSlotEnvironment) {
     if (!secretProvider || typeof secretProvider.get !== "function") {
         throw new Error("AgentProfileSecretProvider.get is required");
     }
     const pending = new Map();
-    const resolveRef = async (input) => {
-        const ref = agentProfileSecretRefSchema.parse(input);
+    const resolveRawRef = (ref) => {
         let raw = pending.get(ref.key);
         if (!raw) {
             raw = (async () => {
@@ -99,16 +113,33 @@ async function resolvePrivateWorkspacePlan(plan, secretProvider) {
             })();
             pending.set(ref.key, raw);
         }
-        const value = await raw;
+        return raw;
+    };
+    const resolveRef = async (input) => {
+        const ref = agentProfileSecretRefSchema.parse(input);
+        const value = await resolveRawRef(ref);
         return ref.format === "bearer" ? `Bearer ${value}` : value;
     };
+    const resolveFileSlot = async (input) => {
+        const ref = agentProfileSecretRefSchema.parse(input);
+        const value = await resolveRawRef(ref);
+        if (!fileSlotEnvironment ||
+            !SUBSTITUTABLE_SECRET_VALUE.test(value) ||
+            UNSUBSTITUTABLE_SECRET_CHARACTERS.test(value)) {
+            return ref.format === "bearer" ? `Bearer ${value}` : value;
+        }
+        const name = secretSlotEnvironmentName(ref);
+        fileSlotEnvironment[name] = value;
+        return ref.format === "bearer" ? `Bearer {env:${name}}` : `{env:${name}}`;
+    };
     const files = await Promise.all(normalizePlanFiles(plan.files).map(async (file) => {
         if (file.secretSlots.length === 0)
             return file;
+        // Generated native config files with secret slots are JSON objects.
         const parsed = JSON.parse(file.content);
         const values = await Promise.all(file.secretSlots.map(async (slot) => ({
             path: slot.path,
-            value: await resolveRef(slot.ref),
+            value: await resolveFileSlot(slot.ref),
         })));
         for (const resolved of values) {
             setValueAtJsonPath(parsed, resolved.path, resolved.value);
@@ -145,6 +176,7 @@ async function resolvePrivateWorkspacePlan(plan, secretProvider) {
         ...systemPromptBindingField(plan),
     };
 }
+import { createHash } from "node:crypto";
 import { agentProfileSecretRefSchema } from "@tangle-network/agent-interface";
 import { hashWorkspacePlan } from "./plan-digest.js";
 import { normalizePlanFiles, normalizeWorkspacePlanArgument, } from "./plan-normalize.js";

package/dist/plan-types.d.ts

@@ -320,6 +320,15 @@ export interface ApplyWorkspacePlanOptions {
      * refusal.
      */
     appliedPlanDigest?: string;
+    /**
+     * Receives the values of secrets that JSON file slots reference instead of
+     * containing. When set, a slot whose resolved value is safe to substitute
+     * is written as `{env:NAME}` (OpenCode config substitution) and the value
+     * lands here under NAME, so file bytes and every digest over them stay
+     * identical when only a secret's value changes. The caller must add these
+     * entries to the launch environment after digesting the launch.
+     */
+    secretFileSlotEnvironment?: Record<string, string>;
 }
 import type { AgentProfileSecretRef } from "@tangle-network/agent-interface";
 import type { HarnessId } from "./harness.js";

package/dist/profile-bundle-cache.d.ts

@@ -29,8 +29,8 @@ export declare function claimProfileBundle(root: string, claim: ProfileBundleCla
 }) => Promise<boolean>): Promise<ProfileBundleClaimResult>;
 /**
  * Open a host-side cache handle over `root`, creating the layout and sweeping
- * stale `incoming/` residue synchronously so the cache is deterministic to
- * use immediately afterwards.
+ * stale `incoming/` residue synchronously when the root is idle. A busy root
+ * leaves cleanup to its serialized admissions and sweeps.
  */
 export declare function openProfileBundleCache(root: string, options?: {
     maxBytes?: number;

package/dist/profile-bundle-cache.js

@@ -3,7 +3,7 @@ import { mkdirSync, readdirSync, rmSync } from "node:fs";
 import { mkdir, open, readFile, rename, rm, stat, writeFile, } from "node:fs/promises";
 import { join } from "node:path";
 import { PROFILE_BUNDLE_DEFAULT_MAX_BYTES, PROFILE_BUNDLE_MAX_BYTES, PROFILE_BUNDLE_MAX_FILE_BYTES, PROFILE_BUNDLE_MAX_FILES, PROFILE_BUNDLE_SCHEMA, } from "./profile-bundle-key.js";
-import { evictProfileBundles, evictUnlocked, fsyncDir, loadLru, pathExists, profileBundleManifestPath, readManifestFile, saveLru, sweepProfileBundleCache, withRootLock, } from "./profile-bundle-lru.js";
+import { evictProfileBundles, evictUnlocked, fsyncDir, hasPendingRootWork, loadLru, pathExists, profileBundleManifestPath, readManifestFile, saveLru, sweepProfileBundleCache, sweepUnlocked, withRootLock, } from "./profile-bundle-lru.js";
 import { hasControlCharacter, normalizeWorkspaceRelativePath, validateFileMode, } from "./workspace-files.js";
 export * from "./profile-bundle-key.js";
 export { evictProfileBundles, profileBundleManifestPath, sweepProfileBundleCache, } from "./profile-bundle-lru.js";
@@ -116,11 +116,11 @@ function validateManifestFiles(manifest) {
 export async function admitProfileBundle(root, manifest, readObject) {
     validateManifestShape(manifest);
     const entries = validateManifestFiles(manifest);
-    await sweepProfileBundleCache(root);
     await mkdir(join(root, "objects"), { recursive: true });
     await mkdir(join(root, "bundles"), { recursive: true });
     await mkdir(join(root, "incoming"), { recursive: true });
     await withRootLock(root, async () => {
+        await sweepUnlocked(root);
         const manifestPath = profileBundleManifestPath(root, manifest.bundle);
         const existing = await readManifestFile(manifestPath);
         if (existing && existing.bundle !== manifest.bundle) {
@@ -293,8 +293,8 @@ export async function claimProfileBundle(root, claim, linkFile) {
 }
 /**
  * Open a host-side cache handle over `root`, creating the layout and sweeping
- * stale `incoming/` residue synchronously so the cache is deterministic to
- * use immediately afterwards.
+ * stale `incoming/` residue synchronously when the root is idle. A busy root
+ * leaves cleanup to its serialized admissions and sweeps.
  */
 export function openProfileBundleCache(root, options) {
     const maxBytes = options?.maxBytes ?? PROFILE_BUNDLE_DEFAULT_MAX_BYTES;
@@ -305,8 +305,10 @@ export function openProfileBundleCache(root, options) {
     mkdirSync(join(root, "bundles"), { recursive: true });
     const incoming = join(root, "incoming");
     mkdirSync(incoming, { recursive: true });
-    for (const entry of readdirSync(incoming)) {
-        rmSync(join(incoming, entry), { recursive: true, force: true });
+    if (!hasPendingRootWork(root)) {
+        for (const entry of readdirSync(incoming)) {
+            rmSync(join(incoming, entry), { recursive: true, force: true });
+        }
     }
     return {
         root,

package/dist/profile-bundle-lru.d.ts

@@ -20,6 +20,8 @@ export interface ProfileBundleLru {
 export declare function pathExists(path: string): Promise<boolean>;
 export declare function fsyncDir(dir: string): Promise<void>;
 export declare function withRootLock<T>(root: string, run: () => Promise<T>): Promise<T>;
+/** Synchronous open must not sweep a root with pending asynchronous work. */
+export declare function hasPendingRootWork(root: string): boolean;
 export declare function readManifestFile(path: string): Promise<{
     schema?: unknown;
     bundle?: unknown;
@@ -32,13 +34,10 @@ export declare function readManifestFile(path: string): Promise<{
  * The raw key is always recoverable from the manifest's `bundle` field.
  */
 export declare function profileBundleManifestPath(root: string, bundle: string): string;
-/** Rebuild advisory lru accounting from a disk scan (objects are immutable). */
-/**
- * Remove stale `incoming/` admission directories. An admit only ever renames
- * OUT of `incoming/`, so anything found here is residue from an interrupted
- * admission and is safe to delete; objects and manifests are untouched.
- */
+/** Sweep only while holding the per-root lock; active admissions own incoming/. */
 export declare function sweepProfileBundleCache(root: string): Promise<void>;
+/** Remove interrupted admission residue; the caller must hold the per-root lock. */
+export declare function sweepUnlocked(root: string): Promise<void>;
 export declare function loadLru(root: string): Promise<ProfileBundleLru>;
 /** Best-effort by contract: lru corruption or a full cache must never break admit/claim. */
 export declare function saveLru(root: string, lru: ProfileBundleLru): Promise<void>;

package/dist/profile-bundle-lru.js

@@ -1,6 +1,6 @@
 import { randomUUID } from "node:crypto";
 import { open, readdir, readFile, rename, rm, stat, writeFile, } from "node:fs/promises";
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { compareStrings } from "./workspace-files.js";
 export async function pathExists(path) {
     try {
@@ -25,14 +25,24 @@ export async function fsyncDir(dir) {
         // Best-effort durability: a cache without directory fsync still verifies.
     }
 }
-/** Serialize admits/evictions per cache root so lru read-modify-write stays deterministic. */
+/** Serialize admissions, sweeps, and evictions per cache root. */
 const rootQueues = new Map();
 export function withRootLock(root, run) {
-    const previous = rootQueues.get(root) ?? Promise.resolve();
+    const key = resolve(root);
+    const previous = rootQueues.get(key) ?? Promise.resolve();
     const next = previous.then(run, run);
-    rootQueues.set(root, next.catch(() => undefined));
+    const settled = next.then(() => undefined, () => undefined);
+    rootQueues.set(key, settled);
+    void settled.then(() => {
+        if (rootQueues.get(key) === settled)
+            rootQueues.delete(key);
+    });
     return next;
 }
+/** Synchronous open must not sweep a root with pending asynchronous work. */
+export function hasPendingRootWork(root) {
+    return rootQueues.has(resolve(root));
+}
 export async function readManifestFile(path) {
     try {
         return JSON.parse(await readFile(path, "utf8"));
@@ -50,13 +60,12 @@ export function profileBundleManifestPath(root, bundle) {
     const filename = bundle.replace(/[^A-Za-z0-9._-]/g, (char) => `_${char.codePointAt(0)?.toString(16) ?? "3f"}_`);
     return join(root, "bundles", `${filename}.json`);
 }
-/** Rebuild advisory lru accounting from a disk scan (objects are immutable). */
-/**
- * Remove stale `incoming/` admission directories. An admit only ever renames
- * OUT of `incoming/`, so anything found here is residue from an interrupted
- * admission and is safe to delete; objects and manifests are untouched.
- */
+/** Sweep only while holding the per-root lock; active admissions own incoming/. */
 export async function sweepProfileBundleCache(root) {
+    await withRootLock(root, () => sweepUnlocked(root));
+}
+/** Remove interrupted admission residue; the caller must hold the per-root lock. */
+export async function sweepUnlocked(root) {
     const incoming = join(root, "incoming");
     let entries;
     try {

package/dist/profile-materializer.js

@@ -40,6 +40,10 @@ export function executionControlConflict(profile, harness) {
 export function materializeProfile(inputProfile, harness, opts = {}) {
     assertMaterializerHarness(harness);
     const profile = agentProfileSchema.parse(inputProfile);
+    const knowledge = profile.resources && Reflect.get(profile.resources, "knowledge");
+    if (Array.isArray(knowledge) && knowledge.length > 0) {
+        throw new Error("Knowledge source generations must be owner-authorized and resolved by the execution runtime before materialization");
+    }
     const skip = new Set(assertSkippableDimensions(opts.skip));
     const binds = assertBindableLaunchControls(opts.binds);
     const instructionsRoot = opts.instructionsRoot ?? "workspace";

package/dist/secret-concurrent-revision.js

@@ -42,7 +42,10 @@ export async function prepareSecretConcurrentProfileRevision(input) {
     }
     assertWorkspacePlanSupported(plan);
     assertLaunchRoot(input.launchRoot);
-    const prepared = await prepareManagedWorkspacePlan(plan, input.managedRoot, input.sharedWorkspaceDir, input.secretProvider, input.options);
+    // Secret values stay out of the revision: file slots reference them, so an
+    // unchanged profile with a rotated per-turn secret reuses this revision.
+    const secretEnvironment = {};
+    const prepared = await prepareManagedWorkspacePlan(plan, input.managedRoot, input.sharedWorkspaceDir, input.secretProvider, { ...input.options, secretFileSlotEnvironment: secretEnvironment });
     try {
         // XDG_CONFIG_HOME is bound to this executor-owned tree at native launch.
         // An agent-owned HOME may hold SQLite state, never native authority.
@@ -82,10 +85,14 @@ export async function prepareSecretConcurrentProfileRevision(input) {
                 prepared.dispose();
             }
         }
+        // Added after launchDigest so the digest and receipt never cover a value.
         return {
             directory,
             manifest: prepared.manifest,
-            application: { ...prepared.application, spawn },
+            application: {
+                ...prepared.application,
+                spawn: { ...spawn, env: { ...spawn.env, ...secretEnvironment } },
+            },
         };
     }
     catch (error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tangle-network/agent-profile-materialize",
-  "version": "0.23.0",
+  "version": "0.25.2",
   "description": "Materialize an AgentProfile into the native per-harness workspace files (the one shared materializer for cli-bridge, agent-dev-container, and VB).",
   "type": "module",
   "repository": {
@@ -25,14 +25,14 @@
     "dist"
   ],
   "devDependencies": {
-    "@tangle-network/agent-interface": "3.0.0",
-    "@tangle-network/agent-interface-current": "npm:@tangle-network/agent-interface@3.0.0",
+    "@tangle-network/agent-interface": "5.0.0",
+    "@tangle-network/agent-interface-current": "npm:@tangle-network/agent-interface@5.0.0",
     "@types/node": "25.6.0",
     "typescript": "^6.0.3",
     "vitest": "^4.1.11"
   },
   "peerDependencies": {
-    "@tangle-network/agent-interface": "^3.0.0"
+    "@tangle-network/agent-interface": "^3.0.0 || ^4.0.0 || ^5.0.0"
   },
   "scripts": {
     "build": "tsc -p tsconfig.json",