@hasna/instructions 0.5.5 → 0.6.0

package/dist/cli/index.js

@@ -1290,8 +1290,8 @@ Expecting one of '${allowedValues.join("', '")}'`);
       args = args.slice();
       let launchWithNode = false;
       const sourceExt = [".js", ".ts", ".tsx", ".mjs", ".cjs"];
-      function findFile(baseDir2, baseName) {
-        const localBin = path.resolve(baseDir2, baseName);
+      function findFile(baseDir, baseName) {
+        const localBin = path.resolve(baseDir, baseName);
         if (fs.existsSync(localBin))
           return localBin;
         if (sourceExt.includes(path.extname(baseName)))
@@ -2136,116 +2136,167 @@ var init_types = __esm(() => {
   };
 });
 
-// src/lib/retired-storage-mode.ts
-function firstDefinedEnvKey(env, keys) {
-  for (const key of keys) {
-    if (Object.hasOwn(env, key) && env[key] !== undefined)
-      return key;
-  }
-  return null;
+// ../contracts/dist/client/transport.js
+import { createRequire } from "module";
+function envToken(name) {
+  return name.toUpperCase().replace(/-/g, "_");
 }
-function assertNoLegacyStorageMode(env = process.env) {
-  const legacyKey = firstDefinedEnvKey(env, LEGACY_STORAGE_MODE_KEYS);
-  if (!legacyKey)
-    return;
-  throw new Error(`${legacyKey} was removed. Deployment modes no longer exist: delete the storage-mode variable. ` + `The client uses the local SQLite store, or the HTTP API selected by ` + `HASNA_INSTRUCTIONS_API_URL + HASNA_INSTRUCTIONS_API_KEY. ` + `On the server, set HASNA_INSTRUCTIONS_DATABASE_URL to select the postgresql backend, ` + `or leave it unset for sqlite.`);
-}
-var LEGACY_STORAGE_MODE_KEYS;
-var init_retired_storage_mode = __esm(() => {
-  LEGACY_STORAGE_MODE_KEYS = [
-    "HASNA_INSTRUCTIONS_STORAGE_MODE",
-    "HASNA_INSTRUCTIONS_MODE",
-    "INSTRUCTIONS_STORAGE_MODE",
-    "INSTRUCTIONS_MODE"
+function clientTransportEnvKeys(name) {
+  const envSegment = envToken(name);
+  return {
+    apiUrlKeys: [`HASNA_${envSegment}_API_URL`, `${envSegment}_API_URL`],
+    apiKeyKeys: [`HASNA_${envSegment}_API_KEY`, `${envSegment}_API_KEY`]
+  };
+}
+function credentialOverrideEnvKey(name) {
+  return `HASNA_${envToken(name)}_API_KEY_OVERRIDE`;
+}
+function credentialPointerEnvKey(name) {
+  return `HASNA_${envToken(name)}_API_KEY_REF`;
+}
+var CREDENTIAL_PROFILE_ENV_KEY = "HASNA_PROFILE", MAX_CREDENTIAL_FILE_BYTES, INSPECT_CUSTOM, CREDENTIAL_SEAL, AMBIENT_ENVIRONMENT, SECRETS_PACKAGE_SPECIFIER, requireSecretsSdk, IDEMPOTENT_METHODS, AUTHORITY_OVERRIDE_HEADERS;
+var init_transport = __esm(() => {
+  MAX_CREDENTIAL_FILE_BYTES = 64 * 1024;
+  INSPECT_CUSTOM = Symbol.for("nodejs.util.inspect.custom");
+  CREDENTIAL_SEAL = Symbol.for("hasna:contracts:sealedCredential");
+  AMBIENT_ENVIRONMENT = Symbol.for("hasna:contracts:ambientClientEnvironment");
+  SECRETS_PACKAGE_SPECIFIER = "@hasna/" + "secrets";
+  requireSecretsSdk = createRequire(import.meta.url);
+  IDEMPOTENT_METHODS = new Set(["GET", "HEAD", "PUT", "DELETE", "OPTIONS"]);
+  AUTHORITY_OVERRIDE_HEADERS = new Set([
+    "host",
+    ":authority",
+    "forwarded",
+    "x-forwarded-host",
+    "x-original-host"
+  ]);
+});
+
+// src/lib/local-opt-in.ts
+function instructionsLocalModeNotice() {
+  return `instructions: local mode \u2014 ${INSTRUCTIONS_LOCAL_OPT_IN_ENV_KEYS[0]}=1 selects the on-box SQLite store, ` + `and no hosted authority was configured. Set HASNA_INSTRUCTIONS_API_KEY (or add the Keychain item ` + `hasna.credentials.instructions.api-key, or write ~/.hasna/instructions/config/credentials) to go hosted.`;
+}
+function isInstructionsLocalOptIn(env = process.env) {
+  return INSTRUCTIONS_LOCAL_OPT_IN_ENV_KEYS.some((key) => (env[key] ?? "").trim() === "1");
+}
+function instructionsAuthorityEnvKeys() {
+  const keys = clientTransportEnvKeys("instructions");
+  return [
+    ...keys.apiUrlKeys,
+    ...keys.apiKeyKeys,
+    credentialOverrideEnvKey("instructions"),
+    credentialPointerEnvKey("instructions"),
+    CREDENTIAL_PROFILE_ENV_KEY
   ];
+}
+function hasInstructionsEnvAuthorityIntent(env = process.env) {
+  return instructionsAuthorityEnvKeys().some((key) => (env[key] ?? "").trim() !== "");
+}
+function selectsInstructionsLocalStore(env = process.env) {
+  return !hasInstructionsEnvAuthorityIntent(env) && isInstructionsLocalOptIn(env);
+}
+function instructionsResolverEnv(env) {
+  const blanks = instructionsAuthorityEnvKeys().filter((key) => (key in env) && (env[key] ?? "").trim() === "");
+  if (blanks.length === 0)
+    return env;
+  const next = { ...env };
+  for (const key of blanks)
+    delete next[key];
+  return next;
+}
+function isAmbientInstructionsEnv(env) {
+  if (typeof process !== "undefined" && env === process.env)
+    return true;
+  return env[CONTRACTS_AMBIENT_ENVIRONMENT] === true;
+}
+function instructionsResolverInputs(env, credentials = {}) {
+  const normalised = instructionsResolverEnv(env);
+  if (normalised === env)
+    return { env: normalised, credentials };
+  const keychain = { ...credentials.keychain };
+  if (keychain.enabled === undefined && keychain.run === undefined) {
+    keychain.enabled = isAmbientInstructionsEnv(env);
+  }
+  return { env: normalised, credentials: { ...credentials, keychain } };
+}
+var INSTRUCTIONS_LOCAL_OPT_IN_ENV_KEYS, CONTRACTS_AMBIENT_ENVIRONMENT;
+var init_local_opt_in = __esm(() => {
+  init_transport();
+  INSTRUCTIONS_LOCAL_OPT_IN_ENV_KEYS = ["HASNA_INSTRUCTIONS_LOCAL"];
+  CONTRACTS_AMBIENT_ENVIRONMENT = Symbol.for("hasna:contracts:ambientClientEnvironment");
 });
 
-// ../../node_modules/.bun/@hasna+paths@0.1.0/node_modules/@hasna/paths/dist/index.js
-import { homedir as homedir3 } from "os";
-import { join as join4 } from "path";
-function assertApp2(app) {
+// src/lib/app-home.ts
+import { existsSync as existsSync3 } from "fs";
+import { homedir as homedir2 } from "os";
+import { join as join3, resolve as resolve2 } from "path";
+import { homedir as pathsResolverHomedir2 } from "os";
+import { join as pathsResolverJoin2 } from "path";
+function pathsResolverAssertApp2(app) {
   if (typeof app !== "string" || app.length === 0) {
     throw new TypeError("paths: app must be a non-empty string");
   }
-  if (!APP_SLUG_RE2.test(app)) {
+  if (!PATHS_RESOLVER_APP_SLUG_RE2.test(app)) {
     throw new TypeError(`paths: invalid app slug "${app}" \u2014 expected lowercase kebab-case ([a-z0-9]+(-[a-z0-9]+)*)`);
   }
 }
-function envOf2(options) {
-  return options.env ?? process.env;
-}
-function envValue2(options, kind) {
-  const value = envOf2(options)[KIND_ENV2[kind]];
-  return typeof value === "string" && value.length > 0 ? value : undefined;
-}
-function isMacOS2(platform) {
-  return platform === "darwin";
+function pathsResolverAssertKind2(kind) {
+  if (!Object.keys(PATHS_RESOLVER_KIND_ENV2).includes(kind)) {
+    throw new TypeError(`paths: invalid path kind "${kind}" \u2014 expected one of ${Object.keys(PATHS_RESOLVER_KIND_ENV2).join(", ")}`);
+  }
 }
-function baseDir2(kind, options) {
-  const override = envValue2(options, kind);
-  if (override)
+function pathsResolverBaseDir2(kind, options) {
+  pathsResolverAssertKind2(kind);
+  const env = options.env ?? process.env;
+  const override = env[PATHS_RESOLVER_KIND_ENV2[kind]];
+  if (typeof override === "string" && override.length > 0)
     return override;
-  const home = options.home ?? homedir3();
+  const home = options.home ?? pathsResolverHomedir2();
   const platform = options.platform ?? process.platform;
-  if (isMacOS2(platform)) {
+  if (platform === "darwin") {
     switch (kind) {
       case "config":
       case "data":
-        return join4(home, "Library", "Application Support", "Hasna");
+        return pathsResolverJoin2(home, "Library", "Application Support", "Hasna");
       case "cache":
-        return join4(home, "Library", "Caches", "Hasna");
+        return pathsResolverJoin2(home, "Library", "Caches", "Hasna");
       case "state":
-        return join4(home, "Library", "Logs", "Hasna");
+        return pathsResolverJoin2(home, "Library", "Logs", "Hasna");
     }
   }
   switch (kind) {
     case "config":
-      return join4(home, ".config", "hasna");
+      return pathsResolverJoin2(home, ".config", "hasna");
     case "data":
-      return join4(home, ".local", "share", "hasna");
+      return pathsResolverJoin2(home, ".local", "share", "hasna");
     case "state":
-      return join4(home, ".local", "state", "hasna");
+      return pathsResolverJoin2(home, ".local", "state", "hasna");
     case "cache":
-      return join4(home, ".cache", "hasna");
+      return pathsResolverJoin2(home, ".cache", "hasna");
   }
 }
-function resolvePath2(kind, options) {
-  assertApp2(options.app);
-  const appSegment = options.internal === true ? join4("internal", options.app) : options.app;
-  return join4(baseDir2(kind, options), appSegment);
+function pathsResolverResolve2(kind, options) {
+  pathsResolverAssertApp2(options.app);
+  const appSegment = options.internal === true ? pathsResolverJoin2("internal", options.app) : options.app;
+  return pathsResolverJoin2(pathsResolverBaseDir2(kind, options), appSegment);
 }
 function configDir(options) {
-  return resolvePath2("config", options);
+  return pathsResolverResolve2("config", options);
 }
-var KIND_ENV2, APP_SLUG_RE2;
-var init_dist = __esm(() => {
-  KIND_ENV2 = {
-    config: "HASNA_CONFIG_HOME",
-    data: "HASNA_DATA_HOME",
-    state: "HASNA_STATE_HOME",
-    cache: "HASNA_CACHE_HOME"
-  };
-  APP_SLUG_RE2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-});
-
-// src/lib/app-home.ts
-import { existsSync as existsSync3 } from "fs";
-import { homedir as homedir5 } from "os";
-import { join as join6, resolve as resolve2 } from "path";
 function homeDir(env = process.env) {
-  return env["HOME"] || env["USERPROFILE"] || homedir5();
+  return env["HOME"] || env["USERPROFILE"] || homedir2();
 }
 function legacyStoreHome(env = process.env) {
-  return resolve2(join6(homeDir(env), ".hasna", "instructions"));
+  return resolve2(join3(homeDir(env), ".hasna", "instructions"));
 }
 function resolverStoreHome(env = process.env) {
-  return configDir({ app: "configs", env, home: env.HOME || env.USERPROFILE || homedir5() });
+  return configDir({ app: "configs", env, home: env.HOME || env.USERPROFILE || homedir2() });
 }
 function adoptResolverStoreHome(resolved, env = process.env) {
   const override = env.HASNA_CONFIG_HOME;
   if (typeof override === "string" && override.trim().length > 0)
     return true;
-  return existsSync3(join6(resolved, "instructions.db"));
+  return existsSync3(join3(resolved, "instructions.db"));
 }
 function exactStoreHome(env = process.env) {
   const v = env[HASNA_CONFIGS_HOME_ENV];
@@ -2258,9 +2309,15 @@ function getConfigsStoreHome(env = process.env) {
   const resolved = resolverStoreHome(env);
   return adoptResolverStoreHome(resolved, env) ? resolve2(resolved) : legacyStoreHome(env);
 }
-var HASNA_CONFIGS_HOME_ENV = "HASNA_CONFIGS_HOME";
+var PATHS_RESOLVER_KIND_ENV2, PATHS_RESOLVER_APP_SLUG_RE2, HASNA_CONFIGS_HOME_ENV = "HASNA_CONFIGS_HOME";
 var init_app_home = __esm(() => {
-  init_dist();
+  PATHS_RESOLVER_KIND_ENV2 = {
+    config: "HASNA_CONFIG_HOME",
+    data: "HASNA_DATA_HOME",
+    state: "HASNA_STATE_HOME",
+    cache: "HASNA_CACHE_HOME"
+  };
+  PATHS_RESOLVER_APP_SLUG_RE2 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
 });
 
 // src/lib/raw-store-root.ts
@@ -2275,7 +2332,7 @@ var init_raw_store_root = __esm(() => {
 // src/db/database.ts
 import { Database } from "bun:sqlite";
 import { existsSync as existsSync5, mkdirSync, rmSync } from "fs";
-import { join as join7 } from "path";
+import { join as join5 } from "path";
 import { randomUUID as randomUUID3 } from "crypto";
 function getDbPath() {
   if (process.env["HASNA_INSTRUCTIONS_DB_PATH"]) {
@@ -2283,7 +2340,7 @@ function getDbPath() {
   }
   const dir = getRawStoreRoot();
   mkdirSync(dir, { recursive: true });
-  return join7(dir, "instructions.db");
+  return join5(dir, "instructions.db");
 }
 function uuid() {
   return randomUUID3();
@@ -2297,9 +2354,8 @@ function slugify(name) {
 function getDatabase(path) {
   if (_db)
     return _db;
-  assertNoLegacyStorageMode();
-  if (!path && process.env["HASNA_INSTRUCTIONS_API_URL"] && process.env["HASNA_INSTRUCTIONS_API_KEY"]) {
-    throw new Error("instructions is using the HTTP API transport (HASNA_INSTRUCTIONS_API_URL set): this command is not wired to the API yet. " + "Unset HASNA_INSTRUCTIONS_API_URL / HASNA_INSTRUCTIONS_API_KEY to use it against the local store.");
+  if (!path && hasInstructionsEnvAuthorityIntent(process.env)) {
+    throw new Error("instructions is using the hosted API transport (a HASNA_INSTRUCTIONS_* credential is configured): this command is not wired to the API yet. " + "Point this run at the local store (HASNA_INSTRUCTIONS_LOCAL=1 with no hosted credential) to use it against the local SQLite store.");
   }
   const dbPath = path || getDbPath();
   const db = new Database(dbPath);
@@ -2380,7 +2436,7 @@ function insertFeedback(input, db) {
 }
 var MIGRATIONS, _db = null;
 var init_database = __esm(() => {
-  init_retired_storage_mode();
+  init_local_opt_in();
   init_raw_store_root();
   MIGRATIONS = [
     `
@@ -2761,9 +2817,9 @@ var init_template = __esm(() => {
 });
 
 // src/lib/machine.ts
-import { arch as currentArch, homedir as homedir6, hostname as currentHostname, type as currentOsType } from "os";
+import { arch as currentArch, homedir as homedir3, hostname as currentHostname, type as currentOsType } from "os";
 import { existsSync as existsSync6 } from "fs";
-import { join as join8 } from "path";
+import { join as join6 } from "path";
 function normalizeOsFamily(os) {
   const value = (os ?? "").trim().toLowerCase();
   if (value === "darwin" || value === "macos" || value === "mac" || value === "osx")
@@ -2775,11 +2831,11 @@ function normalizeOsFamily(os) {
   return value || "unknown";
 }
 function detectMachineContext(overrides = {}) {
-  const homeDir2 = overrides.home_dir ?? process.env["CONFIGS_HOME"] ?? process.env["HOME"] ?? homedir6();
+  const homeDir2 = overrides.home_dir ?? process.env["CONFIGS_HOME"] ?? process.env["HOME"] ?? homedir3();
   const os = overrides.os ?? currentOsType();
   const osFamily = normalizeOsFamily(os);
-  const bunBinDir = overrides.bun_bin_dir ?? join8(homeDir2, ".bun", "bin");
-  const defaultBunPath = osFamily === "macos" && existsSync6(BREW_BUN_PATH) ? BREW_BUN_PATH : join8(bunBinDir, "bun");
+  const bunBinDir = overrides.bun_bin_dir ?? join6(homeDir2, ".bun", "bin");
+  const defaultBunPath = osFamily === "macos" && existsSync6(BREW_BUN_PATH) ? BREW_BUN_PATH : join6(bunBinDir, "bun");
   return {
     id: "current-machine",
     hostname: overrides.hostname ?? currentHostname(),
@@ -2789,10 +2845,10 @@ function detectMachineContext(overrides = {}) {
     created_at: "",
     os_family: osFamily,
     home_dir: homeDir2,
-    workspace_root: overrides.workspace_root ?? join8(homeDir2, osFamily === "macos" ? "Workspace" : "workspace"),
+    workspace_root: overrides.workspace_root ?? join6(homeDir2, osFamily === "macos" ? "Workspace" : "workspace"),
     bun_bin_dir: bunBinDir,
     bun_path: overrides.bun_path ?? defaultBunPath,
-    path_prefix: overrides.path_prefix ?? (osFamily === "macos" ? `${join8("/opt", "homebrew", "bin")}:${bunBinDir}` : bunBinDir)
+    path_prefix: overrides.path_prefix ?? (osFamily === "macos" ? `${join6("/opt", "homebrew", "bin")}:${bunBinDir}` : bunBinDir)
   };
 }
 function machineContextToVariables(machine) {
@@ -7420,6 +7476,114 @@ var init_session_render_contract = __esm(() => {
   ];
 });
 
+// src/lib/session-render-state.ts
+import { existsSync as existsSync7, readdirSync } from "fs";
+import { homedir as homedir4 } from "os";
+import { dirname, join as join7, resolve as resolve4 } from "path";
+import { homedir as pathsResolverHomedir3 } from "os";
+import { join as pathsResolverJoin3 } from "path";
+function pathsResolverAssertApp3(app) {
+  if (typeof app !== "string" || app.length === 0) {
+    throw new TypeError("paths: app must be a non-empty string");
+  }
+  if (!PATHS_RESOLVER_APP_SLUG_RE3.test(app)) {
+    throw new TypeError(`paths: invalid app slug "${app}" \u2014 expected lowercase kebab-case ([a-z0-9]+(-[a-z0-9]+)*)`);
+  }
+}
+function pathsResolverAssertKind3(kind) {
+  if (!Object.keys(PATHS_RESOLVER_KIND_ENV3).includes(kind)) {
+    throw new TypeError(`paths: invalid path kind "${kind}" \u2014 expected one of ${Object.keys(PATHS_RESOLVER_KIND_ENV3).join(", ")}`);
+  }
+}
+function pathsResolverBaseDir3(kind, options) {
+  pathsResolverAssertKind3(kind);
+  const env = options.env ?? process.env;
+  const override = env[PATHS_RESOLVER_KIND_ENV3[kind]];
+  if (typeof override === "string" && override.length > 0)
+    return override;
+  const home = options.home ?? pathsResolverHomedir3();
+  const platform = options.platform ?? process.platform;
+  if (platform === "darwin") {
+    switch (kind) {
+      case "config":
+      case "data":
+        return pathsResolverJoin3(home, "Library", "Application Support", "Hasna");
+      case "cache":
+        return pathsResolverJoin3(home, "Library", "Caches", "Hasna");
+      case "state":
+        return pathsResolverJoin3(home, "Library", "Logs", "Hasna");
+    }
+  }
+  switch (kind) {
+    case "config":
+      return pathsResolverJoin3(home, ".config", "hasna");
+    case "data":
+      return pathsResolverJoin3(home, ".local", "share", "hasna");
+    case "state":
+      return pathsResolverJoin3(home, ".local", "state", "hasna");
+    case "cache":
+      return pathsResolverJoin3(home, ".cache", "hasna");
+  }
+}
+function pathsResolverResolve3(kind, options) {
+  pathsResolverAssertApp3(options.app);
+  const appSegment = options.internal === true ? pathsResolverJoin3("internal", options.app) : options.app;
+  return pathsResolverJoin3(pathsResolverBaseDir3(kind, options), appSegment);
+}
+function stateDir(options) {
+  return pathsResolverResolve3("state", options);
+}
+function homeDir2(env = process.env) {
+  return env["HOME"] || env["USERPROFILE"] || homedir4();
+}
+function legacySnapshotDir(targetHome) {
+  return resolve4(join7(targetHome, ".hasna", "session-render-snapshots"));
+}
+function resolverSnapshotDir(env = process.env) {
+  const override = env.HASNA_STATE_HOME;
+  if (typeof override === "string" && override.trim().length > 0 && !existsSync7(override)) {
+    return stateDir({
+      app: SESSION_RENDER_STATE_APP,
+      env: { ...env, HASNA_STATE_HOME: undefined },
+      home: homeDir2(env)
+    });
+  }
+  return stateDir({ app: SESSION_RENDER_STATE_APP, env, home: homeDir2(env) });
+}
+function adoptResolverSnapshotDir(resolved, env = process.env) {
+  const override = env.HASNA_STATE_HOME;
+  if (typeof override === "string" && override.trim().length > 0 && existsSync7(override)) {
+    return true;
+  }
+  if (!existsSync7(resolved))
+    return false;
+  return readdirSync(resolved).some((name) => name.endsWith(".json"));
+}
+function resolveSessionRenderSnapshotLocation(targetHome, env = process.env) {
+  const resolved = resolverSnapshotDir(env);
+  if (!adoptResolverSnapshotDir(resolved, env)) {
+    return { dir: legacySnapshotDir(targetHome), workspaceRoot: targetHome, adopted: false };
+  }
+  const resolvedPath = resolve4(resolved);
+  return { dir: resolvedPath, workspaceRoot: dirname(resolvedPath), adopted: true };
+}
+function getSessionRenderSnapshotDir(targetHome, env = process.env) {
+  return resolveSessionRenderSnapshotLocation(targetHome, env).dir;
+}
+function sessionRenderSnapshotWorkspaceRoot(targetHome, env = process.env) {
+  return resolveSessionRenderSnapshotLocation(targetHome, env).workspaceRoot;
+}
+var PATHS_RESOLVER_KIND_ENV3, PATHS_RESOLVER_APP_SLUG_RE3, SESSION_RENDER_STATE_APP = "instructions";
+var init_session_render_state = __esm(() => {
+  PATHS_RESOLVER_KIND_ENV3 = {
+    config: "HASNA_CONFIG_HOME",
+    data: "HASNA_DATA_HOME",
+    state: "HASNA_STATE_HOME",
+    cache: "HASNA_CACHE_HOME"
+  };
+  PATHS_RESOLVER_APP_SLUG_RE3 = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+});
+
 // src/lib/project-context.ts
 import { createHash as createHash2, randomUUID as randomUUID5 } from "crypto";
 import { execFileSync } from "child_process";
@@ -7427,7 +7591,7 @@ import { dlopen, FFIType } from "bun:ffi";
 import {
   closeSync,
   constants,
-  existsSync as existsSync7,
+  existsSync as existsSync8,
   fstatSync,
   fsyncSync,
   lstatSync,
@@ -7440,7 +7604,7 @@ import {
   statSync,
   writeFileSync
 } from "fs";
-import { basename, dirname, isAbsolute, join as join9, parse, relative, resolve as resolve4 } from "path";
+import { basename, dirname as dirname2, isAbsolute, join as join8, parse, relative, resolve as resolve5 } from "path";
 function managedObservationMaxBytes(relativePath) {
   return SESSION_MANAGED_OUTPUT_PATHS.includes(relativePath) ? SESSION_MANAGED_OUTPUT_MAX_BYTES : FOREIGN_INPUT_MAX_BYTES;
 }
@@ -7520,7 +7684,7 @@ function planProjectContext(input) {
   const inlineMarkerOverhead = nativeImports ? 0 : Buffer.byteLength(buildManagedBlock(bundle, "", `
 `), "utf8");
   const generated = buildCanonicalFragment(bundle, status, ageSeconds, PROJECT_CONTEXT_MAX_RENDERED_BYTES - Math.max(320, inlineMarkerOverhead), PROJECT_CONTEXT_MAX_APPROX_TOKENS - Math.max(80, Math.ceil(inlineMarkerOverhead / 4)));
-  const previousTargetContent = existsSync7(paths.target) ? readUtf8RegularFile(paths.target, workspaceRoot, managedObservationMaxBytes(relativePosix(workspaceRoot, paths.target))) : null;
+  const previousTargetContent = existsSync8(paths.target) ? readUtf8RegularFile(paths.target, workspaceRoot, managedObservationMaxBytes(relativePosix(workspaceRoot, paths.target))) : null;
   const markerParse = parseManagedBlock(previousTargetContent ?? "", input.force === true);
   if (markerParse.block && markerParse.block.id !== bundle.project.id) {
     throw new ProjectContextError("MANAGED_BLOCK_CONFLICT", "managed block belongs to a different project");
@@ -7571,7 +7735,7 @@ function composeProjectContextSessionRender(input) {
     return null;
   const { runtime, workspace_root: workspaceRoot, observed_hashes: observedHashes } = guard;
   const paths = runtimePaths(workspaceRoot, runtime);
-  if (!existsSync7(paths.manifest))
+  if (!existsSync8(paths.manifest))
     return null;
   assertCodewithTargetIsConsumed(workspaceRoot, runtime);
   const manifest = readProjectContextManifest(paths.manifest, workspaceRoot);
@@ -7600,7 +7764,7 @@ function composeProjectContextSessionRender(input) {
   }
   const fragment = readUtf8RegularFile(paths.fragment, workspaceRoot, PROJECT_CONTEXT_MAX_RENDERED_BYTES);
   scanGeneratedContent(fragment);
-  if (!existsSync7(paths.target)) {
+  if (!existsSync8(paths.target)) {
     throw new ProjectContextError("MANAGED_BLOCK_CONFLICT", "project-context provider target is missing while durable context is active");
   }
   const currentTarget = readUtf8RegularFile(paths.target, workspaceRoot, managedObservationMaxBytes(relativePosix(workspaceRoot, paths.target)));
@@ -7611,7 +7775,7 @@ function composeProjectContextSessionRender(input) {
   if (currentMarkers.block.id !== cache.project_id || currentMarkers.block.revision !== cache.revision || currentMarkers.block.hash !== cache.hash) {
     throw new ProjectContextError("MANAGED_BLOCK_CONFLICT", "project-context provider markers differ from the durable cache");
   }
-  const plannedIndexes = input.files.filter((file) => file.role === "index" && resolve4(file.path) === paths.target);
+  const plannedIndexes = input.files.filter((file) => file.role === "index" && resolve5(file.path) === paths.target);
   if (plannedIndexes.length !== 1) {
     throw new ProjectContextError("PROJECT_CONTEXT_MANIFEST_INVALID", "session renderer does not own the selected project-context provider target");
   }
@@ -7669,7 +7833,7 @@ function withProjectContextSessionGuard(guard, action, options = {}) {
     verify();
     return action(null);
   }
-  const lockPath = resolve4(validated.workspace_root, ...PROJECT_CONTEXT_LOCK_PATH.split("/"));
+  const lockPath = resolve5(validated.workspace_root, ...PROJECT_CONTEXT_LOCK_PATH.split("/"));
   const lock = acquireWorkspaceLock(validated.workspace_root, lockPath);
   try {
     verify();
@@ -7695,7 +7859,7 @@ function validateProjectContextSessionGuard(guard) {
     if (!isRecord(observed) || typeof observed.path !== "string") {
       throw new ProjectContextError("PROJECT_CONTEXT_SESSION_STALE", "session project-context guard contains malformed hash metadata");
     }
-    const path = resolve4(observed.path);
+    const path = resolve5(observed.path);
     if (!allowedPaths.has(path) || observedPaths.has(path)) {
       throw new ProjectContextError("PROJECT_CONTEXT_SESSION_STALE", "session project-context guard contains an unexpected or duplicate path");
     }
@@ -7717,7 +7881,7 @@ function validateProjectContextSessionGuard(guard) {
 function applyProjectContext(options) {
   const workspaceRoot = assertSafeWorkspaceRoot(options.workspace_root);
   const now3 = options.now ?? new Date;
-  const lockPath = resolve4(workspaceRoot, ...PROJECT_CONTEXT_LOCK_PATH.split("/"));
+  const lockPath = resolve5(workspaceRoot, ...PROJECT_CONTEXT_LOCK_PATH.split("/"));
   const lock = options.dry_run ? null : acquireWorkspaceLock(workspaceRoot, lockPath, options.test_hooks?.after_lock_open, options.test_hooks?.before_stale_lock_remove, options.test_hooks?.process_start_identity);
   try {
     const resolved = resolveBundleForApply(options, workspaceRoot, now3);
@@ -7864,7 +8028,7 @@ function resolveBundleForApply(options, workspaceRoot, now3) {
   if (!options.expected_project_id) {
     throw new ProjectContextError("PROJECT_CONTEXT_CACHE_ID_REQUIRED", "expected_project_id is required for stale-cache fallback");
   }
-  const cachePath = resolve4(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/"));
+  const cachePath = resolve5(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/"));
   const cache = readProjectContextCache(cachePath, workspaceRoot);
   if (!cache)
     throw new ProjectContextError("PROJECT_CONTEXT_CACHE_MISSING", "no last-known-good project context cache exists");
@@ -8066,7 +8230,7 @@ function findLegacyCodewithWorkspaceSection(workspaceRoot, runtime, content, bun
   if (runtime !== "codewith" || !content)
     return null;
   const sessionManifestPath = runtimePaths(workspaceRoot, runtime).sessionManifest;
-  if (!existsSync7(sessionManifestPath))
+  if (!existsSync8(sessionManifestPath))
     return null;
   const manifest = readSessionManifestRecord(sessionManifestPath, workspaceRoot);
   if (!manifest || manifest["schema"] !== SESSION_RENDER_SCHEMA) {
@@ -8117,7 +8281,7 @@ function assertRevisionOrdering(plan, force) {
   const manifest = readProjectContextManifest(plan.manifest_path, plan.workspace_root);
   if (manifest) {
     const manifestHashHasRecoveryProof = manifest.projectContext.hash === plan.bundle.hash || metadataSnapshotMatchesManifest(plan, manifest);
-    const canonicalStateAlreadyInstalled = cache !== null && canonicalCacheHash === plan.bundle.hash && cache.project_id === plan.bundle.project.id && cache.revision === plan.bundle.revision && plan.marker !== null && plan.marker.id === plan.bundle.project.id && plan.marker.revision === plan.bundle.revision && plan.marker.hash === plan.bundle.hash && existsSync7(plan.fragment_path) && fragmentMatchesBundle(plan.fragment_path, plan.bundle, plan.workspace_root) && manifestHashHasRecoveryProof;
+    const canonicalStateAlreadyInstalled = cache !== null && canonicalCacheHash === plan.bundle.hash && cache.project_id === plan.bundle.project.id && cache.revision === plan.bundle.revision && plan.marker !== null && plan.marker.id === plan.bundle.project.id && plan.marker.revision === plan.bundle.revision && plan.marker.hash === plan.bundle.hash && existsSync8(plan.fragment_path) && fragmentMatchesBundle(plan.fragment_path, plan.bundle, plan.workspace_root) && manifestHashHasRecoveryProof;
     observations.push({
       source: "manifest",
       id: manifest.projectContext.projectId,
@@ -8125,7 +8289,7 @@ function assertRevisionOrdering(plan, force) {
       hash: canonicalStateAlreadyInstalled && manifest.projectContext.projectId === plan.bundle.project.id && manifest.projectContext.revision === plan.bundle.revision ? plan.bundle.hash : normalizePersistedHash(manifest.projectContext.revision, manifest.projectContext.hash)
     });
     const fragmentEntry = manifest.files.find((file) => file.relativePath === PROJECT_CONTEXT_FRAGMENT_PATH);
-    if (fragmentEntry && existsSync7(plan.fragment_path)) {
+    if (fragmentEntry && existsSync8(plan.fragment_path)) {
       const actual = currentFileHash(plan.fragment_path, plan.workspace_root);
       if (actual !== fragmentEntry.sha256 && !fragmentMatchesBundle(plan.fragment_path, plan.bundle, plan.workspace_root) && !force) {
         throw new ProjectContextError("MANAGED_BLOCK_CONFLICT", "canonical project-context fragment changed outside Instructions");
@@ -8220,9 +8384,9 @@ function buildManifest(plan, now3) {
 function buildSessionCompatibilityManifest(plan, now3) {
   const paths = runtimePaths(plan.workspace_root, plan.runtime);
   const tool = manifestTool(plan.runtime);
-  const targetHome = plan.runtime === "codewith" ? resolve4(plan.workspace_root, ".codewith") : plan.workspace_root;
+  const targetHome = plan.runtime === "codewith" ? resolve5(plan.workspace_root, ".codewith") : plan.workspace_root;
   const targetRelativePath = sessionTargetRelativePath(plan.runtime);
-  const existing = existsSync7(paths.sessionManifest) ? readSessionManifestRecord(paths.sessionManifest, plan.workspace_root) : {
+  const existing = existsSync8(paths.sessionManifest) ? readSessionManifestRecord(paths.sessionManifest, plan.workspace_root) : {
     schema: SESSION_RENDER_SCHEMA,
     tool,
     adapterMode: plan.native_imports ? "native-imports" : "flattened-markdown",
@@ -8242,7 +8406,7 @@ function buildSessionCompatibilityManifest(plan, now3) {
     throw new ProjectContextError("PROJECT_CONTEXT_MANIFEST_INVALID", "provider session manifest is malformed or incompatible");
   }
   const existingTargetHome = safeLegacyMetadataString(existing["targetHome"], null);
-  if (existingTargetHome !== null && resolve4(existingTargetHome) !== targetHome) {
+  if (existingTargetHome !== null && resolve5(existingTargetHome) !== targetHome) {
     throw new ProjectContextError("PROJECT_CONTEXT_MANIFEST_INVALID", "provider session manifest targets a different workspace");
   }
   const sources = sanitizeLegacySources(existing["sources"]).filter((source) => source["id"] !== "project-context-bundle");
@@ -8528,9 +8692,9 @@ function writeMetadataSnapshot(plan, now3) {
   const previous = readProjectContextManifest(plan.manifest_path, plan.workspace_root);
   if (!previous || previous.projectContext.revision === plan.bundle.revision && previous.projectContext.hash === plan.bundle.hash)
     return null;
-  const snapshotDir = resolve4(plan.workspace_root, ...PROJECT_CONTEXT_SNAPSHOT_DIR.split("/"));
+  const snapshotDir = resolve5(plan.workspace_root, ...PROJECT_CONTEXT_SNAPSHOT_DIR.split("/"));
   ensureSafeDirectory(snapshotDir, plan.workspace_root, 448);
-  const snapshotPath = resolve4(snapshotDir, `${safeFilename(previous.projectContext.revision)}-${previous.projectContext.hash.slice(-12)}.json`);
+  const snapshotPath = resolve5(snapshotDir, `${safeFilename(previous.projectContext.revision)}-${previous.projectContext.hash.slice(-12)}.json`);
   const snapshot = {
     schema: "hasna.configs.session-render-snapshot/v1",
     kind: "project-context-metadata",
@@ -8546,9 +8710,9 @@ function writeMetadataSnapshot(plan, now3) {
   return snapshotPath;
 }
 function metadataSnapshotMatchesManifest(plan, manifest) {
-  const snapshotDir = resolve4(plan.workspace_root, ...PROJECT_CONTEXT_SNAPSHOT_DIR.split("/"));
-  const snapshotPath = resolve4(snapshotDir, `${safeFilename(manifest.projectContext.revision)}-${manifest.projectContext.hash.slice(-12)}.json`);
-  if (!existsSync7(snapshotPath))
+  const snapshotDir = resolve5(plan.workspace_root, ...PROJECT_CONTEXT_SNAPSHOT_DIR.split("/"));
+  const snapshotPath = resolve5(snapshotDir, `${safeFilename(manifest.projectContext.revision)}-${manifest.projectContext.hash.slice(-12)}.json`);
+  if (!existsSync8(snapshotPath))
     return false;
   const record = readJsonRecord(snapshotPath, plan.workspace_root);
   const result = projectContextMetadataSnapshotSchema.safeParse(record);
@@ -8596,10 +8760,11 @@ function writeProjectContextRollbackSnapshot(plan, now3, outputs) {
       sha256: nextHash
     };
   });
-  const snapshotDir = resolve4(plan.workspace_root, ...SESSION_RENDER_SNAPSHOT_RELATIVE_DIR.split("/"));
-  ensureSafeDirectory(snapshotDir, plan.workspace_root, 448);
+  const snapshotWorkspaceRoot = sessionRenderSnapshotWorkspaceRoot(plan.workspace_root);
+  const snapshotDir = getSessionRenderSnapshotDir(plan.workspace_root);
+  ensureSafeDirectory(snapshotDir, snapshotWorkspaceRoot, 448);
   const timestamp = now3.toISOString().replace(/[:.]/g, "-");
-  const snapshotPath = resolve4(snapshotDir, `${timestamp}-${randomUUID5()}.json`);
+  const snapshotPath = resolve5(snapshotDir, `${timestamp}-${randomUUID5()}.json`);
   const snapshot = {
     schema: "hasna.configs.session-render-snapshot/v2",
     createdAt: now3.toISOString(),
@@ -8613,11 +8778,11 @@ function writeProjectContextRollbackSnapshot(plan, now3, outputs) {
     afterFiles
   };
   atomicWriteFile(snapshotPath, `${JSON.stringify(snapshot, null, 2)}
-`, plan.workspace_root, 384, null);
+`, snapshotWorkspaceRoot, 384, null);
   return snapshotPath;
 }
 function readProjectContextManifest(path, workspaceRoot) {
-  if (!existsSync7(path))
+  if (!existsSync8(path))
     return null;
   const record = readJsonRecord(path, workspaceRoot);
   const result = storedManifestObservationSchema.safeParse(record);
@@ -8632,7 +8797,7 @@ function readProjectContextManifest(path, workspaceRoot) {
   };
 }
 function readProjectContextCache(path, workspaceRoot) {
-  if (!existsSync7(path))
+  if (!existsSync8(path))
     return null;
   const record = readJsonRecord(path, workspaceRoot);
   const result = projectContextCacheSchema.safeParse(record);
@@ -8664,7 +8829,7 @@ function readSessionManifestRecord(path, workspaceRoot) {
   }
 }
 function atomicWriteFile(path, content, workspaceRoot, defaultMode, expectedHash, afterExchange, atomicExchangeUnavailable = false, beforeInstall, portableCreateOnly = false, maxObservedBytes, allowPortableReplacement = false) {
-  const dir = resolve4(path, "..");
+  const dir = resolve5(path, "..");
   ensureSafeDirectory(dir, workspaceRoot, 448);
   assertNoSymlinkSegments(workspaceRoot, path);
   const anchoredOps = portableCreateOnly ? null : resolveAnchoredFsOps();
@@ -8681,7 +8846,7 @@ function atomicWriteFile(path, content, workspaceRoot, defaultMode, expectedHash
   const previous = anchoredFileObservation(directory, targetName);
   const previousMode = previous?.mode ?? defaultMode;
   const tempName = `.project-context-${randomUUID5()}.tmp`;
-  const tempPath = join9(dir, tempName);
+  const tempPath = join8(dir, tempName);
   let fd = null;
   let preserveTemp = false;
   let directoryChanged = false;
@@ -8810,9 +8975,9 @@ function atomicWritePortable(path, content, workspaceRoot, defaultMode, expected
   if (currentHash !== null) {
     throw new ProjectContextHashRace(`managed path appeared before portable creation: ${relativePosix(workspaceRoot, path)}`);
   }
-  const dir = dirname(path);
+  const dir = dirname2(path);
   const directoryIdentity = captureManagedDirectoryIdentity(dir, workspaceRoot);
-  const tempPath = join9(dir, `.project-context-${randomUUID5()}.tmp`);
+  const tempPath = join8(dir, `.project-context-${randomUUID5()}.tmp`);
   let fd = null;
   let tempIdentity = null;
   try {
@@ -8867,9 +9032,9 @@ function atomicWritePortableReplacement(path, content, workspaceRoot, expectedHa
   if (current.isSymbolicLink() || !current.isFile()) {
     throw new ProjectContextHashRace(`managed path is not a regular file: ${relativePosix(workspaceRoot, path)}`);
   }
-  const dir = dirname(path);
+  const dir = dirname2(path);
   const directoryIdentity = captureManagedDirectoryIdentity(dir, workspaceRoot);
-  const tempPath = join9(dir, `.project-context-${randomUUID5()}.tmp`);
+  const tempPath = join8(dir, `.project-context-${randomUUID5()}.tmp`);
   const desiredHash = sha2562(content);
   let fd = null;
   let tempIdentity = null;
@@ -8926,7 +9091,7 @@ function portablePreparedHash(tempPath, path, workspaceRoot, maxObservedBytes, s
 function portableFileHash(path, workspaceRoot, maxObservedBytes) {
   if (maxObservedBytes === undefined)
     return currentFileHash(path, workspaceRoot);
-  if (!existsSync7(path))
+  if (!existsSync8(path))
     return null;
   assertNoSymlinkSegments(workspaceRoot, path);
   const stat = lstatSync(path);
@@ -8938,13 +9103,13 @@ function portableFileHash(path, workspaceRoot, maxObservedBytes) {
   return createHash2("sha256").update(readFileSync(path)).digest("hex");
 }
 function writeProjectContextCoordinatedFile(input) {
-  atomicWriteFile(resolve4(input.path), input.content, assertSafeWorkspaceRoot(input.workspace_root), input.default_mode ?? 420, input.expected_hash, undefined, false, input.test_hooks?.before_install, input.force_portable_file_ops ?? false, input.max_observed_bytes, input.allow_portable_replacement ?? false);
+  atomicWriteFile(resolve5(input.path), input.content, assertSafeWorkspaceRoot(input.workspace_root), input.default_mode ?? 420, input.expected_hash, undefined, false, input.test_hooks?.before_install, input.force_portable_file_ops ?? false, input.max_observed_bytes, input.allow_portable_replacement ?? false);
 }
 function removeProjectContextCoordinatedFile(input) {
   const workspaceRoot = assertSafeWorkspaceRoot(input.workspace_root);
-  const path = resolve4(input.path);
+  const path = resolve5(input.path);
   assertNoSymlinkSegments(workspaceRoot, path);
-  const dir = dirname(path);
+  const dir = dirname2(path);
   const anchoredOps = input.force_portable_file_ops ? null : resolveAnchoredFsOps();
   if (!anchoredOps) {
     if (!input.allow_portable_removal) {
@@ -8968,7 +9133,7 @@ function removeProjectContextCoordinatedFile(input) {
       throw new ProjectContextHashRace(`managed path changed during deletion: ${relativePosix(workspaceRoot, path)}`);
     }
     displaced = true;
-    input.test_hooks?.after_displace?.(join9(dir, displacedName));
+    input.test_hooks?.after_displace?.(join8(dir, displacedName));
     const moved = anchoredFileObservation(directory, displacedName);
     if (!moved || moved.dev !== observed.dev || moved.ino !== observed.ino || moved.hash !== input.expected_hash || anchoredFileObservation(directory, targetName) !== null) {
       throw new ProjectContextHashRace(`managed path changed during deletion validation: ${relativePosix(workspaceRoot, path)}`);
@@ -9012,9 +9177,9 @@ function removePortableCoordinatedFile(path, workspaceRoot, expectedHash, maxObs
   if (observed.isSymbolicLink() || !observed.isFile()) {
     throw new ProjectContextHashRace(`managed path is not a regular file: ${relativePosix(workspaceRoot, path)}`);
   }
-  const dir = dirname(path);
+  const dir = dirname2(path);
   const directoryIdentity = captureManagedDirectoryIdentity(dir, workspaceRoot);
-  const displacedPath = join9(dir, `.project-context-delete-${randomUUID5()}.tmp`);
+  const displacedPath = join8(dir, `.project-context-delete-${randomUUID5()}.tmp`);
   let displaced = false;
   try {
     assertManagedDirectoryStable(dir, workspaceRoot, directoryIdentity);
@@ -9025,7 +9190,7 @@ function removePortableCoordinatedFile(path, workspaceRoot, expectedHash, maxObs
     displaced = true;
     afterDisplace?.(displacedPath);
     const moved = lstatSync(displacedPath);
-    if (moved.isSymbolicLink() || !moved.isFile() || moved.dev !== observed.dev || moved.ino !== observed.ino || portableFileHash(displacedPath, workspaceRoot, maxObservedBytes) !== expectedHash || existsSync7(path)) {
+    if (moved.isSymbolicLink() || !moved.isFile() || moved.dev !== observed.dev || moved.ino !== observed.ino || portableFileHash(displacedPath, workspaceRoot, maxObservedBytes) !== expectedHash || existsSync8(path)) {
       throw new ProjectContextHashRace(`managed path changed during portable deletion: ${relativePosix(workspaceRoot, path)}`);
     }
     rmSync2(displacedPath);
@@ -9051,7 +9216,7 @@ function restorePortableDisplacedFile(displacedPath, path, workspaceRoot, expect
     if (displaced.isSymbolicLink() || installed.isSymbolicLink() || !displaced.isFile() || !installed.isFile() || displaced.dev !== expected.dev || displaced.ino !== expected.ino || displaced.dev !== installed.dev || displaced.ino !== installed.ino || portableFileHash(displacedPath, workspaceRoot, maxObservedBytes) !== expectedHash || portableFileHash(path, workspaceRoot, maxObservedBytes) !== expectedHash)
       return false;
     rmSync2(displacedPath);
-    fsyncDirectory(dirname(path));
+    fsyncDirectory(dirname2(path));
     return true;
   } catch {
     return false;
@@ -9085,7 +9250,7 @@ function anchoredOpenExclusive(directory, name, mode) {
   const requestedMode = mode & 4095;
   let fd;
   try {
-    fd = openSync(join9(directory.path, name), constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, requestedMode);
+    fd = openSync(join8(directory.path, name), constants.O_WRONLY | constants.O_CREAT | constants.O_EXCL | constants.O_NOFOLLOW, requestedMode);
   } catch {
     throw new ProjectContextHashRace(`could not create prepared managed file in ${relativePosix(directory.workspaceRoot, directory.path)}`);
   }
@@ -9128,7 +9293,7 @@ function anchoredFileObservation(directory, name) {
     const stat = fstatSync(fd);
     if (!stat.isFile())
       throw new ProjectContextHashRace("managed output is not a regular file");
-    const relativePath = relativePosix(directory.workspaceRoot, join9(directory.path, name));
+    const relativePath = relativePosix(directory.workspaceRoot, join8(directory.path, name));
     const maxBytes = directory.maxObservedBytes === undefined ? managedObservationMaxBytes(relativePath) : directory.maxObservedBytes;
     if (maxBytes !== null && stat.size > maxBytes) {
       throw new ProjectContextHashRace(`managed output exceeds the safe read limit: ${relativePath}`);
@@ -9154,7 +9319,7 @@ function anchoredPreparedObservation(directory, name, path, stage) {
   return observed;
 }
 function captureManagedDirectoryIdentity(path, workspaceRoot) {
-  assertNoSymlinkSegments(workspaceRoot, join9(path, ".project-context-directory-guard"));
+  assertNoSymlinkSegments(workspaceRoot, join8(path, ".project-context-directory-guard"));
   let stat;
   try {
     stat = lstatSync(path);
@@ -9167,7 +9332,7 @@ function captureManagedDirectoryIdentity(path, workspaceRoot) {
   return { dev: stat.dev, ino: stat.ino };
 }
 function assertManagedDirectoryStable(path, workspaceRoot, expected) {
-  assertNoSymlinkSegments(workspaceRoot, join9(path, ".project-context-directory-guard"));
+  assertNoSymlinkSegments(workspaceRoot, join8(path, ".project-context-directory-guard"));
   let current;
   try {
     current = lstatSync(path);
@@ -9300,10 +9465,10 @@ function resolveAnchoredFsOps() {
   return null;
 }
 function acquireWorkspaceLock(workspaceRoot, lockPath, afterOpen, beforeStaleRemove, processStartIdentityLookup = processStartIdentity) {
-  const lockDirectory = resolve4(lockPath, "..");
+  const lockDirectory = resolve5(lockPath, "..");
   ensureSafeDirectory(lockDirectory, workspaceRoot, 448);
   assertNoSymlinkSegments(workspaceRoot, lockPath);
-  const tempPath = join9(lockDirectory, `.project-context-lock-${randomUUID5()}.tmp`);
+  const tempPath = join8(lockDirectory, `.project-context-lock-${randomUUID5()}.tmp`);
   let fd = null;
   let openedIdentity = null;
   let openedContentHash = null;
@@ -9337,7 +9502,7 @@ function acquireWorkspaceLock(workspaceRoot, lockPath, afterOpen, beforeStaleRem
       linked = true;
     }
     fsyncDirectory(lockDirectory);
-    if (existsSync7(tempPath)) {
+    if (existsSync8(tempPath)) {
       rmSync2(tempPath);
       fsyncDirectory(lockDirectory);
     }
@@ -9352,7 +9517,7 @@ function acquireWorkspaceLock(workspaceRoot, lockPath, afterOpen, beforeStaleRem
     if (linked && openedIdentity && openedContentHash) {
       removeOwnedLockByInode(lockPath, openedIdentity, openedContentHash);
     }
-    if (!preserveTemp && existsSync7(tempPath)) {
+    if (!preserveTemp && existsSync8(tempPath)) {
       try {
         rmSync2(tempPath);
       } catch {}
@@ -9367,7 +9532,7 @@ function acquireWorkspaceLock(workspaceRoot, lockPath, afterOpen, beforeStaleRem
 }
 function removeOwnedLockByInode(lockPath, identity, expectedHash) {
   try {
-    if (!existsSync7(lockPath))
+    if (!existsSync8(lockPath))
       return;
     const current = lstatSync(lockPath);
     if (current.isSymbolicLink() || current.dev !== identity.dev || current.ino !== identity.ino)
@@ -9375,7 +9540,7 @@ function removeOwnedLockByInode(lockPath, identity, expectedHash) {
     if (expectedHash !== undefined && sha2562(readFileSync(lockPath, "utf8")) !== expectedHash)
       return;
     rmSync2(lockPath);
-    fsyncDirectory(resolve4(lockPath, ".."));
+    fsyncDirectory(resolve5(lockPath, ".."));
   } catch {}
 }
 function observeStaleWorkspaceLock(lockPath, workspaceRoot, processStartIdentityLookup = processStartIdentity) {
@@ -9446,7 +9611,7 @@ function tryTakeoverStaleWorkspaceLock(candidatePath, lockPath, workspaceRoot, c
     const candidateInstalled = !current.isSymbolicLink() && current.dev === candidateIdentity.dev && current.ino === candidateIdentity.ino && currentFileHash(lockPath, workspaceRoot) === candidateHash;
     const staleDisplaced = !displaced.isSymbolicLink() && displaced.dev === stale.identity.dev && displaced.ino === stale.identity.ino && currentFileHash(candidatePath, workspaceRoot) === stale.contentHash;
     if (!candidateInstalled || !staleDisplaced) {
-      if (candidateInstalled && existsSync7(candidatePath)) {
+      if (candidateInstalled && existsSync8(candidatePath)) {
         atomicExchangePaths(candidatePath, lockPath);
         exchanged = false;
         return false;
@@ -9454,13 +9619,13 @@ function tryTakeoverStaleWorkspaceLock(candidatePath, lockPath, workspaceRoot, c
       throw new ProjectContextError("PROJECT_CONTEXT_LOCK_LOST", "workspace lock changed during stale-lock takeover and could not be restored safely");
     }
     rmSync2(candidatePath);
-    fsyncDirectory(resolve4(lockPath, ".."));
+    fsyncDirectory(resolve5(lockPath, ".."));
     exchanged = false;
     return true;
   } catch (error) {
     if (exchanged) {
       try {
-        if (currentFileHash(lockPath, workspaceRoot) === candidateHash && existsSync7(candidatePath)) {
+        if (currentFileHash(lockPath, workspaceRoot) === candidateHash && existsSync8(candidatePath)) {
           atomicExchangePaths(candidatePath, lockPath);
           exchanged = false;
         }
@@ -9473,7 +9638,7 @@ function tryTakeoverStaleWorkspaceLock(candidatePath, lockPath, workspaceRoot, c
   }
 }
 function assertWorkspaceLockHeld(lockPath, lock, workspaceRoot) {
-  if (!existsSync7(lockPath)) {
+  if (!existsSync8(lockPath)) {
     throw new ProjectContextError("PROJECT_CONTEXT_LOCK_LOST", "workspace project-context lock changed during render");
   }
   const current = lstatSync(lockPath);
@@ -9533,8 +9698,8 @@ function releaseWorkspaceLock(lockPath, lock, workspaceRoot) {
     }
     return;
   }
-  const lockDirectory = resolve4(lockPath, "..");
-  const releasePath = join9(lockDirectory, `.project-context-release-${randomUUID5()}.tmp`);
+  const lockDirectory = resolve5(lockPath, "..");
+  const releasePath = join8(lockDirectory, `.project-context-release-${randomUUID5()}.tmp`);
   let releaseFd = null;
   let releaseIdentity = null;
   let releaseHash = null;
@@ -9563,7 +9728,7 @@ function releaseWorkspaceLock(lockPath, lock, workspaceRoot) {
     const releaseInstalled = !installed.isSymbolicLink() && installed.dev === releaseIdentity.dev && installed.ino === releaseIdentity.ino && currentFileHash(lockPath, workspaceRoot) === releaseHash;
     const ownedDisplaced = !displaced.isSymbolicLink() && displaced.dev === lock.identity.dev && displaced.ino === lock.identity.ino && currentFileHash(releasePath, workspaceRoot) === lock.contentHash;
     if (!releaseInstalled || !ownedDisplaced) {
-      if (releaseInstalled && existsSync7(releasePath)) {
+      if (releaseInstalled && existsSync8(releasePath)) {
         atomicExchangePaths(releasePath, lockPath);
         exchanged = false;
       }
@@ -9576,7 +9741,7 @@ function releaseWorkspaceLock(lockPath, lock, workspaceRoot) {
   } catch {
     if (exchanged) {
       try {
-        if (releaseHash && currentFileHash(lockPath, workspaceRoot) === releaseHash && existsSync7(releasePath)) {
+        if (releaseHash && currentFileHash(lockPath, workspaceRoot) === releaseHash && existsSync8(releasePath)) {
           atomicExchangePaths(releasePath, lockPath);
           exchanged = false;
         }
@@ -9588,7 +9753,7 @@ function releaseWorkspaceLock(lockPath, lock, workspaceRoot) {
         closeSync(releaseFd);
       } catch {}
     }
-    if (!exchanged && existsSync7(releasePath)) {
+    if (!exchanged && existsSync8(releasePath)) {
       try {
         rmSync2(releasePath);
       } catch {}
@@ -9614,15 +9779,15 @@ function ensureSafeDirectory(path, workspaceRoot, mode) {
   const segments = rel.split(/[\\/]+/).filter(Boolean);
   let current = workspaceRoot;
   for (const segment of segments) {
-    current = join9(current, segment);
-    if (existsSync7(current)) {
+    current = join8(current, segment);
+    if (existsSync8(current)) {
       if (lstatSync(current).isSymbolicLink())
         throw new ProjectContextError("PROJECT_CONTEXT_SYMLINK_REJECTED", `managed path uses a symlink: ${current}`);
       if (!statSync(current).isDirectory())
         throw new ProjectContextError("PROJECT_CONTEXT_PATH_INVALID", `managed path is not a directory: ${current}`);
     } else {
       mkdirSync2(current, { mode });
-      fsyncDirectory(resolve4(current, ".."));
+      fsyncDirectory(resolve5(current, ".."));
     }
   }
 }
@@ -9678,11 +9843,11 @@ function scanGeneratedContent(content) {
 function runtimePaths(workspaceRoot, runtime) {
   const relativeTarget = runtime === "claude" ? "CLAUDE.md" : runtime === "codewith" ? ".codewith/CODEWITH.md" : "AGENTS.md";
   return {
-    target: resolve4(workspaceRoot, ...relativeTarget.split("/")),
-    fragment: resolve4(workspaceRoot, ...PROJECT_CONTEXT_FRAGMENT_PATH.split("/")),
-    manifest: resolve4(workspaceRoot, ...PROJECT_CONTEXT_MANIFEST_PATH.split("/")),
-    cache: resolve4(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/")),
-    sessionManifest: runtime === "codewith" ? resolve4(workspaceRoot, ".codewith", ".hasna", "session-render-manifest.json") : resolve4(workspaceRoot, ".hasna", "session-render-manifest.json")
+    target: resolve5(workspaceRoot, ...relativeTarget.split("/")),
+    fragment: resolve5(workspaceRoot, ...PROJECT_CONTEXT_FRAGMENT_PATH.split("/")),
+    manifest: resolve5(workspaceRoot, ...PROJECT_CONTEXT_MANIFEST_PATH.split("/")),
+    cache: resolve5(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/")),
+    sessionManifest: runtime === "codewith" ? resolve5(workspaceRoot, ".codewith", ".hasna", "session-render-manifest.json") : resolve5(workspaceRoot, ".hasna", "session-render-manifest.json")
   };
 }
 function projectContextSessionGuardPaths(paths, runtime) {
@@ -9692,7 +9857,7 @@ function projectContextSessionGuardPaths(paths, runtime) {
     paths.fragment,
     paths.target,
     paths.sessionManifest,
-    ...runtime === "codewith" ? [resolve4(paths.target, "..", "CODEWITH.override.md")] : []
+    ...runtime === "codewith" ? [resolve5(paths.target, "..", "CODEWITH.override.md")] : []
   ];
 }
 function sessionTargetRelativePath(runtime) {
@@ -9712,27 +9877,27 @@ function projectContextRuntimeForSessionTool(tool) {
   return null;
 }
 function projectContextWorkspaceForSession(input, runtime) {
-  const targetHome = resolve4(input.target_home);
+  const targetHome = resolve5(input.target_home);
   if (runtime === "codewith") {
-    const workspaceRoot = basename(targetHome) === ".codewith" ? dirname(targetHome) : null;
+    const workspaceRoot = basename(targetHome) === ".codewith" ? dirname2(targetHome) : null;
     if (!workspaceRoot)
       return null;
-    if (input.project_root && resolve4(input.project_root) !== workspaceRoot) {
+    if (input.project_root && resolve5(input.project_root) !== workspaceRoot) {
       throw new ProjectContextError("PROJECT_CONTEXT_PATH_INVALID", "Codewith project_root must be the parent workspace of target_home");
     }
-    if (!existsSync7(workspaceRoot) || !lstatSync(workspaceRoot).isDirectory())
+    if (!existsSync8(workspaceRoot) || !lstatSync(workspaceRoot).isDirectory())
       return null;
     return assertSafeWorkspaceRoot(workspaceRoot);
   }
-  if (!existsSync7(targetHome) || !lstatSync(targetHome).isDirectory())
+  if (!existsSync8(targetHome) || !lstatSync(targetHome).isDirectory())
     return null;
   return assertSafeWorkspaceRoot(targetHome);
 }
 function assertCodewithTargetIsConsumed(workspaceRoot, runtime) {
   if (runtime !== "codewith")
     return;
-  const override = resolve4(workspaceRoot, ".codewith", "CODEWITH.override.md");
-  if (!existsSync7(override))
+  const override = resolve5(workspaceRoot, ".codewith", "CODEWITH.override.md");
+  if (!existsSync8(override))
     return;
   assertNoSymlinkSegments(workspaceRoot, override);
   if (!lstatSync(override).isFile())
@@ -9742,10 +9907,10 @@ function assertCodewithTargetIsConsumed(workspaceRoot, runtime) {
 function assertSafeWorkspaceRoot(path) {
   if (!isAbsolute(path))
     throw new ProjectContextError("PROJECT_CONTEXT_PATH_INVALID", "workspace root must be absolute");
-  const normalized = resolve4(path);
+  const normalized = resolve5(path);
   if (normalized === parse(normalized).root)
     throw new ProjectContextError("PROJECT_CONTEXT_PATH_INVALID", "workspace root cannot be the filesystem root");
-  if (!existsSync7(normalized) || !lstatSync(normalized).isDirectory())
+  if (!existsSync8(normalized) || !lstatSync(normalized).isDirectory())
     throw new ProjectContextError("PROJECT_CONTEXT_PATH_INVALID", "workspace root must be an existing directory");
   assertNoSymlinkAncestors(normalized);
   if (lstatSync(normalized).isSymbolicLink())
@@ -9759,18 +9924,18 @@ function assertNoSymlinkSegments(root, target) {
   }
   let current = root;
   for (const segment of rel.split(/[\\/]+/).filter(Boolean)) {
-    current = join9(current, segment);
-    if (existsSync7(current) && lstatSync(current).isSymbolicLink()) {
+    current = join8(current, segment);
+    if (existsSync8(current) && lstatSync(current).isSymbolicLink()) {
       throw new ProjectContextError("PROJECT_CONTEXT_SYMLINK_REJECTED", `managed path uses a symlink: ${current}`);
     }
   }
 }
 function assertNoSymlinkAncestors(path) {
-  const normalized = resolve4(path);
+  const normalized = resolve5(path);
   let current = parse(normalized).root;
   for (const segment of relative(current, normalized).split(/[\\/]+/).filter(Boolean)) {
-    current = join9(current, segment);
-    if (!existsSync7(current))
+    current = join8(current, segment);
+    if (!existsSync8(current))
       return;
     if (lstatSync(current).isSymbolicLink())
       throw new ProjectContextError("PROJECT_CONTEXT_SYMLINK_REJECTED", `workspace ancestor is a symlink: ${current}`);
@@ -9786,7 +9951,7 @@ function readUtf8RegularFile(path, workspaceRoot, maxBytes = FOREIGN_INPUT_MAX_B
   return readFileSync(path, "utf8");
 }
 function currentFileHash(path, workspaceRoot) {
-  if (!existsSync7(path))
+  if (!existsSync8(path))
     return null;
   const relativePath = relativePosix(workspaceRoot, path);
   return sha2562(readUtf8RegularFile(path, workspaceRoot, managedObservationMaxBytes(relativePath)));
@@ -9805,10 +9970,10 @@ function fragmentMatchesBundle(path, bundle, workspaceRoot) {
 }
 function durableSourcePath(path, workspaceRoot) {
   if (!path || path.startsWith("/dev/fd/"))
-    return resolve4(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/"));
-  const normalized = isAbsolute(path) ? resolve4(path) : resolve4(workspaceRoot, path);
+    return resolve5(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/"));
+  const normalized = isAbsolute(path) ? resolve5(path) : resolve5(workspaceRoot, path);
   if (normalized.startsWith("/dev/fd/"))
-    return resolve4(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/"));
+    return resolve5(workspaceRoot, ...PROJECT_CONTEXT_CACHE_PATH.split("/"));
   return normalized;
 }
 function compareRevisions(incoming, previous) {
@@ -9975,11 +10140,12 @@ function sha2562(content) {
 function isRecord(value) {
   return !!value && typeof value === "object" && !Array.isArray(value);
 }
-var PROJECT_CONTEXT_SCHEMA = "hasna.projects.project_context_bundle.v1", PROJECT_CONTEXT_SCHEMA_V2 = "hasna.projects.project_context_bundle.v2", PROJECT_CONTEXT_SUPPORTED_SCHEMAS, projectContextSchema, PROJECT_CONTEXT_MAX_INPUT_BYTES, PROJECT_CONTEXT_MAX_RENDERED_BYTES, PROJECT_CONTEXT_MAX_APPROX_TOKENS = 1000, PROJECT_CONTEXT_MAX_COMMANDS = 6, PROJECT_CONTEXT_MAX_WARNINGS = 3, PROJECT_CONTEXT_FRAGMENT_PATH = ".hasna/instructions/project-context.md", PROJECT_CONTEXT_MANIFEST_PATH = ".hasna/project-context-manifest.json", PROJECT_CONTEXT_CACHE_PATH = ".hasna/project-context-cache.json", PROJECT_CONTEXT_LOCK_PATH = ".hasna/project-context.lock", PROJECT_CONTEXT_SNAPSHOT_DIR = ".hasna/project-context-snapshots", PROJECT_CONTEXT_CACHE_SCHEMA = "hasna.instructions.project-context-cache/v1", PROJECT_CONTEXT_MANAGED_COMMENT = "Managed by @hasna/configs project context", SESSION_COMPATIBILITY_MANIFEST_MAX_BYTES, FOREIGN_INPUT_MAX_BYTES, SESSION_MANAGED_OUTPUT_MAX_BYTES, SESSION_MANAGED_INPUT_MAX_BYTES, SESSION_MANAGED_OUTPUT_PATHS, SESSION_MANAGED_OUTPUT_WARN_BYTES, PROJECT_CONTEXT_LOCK_STALE_MS, LEGACY_CONFIGS_PACKAGE = "@hasna/configs", LEGACY_CONFIGS_COMPAT_VERSION = "0.2.45", LEGACY_CONFIGS_EXECUTABLE = "configs", PROJECT_KINDS, PROJECT_STATUSES, LINK_STATES, RESOLUTION_SOURCES, safeId, nullableId, producerSlug, producerName, safeOptionalDisplay, isoTimestamp, revisionSchema, hashSchema, absolutePath, commandArg, financeText, financeLegalEntity, financeProjectMetadataSchema, commandSchema, projectContextBundleSchema, storedManifestProjectContextSchema, storedManifestFileSchema, storedManifestObservationSchema, projectContextMetadataSnapshotSchema, projectContextCacheSchema, ProjectContextError, ProjectContextHashRace, anchoredFsOps, atomicExchange, atomicExchangeLibraries;
+var PROJECT_CONTEXT_SCHEMA = "hasna.projects.project_context_bundle.v1", PROJECT_CONTEXT_SCHEMA_V2 = "hasna.projects.project_context_bundle.v2", PROJECT_CONTEXT_SUPPORTED_SCHEMAS, projectContextSchema, PROJECT_CONTEXT_MAX_INPUT_BYTES, PROJECT_CONTEXT_MAX_RENDERED_BYTES, PROJECT_CONTEXT_MAX_APPROX_TOKENS = 1000, PROJECT_CONTEXT_MAX_COMMANDS = 6, PROJECT_CONTEXT_MAX_WARNINGS = 3, PROJECT_CONTEXT_FRAGMENT_PATH = ".hasna/instructions/project-context.md", PROJECT_CONTEXT_MANIFEST_PATH = ".hasna/projects/project-context-manifest.json", PROJECT_CONTEXT_CACHE_PATH = ".hasna/projects/project-context-cache.json", PROJECT_CONTEXT_LOCK_PATH = ".hasna/projects/project-context.lock", PROJECT_CONTEXT_SNAPSHOT_DIR = ".hasna/projects/project-context-snapshots", PROJECT_CONTEXT_CACHE_SCHEMA = "hasna.instructions.project-context-cache/v1", PROJECT_CONTEXT_MANAGED_COMMENT = "Managed by @hasna/configs project context", SESSION_COMPATIBILITY_MANIFEST_MAX_BYTES, FOREIGN_INPUT_MAX_BYTES, SESSION_MANAGED_OUTPUT_MAX_BYTES, SESSION_MANAGED_INPUT_MAX_BYTES, SESSION_MANAGED_OUTPUT_PATHS, SESSION_MANAGED_OUTPUT_WARN_BYTES, PROJECT_CONTEXT_LOCK_STALE_MS, LEGACY_CONFIGS_PACKAGE = "@hasna/configs", LEGACY_CONFIGS_COMPAT_VERSION = "0.2.45", LEGACY_CONFIGS_EXECUTABLE = "configs", PROJECT_KINDS, PROJECT_STATUSES, LINK_STATES, RESOLUTION_SOURCES, safeId, nullableId, producerSlug, producerName, safeOptionalDisplay, isoTimestamp, revisionSchema, hashSchema, absolutePath, commandArg, financeText, financeLegalEntity, financeProjectMetadataSchema, commandSchema, projectContextBundleSchema, storedManifestProjectContextSchema, storedManifestFileSchema, storedManifestObservationSchema, projectContextMetadataSnapshotSchema, projectContextCacheSchema, ProjectContextError, ProjectContextHashRace, anchoredFsOps, atomicExchange, atomicExchangeLibraries;
 var init_project_context = __esm(() => {
   init_zod();
   init_redact();
   init_session_render_contract();
+  init_session_render_state();
   PROJECT_CONTEXT_SUPPORTED_SCHEMAS = [PROJECT_CONTEXT_SCHEMA, PROJECT_CONTEXT_SCHEMA_V2];
   projectContextSchema = exports_external.enum(PROJECT_CONTEXT_SUPPORTED_SCHEMAS);
   PROJECT_CONTEXT_MAX_INPUT_BYTES = 8 * 1024;
@@ -10368,7 +10534,7 @@ function compareProviderVersions(left, right) {
 
 // src/lib/asset-plan.ts
 import { createHash as createHash3 } from "crypto";
-import { isAbsolute as isAbsolute2, posix, resolve as resolve5 } from "path";
+import { isAbsolute as isAbsolute2, posix, resolve as resolve6 } from "path";
 function assetCapability(provider, surface, kind, support, strategies, note, providerVersionRange = "*") {
   return Object.freeze({
     schema: ASSET_CAPABILITY_SCHEMA,
@@ -10575,8 +10741,8 @@ function resolveAssetDestination(item, roots) {
   if (!isAbsolute2(root))
     throw new Error(`Asset ${item.assetKey} destination root must be absolute.`);
   const relativePath = safeRelativePath(item.destination.relativePath);
-  const target = resolve5(root, ...relativePath.split("/"));
-  const normalizedRoot = resolve5(root);
+  const target = resolve6(root, ...relativePath.split("/"));
+  const normalizedRoot = resolve6(root);
   if (target === normalizedRoot)
     throw new Error(`Asset ${item.assetKey} destination cannot replace its root.`);
   if (!target.startsWith(`${normalizedRoot}/`))
@@ -10756,13 +10922,13 @@ var init_asset_plan = __esm(() => {
 // src/lib/cursor-authority.ts
 import { createHash as createHash4 } from "crypto";
 import { lstatSync as lstatSync2, readFileSync as readFileSync2 } from "fs";
-import { homedir as homedir7 } from "os";
-import { join as join10, resolve as resolve6 } from "path";
+import { homedir as homedir5 } from "os";
+import { join as join9, resolve as resolve7 } from "path";
 function sha2564(content) {
   return createHash4("sha256").update(content).digest("hex");
 }
-function homeDir2() {
-  return process.env["HOME"] || homedir7();
+function homeDir3() {
+  return process.env["HOME"] || homedir5();
 }
 function markerPayload(content, markerLine, markerIndex) {
   const index = markerIndex ?? content.indexOf(markerLine);
@@ -10778,12 +10944,12 @@ function baseObservation(path) {
   };
 }
 function observeCursorGlobalAuthority(options = {}) {
-  const authorityPath = resolve6(join10(options.home ?? homeDir2(), CURSOR_GLOBAL_AUTHORITY_RELATIVE_PATH));
+  const authorityPath = resolve7(join9(options.home ?? homeDir3(), CURSOR_GLOBAL_AUTHORITY_RELATIVE_PATH));
   const readFile2 = options.readFile ?? ((path) => readFileSync2(path, "utf8"));
   return observeCursorGlobalAuthorityPath(authorityPath, readFile2);
 }
 function observeCursorGlobalAuthorityAtPath(authorityPath) {
-  return observeCursorGlobalAuthorityPath(resolve6(authorityPath), (path) => readFileSync2(path, "utf8"));
+  return observeCursorGlobalAuthorityPath(resolve7(authorityPath), (path) => readFileSync2(path, "utf8"));
 }
 function observeCursorGlobalAuthorityPath(authorityPath, readFile2) {
   const base = baseObservation(authorityPath);
@@ -10928,7 +11094,7 @@ function observeCursorGlobalAuthorityPath(authorityPath, readFile2) {
   };
 }
 function isCursorGlobalAuthorityPath(path) {
-  return resolve6(path) === resolve6(join10(homeDir2(), CURSOR_GLOBAL_AUTHORITY_RELATIVE_PATH));
+  return resolve7(path) === resolve7(join9(homeDir3(), CURSOR_GLOBAL_AUTHORITY_RELATIVE_PATH));
 }
 function stampCursorGlobalAuthorityMarker(content) {
   const existing = content.match(CURSOR_GLOBAL_AUTHORITY_MARKER_PATTERN);
@@ -10984,16 +11150,16 @@ var init_cursor_authority = __esm(() => {
 // src/lib/session-authority.ts
 import { createHash as createHash5 } from "crypto";
 import { lstatSync as lstatSync3, readFileSync as readFileSync3, realpathSync, statSync as statSync2 } from "fs";
-import { homedir as homedir8 } from "os";
-import { join as join11, resolve as resolve7 } from "path";
+import { homedir as homedir6 } from "os";
+import { join as join10, resolve as resolve8 } from "path";
 function sha2565(content) {
   return createHash5("sha256").update(content).digest("hex");
 }
 function configHomeDir() {
-  return process.env["CONFIGS_HOME"] || process.env["HOME"] || homedir8();
+  return process.env["CONFIGS_HOME"] || process.env["HOME"] || homedir6();
 }
 function normalizeOwnedTargetPath(p) {
-  const expanded = p.startsWith("~/") ? resolve7(configHomeDir(), p.slice(2)) : resolve7(p);
+  const expanded = p.startsWith("~/") ? resolve8(configHomeDir(), p.slice(2)) : resolve8(p);
   try {
     return realpathSync(expanded);
   } catch {
@@ -11001,7 +11167,7 @@ function normalizeOwnedTargetPath(p) {
   }
 }
 function detectClaudeAuthorityConflicts(targetHome, ownedAuthorities = []) {
-  const authorityPath = resolve7(join11(targetHome, CLAUDE_LEGACY_AUTHORITY_RELATIVE_PATH));
+  const authorityPath = resolve8(join10(targetHome, CLAUDE_LEGACY_AUTHORITY_RELATIVE_PATH));
   let stat;
   try {
     stat = lstatSync3(authorityPath);
@@ -11090,9 +11256,9 @@ var init_session_authority = __esm(() => {
 
 // src/lib/session-render.ts
 import { createHash as createHash6 } from "crypto";
-import { existsSync as existsSync9, readFileSync as readFileSync4, realpathSync as realpathSync2, statSync as statSync3 } from "fs";
-import { homedir as homedir9 } from "os";
-import { basename as basename4, dirname as dirname3, extname as extname2, isAbsolute as isAbsolute3, join as join12, parse as parse2, posix as posix2, relative as relative2, resolve as resolve8 } from "path";
+import { existsSync as existsSync10, readFileSync as readFileSync4, realpathSync as realpathSync2, statSync as statSync3 } from "fs";
+import { homedir as homedir7 } from "os";
+import { basename as basename4, dirname as dirname4, extname as extname2, isAbsolute as isAbsolute3, join as join11, parse as parse2, posix as posix2, relative as relative2, resolve as resolve9 } from "path";
 function normalizeSessionInstructionLayer(value) {
   if (value === "provider")
     return "tool";
@@ -11178,13 +11344,13 @@ function yamlQuote2(value) {
   return `"${value.replace(/\\/g, "\\\\").replace(/"/g, "\\\"")}"`;
 }
 function defaultTargetHome(tool, profile, sessionId) {
-  const home = process.env["HOME"] || homedir9();
-  return join12(home, ".hasna", "accounts", "profiles", tool, slug(profile));
+  const home = process.env["HOME"] || homedir7();
+  return join11(home, ".hasna", "accounts", "profiles", tool, slug(profile));
 }
 function joinTarget(targetHome, relativePath) {
   const safeTargetHome = assertSafeTargetRoot(targetHome);
   const safeRelativePath2 = assertSafeRelativePath(relativePath);
-  return join12(safeTargetHome, ...safeRelativePath2.split("/"));
+  return join11(safeTargetHome, ...safeRelativePath2.split("/"));
 }
 function makeFile(targetHome, relativePath, role, content, sourceIds) {
   const safeTargetHome = assertSafeTargetRoot(targetHome);
@@ -11753,7 +11919,7 @@ function buildOpenCodeFiles(targetHome, adapter, profile, sources, providerConfi
     ...sources.flatMap((source) => source.resolvedRules.map((rule) => rule.id))
   ]);
   const existingConfigPath = joinTarget(targetHome, adapter.configFile);
-  const selectedConfig = existsSync9(existingConfigPath) ? readOpenCodeConfig(readFileSync4(existingConfigPath, "utf8"), existingConfigPath) : providerConfig ? readOpenCodeConfig(providerConfig.content, providerConfig.sourceId) : {};
+  const selectedConfig = existsSync10(existingConfigPath) ? readOpenCodeConfig(readFileSync4(existingConfigPath, "utf8"), existingConfigPath) : providerConfig ? readOpenCodeConfig(providerConfig.content, providerConfig.sourceId) : {};
   const preservedInstructions = normalizeOpenCodeInstructions(selectedConfig["instructions"]).filter((path) => !pathIsManagedOpenCodeInstruction(path, adapter.managedDir));
   const config = {
     ...selectedConfig,
@@ -11942,7 +12108,7 @@ function adapterFor(input) {
   return gatedNativeImports ? CODEWITH_NATIVE_ADAPTER : CODEWITH_FLATTENED_ADAPTER;
 }
 function getHomeDir() {
-  return process.env["CONFIGS_HOME"] || process.env["HOME"] || homedir9();
+  return process.env["CONFIGS_HOME"] || process.env["HOME"] || homedir7();
 }
 function cleanSessionPathInput(path) {
   const trimmed = path.trim();
@@ -11957,16 +12123,16 @@ function resolveSessionPath(path) {
     throw new Error("Session render path cannot be empty.");
   const home = getHomeDir();
   if (cleaned === "~")
-    return resolve8(home);
+    return resolve9(home);
   if (cleaned.startsWith("~/"))
-    return resolve8(home, cleaned.slice(2));
+    return resolve9(home, cleaned.slice(2));
   if (cleaned === "{{HOME}}" || cleaned === "${HOME}")
-    return resolve8(home);
+    return resolve9(home);
   if (cleaned.startsWith("{{HOME}}/"))
-    return resolve8(home, cleaned.slice("{{HOME}}/".length));
+    return resolve9(home, cleaned.slice("{{HOME}}/".length));
   if (cleaned.startsWith("${HOME}/"))
-    return resolve8(home, cleaned.slice("${HOME}/".length));
-  return resolve8(cleaned);
+    return resolve9(home, cleaned.slice("${HOME}/".length));
+  return resolve9(cleaned);
 }
 function assertSafeRelativePath(relativePath) {
   if (!relativePath.trim())
@@ -11982,7 +12148,7 @@ function assertSafeRelativePath(relativePath) {
 function assertSafeTargetRoot(targetHome) {
   if (!isAbsolute3(targetHome))
     throw new Error(`Session render target must be an absolute path: ${targetHome}`);
-  const normalized = resolve8(targetHome);
+  const normalized = resolve9(targetHome);
   if (normalized === parse2(normalized).root) {
     throw new Error(`Session render target cannot be the filesystem root: ${targetHome}`);
   }
@@ -12218,7 +12384,7 @@ function planSessionRender(input) {
         sourceId: input.providerConfig.sourceId,
         selectedPayloadSha256: sha2566(input.providerConfig.content),
         renderedPayloadSha256: files.find((file) => file.relativePath === adapter.configFile)?.sha256 ?? sha2566(input.providerConfig.content),
-        selected: !existsSync9(joinTarget(targetHome, adapter.configFile))
+        selected: !existsSync10(joinTarget(targetHome, adapter.configFile))
       }
     } : {},
     ...projectContext ? {
@@ -12479,10 +12645,10 @@ function layerFromIdentityKind(kind, exportShape) {
 function contentFromIdentitySourcePaths(sourcePaths, exportPath, sourceId) {
   if (sourcePaths.length === 0 || !exportPath)
     return;
-  const baseDir3 = dirname3(resolveSessionPath(exportPath));
+  const baseDir = dirname4(resolveSessionPath(exportPath));
   const contents = [];
   for (const sourcePath of sourcePaths) {
-    const content = readIdentitySourcePath(sourcePath, baseDir3, sourceId);
+    const content = readIdentitySourcePath(sourcePath, baseDir, sourceId);
     if (content !== undefined)
       contents.push({ path: sourcePath.path, content });
   }
@@ -12495,9 +12661,9 @@ ${item.content.trimEnd()}`).join(`
 
 `));
 }
-function readIdentitySourcePath(sourcePath, baseDir3, sourceId) {
-  const resolvedPath = resolveIdentitySourcePath(sourcePath.path, baseDir3, sourceId);
-  if (!existsSync9(resolvedPath)) {
+function readIdentitySourcePath(sourcePath, baseDir, sourceId) {
+  const resolvedPath = resolveIdentitySourcePath(sourcePath.path, baseDir, sourceId);
+  if (!existsSync10(resolvedPath)) {
     if (sourcePath.required) {
       throw new Error(`Required identity instruction source path not found for ${sourceId}: ${sourcePath.path}`);
     }
@@ -12507,27 +12673,27 @@ function readIdentitySourcePath(sourcePath, baseDir3, sourceId) {
   if (!stat.isFile()) {
     throw new Error(`Identity instruction source path is not a file for ${sourceId}: ${sourcePath.path}`);
   }
-  const realBase = realpathSync2(baseDir3);
+  const realBase = realpathSync2(baseDir);
   const realPath = realpathSync2(resolvedPath);
   if (!pathIsInside(realPath, realBase)) {
     throw new Error(`Identity instruction source path escapes export directory for ${sourceId}: ${sourcePath.path}`);
   }
   return readFileSync4(realPath, "utf-8");
 }
-function resolveIdentitySourcePath(path, baseDir3, sourceId) {
+function resolveIdentitySourcePath(path, baseDir, sourceId) {
   const cleaned = cleanSessionPathInput(path);
   if (!cleaned)
     throw new Error(`Identity instruction source path cannot be empty for ${sourceId}.`);
   if (cleaned.includes("\\"))
     throw new Error(`Identity instruction source path must use POSIX separators for ${sourceId}: ${path}`);
-  const resolvedPath = isAbsolute3(cleaned) ? resolve8(cleaned) : resolve8(baseDir3, cleaned);
-  if (!pathIsInside(resolvedPath, resolve8(baseDir3))) {
+  const resolvedPath = isAbsolute3(cleaned) ? resolve9(cleaned) : resolve9(baseDir, cleaned);
+  if (!pathIsInside(resolvedPath, resolve9(baseDir))) {
     throw new Error(`Identity instruction source path escapes export directory for ${sourceId}: ${path}`);
   }
   return resolvedPath;
 }
-function pathIsInside(path, baseDir3) {
-  const rel = relative2(baseDir3, path);
+function pathIsInside(path, baseDir) {
+  const rel = relative2(baseDir, path);
   return rel === "" || !rel.startsWith("..") && !isAbsolute3(rel);
 }
 function providerTargetsTool(targets, tool) {
@@ -13628,6 +13794,1222 @@ var init_machines = __esm(() => {
   init_database();
 });
 
+// ../contracts/dist/client/storage.js
+import { isIP as isIP2 } from "net";
+import { spawnSync } from "child_process";
+import { closeSync as closeSync2, fstatSync as fstatSync2, openSync as openSync2, readFileSync as readFileSync5 } from "fs";
+import { O_NOFOLLOW, O_NONBLOCK, O_RDONLY } from "constants";
+import { createRequire as createRequire2 } from "module";
+import { hostname as osHostname } from "os";
+import { isAbsolute as isAbsolute4, join as join12 } from "path";
+function envToken2(name) {
+  return name.toUpperCase().replace(/-/g, "_");
+}
+function clientTransportEnvKeys2(name) {
+  const envSegment = envToken2(name);
+  return {
+    apiUrlKeys: [`HASNA_${envSegment}_API_URL`, `${envSegment}_API_URL`],
+    apiKeyKeys: [`HASNA_${envSegment}_API_KEY`, `${envSegment}_API_KEY`]
+  };
+}
+function credentialOverrideEnvKey2(name) {
+  return `HASNA_${envToken2(name)}_API_KEY_OVERRIDE`;
+}
+function credentialPointerEnvKey2(name) {
+  return `HASNA_${envToken2(name)}_API_KEY_REF`;
+}
+function homeDir4(env) {
+  const home = env.HOME?.trim();
+  return home ? home : null;
+}
+function absoluteOverride(env, key) {
+  const value = env[key]?.trim();
+  return value && isAbsolute4(value) ? value : null;
+}
+function hasnaHomeDir(env) {
+  const override = absoluteOverride(env, HASNA_HOME_ENV_KEY);
+  if (override)
+    return override;
+  const home = homeDir4(env);
+  return home ? join12(home, HASNA_HOME_DIR) : null;
+}
+function appConfigDir(name, env) {
+  const configRoot = absoluteOverride(env, HASNA_CONFIG_HOME_ENV_KEY);
+  if (configRoot)
+    return join12(configRoot, name);
+  const root = hasnaHomeDir(env);
+  return root ? join12(root, name, CONFIG_SUBDIR) : null;
+}
+function credentialDiskSourceList(name, env, profile = null) {
+  if (!SAFE_APP_SLUG.test(name))
+    return [];
+  const directory = appConfigDir(name, env);
+  if (!directory)
+    return [];
+  const file = profile ? `${CREDENTIALS_FILE}-${profile}` : CREDENTIALS_FILE;
+  return [{ path: join12(directory, file), tier: "disk" }];
+}
+function credentialDiskSources(name, env) {
+  return credentialDiskSourceList(name, env, null).map((s) => s.path);
+}
+function profileDiskSources(name, env, profile) {
+  return credentialDiskSourceList(name, env, profile).map((s) => s.path);
+}
+function parseEnvFile(text) {
+  const values = new Map;
+  const unusable = new Set;
+  for (const rawLine of text.split(/\r?\n/)) {
+    const line = rawLine.trim();
+    if (line.length === 0 || line.startsWith("#"))
+      continue;
+    const withoutExport = line.startsWith("export ") ? line.slice("export ".length).trim() : line;
+    const equals = withoutExport.indexOf("=");
+    if (equals <= 0)
+      continue;
+    const key = withoutExport.slice(0, equals).trim();
+    if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(key))
+      continue;
+    let value = withoutExport.slice(equals + 1).trim();
+    const quote = value[0];
+    if (quote === '"' || quote === "'") {
+      if (value.length < 2 || !value.endsWith(quote)) {
+        unusable.add(key);
+        continue;
+      }
+      value = value.slice(1, -1);
+    }
+    if (value.trim().length === 0) {
+      unusable.add(key);
+      continue;
+    }
+    if (values.has(key) && values.get(key) !== value)
+      unusable.add(key);
+    values.set(key, value);
+  }
+  return { values, unusable };
+}
+function configFileModeAllowed(mode) {
+  const permissions = mode & 4095;
+  return permissions === 256 || permissions === 384;
+}
+function configFileReadsCoherent(before, after) {
+  return before.dev === after.dev && before.ino === after.ino && before.size === after.size && before.mtimeMs === after.mtimeMs && before.ctimeMs === after.ctimeMs;
+}
+function readAppConfigFile(path) {
+  const unsafe = (reason) => {
+    throw new CredentialFileUnsafeError(path, reason);
+  };
+  let fd = -1;
+  try {
+    fd = openSync2(path, O_RDONLY | O_NOFOLLOW | O_NONBLOCK);
+  } catch (error) {
+    const code = error.code;
+    if (code === "ENOENT" || code === "ENOTDIR")
+      return null;
+    if (code === "ELOOP")
+      unsafe("the path is a symlink");
+    unsafe(`the path could not be opened (${code ?? "unknown error"})`);
+  }
+  try {
+    const before = fstatSync2(fd);
+    if (!before.isFile())
+      unsafe("the path is not a regular file");
+    if (!configFileModeAllowed(before.mode)) {
+      unsafe(`permission mode ${(before.mode & 4095).toString(8).padStart(4, "0")} is not owner-only 0400 or 0600`);
+    }
+    const uid = process.getuid?.() ?? process.geteuid?.();
+    if (uid !== undefined && before.uid !== uid)
+      unsafe("the file is not owned by the current user");
+    if (before.size > MAX_CREDENTIAL_FILE_BYTES2)
+      unsafe("the file exceeds the size limit");
+    const bytes = readFileSync5(fd);
+    const after = fstatSync2(fd);
+    if (!configFileReadsCoherent(before, after)) {
+      unsafe("the file changed while being read");
+    }
+    return parseEnvFile(bytes.toString("utf8"));
+  } finally {
+    if (fd !== -1)
+      closeSync2(fd);
+  }
+}
+function readCredentialFile(path, apiKeyKeys) {
+  const parsed = readAppConfigFile(path);
+  if (!parsed)
+    return null;
+  for (const key of apiKeyKeys) {
+    if (parsed.unusable.has(key)) {
+      throw new CredentialFileUnsafeError(path, `${key} is declared but blank or malformed`);
+    }
+  }
+  const values = apiKeyKeys.map((key) => parsed.values.get(key)?.trim()).filter((value) => Boolean(value));
+  if (new Set(values).size > 1) {
+    throw new CredentialFileUnsafeError(path, "credential aliases disagree");
+  }
+  return values[0] ?? null;
+}
+function appConfigDiskValue(name, env, keys) {
+  const wanted = keys.filter((key) => !CREDENTIAL_SHAPED_KEY.test(key));
+  if (wanted.length === 0)
+    return null;
+  for (const path of credentialDiskSources(name, env)) {
+    const parsed = readAppConfigFile(path);
+    if (!parsed)
+      continue;
+    if (wanted.some((key) => parsed.unusable.has(key))) {
+      return { key: wanted.find((key) => parsed.unusable.has(key)), value: "", path, unusable: true };
+    }
+    const values = wanted.map((key) => parsed.values.get(key)?.trim()).filter((value) => Boolean(value));
+    if (new Set(values).size > 1)
+      throw new CredentialFileUnsafeError(path, "configuration aliases disagree");
+    for (const key of wanted) {
+      if (parsed.unusable.has(key))
+        return { key, value: "", path, unusable: true };
+      const value = parsed.values.get(key)?.trim();
+      if (value)
+        return { key, value, path };
+    }
+  }
+  return null;
+}
+function assertUsableCredential(appName, source, value) {
+  if (VAULT_POINTER_SHAPE.test(value)) {
+    throw new CredentialResolutionError(appName, `The credential from ${source} looks like a secrets-vault pointer (a path-shaped reference like ` + `'namespace/app/live/api_key'). A vault path is NEVER accepted as a literal API key. ` + `Use ${credentialPointerEnvKey2(appName)} to resolve the key through the vault, or provide the actual key value.`, [source]);
+  }
+  if (!ILLEGAL_IN_HEADER_VALUE.test(value))
+    return;
+  throw new CredentialResolutionError(appName, `The credential from ${source} contains characters that cannot be sent in an HTTP header ` + `(a control character or non-ASCII byte). A file written with CR-only line endings is the usual ` + `cause. Rewrite that credential file with one LF-terminated KEY=value line. ` + `The value is not shown here, and is deliberately never logged.`, [source]);
+}
+function sealCredential(fields) {
+  const { apiKey } = fields;
+  const visible = {
+    tier: fields.tier,
+    source: fields.source,
+    deliberate: fields.deliberate,
+    diskCandidates: Object.freeze([...fields.diskCandidates]),
+    warning: fields.warning
+  };
+  const sealed = { ...visible };
+  Object.defineProperty(sealed, "apiKey", {
+    value: apiKey,
+    enumerable: false,
+    writable: false,
+    configurable: false
+  });
+  if (fields.pointerVaultKey !== undefined) {
+    Object.defineProperty(sealed, "pointerVaultKey", {
+      value: fields.pointerVaultKey,
+      enumerable: false,
+      writable: false,
+      configurable: false
+    });
+  }
+  Object.defineProperty(sealed, INSPECT_CUSTOM2, {
+    value: () => ({ ...visible, apiKey: "[redacted]" }),
+    enumerable: false,
+    writable: false,
+    configurable: false
+  });
+  Object.defineProperty(sealed, CREDENTIAL_SEAL2, {
+    value: true,
+    enumerable: false,
+    writable: false,
+    configurable: false
+  });
+  return Object.freeze(sealed);
+}
+function isSealedCredential(credential) {
+  return credential[CREDENTIAL_SEAL2] === true;
+}
+function explicitCredential(appName, apiKey) {
+  const source = "explicit apiKey option";
+  assertUsableCredential(appName, source, apiKey);
+  return sealCredential({
+    apiKey,
+    tier: "argument",
+    source,
+    deliberate: true,
+    diskCandidates: [],
+    warning: null
+  });
+}
+function validateAndSealResolvedCredential(appName, credential) {
+  const apiKey = credential.apiKey;
+  assertUsableCredential(appName, CALLER_SUPPLIED_CREDENTIAL_PROVIDER_SOURCE, apiKey);
+  if (!isSealedCredential(credential)) {
+    return sealCredential({
+      apiKey,
+      tier: "argument",
+      source: CALLER_SUPPLIED_CREDENTIAL_PROVIDER_SOURCE,
+      deliberate: true,
+      diskCandidates: [],
+      warning: null
+    });
+  }
+  return sealCredential({
+    apiKey,
+    tier: credential.tier,
+    source: credential.source,
+    deliberate: credential.deliberate,
+    diskCandidates: credential.diskCandidates,
+    warning: credential.warning,
+    ...credential.pointerVaultKey !== undefined ? { pointerVaultKey: credential.pointerVaultKey } : {}
+  });
+}
+function firstEnvValue(env, keys) {
+  for (const key of keys) {
+    if (!Object.prototype.hasOwnProperty.call(env, key))
+      continue;
+    const value = env[key]?.trim();
+    if (value)
+      return { key, value };
+  }
+  return null;
+}
+function isAmbientEnvironment(env) {
+  return env === process.env || env[AMBIENT_ENVIRONMENT2] === true;
+}
+function defaultKeychainRunner(argv) {
+  const result = spawnSync(KEYCHAIN_SECURITY_BIN, [...argv], {
+    encoding: "utf8",
+    stdio: ["ignore", "pipe", "pipe"],
+    timeout: KEYCHAIN_SPAWN_TIMEOUT_MS
+  });
+  return {
+    status: result.status,
+    stdout: result.stdout ?? "",
+    stderr: result.error ? result.error.message : result.stderr ?? ""
+  };
+}
+function keychainTierEnabled(env, options) {
+  if ((options.platform ?? process.platform) !== "darwin")
+    return false;
+  if (options.enabled !== undefined)
+    return options.enabled;
+  return options.run !== undefined || isAmbientEnvironment(env);
+}
+function keychainAccount(env, options) {
+  const station = env[KEYCHAIN_STATION_ENV_KEY]?.trim();
+  if (station)
+    return station;
+  const host = (options.hostname ?? osHostname)().split(".")[0]?.trim() ?? "";
+  if (host)
+    return host;
+  const user = env.USER?.trim();
+  return user || null;
+}
+function keychainFailureHint(text) {
+  const line = text.split(/\r?\n/).find((entry) => entry.trim().length > 0)?.trim() ?? "";
+  const clean = line.replace(/[\u0000-\u001f\u007f]/g, "").slice(0, 200);
+  return clean ? `: ${clean}` : "";
+}
+function readKeychainItem(name, env, kind, options) {
+  if (!SAFE_APP_SLUG.test(name) || !keychainTierEnabled(env, options))
+    return null;
+  const account = keychainAccount(env, options);
+  if (!account)
+    return null;
+  const service = `${KEYCHAIN_SERVICE_PREFIX}.${name}.${kind}`;
+  const source = `keychain:${service}@${account}`;
+  const run = options.run ?? defaultKeychainRunner;
+  let result;
+  try {
+    result = run(["find-generic-password", "-a", account, "-s", service, "-w"]);
+  } catch (error) {
+    const reason = keychainFailureHint(error instanceof Error ? error.message : String(error));
+    throw new CredentialResolutionError(name, `The Keychain lookup for ${source} could not run${reason}. A Keychain failure is never resolved ` + `around: fix the keychain, or delete the item to fall through to the credential on disk.`, [source]);
+  }
+  if (result.status === KEYCHAIN_ITEM_NOT_FOUND_STATUS)
+    return null;
+  if (result.status !== 0) {
+    throw new CredentialResolutionError(name, `The Keychain lookup for ${source} failed (security exited ` + `${result.status ?? "without a status"}${keychainFailureHint(result.stderr)}). A Keychain item that ` + `exists but cannot be read is never resolved around: unlock the keychain, run from a session that ` + `may use it, or delete the item to fall through to the credential on disk.`, [source]);
+  }
+  const value = result.stdout.trim();
+  if (!value) {
+    throw new CredentialResolutionError(name, `${source} exists but holds an empty value; a declared item never falls through to another ` + `identity. Store a value in it or delete the item.`, [source]);
+  }
+  return { value, source };
+}
+function keychainConfigValue(name, env, options = {}) {
+  return readKeychainItem(name, env, "api-url", options);
+}
+function snapshotClientEnvironment(name, env) {
+  const keys = clientTransportEnvKeys2(name);
+  const ambient = isAmbientEnvironment(env);
+  const snapshot = Object.create(null);
+  for (const key of [
+    ...keys.apiUrlKeys,
+    ...keys.apiKeyKeys,
+    credentialOverrideEnvKey2(name),
+    credentialPointerEnvKey2(name),
+    CREDENTIAL_PROFILE_ENV_KEY2,
+    "HOME",
+    HASNA_HOME_ENV_KEY,
+    HASNA_CONFIG_HOME_ENV_KEY,
+    KEYCHAIN_STATION_ENV_KEY,
+    "USER"
+  ]) {
+    const descriptor = Object.getOwnPropertyDescriptor(env, key);
+    if (!descriptor)
+      continue;
+    if (!("value" in descriptor)) {
+      throw new CredentialResolutionError(name, `${key} is accessor-backed; client configuration requires own data properties.`, [key]);
+    }
+    if (descriptor.value !== undefined && typeof descriptor.value !== "string") {
+      throw new CredentialResolutionError(name, `${key} must be a string data property.`, [key]);
+    }
+    snapshot[key] = descriptor.value;
+  }
+  if (ambient) {
+    Object.defineProperty(snapshot, AMBIENT_ENVIRONMENT2, {
+      value: true,
+      enumerable: false,
+      writable: false,
+      configurable: false
+    });
+  }
+  return Object.freeze(snapshot);
+}
+function resolveCredential(name, env, options = {}) {
+  env = snapshotClientEnvironment(name, env);
+  const { apiKeyKeys } = clientTransportEnvKeys2(name);
+  const diskPaths = credentialDiskSources(name, env);
+  if (options.apiKey !== undefined) {
+    const explicitKey = options.apiKey.trim();
+    if (!explicitKey) {
+      throw new CredentialResolutionError(name, "The explicit apiKey argument is blank; an explicit credential never falls through to another identity.", ["explicit apiKey argument"]);
+    }
+    assertUsableCredential(name, "the explicit apiKey argument", explicitKey);
+    return sealCredential({
+      apiKey: explicitKey,
+      tier: "argument",
+      source: "explicit apiKey argument",
+      deliberate: true,
+      diskCandidates: diskPaths,
+      warning: null
+    });
+  }
+  const overrideKeyName = credentialOverrideEnvKey2(name);
+  const overrideRaw = Object.prototype.hasOwnProperty.call(env, overrideKeyName) ? env[overrideKeyName] : undefined;
+  if (overrideRaw !== undefined) {
+    const override = overrideRaw.trim();
+    if (!override) {
+      throw new CredentialResolutionError(name, `${overrideKeyName} is set but empty. It is a deliberate override, so it is not resolved around: ` + `either give it a real key or unset it to fall back to the credential on disk.`, [overrideKeyName]);
+    }
+    assertUsableCredential(name, overrideKeyName, override);
+    return sealCredential({
+      apiKey: override,
+      tier: "override",
+      source: overrideKeyName,
+      deliberate: true,
+      diskCandidates: diskPaths,
+      warning: null
+    });
+  }
+  const pointerKeyName = credentialPointerEnvKey2(name);
+  const pointerRaw = Object.prototype.hasOwnProperty.call(env, pointerKeyName) ? env[pointerKeyName] : undefined;
+  if (pointerRaw !== undefined) {
+    const pointer = pointerRaw.trim();
+    if (!pointer) {
+      throw new CredentialResolutionError(name, `${pointerKeyName} is set but empty. It is a deliberate vault pointer, so it is not resolved around: ` + `either give it a vault item key or unset it to fall back to the credential on disk.`, [pointerKeyName]);
+    }
+    if (!VAULT_POINTER_SHAPE.test(pointer)) {
+      throw new CredentialResolutionError(name, `${pointerKeyName} must name a vault ITEM KEY (a path-shaped reference like ` + `'namespace/app/live/api_key'), not a credential value. A pointer that carries a literal is refused.`, [pointerKeyName]);
+    }
+    return sealCredential({
+      apiKey: "",
+      pointerVaultKey: pointer,
+      tier: "pointer",
+      source: pointerKeyName,
+      deliberate: true,
+      diskCandidates: diskPaths,
+      warning: null
+    });
+  }
+  if (options.profile !== undefined && !options.profile.trim()) {
+    throw new CredentialResolutionError(name, "The explicit profile argument is blank; an explicit identity selection never falls through.", ["explicit profile argument"]);
+  }
+  const profileRaw = Object.prototype.hasOwnProperty.call(env, CREDENTIAL_PROFILE_ENV_KEY2) ? env[CREDENTIAL_PROFILE_ENV_KEY2] : undefined;
+  if (profileRaw !== undefined && !profileRaw.trim()) {
+    throw new CredentialResolutionError(name, `${CREDENTIAL_PROFILE_ENV_KEY2} is set but blank.`, [CREDENTIAL_PROFILE_ENV_KEY2]);
+  }
+  const profile = options.profile?.trim() || profileRaw?.trim();
+  if (profile) {
+    const profileSource = options.profile?.trim() ? "explicit profile argument" : CREDENTIAL_PROFILE_ENV_KEY2;
+    if (!SAFE_PROFILE.test(profile)) {
+      throw new CredentialResolutionError(name, `Profile name from ${profileSource} is not usable in a path. ` + `Use letters, digits, dot, dash, or underscore.`, [profileSource]);
+    }
+    const paths = profileDiskSources(name, env, profile);
+    for (const path of paths) {
+      const value = readCredentialFile(path, apiKeyKeys);
+      if (value) {
+        assertUsableCredential(name, path, value);
+        return sealCredential({
+          apiKey: value,
+          tier: "profile",
+          source: path,
+          deliberate: true,
+          diskCandidates: paths,
+          warning: null
+        });
+      }
+    }
+    throw new CredentialResolutionError(name, `Profile '${profile}' (from ${profileSource}) has no ${apiKeyKeys[0]} for '${name}'. ` + `Looked in: ${paths.join(", ") || "<no HOME in this environment>"}. ` + `A profile names WHICH identity to use, so it is never resolved around \u2014 ` + `create the profile's credential file or unset ${CREDENTIAL_PROFILE_ENV_KEY2}.`, paths);
+  }
+  const definedEnvEntries = apiKeyKeys.filter((key) => Object.prototype.hasOwnProperty.call(env, key) && env[key] !== undefined).map((key) => ({ key, value: String(env[key]).trim() }));
+  const blankEnv = definedEnvEntries.find((entry) => entry.value.length === 0);
+  if (blankEnv) {
+    throw new CredentialResolutionError(name, `${blankEnv.key} is set but blank; a declared credential never falls through to another alias or identity.`, [blankEnv.key]);
+  }
+  if (definedEnvEntries.length > 1 && new Set(definedEnvEntries.map((entry) => entry.value)).size > 1) {
+    throw new CredentialResolutionError(name, `${definedEnvEntries.map((entry) => entry.key).join(" and ")} disagree; credential aliases must be identical or only one may be set.`, definedEnvEntries.map((entry) => entry.key));
+  }
+  const envHit = firstEnvValue(env, apiKeyKeys);
+  const keychainHit = readKeychainItem(name, env, "api-key", options.keychain ?? {});
+  if (keychainHit) {
+    assertUsableCredential(name, keychainHit.source, keychainHit.value);
+    const warning = envHit && envHit.value !== keychainHit.value ? `Credential sources disagree for '${name}': ${keychainHit.source} and ${envHit.key} hold ` + `different keys. ${keychainHit.source} wins, because the Keychain is re-read on every call while ` + `an environment variable is a snapshot. Reconcile them \u2014 a rotation that updated only one leaves ` + `the other to fail 401 wherever it is loaded first.` : null;
+    return sealCredential({
+      apiKey: keychainHit.value,
+      tier: "keychain",
+      source: keychainHit.source,
+      deliberate: false,
+      diskCandidates: diskPaths,
+      warning
+    });
+  }
+  const diskSourceList = credentialDiskSourceList(name, env, null);
+  const diskHits = diskSourceList.map((src) => ({ src, value: readCredentialFile(src.path, apiKeyKeys) })).filter((hit) => hit.value !== null);
+  if (diskHits.length > 0) {
+    const winner = diskHits[0];
+    assertUsableCredential(name, winner.src.path, winner.value);
+    const divergentSources = [
+      ...diskHits.slice(1).filter((hit) => hit.value !== winner.value).map((hit) => hit.src.path),
+      ...envHit && envHit.value !== winner.value ? [envHit.key] : []
+    ];
+    const warning = divergentSources.length > 0 ? `Credential sources disagree for '${name}': ${winner.src.path} and ` + `${divergentSources.join(", ")} hold different keys. ${winner.src.path} wins, because a file on ` + `disk is re-read on every call while an environment variable is a snapshot. Reconcile them \u2014 ` + `a rotation that updated only one leaves the other to fail 401 wherever it is loaded first.` : null;
+    return sealCredential({
+      apiKey: winner.value,
+      tier: winner.src.tier,
+      source: winner.src.path,
+      deliberate: false,
+      diskCandidates: diskPaths,
+      warning
+    });
+  }
+  if (envHit) {
+    assertUsableCredential(name, envHit.key, envHit.value);
+    return sealCredential({
+      apiKey: envHit.value,
+      tier: "env",
+      source: envHit.key,
+      deliberate: false,
+      diskCandidates: diskPaths,
+      warning: null
+    });
+  }
+  return null;
+}
+async function completePointerCredential(name, pointerResolution, env = process.env) {
+  const vaultKey = pointerResolution.pointerVaultKey;
+  const pointerEnvKey = pointerResolution.source;
+  if (!vaultKey) {
+    throw new CredentialResolutionError(name, `Pointer resolution from ${pointerEnvKey} carries no vault item key; this is a defect in the resolver.`, [pointerEnvKey]);
+  }
+  let secretsSdk;
+  try {
+    secretsSdk = requireSecretsSdk2(SECRETS_PACKAGE_SPECIFIER2);
+  } catch {
+    throw new CredentialResolutionError(name, `${pointerEnvKey} names vault item '${vaultKey}', but the secrets SDK (@hasna/secrets) is not installed ` + `in this process. A vault pointer is TERMINAL: install @hasna/secrets to resolve it, or unset ${pointerEnvKey}.`, [pointerEnvKey]);
+  }
+  let client;
+  try {
+    client = secretsSdk.createSecretsClientFromEnv(env);
+  } catch {
+    throw new CredentialResolutionError(name, `${pointerEnvKey} names vault item '${vaultKey}', but the secrets client could not be configured from this ` + `environment (the secrets service URL and key env are missing or invalid). A vault pointer is TERMINAL and ` + `never falls through to a literal or disk credential.`, [pointerEnvKey]);
+  }
+  let secret;
+  try {
+    secret = await client.getSecret({ key: vaultKey });
+  } catch {
+    throw new CredentialResolutionError(name, `${pointerEnvKey} names vault item '${vaultKey}', but the vault could not be reached or the item is ` + `unavailable. A vault pointer is TERMINAL and never falls through to a literal or disk credential.`, [pointerEnvKey]);
+  }
+  const value = secret.value;
+  if (!value) {
+    throw new CredentialResolutionError(name, `${pointerEnvKey} resolved vault item '${vaultKey}', but it holds no value. A vault pointer is TERMINAL.`, [pointerEnvKey]);
+  }
+  assertUsableCredential(name, `${pointerEnvKey} -> vault:${vaultKey}`, value);
+  return sealCredential({
+    apiKey: value,
+    tier: "pointer",
+    source: `${pointerEnvKey} -> vault:${vaultKey}`,
+    deliberate: true,
+    diskCandidates: pointerResolution.diskCandidates,
+    warning: null
+  });
+}
+function defaultFleetGatewayBaseUrl(name) {
+  return `${DEFAULT_FLEET_GATEWAY_ORIGIN}/${validateAppSlug(name)}`;
+}
+function isValidDnsDomain(value) {
+  if (value.length === 0 || value.length > 253 || ASCII_CONTROL_PATTERN.test(value) || /[^\x00-\x7f]/.test(value)) {
+    return false;
+  }
+  return value.split(".").every((label) => label.length <= 63 && !label.startsWith("xn--") && DNS_LABEL_PATTERN.test(label));
+}
+function validateAppSlug(name) {
+  if (name.length > 63 || !DNS_LABEL_PATTERN.test(name)) {
+    throw new Error("App name must be one lowercase DNS label.");
+  }
+  return name;
+}
+function rawAuthority(value) {
+  const match = /^[a-z][a-z0-9+.-]*:\/\//i.exec(value);
+  if (!match)
+    throw new Error("API URL must be absolute.");
+  const afterScheme = value.slice(match[0].length);
+  const boundary = afterScheme.search(/[/?#]/);
+  const authority = boundary === -1 ? afterScheme : afterScheme.slice(0, boundary);
+  if (!authority)
+    throw new Error("API URL must include a hostname.");
+  return authority;
+}
+function assertCanonicalPort(port) {
+  if (!/^[0-9]+$/.test(port) || port.length > 1 && port.startsWith("0")) {
+    throw new Error("API URL authority must contain a canonical port between 1 and 65535.");
+  }
+  const numericPort = Number(port);
+  if (!Number.isSafeInteger(numericPort) || numericPort < 1 || numericPort > 65535) {
+    throw new Error("API URL authority must contain a canonical port between 1 and 65535.");
+  }
+}
+function canonicalAuthorityHostname(authority) {
+  let rawHostname;
+  if (authority.startsWith("[")) {
+    const closingBracket = authority.indexOf("]");
+    if (closingBracket === -1) {
+      throw new Error("API URL authority must contain a canonical hostname.");
+    }
+    rawHostname = authority.slice(0, closingBracket + 1);
+    const portSuffix = authority.slice(closingBracket + 1);
+    if (portSuffix) {
+      if (!portSuffix.startsWith(":")) {
+        throw new Error("API URL authority must contain a canonical hostname and port.");
+      }
+      assertCanonicalPort(portSuffix.slice(1));
+    }
+    if (isIP2(rawHostname.slice(1, -1)) !== 6) {
+      throw new Error("API URL authority must contain a canonical IPv6 literal.");
+    }
+  } else {
+    const firstColon = authority.indexOf(":");
+    const lastColon = authority.lastIndexOf(":");
+    if (firstColon !== lastColon) {
+      throw new Error("IPv6 API URL authorities must use brackets.");
+    }
+    if (lastColon !== -1) {
+      const port = authority.slice(lastColon + 1);
+      assertCanonicalPort(port);
+      rawHostname = authority.slice(0, lastColon);
+    } else {
+      rawHostname = authority;
+    }
+    const ipVersion = isIP2(rawHostname);
+    const numericAddressParts = rawHostname.split(".");
+    const looksLikeNonCanonicalIpv4 = numericAddressParts.every((part) => /^(?:0x[0-9a-f]+|[0-9]+)$/i.test(part));
+    if (ipVersion !== 4 && looksLikeNonCanonicalIpv4 || ipVersion !== 4 && !isValidDnsDomain(rawHostname.toLowerCase())) {
+      throw new Error("API URL authority must contain a canonical ASCII hostname.");
+    }
+  }
+  return rawHostname.toLowerCase();
+}
+function isDeliberateLoopbackHttpAuthority(authority) {
+  return /^(?:localhost|127\.0\.0\.1|\[::1\])(?::[0-9]+)?$/i.test(authority);
+}
+function toV1BaseUrl(apiUrl) {
+  if (ASCII_CONTROL_PATTERN.test(apiUrl)) {
+    throw new Error("API URL must not contain ASCII control characters.");
+  }
+  const input = apiUrl.trim();
+  const authority = rawAuthority(input);
+  if (authority.includes("@") || authority.includes("\\") || authority.includes("%") || /[^\x00-\x7f]/.test(authority)) {
+    throw new Error("API URL authority must be canonical ASCII without credentials.");
+  }
+  const canonicalHostname = canonicalAuthorityHostname(authority);
+  const url = new URL(input);
+  if (url.protocol !== "http:" && url.protocol !== "https:") {
+    throw new Error("API URL must use http or https.");
+  }
+  if (url.username || url.password) {
+    throw new Error("API URL must not include credentials.");
+  }
+  if (!url.hostname || url.hostname.endsWith(".")) {
+    throw new Error("API URL must include a canonical hostname.");
+  }
+  if (url.hostname.toLowerCase() !== canonicalHostname) {
+    throw new Error("API URL authority must not rely on parser hostname normalization.");
+  }
+  if (url.hostname.split(".").some((label) => label.toLowerCase().startsWith("xn--"))) {
+    throw new Error("API URL must not use IDN or punycode hostnames.");
+  }
+  if (url.protocol === "http:" && !isDeliberateLoopbackHttpAuthority(authority)) {
+    throw new Error("API URL may use http only for an exact loopback authority.");
+  }
+  if (url.search || url.hash) {
+    throw new Error("API URL must not include a query string or fragment.");
+  }
+  let path = url.pathname.replace(/\/+$/, "");
+  if (path.endsWith("/v1"))
+    path = path.slice(0, -"/v1".length);
+  url.pathname = `${path}/v1`;
+  return url.toString().replace(/\/+$/, "");
+}
+function resolveClientTransportSnapshot(name, env = process.env, options = {}) {
+  env = snapshotClientEnvironment(name, env);
+  const keys = clientTransportEnvKeys2(name);
+  const definedUrlEntries = keys.apiUrlKeys.filter((key) => Object.prototype.hasOwnProperty.call(env, key) && env[key] !== undefined).map((key) => ({ key, raw: String(env[key]) }));
+  const blankUrl = definedUrlEntries.find((entry) => entry.raw.trim().length === 0);
+  if (blankUrl) {
+    throw new ClientTransportConfigurationError(name, `${blankUrl.key} is set but blank; public clients require an explicit HTTPS API URL and never select local storage.`, [blankUrl.key]);
+  }
+  const controlledUrl = definedUrlEntries.find((entry) => ASCII_CONTROL_PATTERN.test(entry.raw));
+  if (controlledUrl) {
+    throw new ClientTransportConfigurationError(name, `${controlledUrl.key} contains ASCII control characters.`, [controlledUrl.key]);
+  }
+  const usableUrlEntries = definedUrlEntries.map((entry) => ({ key: entry.key, value: entry.raw.trim() }));
+  if (usableUrlEntries.length > 1 && new Set(usableUrlEntries.map((entry) => entry.value)).size > 1) {
+    throw new ClientTransportConfigurationError(name, `${usableUrlEntries.map((entry) => entry.key).join(" and ")} disagree; client authority aliases must be identical or only one may be set.`, usableUrlEntries.map((entry) => entry.key));
+  }
+  const envUrlHit = usableUrlEntries[0] ?? null;
+  const keychainUrlHit = keychainConfigValue(name, env, options.credentials?.keychain);
+  const diskConfigUrlHit = appConfigDiskValue(name, env, keys.apiUrlKeys);
+  if (diskConfigUrlHit?.unusable) {
+    throw new ClientTransportConfigurationError(name, `${diskConfigUrlHit.key} in ${diskConfigUrlHit.path} is declared but blank or malformed; public clients require a valid HTTPS service authority.`, [diskConfigUrlHit.path]);
+  }
+  const urlCandidates = [
+    ...envUrlHit ? [envUrlHit] : [],
+    ...keychainUrlHit ? [{ key: keychainUrlHit.source, value: keychainUrlHit.value }] : [],
+    ...diskConfigUrlHit ? [{ key: diskConfigUrlHit.path, value: diskConfigUrlHit.value.trim() }] : []
+  ];
+  const configuredUrl = urlCandidates[0] ?? null;
+  const divergentUrls = urlCandidates.filter((candidate) => candidate.value !== configuredUrl?.value);
+  if (configuredUrl && divergentUrls.length > 0) {
+    throw new ClientTransportConfigurationError(name, `${configuredUrl.key} and ${divergentUrls.map((candidate) => candidate.key).join(" and ")} select different service authorities; refusing to send a credential written for one authority to the other.`, urlCandidates.map((candidate) => candidate.key));
+  }
+  const warnings = [];
+  if (configuredUrl && !envUrlHit) {
+    warnings.push(`No ${keys.apiUrlKeys[0]} in the environment; the server URL in ${configuredUrl.key} was used, so this client connects to the server. ` + `Keep that entry aligned with the intended service authority.`);
+  }
+  const credential = resolveCredential(name, env, options.credentials);
+  if (!credential) {
+    const diskHint = credentialDiskSourcesForMessage(name, env);
+    const lead = configuredUrl ? `${configuredUrl.key} selects the HTTP server for '${name}', but no API key could be resolved` : `${keys.apiUrlKeys[0]} is not set and no API key could be resolved for '${name}'; a credential is required before the default fleet gateway authority applies`;
+    warnings.push(`${lead}; refusing to create an unauthenticated client \u2014 public clients never fall back to SQLite or another local store. ` + `Looked in the Keychain (macOS only), then for a credential file at ${diskHint}, then for ${keys.apiKeyKeys[0]} in the environment.`);
+    throw new ClientTransportConfigurationError(name, warnings.join(" "), [configuredUrl?.key ?? keys.apiUrlKeys[0]]);
+  }
+  if (credential.warning)
+    warnings.push(credential.warning);
+  let urlHit;
+  if (configuredUrl) {
+    urlHit = configuredUrl;
+  } else {
+    try {
+      urlHit = { key: DEFAULT_AUTHORITY_SOURCE, value: defaultFleetGatewayBaseUrl(name) };
+    } catch (error) {
+      const message = error instanceof Error ? error.message : String(error);
+      throw new ClientTransportConfigurationError(name, `No ${keys.apiUrlKeys[0]} is configured and the default fleet gateway authority cannot be composed for '${name}': ${message}`, [keys.apiUrlKeys[0]]);
+    }
+  }
+  const apiUrlSource = urlHit.key;
+  let baseUrl;
+  try {
+    baseUrl = toV1BaseUrl(urlHit.value);
+  } catch (error) {
+    const message = error instanceof Error ? error.message : String(error);
+    throw new ClientTransportConfigurationError(name, `Invalid API URL from ${apiUrlSource}: ${message}`, [apiUrlSource]);
+  }
+  return {
+    resolution: {
+      transport: "http",
+      transportSource: urlHit.key,
+      baseUrl,
+      apiUrlSource,
+      apiKeyPresent: true,
+      apiKeySource: credential.source,
+      apiKeyTier: credential.tier,
+      misconfigured: false,
+      warning: warnings.length > 0 ? warnings.join(" ") : null
+    },
+    credential
+  };
+}
+function credentialDiskSourcesForMessage(name, env) {
+  const paths = credentialDiskSources(name, env);
+  return paths.length > 0 ? paths.join(" or ") : "<no HOME or HASNA_HOME set in this environment, so no credential file was consulted>";
+}
+function currentCredential(name, apiKey) {
+  if (typeof apiKey === "function") {
+    return validateAndSealResolvedCredential(name, apiKey());
+  }
+  return explicitCredential(name, apiKey);
+}
+async function resolveRequestCredential(name, apiKey, env = process.env) {
+  const resolved = currentCredential(name, apiKey);
+  if (resolved.tier === "pointer") {
+    return completePointerCredential(name, resolved, env);
+  }
+  return resolved;
+}
+function authFailureGuidance(credential) {
+  const origin = `The API key for this request came from ${credential.source}`;
+  if (credential.deliberate) {
+    const remedy = credential.source === CALLER_SUPPLIED_CREDENTIAL_PROVIDER_SOURCE ? `Fix that provider so it returns the current key, or replace it with resolveCredential() ` + `so diagnostics can name the original source.` : `Rotate that key, or unset the override to use the credential on disk.`;
+    return `${origin} \u2014 a credential you selected deliberately. It was NOT substituted with any other key: ` + `falling back here would authenticate as a different principal than the one you named, which is ` + `exactly the failure an override exists to prevent. ${remedy}`;
+  }
+  if (credential.tier === "env") {
+    const target = credential.diskCandidates[0];
+    const remedy = target ? `Store the CURRENT key in the Keychain or write it to ${target} \u2014 both are re-read on every call, so ` + `rotations take effect immediately and in every shell. Do not simply unset ${credential.source}: ` + `nothing was found in the Keychain or on disk, so that would leave this client with no credential at all.` : `This environment has no HOME or HASNA_HOME, so no credential file could be consulted; the disk tier is ` + `unavailable here and there is nothing to fall back to. Set HOME, or supply the key explicitly.`;
+    return `${origin}, a variable in this process's environment. If a wrapper injected it for this one process, the ` + `wrapper re-reads its store on every invocation and the stored key itself is being rejected \u2014 rotate it. ` + `If this SHELL exported it, the export is a snapshot taken when the shell started: a STALE SHELL that ` + `exported the key before it was rotated keeps sending the old one until it exits. ${remedy}`;
+  }
+  if (credential.tier === "keychain") {
+    return `${origin}, which was re-read from the Keychain on this very call \u2014 so a stale shell is NOT the cause ` + `here. The stored item is genuinely being rejected: update it with the current key, or re-run the fleet ` + `key distribution so this machine gets the current key.`;
+  }
+  return `${origin}, which was re-read from disk on this very call \u2014 so a stale shell is NOT the cause here. ` + `The stored credential is genuinely being rejected: rotate it, or re-run the fleet key distribution ` + `so this machine gets the current key.`;
+}
+function assertNoAuthorityOverrideHeaders(headers, source) {
+  if (!headers)
+    return;
+  const forbidden = Object.keys(headers).find((name) => AUTHORITY_OVERRIDE_HEADERS2.has(name.trim().toLowerCase()));
+  if (forbidden) {
+    throw new Error(`Authenticated ${source} headers must not set authority header '${forbidden}'.`);
+  }
+}
+function appendQuery(path, query) {
+  if (!query)
+    return path;
+  const params = query instanceof URLSearchParams ? query : new URLSearchParams;
+  if (!(query instanceof URLSearchParams)) {
+    for (const [key, value] of Object.entries(query)) {
+      if (value === null || value === undefined)
+        continue;
+      if (Array.isArray(value)) {
+        for (const v of value)
+          params.append(key, String(v));
+      } else {
+        params.append(key, String(value));
+      }
+    }
+  }
+  const qs = params.toString();
+  if (!qs)
+    return path;
+  return `${path}${path.includes("?") ? "&" : "?"}${qs}`;
+}
+function createHasnaHttpTransportInternal(options, requestBindingProvider) {
+  const fetchImpl = options.fetchImpl ?? ((input, init) => fetch(input, init));
+  const base = toV1BaseUrl(options.baseUrl);
+  const timeoutMs = options.timeoutMs ?? 30000;
+  const sleep = options.sleepImpl ?? defaultSleep;
+  const defaultRetry = options.retry;
+  function resolveRetry(callRetry) {
+    const chosen = callRetry !== undefined ? callRetry : defaultRetry;
+    if (chosen === false)
+      return null;
+    const r = chosen ?? {};
+    return {
+      retries: r.retries ?? 2,
+      baseDelayMs: r.baseDelayMs ?? 200,
+      maxDelayMs: r.maxDelayMs ?? 2000,
+      retryStatuses: r.retryStatuses ?? [...DEFAULT_RETRY_STATUSES]
+    };
+  }
+  async function once(method, rel, url, body, opts, credential) {
+    assertNoAuthorityOverrideHeaders(options.headers, "transport");
+    assertNoAuthorityOverrideHeaders(opts.headers, "request");
+    const headers = {
+      "x-api-key": credential.apiKey,
+      Authorization: `Bearer ${credential.apiKey}`,
+      Accept: "application/json",
+      ...options.headers ?? {},
+      ...opts.headers ?? {}
+    };
+    if (opts.idempotencyKey)
+      headers["Idempotency-Key"] = opts.idempotencyKey;
+    const init = {
+      method,
+      headers,
+      redirect: "manual"
+    };
+    if (body !== undefined) {
+      headers["Content-Type"] = "application/json";
+      init.body = JSON.stringify(body);
+    }
+    const controller = new AbortController;
+    const onAbort = () => controller.abort();
+    if (opts.signal) {
+      if (opts.signal.aborted)
+        controller.abort();
+      else
+        opts.signal.addEventListener("abort", onAbort, { once: true });
+    }
+    const timer = setTimeout(() => controller.abort(), opts.timeoutMs ?? timeoutMs);
+    init.signal = controller.signal;
+    let response;
+    try {
+      response = await fetchImpl(url, init);
+    } catch (error) {
+      const err = error instanceof Error ? error : new Error(String(error));
+      if (opts.signal?.aborted)
+        return { ok: false, retryable: false, error: err };
+      return { ok: false, retryable: true, error: err };
+    } finally {
+      clearTimeout(timer);
+      if (opts.signal)
+        opts.signal.removeEventListener("abort", onAbort);
+    }
+    const authenticationFailure = response.status === 401 || response.status === 403;
+    let parsed = undefined;
+    if (authenticationFailure) {
+      try {
+        await response.body?.cancel();
+      } catch {}
+    } else {
+      const text = await response.text();
+      if (text.length > 0) {
+        try {
+          parsed = JSON.parse(text);
+        } catch {
+          parsed = text;
+        }
+      }
+    }
+    if (!response.ok) {
+      if (response.status >= 300 && response.status < 400) {
+        return {
+          ok: false,
+          retryable: false,
+          error: new HasnaHttpError(method, rel, response.status, parsed)
+        };
+      }
+      if (authenticationFailure) {
+        return {
+          ok: false,
+          retryable: false,
+          error: new HasnaHttpError(method, rel, response.status, undefined, {
+            source: credential.source,
+            tier: credential.tier,
+            guidance: authFailureGuidance(credential)
+          })
+        };
+      }
+      const retry = resolveRetry(opts.retry);
+      const retryable = retry ? retry.retryStatuses.includes(response.status) : false;
+      return { ok: false, retryable, error: new HasnaHttpError(method, rel, response.status, parsed) };
+    }
+    return { ok: true, value: parsed };
+  }
+  async function request(method, path, body, opts = {}) {
+    const upper = method.toUpperCase();
+    const rel = appendQuery(path.startsWith("/") ? path : `/${path}`, opts.query);
+    const retry = resolveRetry(opts.retry);
+    const methodRetryable = IDEMPOTENT_METHODS2.has(upper) || Boolean(opts.idempotencyKey);
+    const maxAttempts = retry && methodRetryable ? retry.retries + 1 : 1;
+    const binding = requestBindingProvider ? await requestBindingProvider() : {
+      baseUrl: base,
+      credential: await resolveRequestCredential(options.name, options.apiKey)
+    };
+    const url = `${binding.baseUrl}${rel}`;
+    const credential = binding.credential;
+    let last = null;
+    for (let attempt = 1;attempt <= maxAttempts; attempt++) {
+      const result = await once(upper, rel, url, body, opts, credential);
+      if (result.ok)
+        return result.value;
+      last = result;
+      const canRetry = retry !== null && methodRetryable && result.retryable && attempt < maxAttempts;
+      if (!canRetry)
+        break;
+      const backoff = Math.min(retry.maxDelayMs, retry.baseDelayMs * 2 ** (attempt - 1));
+      const jitter = Math.floor(Math.random() * (backoff / 2 + 1));
+      await sleep(backoff + jitter);
+    }
+    throw last.error;
+  }
+  return {
+    baseUrl: base,
+    request,
+    get: (path, opts) => request("GET", path, undefined, opts),
+    post: (path, body, opts) => request("POST", path, body, opts),
+    put: (path, body, opts) => request("PUT", path, body, opts),
+    patch: (path, body, opts) => request("PATCH", path, body, opts),
+    del: (path, body, opts) => request("DELETE", path, body, opts)
+  };
+}
+function createClientTransport(name, env = process.env, overrides) {
+  const credentialOptions = overrides?.credentials;
+  const snapshotOptions = { ...credentialOptions ? { credentials: credentialOptions } : {} };
+  const resolution = resolveClientTransportSnapshot(name, env, snapshotOptions).resolution;
+  const sameBinding = (left, right) => left.resolution.baseUrl === right.resolution.baseUrl && left.credential.apiKey === right.credential.apiKey && left.credential.pointerVaultKey === right.credential.pointerVaultKey && left.credential.source === right.credential.source && left.credential.tier === right.credential.tier;
+  const unstableConfiguration = () => new ClientTransportConfigurationError(name, "The configured service authority or credential changed while a request was being prepared; no authenticated request was sent.");
+  const requestBindingProvider = async () => {
+    const first = resolveClientTransportSnapshot(name, env, snapshotOptions);
+    const reviewed = resolveClientTransportSnapshot(name, env, snapshotOptions);
+    if (!sameBinding(first, reviewed))
+      throw unstableConfiguration();
+    if (reviewed.resolution.baseUrl !== resolution.baseUrl) {
+      throw new ClientTransportConfigurationError(name, "The configured service authority changed; rebuild the client before sending credentials.");
+    }
+    const credential = await resolveRequestCredential(name, () => reviewed.credential, env);
+    const immediatelyBeforeDispatch = resolveClientTransportSnapshot(name, env, snapshotOptions);
+    if (!sameBinding(reviewed, immediatelyBeforeDispatch))
+      throw unstableConfiguration();
+    if (immediatelyBeforeDispatch.resolution.baseUrl !== resolution.baseUrl) {
+      throw new ClientTransportConfigurationError(name, "The configured service authority changed; rebuild the client before sending credentials.");
+    }
+    return { baseUrl: immediatelyBeforeDispatch.resolution.baseUrl, credential };
+  };
+  return {
+    transport: "http",
+    client: createHasnaHttpTransportInternal({
+      name,
+      baseUrl: resolution.baseUrl,
+      apiKey: () => {
+        throw new Error("The authenticated request binding provider was not invoked.");
+      },
+      ...overrides?.fetchImpl ? { fetchImpl: overrides.fetchImpl } : {},
+      ...overrides?.headers ? { headers: overrides.headers } : {},
+      ...overrides?.timeoutMs ? { timeoutMs: overrides.timeoutMs } : {},
+      ...overrides?.retry !== undefined ? { retry: overrides.retry } : {},
+      ...overrides?.sleepImpl ? { sleepImpl: overrides.sleepImpl } : {}
+    }, requestBindingProvider),
+    resolution
+  };
+}
+function resourcePath(resource) {
+  const trimmed = resource.replace(/^\/+|\/+$/g, "");
+  if (!trimmed)
+    throw new Error("resource must be a non-empty path segment");
+  return `/${trimmed}`;
+}
+function entityPath(resource, id) {
+  if (id === undefined || id === null || `${id}`.length === 0) {
+    throw new Error("id must be a non-empty string");
+  }
+  return `${resourcePath(resource)}/${encodeURIComponent(String(id))}`;
+}
+function newIdempotencyKey() {
+  const g = globalThis;
+  if (g.crypto?.randomUUID)
+    return g.crypto.randomUUID();
+  return `idmp_${Date.now().toString(36)}_${Math.random().toString(36).slice(2, 12)}`;
+}
+function extractItems(raw) {
+  if (Array.isArray(raw))
+    return raw;
+  if (raw && typeof raw === "object") {
+    const obj = raw;
+    for (const key of ["items", "data", "results", "rows", "records"]) {
+      if (Array.isArray(obj[key]))
+        return obj[key];
+    }
+  }
+  return [];
+}
+function extractTotal(raw) {
+  if (raw && typeof raw === "object") {
+    const obj = raw;
+    for (const key of ["total", "count", "totalCount", "total_count"]) {
+      if (typeof obj[key] === "number")
+        return obj[key];
+    }
+  }
+  return null;
+}
+function extractCursor(raw) {
+  if (raw && typeof raw === "object") {
+    const obj = raw;
+    for (const key of ["cursor", "nextCursor", "next_cursor", "next"]) {
+      if (typeof obj[key] === "string")
+        return obj[key];
+    }
+  }
+  return null;
+}
+function isNotFoundHttpError(error) {
+  return typeof error === "object" && error !== null && error.name === "HasnaHttpError" && error.status === 404;
+}
+function createHasnaStorageClient(name, transport) {
+  return {
+    name,
+    baseUrl: transport.baseUrl,
+    transport,
+    async list(resource, options = {}) {
+      const raw = await transport.get(resourcePath(resource), options);
+      return {
+        items: extractItems(raw),
+        total: extractTotal(raw),
+        cursor: extractCursor(raw),
+        raw
+      };
+    },
+    async get(resource, id, options = {}) {
+      try {
+        return await transport.get(entityPath(resource, id), options);
+      } catch (error) {
+        if (isNotFoundHttpError(error))
+          return null;
+        throw error;
+      }
+    },
+    async create(resource, body, options = {}) {
+      const { idempotencyKey, ...rest } = options;
+      return transport.post(resourcePath(resource), body, {
+        ...rest,
+        idempotencyKey: idempotencyKey ?? newIdempotencyKey()
+      });
+    },
+    async update(resource, id, patch, options = {}) {
+      const { method = "PATCH", idempotencyKey, ...rest } = options;
+      const call = method === "PUT" ? transport.put : transport.patch;
+      return call(entityPath(resource, id), patch, { ...rest, ...idempotencyKey ? { idempotencyKey } : {} });
+    },
+    async delete(resource, id, options = {}) {
+      try {
+        await transport.del(entityPath(resource, id), undefined, options);
+      } catch (error) {
+        if (isNotFoundHttpError(error))
+          return;
+        throw error;
+      }
+    }
+  };
+}
+function resolveStorageClient(name, env = process.env, overrides) {
+  const wired = createClientTransport(name, env, overrides);
+  return { transport: "http", client: createHasnaStorageClient(name, wired.client) };
+}
+var CREDENTIAL_PROFILE_ENV_KEY2 = "HASNA_PROFILE", CredentialResolutionError, CredentialFileUnsafeError, HASNA_HOME_ENV_KEY = "HASNA_HOME", HASNA_CONFIG_HOME_ENV_KEY = "HASNA_CONFIG_HOME", KEYCHAIN_STATION_ENV_KEY = "HASNA_STATION", HASNA_HOME_DIR = ".hasna", CONFIG_SUBDIR = "config", CREDENTIALS_FILE = "credentials", KEYCHAIN_SECURITY_BIN = "/usr/bin/security", KEYCHAIN_SERVICE_PREFIX = "hasna.credentials", KEYCHAIN_ITEM_NOT_FOUND_STATUS = 44, KEYCHAIN_SPAWN_TIMEOUT_MS = 1e4, MAX_CREDENTIAL_FILE_BYTES2, SAFE_APP_SLUG, SAFE_PROFILE, ILLEGAL_IN_HEADER_VALUE, VAULT_POINTER_SHAPE, CREDENTIAL_SHAPED_KEY, INSPECT_CUSTOM2, CREDENTIAL_SEAL2, CALLER_SUPPLIED_CREDENTIAL_PROVIDER_SOURCE = "caller-supplied CredentialProvider", AMBIENT_ENVIRONMENT2, SECRETS_PACKAGE_SPECIFIER2, requireSecretsSdk2, DEFAULT_FLEET_GATEWAY_ORIGIN = "https://api.hasna.com", DEFAULT_AUTHORITY_SOURCE = "default", ASCII_CONTROL_PATTERN, DNS_LABEL_PATTERN, ClientTransportConfigurationError, HasnaHttpError, DEFAULT_RETRY_STATUSES, IDEMPOTENT_METHODS2, AUTHORITY_OVERRIDE_HEADERS2, defaultSleep = (ms) => new Promise((resolve10) => setTimeout(resolve10, ms));
+var init_storage = __esm(() => {
+  CredentialResolutionError = class CredentialResolutionError extends Error {
+    appName;
+    attempted;
+    constructor(appName, message, attempted) {
+      super(message);
+      this.name = "CredentialResolutionError";
+      this.appName = appName;
+      this.attempted = attempted;
+    }
+  };
+  CredentialFileUnsafeError = class CredentialFileUnsafeError extends Error {
+    path;
+    constructor(path, reason) {
+      super(`Refusing unsafe credential/config file ${path}: ${reason}.`);
+      this.name = "CredentialFileUnsafeError";
+      this.path = path;
+    }
+  };
+  MAX_CREDENTIAL_FILE_BYTES2 = 64 * 1024;
+  SAFE_APP_SLUG = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
+  SAFE_PROFILE = /^[A-Za-z0-9](?:[A-Za-z0-9._-]*[A-Za-z0-9])?$/;
+  ILLEGAL_IN_HEADER_VALUE = /[^\t\x20-\x7e]/;
+  VAULT_POINTER_SHAPE = /^[a-z0-9][a-z0-9-]*(?:\/[a-z0-9][a-z0-9-_.]*){2,}$/;
+  CREDENTIAL_SHAPED_KEY = /(?:^|_)(?:API_KEY|KEY|TOKEN|SECRET|PASSWORD|PASSWD|CREDENTIAL|AUTH)(?:_|$)/;
+  INSPECT_CUSTOM2 = Symbol.for("nodejs.util.inspect.custom");
+  CREDENTIAL_SEAL2 = Symbol.for("hasna:contracts:sealedCredential");
+  AMBIENT_ENVIRONMENT2 = Symbol.for("hasna:contracts:ambientClientEnvironment");
+  SECRETS_PACKAGE_SPECIFIER2 = "@hasna/" + "secrets";
+  requireSecretsSdk2 = createRequire2(import.meta.url);
+  ASCII_CONTROL_PATTERN = /[\u0000-\u001f\u007f]/;
+  DNS_LABEL_PATTERN = /^[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/;
+  ClientTransportConfigurationError = class ClientTransportConfigurationError extends Error {
+    appName;
+    sources;
+    constructor(appName, message, sources = []) {
+      super(message);
+      this.name = "ClientTransportConfigurationError";
+      this.appName = appName;
+      this.sources = Object.freeze([...sources]);
+    }
+  };
+  HasnaHttpError = class HasnaHttpError extends Error {
+    status;
+    method;
+    path;
+    credentialSource;
+    credentialTier;
+    constructor(method, path, status, body, credential) {
+      const guidance = credential ? `. ${credential.guidance}` : "";
+      super(`Hasna cloud request failed: ${method} ${path} -> ${status}${guidance}`);
+      this.name = "HasnaHttpError";
+      this.status = status;
+      this.method = method;
+      this.path = path;
+      Object.defineProperty(this, "body", {
+        value: body,
+        enumerable: status !== 401 && status !== 403,
+        writable: false,
+        configurable: false
+      });
+      this.credentialSource = credential?.source ?? null;
+      this.credentialTier = credential?.tier ?? null;
+    }
+  };
+  DEFAULT_RETRY_STATUSES = [408, 425, 429, 500, 502, 503, 504];
+  IDEMPOTENT_METHODS2 = new Set(["GET", "HEAD", "PUT", "DELETE", "OPTIONS"]);
+  AUTHORITY_OVERRIDE_HEADERS2 = new Set([
+    "host",
+    ":authority",
+    "forwarded",
+    "x-forwarded-host",
+    "x-original-host"
+  ]);
+});
+
+// src/lib/transport-resolver.ts
+function rethrowInstructionsAuthorityFailure(error) {
+  const message = error instanceof Error ? error.message : String(error);
+  const name = error instanceof Error ? error.name : "";
+  const failure = (code, lead) => {
+    throw new Error(`${code}: ${lead} ${message} There is no local fallback: local SQLite is opt-in only ` + `(${INSTRUCTIONS_LOCAL_OPT_IN_ENV}=1) and is disabled by default \u2014 failing closed`, { cause: error });
+  };
+  if (name === "CredentialResolutionError" || name === "CredentialFileUnsafeError") {
+    return failure("REMOTE_API_CREDENTIAL_INVALID", "The configured Instructions credential could not be used.");
+  }
+  if (/no API key could be resolved/.test(message)) {
+    if (/is not set and no API key could be resolved/.test(message)) {
+      return failure("REMOTE_API_CONFIG_MISSING", "no Instructions credential resolved from the Keychain item " + "hasna.credentials.instructions.api-key, ~/.hasna/instructions/config/credentials, " + `or ${clientTransportEnvKeys(INSTRUCTIONS_APP).apiKeyKeys[0]}.`);
+    }
+    return failure("REMOTE_API_KEY_MISSING", "an Instructions authority is configured but no API key resolved \u2014 looked in " + "hasna.credentials.instructions.api-key, ~/.hasna/instructions/config/credentials, " + `and ${clientTransportEnvKeys(INSTRUCTIONS_APP).apiKeyKeys[0]}.`);
+  }
+  return failure("REMOTE_API_URL_INVALID", "the configured Instructions authority is invalid.");
+}
+function resolveInstructionsStorageClient(env = process.env, options = {}) {
+  const inputs = instructionsResolverInputs(env, options.credentials);
+  try {
+    return resolveStorageClient(INSTRUCTIONS_APP, inputs.env, {
+      fetchImpl: (input, init) => fetch(input, { ...init, redirect: "manual" }),
+      credentials: inputs.credentials
+    });
+  } catch (error) {
+    rethrowInstructionsAuthorityFailure(error);
+  }
+}
+function announceLocalInstructionsMode(write = (line) => process.stderr.write(`${line}
+`)) {
+  if (localNoticePrinted)
+    return false;
+  localNoticePrinted = true;
+  write(instructionsLocalModeNotice());
+  return true;
+}
+var INSTRUCTIONS_APP = "instructions", INSTRUCTIONS_LOCAL_OPT_IN_ENV, localNoticePrinted = false;
+var init_transport_resolver = __esm(() => {
+  init_transport();
+  init_storage();
+  init_local_opt_in();
+  INSTRUCTIONS_LOCAL_OPT_IN_ENV = INSTRUCTIONS_LOCAL_OPT_IN_ENV_KEYS[0];
+});
+
 // src/data/config-store.ts
 import { randomUUID as randomUUID6 } from "crypto";
 function parseBoundedPagePayload(value, label) {
@@ -13635,7 +15017,7 @@ function parseBoundedPagePayload(value, label) {
   const consumed = Number(page?.cursor) + (page?.items?.length ?? 0);
   const complete = Boolean(page && Number.isSafeInteger(page.total) && consumed >= Number(page.total));
   if (!page || !Array.isArray(page.items) || !Number.isSafeInteger(page.total) || Number(page.total) < 0 || !Number.isSafeInteger(page.limit) || Number(page.limit) < 1 || !Number.isSafeInteger(page.cursor) || Number(page.cursor) < 0 || page.items.length > Number(page.limit) || typeof page.has_more !== "boolean" || typeof page.complete !== "boolean" || page.truncated !== false || page.next_cursor !== null && !Number.isSafeInteger(page.next_cursor) || page.complete !== complete || page.has_more !== !complete || page.next_cursor !== (complete ? null : consumed)) {
-    throw new CloudHttpError(502, `${label} returned an invalid or truncated bounded-read envelope`, value);
+    throw new Error(`${label} returned an invalid or truncated bounded-read envelope`);
   }
   return {
     ...page,
@@ -13650,50 +15032,38 @@ function parseBoundedOrLegacyPage(value, legacyItems, options, label) {
     }
   }
   if (!Array.isArray(legacyItems)) {
-    throw new CloudHttpError(502, `${label} returned neither a bounded envelope nor a complete legacy array`, value);
+    throw new Error(`${label} returned neither a bounded envelope nor a complete legacy array`);
   }
   const normalized = normalizeBoundedReadOptions(options);
   const page = boundedReadPage(legacyItems.slice(normalized.cursor, normalized.cursor + normalized.limit), legacyItems.length, normalized);
   return { ...page, source_bounded: false };
 }
 function isCloudAuthError(err) {
-  return err instanceof CloudHttpError && (err.status === 401 || err.status === 403);
+  return typeof err === "object" && err !== null && err.name === "HasnaHttpError" && (err.status === 401 || err.status === 403);
+}
+function isNotFoundHttpError2(err) {
+  return typeof err === "object" && err !== null && err.name === "HasnaHttpError" && err.status === 404;
 }
 function formatCliError(err, env = process.env) {
   if (isCloudAuthError(err)) {
-    const apiUrl = env[API_URL_ENV]?.trim();
-    const detail = err.message?.trim();
-    const serverNote = detail && !/^HTTP \d+\b/.test(detail) ? `  Server said: ${detail}` : "";
     return [
       `Instructions cloud API rejected the request (HTTP ${err.status}: authentication failed).`,
-      serverNote,
-      `  The API key in ${API_KEY_ENV} is missing, expired, or revoked${apiUrl ? ` for ${apiUrl}` : ""}.`,
+      `  The API key in use is missing, expired, or revoked (the transport never echoes the server's 401/403 body).`,
       `  To continue, either:`,
-      `    - set a valid key:   export ${API_KEY_ENV}=<new-key>`,
-      `    - or use the local store instead:   unset ${API_URL_ENV} ${API_KEY_ENV}`
-    ].filter(Boolean).join(`
+      `    - set a valid key:   export HASNA_INSTRUCTIONS_API_KEY=<new-key>`,
+      `      (or add the Keychain item hasna.credentials.instructions.api-key, or write`,
+      `       ~/.hasna/instructions/config/credentials)`,
+      `    - or opt in to the local store explicitly:   export ${LOCAL_OPT_IN_ENV}=1`
+    ].join(`
 `);
   }
   return err instanceof Error ? err.message : String(err);
 }
-function resolveCloudConfig(env = process.env) {
-  assertNoLegacyStorageMode(env);
-  const apiUrl = env[API_URL_ENV]?.trim();
-  const apiKey = env[API_KEY_ENV]?.trim();
-  if (!apiUrl && !apiKey)
-    return null;
-  if (!apiUrl || !apiKey) {
-    throw new Error(`API mode requires BOTH ${API_URL_ENV} and ${API_KEY_ENV}; only ` + `${apiUrl ? API_URL_ENV : API_KEY_ENV} is set. Set both to use the HTTP API, ` + `or unset both to use the local store.`);
-  }
-  return { apiUrl, apiKey };
-}
-function isApiTransport(env = process.env) {
-  return resolveCloudConfig(env) !== null;
-}
 
 class LocalConfigStore {
   db;
   mode = "local";
+  v1BaseUrl = null;
   constructor(db) {
     this.db = db;
   }
@@ -13822,50 +15192,22 @@ class LocalConfigStore {
 
 class CloudConfigStore {
   mode = "api";
-  base;
-  apiKey;
-  timeoutMs;
-  constructor(config) {
-    this.base = `${config.apiUrl.replace(/\/+$/, "")}/v1`;
-    this.apiKey = config.apiKey;
-    this.timeoutMs = config.timeoutMs ?? 30000;
+  v1BaseUrl;
+  client;
+  constructor(client) {
+    this.client = client;
+    this.v1BaseUrl = client.baseUrl;
   }
   async request(method, path, body, opts = {}) {
-    const controller = new AbortController;
-    const timer = setTimeout(() => controller.abort(), this.timeoutMs);
-    const headers = {
-      Authorization: `Bearer ${this.apiKey}`,
-      Accept: "application/json"
-    };
-    if (body !== undefined)
-      headers["Content-Type"] = "application/json";
-    if (opts.idempotent)
-      headers["Idempotency-Key"] = randomUUID6();
     try {
-      const res = await fetch(`${this.base}${path}`, {
-        method,
-        headers,
-        body: body === undefined ? undefined : JSON.stringify(body),
-        signal: controller.signal
+      const data = await this.client.transport.request(method, path, body, {
+        ...opts.idempotent ? { idempotencyKey: randomUUID6() } : {}
       });
-      if (res.status === 404 && opts.allow404)
+      return { status: 200, data };
+    } catch (err) {
+      if (opts.allow404 && isNotFoundHttpError2(err))
         return { status: 404, data: null };
-      const text = await res.text();
-      let parsed = null;
-      if (text) {
-        try {
-          parsed = JSON.parse(text);
-        } catch {
-          parsed = text;
-        }
-      }
-      if (!res.ok) {
-        const message = (parsed && typeof parsed === "object" && "error" in parsed ? String(parsed.error) : undefined) ?? `HTTP ${res.status} on ${method} ${path}`;
-        throw new CloudHttpError(res.status, message, parsed);
-      }
-      return { status: res.status, data: parsed };
-    } finally {
-      clearTimeout(timer);
+      throw err;
     }
   }
   async listConfigs(filter = {}) {
@@ -14021,7 +15363,7 @@ class CloudConfigStore {
     if (first.status !== 404) {
       if (isUsable(first.data))
         return first;
-      throw new CloudHttpError(502, "profile follow-up returned an invalid response", first.data);
+      throw new Error(`Cloud /v1 returned an invalid profile response for ${pathForId(idOrSlug)}`);
     }
     const profiles = await this.listProfiles();
     const profile = profiles.find((candidate) => candidate.id === idOrSlug || candidate.slug === idOrSlug);
@@ -14034,7 +15376,7 @@ class CloudConfigStore {
       if (response.status !== 404) {
         if (isUsable(response.data))
           return response;
-        throw new CloudHttpError(502, "profile follow-up returned an invalid response", response.data);
+        throw new Error(`Cloud /v1 returned an invalid profile response for ${pathForId(candidate)}`);
       }
     }
     return { status: 404, data: null };
@@ -14117,7 +15459,7 @@ class CloudConfigStore {
     }
     if (data && "complete" in data) {
       if (data.complete !== true || data.truncated !== false) {
-        throw new CloudHttpError(502, "profile resolve returned an incomplete or truncated read", data);
+        throw new Error("Cloud /v1 profile resolve returned an incomplete or truncated read");
       }
       return { ...data, source_bounded: data.source_bounded ?? true };
     }
@@ -14133,7 +15475,7 @@ class CloudConfigStore {
       };
     }
     {
-      throw new CloudHttpError(502, "profile resolve returned an incomplete or truncated read", data);
+      throw new Error("Cloud /v1 profile resolve returned an incomplete or truncated read");
     }
   }
   async registerMachine(hostname2, os, arch2) {
@@ -14156,14 +15498,19 @@ class CloudConfigStore {
     });
   }
   async reset() {
-    throw new Error("`init --force` cannot wipe the shared cloud store from a client. " + "Unset HASNA_INSTRUCTIONS_API_URL / HASNA_INSTRUCTIONS_API_KEY to reset the local store instead.");
+    throw new Error("`init --force` cannot wipe the shared cloud store from a client. " + "Point this run at the local store (HASNA_INSTRUCTIONS_LOCAL=1 with no hosted credential) to reset it instead.");
   }
 }
-function resolveConfigStore(env = process.env) {
-  const cloud = resolveCloudConfig(env);
-  return cloud ? new CloudConfigStore(cloud) : new LocalConfigStore;
+function resolveConfigStore(env = process.env, options = {}) {
+  if (selectsInstructionsLocalStore(env)) {
+    if (env === process.env)
+      announceLocalInstructionsMode();
+    return new LocalConfigStore;
+  }
+  const { client } = resolveInstructionsStorageClient(env, options);
+  return new CloudConfigStore(client);
 }
-var CloudHttpError, API_URL_ENV = "HASNA_INSTRUCTIONS_API_URL", API_KEY_ENV = "HASNA_INSTRUCTIONS_API_KEY";
+var LOCAL_OPT_IN_ENV;
 var init_config_store = __esm(() => {
   init_configs();
   init_profiles();
@@ -14173,22 +15520,14 @@ var init_config_store = __esm(() => {
   init_types();
   init_bounded_read();
   init_instruction_graph();
-  init_retired_storage_mode();
-  CloudHttpError = class CloudHttpError extends Error {
-    status;
-    body;
-    constructor(status, message, body) {
-      super(message);
-      this.status = status;
-      this.body = body;
-      this.name = "CloudHttpError";
-    }
-  };
+  init_transport_resolver();
+  init_local_opt_in();
+  LOCAL_OPT_IN_ENV = INSTRUCTIONS_LOCAL_OPT_IN_ENV;
 });
 
 // src/lib/session-render-ownership.ts
-import { existsSync as existsSync10, readFileSync as readFileSync5, statSync as statSync4 } from "fs";
-import { dirname as dirname4, join as join13, parse as parse3, relative as relative3, sep } from "path";
+import { existsSync as existsSync11, readFileSync as readFileSync6, statSync as statSync4 } from "fs";
+import { dirname as dirname5, join as join13, parse as parse3, relative as relative3, sep } from "path";
 function toSegments(absolutePath2) {
   return absolutePath2.replaceAll("\\", "/").split("/").filter(Boolean);
 }
@@ -14207,7 +15546,7 @@ function pathIsSessionRenderManagedDir(absolutePath2) {
 function readManifestRelativePaths(manifestPath) {
   let stats;
   try {
-    if (!existsSync10(manifestPath))
+    if (!existsSync11(manifestPath))
       return null;
     stats = statSync4(manifestPath);
   } catch {
@@ -14219,7 +15558,7 @@ function readManifestRelativePaths(manifestPath) {
   }
   let manifest;
   try {
-    manifest = JSON.parse(readFileSync5(manifestPath, "utf-8"));
+    manifest = JSON.parse(readFileSync6(manifestPath, "utf-8"));
   } catch {
     return null;
   }
@@ -14234,7 +15573,7 @@ function readManifestRelativePaths(manifestPath) {
 }
 function sessionRenderManifestClaimsPath(absolutePath2) {
   const root = parse3(absolutePath2).root;
-  let home = dirname4(absolutePath2);
+  let home = dirname5(absolutePath2);
   for (let depth = 0;depth < MANIFEST_ANCESTOR_LIMIT; depth += 1) {
     const manifestPath = join13(home, ...SESSION_RENDER_MANIFEST_RELATIVE_PATH.split("/"));
     const relativePaths = readManifestRelativePaths(manifestPath);
@@ -14243,7 +15582,7 @@ function sessionRenderManifestClaimsPath(absolutePath2) {
       if (relativePaths.has(claimed))
         return true;
     }
-    const parent = dirname4(home);
+    const parent = dirname5(home);
     if (parent === home || home === root)
       break;
     home = parent;
@@ -14271,17 +15610,17 @@ __export(exports_apply, {
   applyConfigs: () => applyConfigs,
   applyConfig: () => applyConfig
 });
-import { existsSync as existsSync11, mkdirSync as mkdirSync3, readFileSync as readFileSync6, realpathSync as realpathSync3, writeFileSync as writeFileSync2 } from "fs";
-import { basename as basename5, dirname as dirname5, join as join14, resolve as resolve9 } from "path";
-import { homedir as homedir10 } from "os";
+import { existsSync as existsSync12, mkdirSync as mkdirSync3, readFileSync as readFileSync7, realpathSync as realpathSync3, writeFileSync as writeFileSync2 } from "fs";
+import { basename as basename5, dirname as dirname6, join as join14, resolve as resolve10 } from "path";
+import { homedir as homedir8 } from "os";
 function getConfigHome() {
-  return process.env["CONFIGS_HOME"] || process.env["HOME"] || homedir10();
+  return process.env["CONFIGS_HOME"] || process.env["HOME"] || homedir8();
 }
 function expandPath(p) {
   if (p.startsWith("~/")) {
-    return resolve9(getConfigHome(), p.slice(2));
+    return resolve10(getConfigHome(), p.slice(2));
   }
-  return resolve9(p);
+  return resolve10(p);
 }
 function normalizeTargetPath(p) {
   const expanded = expandPath(p);
@@ -14291,14 +15630,14 @@ function normalizeTargetPath(p) {
     let current = expanded;
     const missingSegments = [];
     while (true) {
-      if (existsSync11(current)) {
+      if (existsSync12(current)) {
         try {
-          return resolve9(realpathSync3(current), ...missingSegments);
+          return resolve10(realpathSync3(current), ...missingSegments);
         } catch {
           return expanded;
         }
       }
-      const parent = dirname5(current);
+      const parent = dirname6(current);
       const name = basename5(current);
       if (parent === current)
         return expanded;
@@ -14322,11 +15661,11 @@ async function writeConfigResult(config, targetPath, content, opts, meta = {}) {
   }
   const path = expandPath(renderedTargetPath);
   const renderedForTarget = isCursorGlobalAuthorityPath(path) ? stampCursorGlobalAuthorityMarker(renderedContent) : renderedContent;
-  const previousContent = existsSync11(path) ? readFileSync6(path, "utf-8") : null;
+  const previousContent = existsSync12(path) ? readFileSync7(path, "utf-8") : null;
   const changed = previousContent !== renderedForTarget;
   if (!opts.dryRun) {
-    const dir = dirname5(path);
-    if (!existsSync11(dir)) {
+    const dir = dirname6(path);
+    if (!existsSync12(dir)) {
       mkdirSync3(dir, { recursive: true });
     }
     if (previousContent !== null && changed) {
@@ -14360,9 +15699,9 @@ function wouldDestroyACredential(targetPath, renderedContent, format) {
   let current;
   try {
     const path = expandPath(targetPath);
-    if (!existsSync11(path))
+    if (!existsSync12(path))
       return [];
-    current = readFileSync6(path, "utf-8");
+    current = readFileSync7(path, "utf-8");
   } catch {
     return secretTokens;
   }
@@ -14704,20 +16043,20 @@ var init_apply = __esm(() => {
 });
 
 // src/lib/sync-dir.ts
-import { existsSync as existsSync12, readdirSync, readFileSync as readFileSync7, statSync as statSync5 } from "fs";
+import { existsSync as existsSync13, readdirSync as readdirSync2, readFileSync as readFileSync8, statSync as statSync5 } from "fs";
 import { join as join15, relative as relative4 } from "path";
-import { homedir as homedir11 } from "os";
+import { homedir as homedir9 } from "os";
 function shouldSkip(p) {
   return SKIP.some((s) => p.includes(s));
 }
 async function syncFromDir(dir, opts = {}) {
   const store = opts.store ?? resolveConfigStore();
   const absDir = expandPath(dir);
-  if (!existsSync12(absDir))
+  if (!existsSync13(absDir))
     return { added: 0, updated: 0, unchanged: 0, skipped: [`Not found: ${absDir}`] };
-  const files = opts.recursive !== false ? walkDir(absDir) : readdirSync(absDir).map((f) => join15(absDir, f)).filter((f) => statSync5(f).isFile());
+  const files = opts.recursive !== false ? walkDir(absDir) : readdirSync2(absDir).map((f) => join15(absDir, f)).filter((f) => statSync5(f).isFile());
   const result = { added: 0, updated: 0, unchanged: 0, skipped: [] };
-  const home = homedir11();
+  const home = homedir9();
   const allConfigs = await store.listConfigs();
   for (const file of files) {
     if (shouldSkip(file)) {
@@ -14725,7 +16064,7 @@ async function syncFromDir(dir, opts = {}) {
       continue;
     }
     try {
-      const content = readFileSync7(file, "utf-8");
+      const content = readFileSync8(file, "utf-8");
       if (content.length > 500000) {
         result.skipped.push(file + " (too large)");
         continue;
@@ -14752,7 +16091,7 @@ async function syncFromDir(dir, opts = {}) {
 }
 async function syncToDir(dir, opts = {}) {
   const store = opts.store ?? resolveConfigStore();
-  const home = homedir11();
+  const home = homedir9();
   const absDir = expandPath(dir);
   const normalized = dir.startsWith("~/") ? dir : absDir.replace(home, "~");
   const configs = (await store.listConfigs()).filter((c) => c.target_path && (c.target_path.startsWith(normalized) || c.target_path.startsWith(absDir)));
@@ -14775,7 +16114,7 @@ async function syncToDir(dir, opts = {}) {
   return result;
 }
 function walkDir(dir, files = []) {
-  for (const entry of readdirSync(dir, { withFileTypes: true })) {
+  for (const entry of readdirSync2(dir, { withFileTypes: true })) {
     const full = join15(dir, entry.name);
     if (shouldSkip(full))
       continue;
@@ -14811,7 +16150,7 @@ __export(exports_sync, {
   KNOWN_CONFIGS: () => KNOWN_CONFIGS,
   CLAUDE_PROMPT_OUTPUTS: () => CLAUDE_PROMPT_OUTPUTS
 });
-import { existsSync as existsSync13, readdirSync as readdirSync2, readFileSync as readFileSync8 } from "fs";
+import { existsSync as existsSync14, readdirSync as readdirSync3, readFileSync as readFileSync9 } from "fs";
 import { basename as basename6, extname as extname3, join as join16 } from "path";
 function claudeRuleOutputs(fileName) {
   const stem = basename6(fileName, extname3(fileName));
@@ -14851,7 +16190,7 @@ function isGeneratedOutputTarget2(config, owners) {
   return !!ownerIds && !ownerIds.has(config.id);
 }
 function hasClaudePromptSource() {
-  return existsSync13(expandPath("~/.claude/CLAUDE.md"));
+  return existsSync14(expandPath("~/.claude/CLAUDE.md"));
 }
 function hasClaudeRuleSourceForCursorTarget(targetPath) {
   const absoluteTargetPath = expandPath(targetPath);
@@ -14859,7 +16198,7 @@ function hasClaudeRuleSourceForCursorTarget(targetPath) {
   if (!absoluteTargetPath.startsWith(`${absolutePrefix}/`) || !absoluteTargetPath.endsWith(".mdc"))
     return false;
   const stem = basename6(absoluteTargetPath, ".mdc");
-  return existsSync13(expandPath(`~/.claude/rules/${stem}.md`)) || existsSync13(expandPath(`~/.claude/rules/${stem}.mdc`));
+  return existsSync14(expandPath(`~/.claude/rules/${stem}.md`)) || existsSync14(expandPath(`~/.claude/rules/${stem}.mdc`));
 }
 function isKnownGeneratedTargetPath(targetPath) {
   const normalizedTargetPath = normalizeTargetPath(targetPath);
@@ -14877,10 +16216,10 @@ async function syncProject(opts) {
   const machine = detectMachineContext();
   for (const pf of PROJECT_CONFIG_FILES) {
     const abs = join16(absDir, pf.file);
-    if (!existsSync13(abs))
+    if (!existsSync14(abs))
       continue;
     try {
-      const rawContent = readFileSync8(abs, "utf-8");
+      const rawContent = readFileSync9(abs, "utf-8");
       if (rawContent.length > 500000) {
         result.skipped.push(pf.file);
         continue;
@@ -14917,12 +16256,12 @@ async function syncProject(opts) {
     { dir: join16(absDir, ".windsurf", "rules"), agent: "windsurf-legacy", namePrefix: "windsurf-rules" },
     { dir: join16(absDir, ".clinerules"), agent: "cline", namePrefix: "cline-rules" }
   ]) {
-    if (!existsSync13(ruleDir.dir))
+    if (!existsSync14(ruleDir.dir))
       continue;
-    const mdFiles = readdirSync2(ruleDir.dir).filter((f) => f.endsWith(".md") || f.endsWith(".mdc"));
+    const mdFiles = readdirSync3(ruleDir.dir).filter((f) => f.endsWith(".md") || f.endsWith(".mdc"));
     for (const f of mdFiles) {
       const abs = join16(ruleDir.dir, f);
-      const raw = readFileSync8(abs, "utf-8");
+      const raw = readFileSync9(abs, "utf-8");
       const redacted = redactContent(raw, "markdown");
       const machineAware = templateizeMachineContent(redacted.content, machine);
       const content = machineAware.content;
@@ -14961,12 +16300,12 @@ async function syncKnown(opts = {}) {
   for (const known of targets) {
     if (known.rulesDir) {
       const absDir = expandPath(known.rulesDir);
-      if (!existsSync13(absDir)) {
+      if (!existsSync14(absDir)) {
         result.skipped.push(known.rulesDir);
         continue;
       }
       const extensions = known.rulesExtensions ?? [".md", ".mdc"];
-      const ruleFiles = readdirSync2(absDir).filter((f) => extensions.some((ext) => f.endsWith(ext)));
+      const ruleFiles = readdirSync3(absDir).filter((f) => extensions.some((ext) => f.endsWith(ext)));
       for (const f of ruleFiles) {
         const abs2 = join16(absDir, f);
         const targetPath = abs2.replace(home, "~");
@@ -14974,7 +16313,7 @@ async function syncKnown(opts = {}) {
           result.skipped.push(`${targetPath} (generated output)`);
           continue;
         }
-        const raw = readFileSync8(abs2, "utf-8");
+        const raw = readFileSync9(abs2, "utf-8");
         const redacted = redactContent(raw, "markdown");
         const machineAware = templateizeMachineContent(redacted.content, machine);
         const content = machineAware.content;
@@ -15002,12 +16341,12 @@ async function syncKnown(opts = {}) {
       continue;
     }
     const abs = expandPath(known.path);
-    if (!existsSync13(abs)) {
+    if (!existsSync14(abs)) {
       result.skipped.push(known.path);
       continue;
     }
     try {
-      const rawContent = normalizeKnownConfigSource(known, readFileSync8(abs, "utf-8"));
+      const rawContent = normalizeKnownConfigSource(known, readFileSync9(abs, "utf-8"));
       if (rawContent.length > 500000) {
         result.skipped.push(known.path + " (too large)");
         continue;
@@ -15108,9 +16447,9 @@ function storedPlaceholderIsLiteralOnDisk(storedLine, diskLine) {
 }
 function buildDiff(expectedContent, targetPath, storedFormat, showSecrets) {
   const path = expandPath(targetPath);
-  if (!existsSync13(path))
+  if (!existsSync14(path))
     return `(file not found on disk: ${path})`;
-  const diskContent = readFileSync8(path, "utf-8");
+  const diskContent = readFileSync9(path, "utf-8");
   if (diskContent === expectedContent)
     return "(no diff \u2014 identical)";
   const format = redactFormatForTarget(targetPath, storedFormat);
@@ -15343,16 +16682,16 @@ __export(exports_package_manager_guard, {
   scanPackageManagerSecrets: () => scanPackageManagerSecrets
 });
 import { execFileSync as execFileSync2 } from "child_process";
-import { existsSync as existsSync22, lstatSync as lstatSync7, readdirSync as readdirSync5, readFileSync as readFileSync16 } from "fs";
-import { homedir as homedir14 } from "os";
-import { basename as basename7, dirname as dirname10, isAbsolute as isAbsolute5, join as join24, relative as relative7, resolve as resolve14 } from "path";
+import { existsSync as existsSync23, lstatSync as lstatSync7, readdirSync as readdirSync6, readFileSync as readFileSync17 } from "fs";
+import { homedir as homedir12 } from "os";
+import { basename as basename7, dirname as dirname11, isAbsolute as isAbsolute6, join as join24, relative as relative7, resolve as resolve15 } from "path";
 function scanPackageManagerSecrets(options = {}) {
-  const cwd = options.cwd ? resolve14(options.cwd) : process.cwd();
-  const roots = (options.roots && options.roots.length > 0 ? options.roots : [cwd]).map((root) => resolve14(cwd, root));
+  const cwd = options.cwd ? resolve15(options.cwd) : process.cwd();
+  const roots = (options.roots && options.roots.length > 0 ? options.roots : [cwd]).map((root) => resolve15(cwd, root));
   const findings = [];
   let scannedFiles = 0;
   for (const root of roots) {
-    if (!existsSync22(root))
+    if (!existsSync23(root))
       continue;
     const stat = lstatSync7(root);
     if (stat.isFile()) {
@@ -15362,7 +16701,7 @@ function scanPackageManagerSecrets(options = {}) {
       if (text === null)
         continue;
       scannedFiles++;
-      findings.push(...scanFile(root, text, classifyRepoFile(root), isTrackedFile(root), dirname10(root)));
+      findings.push(...scanFile(root, text, classifyRepoFile(root), isTrackedFile(root), dirname11(root)));
       continue;
     }
     if (!stat.isDirectory())
@@ -15379,10 +16718,10 @@ function scanPackageManagerSecrets(options = {}) {
     }
   }
   if (options.includeHome) {
-    const home = homedir14();
+    const home = homedir12();
     for (const name of HOME_FILES) {
       const file = join24(home, name);
-      if (!existsSync22(file))
+      if (!existsSync23(file))
         continue;
       const text = readTextFile(file);
       if (text === null)
@@ -15402,7 +16741,7 @@ function scanPackageManagerSecrets(options = {}) {
 function collectRepoFiles(root) {
   const out = [];
   const visit = (dir) => {
-    for (const entry of readdirSync5(dir, { withFileTypes: true })) {
+    for (const entry of readdirSync6(dir, { withFileTypes: true })) {
       if (entry.isDirectory()) {
         if (SKIP_DIRS.has(entry.name))
           continue;
@@ -15449,7 +16788,7 @@ function readTextFile(file) {
     const stat = lstatSync7(file);
     if (!stat.isFile() || stat.size > 5000000)
       return null;
-    const buf = readFileSync16(file);
+    const buf = readFileSync17(file);
     if (buf.includes(0))
       return null;
     return buf.toString("utf-8");
@@ -15649,7 +16988,7 @@ function trackedFiles(root) {
 }
 function isTrackedFile(file) {
   try {
-    const repoRoot = execFileSync2("git", ["-C", dirname10(file), "rev-parse", "--show-toplevel"], {
+    const repoRoot = execFileSync2("git", ["-C", dirname11(file), "rev-parse", "--show-toplevel"], {
       encoding: "utf-8",
       stdio: ["ignore", "pipe", "ignore"]
     }).trim();
@@ -15679,10 +17018,10 @@ function stripInlineComment(value) {
   return value.replace(/\s[#;].*$/, "").trim();
 }
 function displayPath(file, root) {
-  const home = homedir14();
+  const home = homedir12();
   if (root === home && (file === home || file.startsWith(home + "/")))
     return "~/" + toPosix(relative7(home, file));
-  if (isAbsolute5(root) && file.startsWith(root + "/"))
+  if (isAbsolute6(root) && file.startsWith(root + "/"))
     return toPosix(relative7(root, file));
   if (file === home || file.startsWith(home + "/"))
     return "~/" + toPosix(relative7(home, file));
@@ -15734,12 +17073,12 @@ var init_package_manager_guard = __esm(() => {
 import { chmod, mkdir, readFile, rename, writeFile } from "fs/promises";
 import { Buffer as Buffer2 } from "buffer";
 import { existsSync as existsSync2 } from "fs";
-import { join as join3 } from "path";
+import { join as join2 } from "path";
 import { existsSync } from "fs";
-import { homedir as homedir2 } from "os";
-import { join as join2, resolve } from "path";
 import { homedir } from "os";
-import { join } from "path";
+import { join, resolve } from "path";
+import { homedir as pathsResolverHomedir } from "os";
+import { join as pathsResolverJoin } from "path";
 import { createHmac, timingSafeEqual } from "crypto";
 import { lookup as dnsLookup } from "dns/promises";
 import { isIP } from "net";
@@ -15843,75 +17182,72 @@ function channelMatchesEvent(channel, event) {
     return true;
   return channel.filters.some((filter) => eventMatchesFilter(event, filter));
 }
-var KIND_ENV = {
+var PATHS_RESOLVER_KIND_ENV = {
   config: "HASNA_CONFIG_HOME",
   data: "HASNA_DATA_HOME",
   state: "HASNA_STATE_HOME",
   cache: "HASNA_CACHE_HOME"
 };
-var APP_SLUG_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
-function assertApp(app) {
+var PATHS_RESOLVER_APP_SLUG_RE = /^[a-z0-9]+(?:-[a-z0-9]+)*$/;
+function pathsResolverAssertApp(app) {
   if (typeof app !== "string" || app.length === 0) {
     throw new TypeError("paths: app must be a non-empty string");
   }
-  if (!APP_SLUG_RE.test(app)) {
+  if (!PATHS_RESOLVER_APP_SLUG_RE.test(app)) {
     throw new TypeError(`paths: invalid app slug "${app}" \u2014 expected lowercase kebab-case ([a-z0-9]+(-[a-z0-9]+)*)`);
   }
 }
-function envOf(options) {
-  return options.env ?? process.env;
-}
-function envValue(options, kind) {
-  const value = envOf(options)[KIND_ENV[kind]];
-  return typeof value === "string" && value.length > 0 ? value : undefined;
-}
-function isMacOS(platform) {
-  return platform === "darwin";
+function pathsResolverAssertKind(kind) {
+  if (!Object.keys(PATHS_RESOLVER_KIND_ENV).includes(kind)) {
+    throw new TypeError(`paths: invalid path kind "${kind}" \u2014 expected one of ${Object.keys(PATHS_RESOLVER_KIND_ENV).join(", ")}`);
+  }
 }
-function baseDir(kind, options) {
-  const override = envValue(options, kind);
-  if (override)
+function pathsResolverBaseDir(kind, options) {
+  pathsResolverAssertKind(kind);
+  const env = options.env ?? process.env;
+  const override = env[PATHS_RESOLVER_KIND_ENV[kind]];
+  if (typeof override === "string" && override.length > 0)
     return override;
-  const home = options.home ?? homedir();
+  const home = options.home ?? pathsResolverHomedir();
   const platform = options.platform ?? process.platform;
-  if (isMacOS(platform)) {
+  if (platform === "darwin") {
     switch (kind) {
       case "config":
       case "data":
-        return join(home, "Library", "Application Support", "Hasna");
+        return pathsResolverJoin(home, "Library", "Application Support", "Hasna");
       case "cache":
-        return join(home, "Library", "Caches", "Hasna");
+        return pathsResolverJoin(home, "Library", "Caches", "Hasna");
       case "state":
-        return join(home, "Library", "Logs", "Hasna");
+        return pathsResolverJoin(home, "Library", "Logs", "Hasna");
     }
   }
   switch (kind) {
     case "config":
-      return join(home, ".config", "hasna");
+      return pathsResolverJoin(home, ".config", "hasna");
     case "data":
-      return join(home, ".local", "share", "hasna");
+      return pathsResolverJoin(home, ".local", "share", "hasna");
     case "state":
-      return join(home, ".local", "state", "hasna");
+      return pathsResolverJoin(home, ".local", "state", "hasna");
     case "cache":
-      return join(home, ".cache", "hasna");
+      return pathsResolverJoin(home, ".cache", "hasna");
   }
 }
-function resolvePath(kind, options) {
-  assertApp(options.app);
-  const appSegment = options.internal === true ? join("internal", options.app) : options.app;
-  return join(baseDir(kind, options), appSegment);
+function pathsResolverResolve(kind, options) {
+  pathsResolverAssertApp(options.app);
+  const appSegment = options.internal === true ? pathsResolverJoin("internal", options.app) : options.app;
+  return pathsResolverJoin(pathsResolverBaseDir(kind, options), appSegment);
 }
 function dataDir(options) {
-  return resolvePath("data", options);
+  return pathsResolverResolve("data", options);
 }
 var HASNA_EVENTS_DIR_ENV = "HASNA_EVENTS_DIR";
 var HASNA_EVENTS_HOME_ENV = "HASNA_EVENTS_HOME";
 var EVENTS_STORE_SENTINEL_FILE = "events.json";
 function effectiveHome() {
-  return process.env["HOME"] || process.env["USERPROFILE"] || homedir2();
+  return process.env["HOME"] || process.env["USERPROFILE"] || homedir();
 }
 function legacyHomeDir() {
-  return join2(effectiveHome(), ".hasna", "events");
+  return join(effectiveHome(), ".hasna", "events");
 }
 function resolverHome() {
   return dataDir({ app: "events", home: effectiveHome() || undefined });
@@ -15920,7 +17256,7 @@ function adoptResolverHome(resolved, env = process.env) {
   const dataOverride = env.HASNA_DATA_HOME;
   if (typeof dataOverride === "string" && dataOverride.trim().length > 0)
     return true;
-  return existsSync(join2(resolved, EVENTS_STORE_SENTINEL_FILE));
+  return existsSync(join(resolved, EVENTS_STORE_SENTINEL_FILE));
 }
 function exactEventsHome() {
   const dir = process.env[HASNA_EVENTS_DIR_ENV];
@@ -15961,9 +17297,9 @@ class JsonEventsStore {
   constructor(dataDir2 = getEventsDataDir()) {
     this.dataDir = dataDir2;
     this.runtime = localJsonRuntime(dataDir2);
-    this.channelsPath = join3(dataDir2, "channels.json");
-    this.eventsPath = join3(dataDir2, "events.json");
-    this.deliveriesPath = join3(dataDir2, "deliveries.json");
+    this.channelsPath = join2(dataDir2, "channels.json");
+    this.eventsPath = join2(dataDir2, "events.json");
+    this.deliveriesPath = join2(dataDir2, "deliveries.json");
   }
   async init() {
     await mkdir(this.dataDir, { recursive: true, mode: 448 });
@@ -16231,7 +17567,7 @@ async function getEventsStatus(dataDir2) {
   };
 }
 function statusFile(dataDir2, fileName, records) {
-  const path = join3(dataDir2, fileName);
+  const path = join2(dataDir2, fileName);
   return { path, exists: existsSync2(path), records };
 }
 var DEFAULT_SIGNATURE_TOLERANCE_MS = 5 * 60 * 1000;
@@ -17165,6 +18501,13 @@ function parseMatcherExpression(value, label) {
     negated: false
   };
 }
+function webhookTargetPolicyFromEnv() {
+  const value = process.env.HASNA_EVENTS_ALLOW_PRIVATE_WEBHOOK_TARGETS;
+  if (!value)
+    return;
+  const hosts = value.split(",").map((entry) => entry.trim()).filter((entry) => entry.length > 0);
+  return hosts.length > 0 ? { allowPrivateHosts: hosts } : undefined;
+}
 var DEFAULT_EVENT_LIST_LIMIT = 100;
 function parseJsonObject(value, fallback) {
   if (!value)
@@ -17190,7 +18533,7 @@ function parseHeaders(values) {
 function createClient(options) {
   if (options.createClient)
     return options.createClient();
-  return new EventsClient({ store: new JsonEventsStore(options.dataDir) });
+  return new EventsClient({ store: new JsonEventsStore(options.dataDir), webhookTargetPolicy: webhookTargetPolicyFromEnv() });
 }
 function print(value, json, text) {
   if (json)
@@ -17271,6 +18614,8 @@ function registerChannelCommands(program, options) {
         metadata: parseJsonObject(actionOptions.metadata, {})
       }, { honorFilters: actionOptions.honorFilters });
       print(result, json, `${result.status}: ${result.channelId}`);
+      if (result.status === "failed")
+        process.exitCode = 1;
     } catch (error) {
       fail(error, json);
     }
@@ -17379,9 +18724,9 @@ var {
 // src/cli/index.tsx
 init_apply();
 import chalk from "chalk";
-import { existsSync as existsSync23, lstatSync as lstatSync8, readFileSync as readFileSync17, readSync, writeSync } from "fs";
-import { homedir as homedir15 } from "os";
-import { basename as basename8, join as join25, resolve as resolve15 } from "path";
+import { existsSync as existsSync24, lstatSync as lstatSync8, readFileSync as readFileSync18, readSync, writeSync } from "fs";
+import { homedir as homedir13 } from "os";
+import { basename as basename8, join as join25, resolve as resolve16 } from "path";
 
 // src/lib/config-target-identity.ts
 init_apply();
@@ -17427,13 +18772,13 @@ init_redact();
 
 // src/lib/export.ts
 init_config_store();
-import { existsSync as existsSync14, mkdirSync as mkdirSync4, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
-import { join as join17, resolve as resolve10 } from "path";
+import { existsSync as existsSync15, mkdirSync as mkdirSync4, rmSync as rmSync3, writeFileSync as writeFileSync3 } from "fs";
+import { join as join17, resolve as resolve11 } from "path";
 import { tmpdir } from "os";
 async function exportConfigs(outputPath, opts = {}) {
   const store = opts.store ?? resolveConfigStore();
   const configs = await store.listConfigs(opts.filter);
-  const absOutput = resolve10(outputPath);
+  const absOutput = resolve11(outputPath);
   const tmpDir = join17(tmpdir(), `configs-export-${Date.now()}`);
   const contentsDir = join17(tmpDir, "contents");
   try {
@@ -17459,7 +18804,7 @@ async function exportConfigs(outputPath, opts = {}) {
     }
     return { path: absOutput, count: configs.length };
   } finally {
-    if (existsSync14(tmpDir)) {
+    if (existsSync15(tmpDir)) {
       rmSync3(tmpDir, { recursive: true, force: true });
     }
   }
@@ -17467,13 +18812,13 @@ async function exportConfigs(outputPath, opts = {}) {
 
 // src/lib/import.ts
 init_config_store();
-import { existsSync as existsSync15, mkdirSync as mkdirSync5, readFileSync as readFileSync9, rmSync as rmSync4 } from "fs";
-import { join as join18, resolve as resolve11 } from "path";
+import { existsSync as existsSync16, mkdirSync as mkdirSync5, readFileSync as readFileSync10, rmSync as rmSync4 } from "fs";
+import { join as join18, resolve as resolve12 } from "path";
 import { tmpdir as tmpdir2 } from "os";
 async function importConfigs(bundlePath, opts = {}) {
   const store = opts.store ?? resolveConfigStore();
   const conflict = opts.conflict ?? "skip";
-  const absPath = resolve11(bundlePath);
+  const absPath = resolve12(bundlePath);
   const tmpDir = join18(tmpdir2(), `configs-import-${Date.now()}`);
   const result = { created: 0, updated: 0, skipped: 0, errors: [] };
   try {
@@ -17488,14 +18833,14 @@ async function importConfigs(bundlePath, opts = {}) {
       throw new Error(`tar extraction failed: ${stderr}`);
     }
     const manifestPath = join18(tmpDir, "manifest.json");
-    if (!existsSync15(manifestPath))
+    if (!existsSync16(manifestPath))
       throw new Error("Invalid bundle: missing manifest.json");
-    const manifest = JSON.parse(readFileSync9(manifestPath, "utf-8"));
+    const manifest = JSON.parse(readFileSync10(manifestPath, "utf-8"));
     for (const meta of manifest.configs) {
       try {
         const ext = meta.format === "text" ? "txt" : meta.format;
         const contentFile = join18(tmpDir, "contents", `${meta.slug}.${ext}`);
-        const content = existsSync15(contentFile) ? readFileSync9(contentFile, "utf-8") : "";
+        const content = existsSync16(contentFile) ? readFileSync10(contentFile, "utf-8") : "";
         let existing = null;
         try {
           existing = await store.getConfig(meta.slug);
@@ -17529,7 +18874,7 @@ async function importConfigs(bundlePath, opts = {}) {
     }
     return result;
   } finally {
-    if (existsSync15(tmpDir)) {
+    if (existsSync16(tmpDir)) {
       rmSync4(tmpDir, { recursive: true, force: true });
     }
   }
@@ -17541,19 +18886,20 @@ init_machine();
 
 // src/lib/session-apply.ts
 init_project_context();
+init_session_render_state();
 init_session_render();
 init_cursor_authority();
 init_session_authority();
 import { createHash as createHash8, randomUUID as randomUUID7 } from "crypto";
 import {
-  existsSync as existsSync16,
+  existsSync as existsSync17,
   lstatSync as lstatSync4,
   mkdirSync as mkdirSync6,
-  readFileSync as readFileSync10,
-  readdirSync as readdirSync3,
+  readFileSync as readFileSync11,
+  readdirSync as readdirSync4,
   statSync as statSync6
 } from "fs";
-import { dirname as dirname6, isAbsolute as isAbsolute4, join as join19, parse as parse4, relative as relative5, resolve as resolve12 } from "path";
+import { dirname as dirname7, isAbsolute as isAbsolute5, join as join19, parse as parse4, relative as relative5, resolve as resolve13 } from "path";
 
 class SessionApplyError extends Error {
   constructor(message) {
@@ -17685,13 +19031,13 @@ function assertClaudeAuthorityStillClear(plan, targetHome, ownedClaudeAuthoritie
   throw new SessionApplyError(`Claude authority changed after planning; refusing to apply: ${summary}`);
 }
 function ensureSessionTargetHome(targetHome) {
-  if (!existsSync16(targetHome))
+  if (!existsSync17(targetHome))
     mkdirSync6(targetHome, { recursive: true, mode: 448 });
   assertSafeTargetHome(targetHome);
 }
 function checkSessionRenderDrift(targetHome, manifestPath) {
   const safeTargetHome = assertSafeTargetHome(targetHome);
-  const resolvedManifestPath = manifestPath ? resolveManifestRelativePath(relative5(safeTargetHome, resolve12(manifestPath)), safeTargetHome) : resolve12(safeTargetHome, ".hasna", "session-render-manifest.json");
+  const resolvedManifestPath = manifestPath ? resolveManifestRelativePath(relative5(safeTargetHome, resolve13(manifestPath)), safeTargetHome) : resolve13(safeTargetHome, ".hasna", "session-render-manifest.json");
   const checkedAt = new Date().toISOString();
   const previousManifest = readPreviousManifest(resolvedManifestPath);
   if (!previousManifest) {
@@ -17708,7 +19054,7 @@ function checkSessionRenderDrift(targetHome, manifestPath) {
   const drifted = [];
   for (const file of previousManifest.files) {
     const target = resolveManifestRelativePath(file.relativePath, safeTargetHome);
-    if (!existsSync16(target)) {
+    if (!existsSync17(target)) {
       missing.push({
         path: target,
         relativePath: file.relativePath,
@@ -17718,7 +19064,7 @@ function checkSessionRenderDrift(targetHome, manifestPath) {
       });
       continue;
     }
-    const actualSha256 = sha2568(readFileSync10(target, "utf-8"));
+    const actualSha256 = sha2568(readFileSync11(target, "utf-8"));
     if (actualSha256 !== file.sha256) {
       drifted.push({
         path: target,
@@ -17741,12 +19087,17 @@ function checkSessionRenderDrift(targetHome, manifestPath) {
 function restoreSessionRenderSnapshot(snapshotPath, options = {}) {
   const snapshot = readSessionRenderSnapshot(snapshotPath);
   const targetHome = assertSafeTargetHome(snapshot.targetHome);
-  const resolvedSnapshotPath = resolve12(snapshotPath);
-  const snapshotRelativePath = relative5(targetHome, resolvedSnapshotPath);
-  if (snapshotRelativePath === "" || snapshotRelativePath === ".." || snapshotRelativePath.startsWith("../") || isAbsolute4(snapshotRelativePath)) {
-    throw new SessionApplyError("Session snapshot must be stored inside its target home.");
+  const resolvedSnapshotPath = resolve13(snapshotPath);
+  const snapshotDir = getSessionRenderSnapshotDir(targetHome);
+  const snapshotDirRelative = relative5(snapshotDir, resolvedSnapshotPath);
+  const insideSnapshotDir = snapshotDirRelative !== ".." && !snapshotDirRelative.startsWith("../") && !isAbsolute5(snapshotDirRelative);
+  if (!insideSnapshotDir) {
+    const snapshotRelativePath = relative5(targetHome, resolvedSnapshotPath);
+    if (snapshotRelativePath === "" || snapshotRelativePath === ".." || snapshotRelativePath.startsWith("../") || isAbsolute5(snapshotRelativePath)) {
+      throw new SessionApplyError("Session snapshot must be stored inside its session-render snapshot location.");
+    }
   }
-  assertNoSymlinkSegments2(targetHome, resolvedSnapshotPath);
+  assertNoSymlinkSegments2(sessionRenderSnapshotWorkspaceRoot(targetHome), resolvedSnapshotPath);
   const guard = observeProjectContextSessionGuard({
     tool: snapshot.tool,
     target_home: targetHome,
@@ -17859,8 +19210,8 @@ function requiredRestoreHash(file) {
   return file.previousSha256;
 }
 function readSessionRenderSnapshot(snapshotPath) {
-  const resolved = resolve12(snapshotPath);
-  if (!existsSync16(resolved))
+  const resolved = resolve13(snapshotPath);
+  if (!existsSync17(resolved))
     throw new SessionApplyError(`Session snapshot not found: ${snapshotPath}`);
   const stat = lstatSync4(resolved);
   if (stat.isSymbolicLink() || !stat.isFile()) {
@@ -17871,7 +19222,7 @@ function readSessionRenderSnapshot(snapshotPath) {
   }
   let parsed;
   try {
-    parsed = JSON.parse(readFileSync10(resolved, "utf8"));
+    parsed = JSON.parse(readFileSync11(resolved, "utf8"));
   } catch {
     throw new SessionApplyError(`Session snapshot is not valid JSON: ${snapshotPath}`);
   }
@@ -17940,7 +19291,7 @@ function readSessionRenderSnapshot(snapshotPath) {
 }
 function reconstructPreRollbackLegacyV1Snapshot(snapshot, previousFiles, previousManifestFiles, targetHome, snapshotPath) {
   assertNoNewerSessionSnapshot(snapshotPath, snapshot.createdAt, targetHome);
-  const manifestPath = resolve12(snapshot.manifestPath);
+  const manifestPath = resolve13(snapshot.manifestPath);
   const manifestRelativePath = relative5(targetHome, manifestPath).replaceAll("\\", "/");
   resolveSnapshotFilePath(manifestRelativePath, snapshot.manifestPath, targetHome);
   const manifestSha256 = currentSessionFileHash(manifestPath, targetHome);
@@ -17949,7 +19300,7 @@ function reconstructPreRollbackLegacyV1Snapshot(snapshot, previousFiles, previou
   }
   let parsedManifest;
   try {
-    parsedManifest = JSON.parse(readFileSync10(manifestPath, "utf8"));
+    parsedManifest = JSON.parse(readFileSync11(manifestPath, "utf8"));
   } catch {
     throw new SessionApplyError(`Pre-rollback legacy v1 applied manifest is not valid JSON: ${snapshotPath}`);
   }
@@ -17957,7 +19308,7 @@ function reconstructPreRollbackLegacyV1Snapshot(snapshot, previousFiles, previou
     throw new SessionApplyError(`Pre-rollback legacy v1 applied manifest is invalid: ${snapshotPath}`);
   }
   const appliedManifest = parsedManifest;
-  if (appliedManifest.schema !== SESSION_RENDER_SCHEMA || appliedManifest.tool !== snapshot.tool || appliedManifest.profile !== snapshot.profile || typeof appliedManifest.targetHome !== "string" || resolve12(appliedManifest.targetHome) !== targetHome || appliedManifest.targetKind !== "session-home" && appliedManifest.targetKind !== "project-root" || !Array.isArray(appliedManifest.files)) {
+  if (appliedManifest.schema !== SESSION_RENDER_SCHEMA || appliedManifest.tool !== snapshot.tool || appliedManifest.profile !== snapshot.profile || typeof appliedManifest.targetHome !== "string" || resolve13(appliedManifest.targetHome) !== targetHome || appliedManifest.targetKind !== "session-home" && appliedManifest.targetKind !== "project-root" || !Array.isArray(appliedManifest.files)) {
     throw new SessionApplyError(`Pre-rollback legacy v1 applied manifest does not match its snapshot: ${snapshotPath}`);
   }
   const afterFiles = [];
@@ -18041,17 +19392,17 @@ function assertNoNewerSessionSnapshot(snapshotPath, createdAt, targetHome) {
   if (!Number.isFinite(createdAtMs)) {
     throw new SessionApplyError(`Pre-rollback legacy v1 snapshot has an invalid creation time: ${snapshotPath}`);
   }
-  for (const entry of readdirSync3(dirname6(snapshotPath))) {
-    const candidatePath = resolve12(dirname6(snapshotPath), entry);
-    if (candidatePath === resolve12(snapshotPath) || !entry.endsWith(".json"))
+  for (const entry of readdirSync4(dirname7(snapshotPath))) {
+    const candidatePath = resolve13(dirname7(snapshotPath), entry);
+    if (candidatePath === resolve13(snapshotPath) || !entry.endsWith(".json"))
       continue;
     const candidateStat = lstatSync4(candidatePath);
     if (candidateStat.isSymbolicLink() || !candidateStat.isFile() || candidateStat.size > 32 * 1024 * 1024)
       continue;
     try {
-      const candidate = JSON.parse(readFileSync10(candidatePath, "utf8"));
+      const candidate = JSON.parse(readFileSync11(candidatePath, "utf8"));
       const candidateCreatedAtMs = typeof candidate.createdAt === "string" ? Date.parse(candidate.createdAt) : Number.NaN;
-      if ((candidate.schema === "hasna.configs.session-render-snapshot/v1" || candidate.schema === "hasna.configs.session-render-snapshot/v2") && typeof candidate.targetHome === "string" && resolve12(candidate.targetHome) === targetHome && Number.isFinite(candidateCreatedAtMs) && candidateCreatedAtMs >= createdAtMs) {
+      if ((candidate.schema === "hasna.configs.session-render-snapshot/v1" || candidate.schema === "hasna.configs.session-render-snapshot/v2") && typeof candidate.targetHome === "string" && resolve13(candidate.targetHome) === targetHome && Number.isFinite(candidateCreatedAtMs) && candidateCreatedAtMs >= createdAtMs) {
         throw new SessionApplyError(`Cannot restore pre-rollback legacy v1 snapshot after a newer session snapshot exists: ${candidatePath}`);
       }
     } catch (error) {
@@ -18120,14 +19471,14 @@ function inferLegacySnapshotAction(file, previousFiles, previousManifestFiles, p
 }
 function resolveSnapshotFilePath(relativePath, recordedPath, targetHome) {
   const path = resolveManifestRelativePath(relativePath, targetHome);
-  if (resolve12(recordedPath) !== path) {
+  if (resolve13(recordedPath) !== path) {
     throw new SessionApplyError(`Session snapshot file path mismatch for ${relativePath}`);
   }
   return path;
 }
 function planFileResult(plan, file, targetHome, previousHashes, previousManifest, options) {
   const target = resolvePlannedFilePath(plan, file, targetHome);
-  const previousContent = existsSync16(target) ? readFileSync10(target, "utf-8") : null;
+  const previousContent = existsSync17(target) ? readFileSync11(target, "utf-8") : null;
   const previousSha256 = previousContent === null ? null : sha2568(previousContent);
   const previouslyManaged = isPreviouslyManaged(file, previousSha256, previousHashes, previousManifest);
   const changed = previousContent !== file.content;
@@ -18226,9 +19577,9 @@ function planStaleFileResults(plan, targetHome, previousManifest, currentRelativ
 }
 function planStaleFileResult(file, targetHome, options) {
   const target = resolveManifestRelativePath(file.relativePath, targetHome);
-  if (!existsSync16(target))
+  if (!existsSync17(target))
     return null;
-  const previousContent = readFileSync10(target, "utf-8");
+  const previousContent = readFileSync11(target, "utf-8");
   const previousSha256 = sha2568(previousContent);
   if (!options.force && previousSha256 !== file.sha256) {
     return {
@@ -18273,31 +19624,31 @@ function isPreviouslyManaged(file, previousSha256, previousHashes, previousManif
   return previousHashes.get(file.relativePath) === previousSha256;
 }
 function resolvePlannedFilePath(plan, file, targetHome) {
-  const target = resolve12(targetHome, ...file.relativePath.split("/"));
+  const target = resolve13(targetHome, ...file.relativePath.split("/"));
   const rel = relative5(targetHome, target);
-  if (rel === "" || rel === ".." || rel.startsWith("../") || isAbsolute4(rel)) {
+  if (rel === "" || rel === ".." || rel.startsWith("../") || isAbsolute5(rel)) {
     throw new SessionApplyError(`Session file escapes target home: ${file.relativePath}`);
   }
-  if (resolve12(file.path) !== target) {
+  if (resolve13(file.path) !== target) {
     throw new SessionApplyError(`Session file path mismatch for ${file.relativePath}: ${file.path}`);
   }
   assertNoSymlinkSegments2(targetHome, target);
   return target;
 }
 function resolveManifestRelativePath(relativePath, targetHome) {
-  const target = resolve12(targetHome, ...relativePath.split(/[\\/]+/));
+  const target = resolve13(targetHome, ...relativePath.split(/[\\/]+/));
   const rel = relative5(targetHome, target);
-  if (rel === "" || rel === ".." || rel.startsWith("../") || isAbsolute4(rel)) {
+  if (rel === "" || rel === ".." || rel.startsWith("../") || isAbsolute5(rel)) {
     throw new SessionApplyError(`Session manifest file escapes target home: ${relativePath}`);
   }
   assertNoSymlinkSegments2(targetHome, target);
   return target;
 }
 function readPreviousManifest(path) {
-  if (!existsSync16(path))
+  if (!existsSync17(path))
     return null;
   try {
-    const parsed = JSON.parse(readFileSync10(path, "utf-8"));
+    const parsed = JSON.parse(readFileSync11(path, "utf-8"));
     if (parsed.schema !== SESSION_RENDER_SCHEMA)
       return null;
     if (!Array.isArray(parsed.files))
@@ -18336,13 +19687,13 @@ function assertExpectedSessionFileHash(path, targetHome, expectedHash) {
 }
 function currentSessionFileHash(path, targetHome) {
   assertNoSymlinkSegments2(targetHome, path);
-  if (!existsSync16(path))
+  if (!existsSync17(path))
     return null;
   const stat = lstatSync4(path);
   if (stat.isSymbolicLink() || !stat.isFile()) {
     throw new SessionApplyError(`Session apply path is not a regular file: ${path}`);
   }
-  return sha2568(readFileSync10(path, "utf-8"));
+  return sha2568(readFileSync11(path, "utf-8"));
 }
 function requiredPreviousHash(result) {
   if (result.previousSha256 === null) {
@@ -18351,8 +19702,8 @@ function requiredPreviousHash(result) {
   return result.previousSha256;
 }
 function writeSessionSnapshot(plan, targetHome, manifestPath, results, previousManifest, coordination, allowPortableFallback, forcePortableFileOps) {
-  const existingFiles = results.filter((result) => result.action === "update" || result.action === "delete").filter((result) => existsSync16(result.path)).map((result) => {
-    const content = readFileSync10(result.path, "utf-8");
+  const existingFiles = results.filter((result) => result.action === "update" || result.action === "delete").filter((result) => existsSync17(result.path)).map((result) => {
+    const content = readFileSync11(result.path, "utf-8");
     return {
       path: result.path,
       relativePath: result.relativePath,
@@ -18370,7 +19721,7 @@ function writeSessionSnapshot(plan, targetHome, manifestPath, results, previousM
     };
   }
   const timestamp = new Date().toISOString().replace(/[:.]/g, "-");
-  const snapshotPath = resolve12(targetHome, ".hasna", "session-render-snapshots", `${timestamp}-${randomUUID7()}.json`);
+  const snapshotPath = join19(getSessionRenderSnapshotDir(targetHome), `${timestamp}-${randomUUID7()}.json`);
   const afterFiles = results.map((result) => {
     if (result.action === "conflict") {
       throw new SessionApplyError(`Cannot snapshot unresolved conflict: ${result.relativePath}`);
@@ -18400,7 +19751,7 @@ function writeSessionSnapshot(plan, targetHome, manifestPath, results, previousM
     path: snapshotPath,
     content: `${JSON.stringify(snapshot, null, 2)}
 `,
-    workspace_root: targetHome,
+    workspace_root: sessionRenderSnapshotWorkspaceRoot(targetHome),
     default_mode: 384,
     expected_hash: null,
     max_observed_bytes: null,
@@ -18416,14 +19767,14 @@ function writeSessionSnapshot(plan, targetHome, manifestPath, results, previousM
   };
 }
 function assertSafeTargetHome(targetHome) {
-  if (!isAbsolute4(targetHome))
+  if (!isAbsolute5(targetHome))
     throw new SessionApplyError(`Session target home must be absolute: ${targetHome}`);
-  const normalized = resolve12(targetHome);
+  const normalized = resolve13(targetHome);
   if (normalized === parse4(normalized).root) {
     throw new SessionApplyError(`Session target home cannot be the filesystem root: ${targetHome}`);
   }
   assertNoSymlinkAncestors2(normalized);
-  if (existsSync16(normalized) && lstatSync4(normalized).isSymbolicLink()) {
+  if (existsSync17(normalized) && lstatSync4(normalized).isSymbolicLink()) {
     throw new SessionApplyError(`Session target home cannot be a symlink: ${normalized}`);
   }
   return normalized;
@@ -18434,19 +19785,19 @@ function assertNoSymlinkSegments2(root, target) {
   let current = root;
   for (const segment of rel.split(/[\\/]+/).filter(Boolean)) {
     current = join19(current, segment);
-    if (existsSync16(current) && lstatSync4(current).isSymbolicLink()) {
+    if (existsSync17(current) && lstatSync4(current).isSymbolicLink()) {
       throw new SessionApplyError(`Session apply path uses a symlink: ${current}`);
     }
   }
 }
 function assertNoSymlinkAncestors2(path) {
-  const normalized = resolve12(path);
+  const normalized = resolve13(path);
   const parsed = parse4(normalized);
   let current = parsed.root;
   const rel = relative5(parsed.root, normalized);
   for (const segment of rel.split(/[\\/]+/).filter(Boolean)) {
     current = join19(current, segment);
-    if (!existsSync16(current))
+    if (!existsSync17(current))
       return;
     if (lstatSync4(current).isSymbolicLink()) {
       throw new SessionApplyError(`Session apply path uses a symlink ancestor: ${current}`);
@@ -18496,10 +19847,10 @@ function formatGlobalSourceCoverageWarnings(result) {
 
 // src/lib/station-profile.ts
 init_raw_store_root();
-import { spawnSync } from "child_process";
-import { existsSync as existsSync17, lstatSync as lstatSync5, mkdirSync as mkdirSync7, readFileSync as readFileSync11, readdirSync as readdirSync4, writeFileSync as writeFileSync4 } from "fs";
-import { arch as osArch, homedir as homedir12, hostname as osHostname, platform as osPlatform, userInfo as osUserInfo } from "os";
-import { dirname as dirname7, join as join20 } from "path";
+import { spawnSync as spawnSync2 } from "child_process";
+import { existsSync as existsSync18, lstatSync as lstatSync5, mkdirSync as mkdirSync7, readFileSync as readFileSync12, readdirSync as readdirSync5, writeFileSync as writeFileSync4 } from "fs";
+import { arch as osArch, homedir as homedir10, hostname as osHostname2, platform as osPlatform, userInfo as osUserInfo } from "os";
+import { dirname as dirname8, join as join20 } from "path";
 var STATION_PROFILE_CACHE_FILENAME = "station-profile.md";
 var STATION_PROFILE_SOURCE_ID = "station-profile";
 var STATION_PROFILE_LAYER = "machine";
@@ -18509,23 +19860,23 @@ var STATION_PROFILE_FULL_NAMES_MAX = 6;
 var STATION_PROFILE_PRIMARY_SCOPE = "@hasna";
 var MACHINES_MANIFEST_PATH_ENV = "HASNA_MACHINES_MANIFEST_PATH";
 var BUN_INSTALL_ENV = "BUN_INSTALL";
-function homeDir3(env = process.env) {
-  return env["HOME"] || env["USERPROFILE"] || homedir12();
+function homeDir5(env = process.env) {
+  return env["HOME"] || env["USERPROFILE"] || homedir10();
 }
 function getStationProfileCachePath(env = process.env) {
   return join20(getRawStoreRoot(env), STATION_PROFILE_CACHE_FILENAME);
 }
 function getMachinesManifestPath(env = process.env) {
-  return env[MACHINES_MANIFEST_PATH_ENV] || join20(homeDir3(env), ".hasna", "machines", "machines.json");
+  return env[MACHINES_MANIFEST_PATH_ENV] || join20(homeDir5(env), ".hasna", "machines", "machines.json");
 }
 function getBunGlobalModulesDir(env = process.env) {
-  return join20(env[BUN_INSTALL_ENV] || join20(homeDir3(env), ".bun"), "install", "global", "node_modules");
+  return join20(env[BUN_INSTALL_ENV] || join20(homeDir5(env), ".bun"), "install", "global", "node_modules");
 }
 function readMachinesManifest(path) {
   try {
-    if (!existsSync17(path))
+    if (!existsSync18(path))
       return null;
-    const parsed = JSON.parse(readFileSync11(path, "utf8"));
+    const parsed = JSON.parse(readFileSync12(path, "utf8"));
     if (!parsed || typeof parsed !== "object" || Array.isArray(parsed))
       return null;
     const machines = parsed["machines"];
@@ -18555,7 +19906,7 @@ function metadataUser(record) {
 }
 function probeMachineStatus(machineId) {
   try {
-    const result = spawnSync("machines", ["details", "--json", "--machine", machineId], {
+    const result = spawnSync2("machines", ["details", "--json", "--machine", machineId], {
       encoding: "utf8",
       timeout: 3000,
       stdio: ["ignore", "pipe", "pipe"]
@@ -18577,9 +19928,9 @@ function probeMachineStatus(machineId) {
   }
 }
 function resolveStationProfileMachine(env = process.env, options = {}) {
-  const hostname2 = osHostname();
+  const hostname2 = osHostname2();
   const record = findLocalManifestMachine(readMachinesManifest(getMachinesManifestPath(env)), hostname2);
-  const home = homeDir3(env);
+  const home = homeDir5(env);
   const platform = stringField(record, "platform") ?? osPlatform();
   const workspacePath = stringField(record, "workspacePath") ?? join20(home, platform === "darwin" ? "Workspace" : "workspace");
   const machine = {
@@ -18600,7 +19951,7 @@ function resolveStationProfileMachine(env = process.env, options = {}) {
 function scopedPackageNames(modulesDir, scope) {
   const scopeDir = join20(modulesDir, scope);
   try {
-    if (!existsSync17(scopeDir))
+    if (!existsSync18(scopeDir))
       return null;
     return readdirNames(scopeDir).sort();
   } catch {
@@ -18608,7 +19959,7 @@ function scopedPackageNames(modulesDir, scope) {
   }
 }
 function readdirNames(dir) {
-  return readdirSync4(dir).filter((name) => {
+  return readdirSync5(dir).filter((name) => {
     try {
       return lstatSync5(join20(dir, name)).isDirectory();
     } catch {
@@ -18620,7 +19971,7 @@ function resolveStationProfilePackages(env = process.env) {
   const modulesDir = getBunGlobalModulesDir(env);
   let scopeDirs;
   try {
-    if (!existsSync17(modulesDir))
+    if (!existsSync18(modulesDir))
       return null;
     scopeDirs = readdirNames(modulesDir).filter((name) => name.startsWith("@") && name.toLowerCase().includes("hasna"));
   } catch {
@@ -18695,9 +20046,9 @@ function refreshStationProfile(options = {}) {
   const path = getStationProfileCachePath(env);
   const generatedAt = new Date().toISOString();
   if (!options.dryRun) {
-    const existing = existsSync17(path) ? readFileSync11(path, "utf8") : null;
+    const existing = existsSync18(path) ? readFileSync12(path, "utf8") : null;
     if (existing !== content) {
-      mkdirSync7(dirname7(path), { recursive: true });
+      mkdirSync7(dirname8(path), { recursive: true });
       writeFileSync4(path, content, "utf8");
     }
   }
@@ -18714,9 +20065,9 @@ function refreshStationProfile(options = {}) {
 function readStationProfile(env = process.env) {
   const path = getStationProfileCachePath(env);
   try {
-    if (!existsSync17(path))
+    if (!existsSync18(path))
       return null;
-    return readFileSync11(path, "utf8");
+    return readFileSync12(path, "utf8");
   } catch {
     return null;
   }
@@ -18743,9 +20094,6 @@ init_config_store();
 init_config_store();
 var PROJECT_DASHBOARD_STANDARD_SLUG = "agent-managed-project-dashboard-standard";
 var PROJECT_DASHBOARD_PROFILE_VARIABLES = {
-  PROJECT_DASHBOARD_DIR: ".hasna/project",
-  PROJECT_DASHBOARD_RENDER_MANIFEST: ".hasna/project/dashboard/render.json",
-  PROJECT_DASHBOARD_SNAPSHOTS_DIR: ".hasna/project/dashboard/snapshots",
   PROJECT_CHANNEL_PREFIX: ""
 };
 var PROJECT_DASHBOARD_STANDARD_CONTENT = `# Agent-Managed Project Dashboard Standard
@@ -18756,9 +20104,13 @@ evidence, tasks, knowledge, and dashboard output consistent.
 
 ## Canonical Files
 
-- Project manifest root: \`.hasna/project/\`
-- Dashboard render manifest: \`.hasna/project/dashboard/render.json\`
-- Latest snapshot: \`.hasna/project/dashboard/snapshots/latest.snapshot.json\`
+There is exactly one project-layout convention: the canonical per-workspace
+store \`~/.hasna/projects/workspaces/<workspace_id>/\`. Never create a project
+layout directory inside the project folder itself.
+
+- Per-workspace store root: \`~/.hasna/projects/workspaces/<workspace_id>/\`
+- Dashboard render manifest: \`~/.hasna/projects/workspaces/<workspace_id>/dashboard/render.json\`
+- Latest snapshot: \`~/.hasna/projects/workspaces/<workspace_id>/dashboard/snapshots/latest.snapshot.json\`
 - Dashboard schema ids come from \`@hasna/contracts\`.
 - Project folders may contain private documents, but render JSON must contain
   only ids, counts, statuses, resource refs, evidence refs, and redacted
@@ -19051,18 +20403,18 @@ init_codewith_shared_todos_storage_standard();
 
 // src/lib/managed-skill-runtimes.ts
 import { createHash as createHash9 } from "crypto";
-import { spawnSync as spawnSync2 } from "child_process";
+import { spawnSync as spawnSync3 } from "child_process";
 import {
-  existsSync as existsSync18,
+  existsSync as existsSync19,
   lstatSync as lstatSync6,
   mkdirSync as mkdirSync8,
-  readFileSync as readFileSync12,
+  readFileSync as readFileSync13,
   renameSync as renameSync2,
   rmSync as rmSync5,
   writeFileSync as writeFileSync5
 } from "fs";
-import { homedir as homedir13 } from "os";
-import { dirname as dirname8, join as join21, parse as parse5, relative as relative6, resolve as resolve13 } from "path";
+import { homedir as homedir11 } from "os";
+import { dirname as dirname9, join as join21, parse as parse5, relative as relative6, resolve as resolve14 } from "path";
 var INBOX_CONVERSATIONS_MINIMUM_VERSION = "0.5.28";
 var INBOX_SKILL_MARKERS = [
   [".claude", "skills", "inbox", "SKILL.md"],
@@ -19083,13 +20435,13 @@ function lstatOrNull(path) {
   }
 }
 function findSymlinkedAncestor(path) {
-  const normalized = resolve13(path);
+  const normalized = resolve14(path);
   const parsed = parse5(normalized);
   let current = parsed.root;
   const rel = relative6(parsed.root, normalized);
   for (const segment of rel.split(/[\\/]+/).filter(Boolean)) {
     current = join21(current, segment);
-    if (!existsSync18(current))
+    if (!existsSync19(current))
       return null;
     if (lstatSync6(current).isSymbolicLink())
       return current;
@@ -19110,7 +20462,7 @@ function packagedInboxSkillPath(explicitPath) {
     join21(import.meta.dir, "..", "assets", "skills", "inbox", "SKILL.md"),
     join21(process.cwd(), "assets", "skills", "inbox", "SKILL.md")
   ];
-  const found = candidates.find((candidate) => existsSync18(candidate));
+  const found = candidates.find((candidate) => existsSync19(candidate));
   if (!found) {
     throw new Error(`packaged inbox skill contract is missing (checked ${candidates.length} package-relative locations)`);
   }
@@ -19122,7 +20474,7 @@ function readCanonicalSkill(explicitPath) {
   if (!stat?.isFile()) {
     throw new Error("packaged inbox skill contract is not a regular file");
   }
-  const content = readFileSync12(assetPath, "utf8");
+  const content = readFileSync13(assetPath, "utf8");
   if (!content.includes("conversations watch --from <agent> --all")) {
     throw new Error("packaged inbox skill contract does not declare the canonical conversations watcher");
   }
@@ -19132,7 +20484,7 @@ function readCanonicalSkill(explicitPath) {
   return { content, sha256: sha2569(content) };
 }
 function runProbe(command, args) {
-  const result = spawnSync2(command, args, {
+  const result = spawnSync3(command, args, {
     encoding: "utf8",
     timeout: 5000,
     stdio: ["ignore", "pipe", "pipe"]
@@ -19159,8 +20511,8 @@ function compareVersions(left, right) {
   }
   return 0;
 }
-function inspectSkillMarkers(homeDir4) {
-  return INBOX_SKILL_MARKERS.map((parts) => join21(homeDir4, ...parts)).map((path) => {
+function inspectSkillMarkers(homeDir6) {
+  return INBOX_SKILL_MARKERS.map((parts) => join21(homeDir6, ...parts)).map((path) => {
     const stat = lstatOrNull(path);
     if (!stat)
       return null;
@@ -19169,16 +20521,16 @@ function inspectSkillMarkers(homeDir4) {
     }
     return {
       path,
-      content: readFileSync12(path, "utf8"),
+      content: readFileSync13(path, "utf8"),
       mode: stat.mode & 511,
       regular: true
     };
   }).filter((snapshot) => snapshot !== null);
 }
 function inspectInbox(options) {
-  const homeDir4 = options.homeDir ?? homedir13();
+  const homeDir6 = options.homeDir ?? homedir11();
   const runtimeCommand = options.conversationsCommand ?? "conversations";
-  const snapshots = inspectSkillMarkers(homeDir4);
+  const snapshots = inspectSkillMarkers(homeDir6);
   const skillPresent = snapshots.length > 0;
   let canonicalContent = null;
   let canonicalSha256 = null;
@@ -19204,7 +20556,7 @@ function inspectInbox(options) {
   let reason = "skill not installed";
   if (skillPresent) {
     const nonRegular = snapshots.some((snapshot) => !snapshot.regular);
-    const symlinkAncestor = snapshots.map((snapshot) => snapshot.path).map((path) => findSymlinkedAncestor(dirname8(path))).find((found) => found !== null);
+    const symlinkAncestor = snapshots.map((snapshot) => snapshot.path).map((path) => findSymlinkedAncestor(dirname9(path))).find((found) => found !== null);
     if (nonRegular)
       reason = "managed skill target is not a regular file";
     else if (symlinkAncestor)
@@ -19291,10 +20643,10 @@ function cleanup(path) {
   rmSync5(path, { force: true });
 }
 function writeAtomic(path, content, mode) {
-  assertNoSymlinkAncestors3(dirname8(path));
+  assertNoSymlinkAncestors3(dirname9(path));
   const tempPath = `${path}.tmp-${process.pid}-${Date.now()}-${Math.random().toString(16).slice(2)}`;
   try {
-    mkdirSync8(dirname8(path), { recursive: true, mode: 493 });
+    mkdirSync8(dirname9(path), { recursive: true, mode: 493 });
     writeFileSync5(tempPath, content, { mode, flag: "wx" });
     renameSync2(tempPath, path);
   } finally {
@@ -19303,7 +20655,7 @@ function writeAtomic(path, content, mode) {
 }
 var DEFAULT_SKILL_WRITE_FILE_OPERATIONS = {
   lstat: lstatOrNull,
-  read: (path) => readFileSync12(path, "utf8"),
+  read: (path) => readFileSync13(path, "utf8"),
   write: writeAtomic
 };
 function writeSkillContractsTransactional(snapshots, canonicalContent, fileOperations = DEFAULT_SKILL_WRITE_FILE_OPERATIONS) {
@@ -19370,7 +20722,7 @@ async function reconcileManagedSkillRuntimes(options = {}) {
       dry_run: dryRun
     };
   }
-  const symlinkedAncestor = before.snapshots.map((snapshot) => snapshot.path).map((path) => findSymlinkedAncestor(dirname8(path))).find((found) => found !== null);
+  const symlinkedAncestor = before.snapshots.map((snapshot) => snapshot.path).map((path) => findSymlinkedAncestor(dirname9(path))).find((found) => found !== null);
   if (symlinkedAncestor) {
     return {
       runtimes: [{ ...status, action: "failed", dry_run: dryRun, skill_contracts_changed: 0 }],
@@ -19453,28 +20805,28 @@ init_project_context();
 init_config_store();
 init_apply();
 init_config_agents();
-import { existsSync as existsSync20, readFileSync as readFileSync14 } from "fs";
+import { existsSync as existsSync21, readFileSync as readFileSync15 } from "fs";
 
 // src/lib/package-version.ts
-import { existsSync as existsSync19, readFileSync as readFileSync13 } from "fs";
-import { dirname as dirname9, join as join22 } from "path";
+import { existsSync as existsSync20, readFileSync as readFileSync14 } from "fs";
+import { dirname as dirname10, join as join22 } from "path";
 import { fileURLToPath } from "url";
 var cached = null;
 function getPackageVersion() {
   if (cached)
     return cached;
   try {
-    let dir = dirname9(fileURLToPath(import.meta.url));
+    let dir = dirname10(fileURLToPath(import.meta.url));
     for (let i = 0;i < 8; i++) {
       const pkgPath = join22(dir, "package.json");
-      if (existsSync19(pkgPath)) {
-        const pkg = JSON.parse(readFileSync13(pkgPath, "utf8"));
+      if (existsSync20(pkgPath)) {
+        const pkg = JSON.parse(readFileSync14(pkgPath, "utf8"));
         if (pkg.name === "@hasna/instructions" && pkg.version) {
           cached = pkg.version;
           return cached;
         }
       }
-      const parent = dirname9(dir);
+      const parent = dirname10(dir);
       if (parent === dir)
         break;
       dir = parent;
@@ -19531,11 +20883,11 @@ async function getConfigsStatus(store = resolveConfigStore(), options = {}) {
       continue;
     knownTargets += 1;
     const targetPath = expandPath(config.target_path);
-    if (!existsSync20(targetPath)) {
+    if (!existsSync21(targetPath)) {
       missingTargets += 1;
       continue;
     }
-    const disk = readFileSync14(targetPath, "utf-8");
+    const disk = readFileSync15(targetPath, "utf-8");
     const { content: redactedDisk } = redactContent(disk, redactFormatForTarget(config.target_path, config.format));
     if (redactedDisk !== config.content) {
       driftedTargets += 1;
@@ -19631,7 +20983,7 @@ init_config_store();
 
 // src/lib/provider-context.ts
 import { createHash as createHash10 } from "crypto";
-import { existsSync as existsSync21, mkdirSync as mkdirSync9, readFileSync as readFileSync15, writeFileSync as writeFileSync6 } from "fs";
+import { existsSync as existsSync22, mkdirSync as mkdirSync9, readFileSync as readFileSync16, writeFileSync as writeFileSync6 } from "fs";
 import { join as join23 } from "path";
 var PROVIDER_CONTEXT_DIR = ".hasna/provider-context";
 var PROVIDER_CONTEXT_MANIFEST = "manifest.json";
@@ -19778,7 +21130,7 @@ function resolveAndRenderProviderContext(opts) {
   const reason = entry === null && opts.rawEndpoint ? originAccepted ? `endpoint "${recordedEndpoint}" is not in the provider-context registry; using the invariant fragment` : "endpoint rejected (embedded credentials or unparseable); using the invariant fragment" : null;
   const content = renderProviderFragment(entry);
   const dir = join23(opts.homeDir, PROVIDER_CONTEXT_DIR);
-  if (!existsSync21(dir))
+  if (!existsSync22(dir))
     mkdirSync9(dir, { recursive: true });
   const filename = `${entry ? entry.key : "invariant"}.md`;
   const fragmentPath2 = join23(dir, filename);
@@ -19787,8 +21139,8 @@ function resolveAndRenderProviderContext(opts) {
   const manifestPath = join23(dir, PROVIDER_CONTEXT_MANIFEST);
   let manifest = { schema: PROVIDER_CONTEXT_SCHEMA, fragments: {} };
   try {
-    if (existsSync21(manifestPath)) {
-      const parsed = JSON.parse(readFileSync15(manifestPath, "utf8"));
+    if (existsSync22(manifestPath)) {
+      const parsed = JSON.parse(readFileSync16(manifestPath, "utf8"));
       if (parsed && typeof parsed === "object")
         manifest = parsed;
     }
@@ -19826,8 +21178,8 @@ function providerContextAuditLine(r, nowIso = new Date().toISOString()) {
 }
 
 // src/cli/index.tsx
-import { createRequire } from "module";
-var pkg = createRequire(import.meta.url)("../../package.json");
+import { createRequire as createRequire3 } from "module";
+var pkg = createRequire3(import.meta.url)("../../package.json");
 var EAGAIN_SLEEP = new Int32Array(new SharedArrayBuffer(4));
 function writeStdout(text) {
   const buf = Buffer.from(text, "utf8");
@@ -19931,7 +21283,7 @@ function parseSessionSource(value, order) {
   if (!path)
     throw new Error(`Invalid --source "${value}" (expected path or id=path)`);
   const absPath = resolveSessionPath(path);
-  if (!existsSync23(absPath))
+  if (!existsSync24(absPath))
     throw new Error(`Instruction source file not found: ${absPath}`);
   const content = readSessionInstructionSourceFile(absPath);
   const source = sourceFromFilePath(absPath, content, order);
@@ -19985,7 +21337,7 @@ function readSessionInstructionSourceFile(path) {
   if (stat.size > SESSION_MANAGED_INPUT_MAX_BYTES) {
     throw new Error(`SESSION_SOURCE_INPUT_TOO_LARGE: instruction source file exceeds ${SESSION_MANAGED_INPUT_MAX_BYTES} bytes`);
   }
-  return readFileSync17(path, "utf-8");
+  return readFileSync18(path, "utf-8");
 }
 function parseLayeredReference(value) {
   const trimmed = value.trim();
@@ -20012,9 +21364,9 @@ async function collectSessionSources(opts, tool, store) {
   }
   for (const value of opts.identityExport ?? []) {
     const path = resolveSessionPath(value);
-    if (!existsSync23(path))
+    if (!existsSync24(path))
       throw new Error(`Identity instruction export not found: ${path}`);
-    const parsed = JSON.parse(readFileSync17(path, "utf-8"));
+    const parsed = JSON.parse(readFileSync18(path, "utf-8"));
     sources.push(...sourcesFromIdentityExport(parsed, { path, tool, orderOffset: sources.length }));
   }
   return sources.map((source) => {
@@ -20146,7 +21498,7 @@ function readProjectContextBundleOption(value, allowMissing = false) {
   if (value === "-")
     return { json: readBoundedProjectContextStdin() };
   const path = resolveSessionPath(value);
-  if (!existsSync23(path)) {
+  if (!existsSync24(path)) {
     if (allowMissing)
       return {};
     throw new ProjectContextError("PROJECT_CONTEXT_INPUT_MISSING", `bundle file not found: ${path}`);
@@ -20158,7 +21510,7 @@ function readProjectContextBundleOption(value, allowMissing = false) {
   if (stat.size > PROJECT_CONTEXT_MAX_INPUT_BYTES) {
     throw new ProjectContextError("PROJECT_CONTEXT_INPUT_TOO_LARGE", `bundle exceeds ${PROJECT_CONTEXT_MAX_INPUT_BYTES} bytes`);
   }
-  return { json: readFileSync17(path, "utf8"), sourcePath: path };
+  return { json: readFileSync18(path, "utf8"), sourcePath: path };
 }
 function readBoundedProjectContextStdin() {
   const chunks = [];
@@ -20317,16 +21669,16 @@ program.command("tag <id>").description("Add or remove tags on a stored config (
   console.log(chalk.green("\u2713") + ` Tags on ${chalk.bold(updated.name)} ${chalk.dim(`(${updated.slug})`)}: ${nextTags.join(", ") || chalk.dim("(none)")}`);
 });
 program.command("add <path>").description("Ingest a file into the config DB").option("-n, --name <name>", "config name (defaults to filename)").option("-c, --category <cat>", "category override").option("-a, --agent <agent>", "agent override").option("-k, --kind <kind>", "kind: file|reference", "file").option("--template", "mark as template (has {{VAR}} placeholders)").option("--update", "if a config already owns this path, update that row in place instead of refusing").action(async (filePath, opts) => {
-  const abs = resolve15(filePath);
-  if (!existsSync23(abs)) {
+  const abs = resolve16(filePath);
+  if (!existsSync24(abs)) {
     console.error(chalk.red(`File not found: ${abs}`));
     process.exit(1);
   }
-  const rawContent = readFileSync17(abs, "utf-8");
+  const rawContent = readFileSync18(abs, "utf-8");
   const storedFmt = detectFormat(abs);
   const fmt = redactFormatForTarget(abs, storedFmt);
   const { content, redacted, isTemplate: isTemplate2 } = redactContent(rawContent, fmt);
-  const targetPath = abs.startsWith(homedir15()) ? abs.replace(homedir15(), "~") : abs;
+  const targetPath = abs.startsWith(homedir13()) ? abs.replace(homedir13(), "~") : abs;
   const name = opts.name || filePath.split("/").pop();
   const store = resolveConfigStore();
   const allConfigs = await store.listConfigs();
@@ -20494,9 +21846,9 @@ program.command("sync").description("Sync known AI coding configs from disk into
   if (opts.project) {
     const dir = typeof opts.project === "string" ? opts.project : process.cwd();
     if (opts.all) {
-      const { readdirSync: readdirSync6 } = await import("fs");
+      const { readdirSync: readdirSync7 } = await import("fs");
       const absDir = expandPath(dir);
-      const entries = readdirSync6(absDir, { withFileTypes: true });
+      const entries = readdirSync7(absDir, { withFileTypes: true });
       let totalAdded = 0, totalUpdated = 0, totalUnchanged = 0, projects = 0;
       for (const entry of entries) {
         if (!entry.isDirectory())
@@ -20514,7 +21866,7 @@ program.command("sync").description("Sync known AI coding configs from disk into
           ".aicopilot",
           ".cursor",
           ".agents"
-        ].some((marker) => existsSync23(join25(projDir, marker)));
+        ].some((marker) => existsSync24(join25(projDir, marker)));
         if (!hasAgentConfig)
           continue;
         const result2 = await syncProject({ projectDir: projDir, dryRun: opts.dryRun, store });
@@ -20565,10 +21917,10 @@ program.command("import <file>").description("Import configs from a tar.gz bundl
 });
 program.command("whoami").description("Show setup summary").action(async () => {
   const store = resolveConfigStore();
-  const dbPath = isApiTransport() ? `${process.env["HASNA_INSTRUCTIONS_API_URL"]}/v1` : process.env["HASNA_INSTRUCTIONS_DB_PATH"] || join25(getRawStoreRoot(), "instructions.db");
+  const dbPath = store.mode === "api" ? store.v1BaseUrl : process.env["HASNA_INSTRUCTIONS_DB_PATH"] || join25(getRawStoreRoot(), "instructions.db");
   const stats = await store.getConfigStats();
   console.log(chalk.bold("@hasna/instructions") + chalk.dim(" v" + pkg.version));
-  console.log(chalk.cyan(isApiTransport() ? "API:" : "DB:") + " " + dbPath);
+  console.log(chalk.cyan(store.mode === "api" ? "API:" : "DB:") + " " + dbPath);
   console.log(chalk.cyan("Total configs:") + " " + (stats["total"] || 0));
   console.log();
   console.log(chalk.bold("By category:"));
@@ -21444,14 +22796,14 @@ mcpCmd.command("install").alias("add").description("Install configs MCP server i
       } else if (target === "codex") {
         const { appendFileSync, existsSync: ex } = await import("fs");
         const { join: j } = await import("path");
-        const configPath = j(homedir15(), ".codex", "config.toml");
+        const configPath = j(homedir13(), ".codex", "config.toml");
         const block = `
 [mcp_servers.configs]
 command = "${mcpBinary}"
 args = []
 `;
         if (ex(configPath)) {
-          const content = readFileSync17(configPath, "utf-8");
+          const content = readFileSync18(configPath, "utf-8");
           if (content.includes("[mcp_servers.configs]")) {
             console.log(chalk.dim("= Already installed in Codex"));
             continue;
@@ -21462,7 +22814,7 @@ args = []
       } else if (target === "antigravity") {
         const { mkdirSync: md, readFileSync: rf, writeFileSync: wf, existsSync: ex } = await import("fs");
         const { dirname: dn, join: j } = await import("path");
-        const configPath = j(homedir15(), ".gemini", "config", "mcp_config.json");
+        const configPath = j(homedir13(), ".gemini", "config", "mcp_config.json");
         let settings = {};
         if (ex(configPath)) {
           try {
@@ -21546,9 +22898,9 @@ DB stats:`));
     if (count > 0)
       console.log(`  ${key.padEnd(18)} ${count}`);
   }
-  const location = isApiTransport() ? `${process.env["HASNA_INSTRUCTIONS_API_URL"]}/v1` : process.env["HASNA_INSTRUCTIONS_DB_PATH"] || join25(getRawStoreRoot(), "instructions.db");
+  const location = store.mode === "api" ? store.v1BaseUrl : process.env["HASNA_INSTRUCTIONS_DB_PATH"] || join25(getRawStoreRoot(), "instructions.db");
   console.log(chalk.dim(`
-${isApiTransport() ? "API" : "DB"}: ${location}`));
+${store.mode === "api" ? "API" : "DB"}: ${location}`));
 });
 program.command("status").description("Health check: total configs, drift from disk, unredacted secrets").option("--json", "output metadata-only JSON").action(async (opts) => {
   const status = await getConfigsStatus(resolveConfigStore());
@@ -21638,9 +22990,9 @@ program.command("doctor").description("Validate configs: syntax, permissions, mi
   console.log(chalk.cyan("Known files on disk:"));
   for (const k of KNOWN_CONFIGS) {
     if (k.rulesDir) {
-      existsSync23(expandPath(k.rulesDir)) ? pass(`${k.rulesDir}/ exists`) : k.optional ? skip(`${k.rulesDir}/ (optional)`) : fail2(`${k.rulesDir}/ not found`);
+      existsSync24(expandPath(k.rulesDir)) ? pass(`${k.rulesDir}/ exists`) : k.optional ? skip(`${k.rulesDir}/ (optional)`) : fail2(`${k.rulesDir}/ not found`);
     } else {
-      existsSync23(expandPath(k.path)) ? pass(k.path) : k.optional ? skip(`${k.path} (optional)`) : fail2(`${k.path} not found`);
+      existsSync24(expandPath(k.path)) ? pass(k.path) : k.optional ? skip(`${k.path} (optional)`) : fail2(`${k.path} not found`);
     }
   }
   const allConfigs = await store.listConfigs();
@@ -21794,16 +23146,16 @@ program.command("watch").description("Watch known config files for changes and a
   for (const k of KNOWN_CONFIGS) {
     if (k.rulesDir) {
       const absDir = expandPath2(k.rulesDir);
-      if (!existsSync23(absDir))
+      if (!existsSync24(absDir))
         continue;
-      const { readdirSync: readdirSync6 } = await import("fs");
-      for (const f of readdirSync6(absDir).filter((f2) => f2.endsWith(".md"))) {
+      const { readdirSync: readdirSync7 } = await import("fs");
+      for (const f of readdirSync7(absDir).filter((f2) => f2.endsWith(".md"))) {
         const abs = join25(absDir, f);
         mtimes.set(abs, st(abs).mtimeMs);
       }
     } else {
       const abs = expandPath2(k.path);
-      if (existsSync23(abs))
+      if (existsSync24(abs))
         mtimes.set(abs, st(abs).mtimeMs);
     }
   }
@@ -21811,7 +23163,7 @@ program.command("watch").description("Watch known config files for changes and a
   const tick = async () => {
     let changed = 0;
     for (const [abs, oldMtime] of mtimes) {
-      if (!existsSync23(abs))
+      if (!existsSync24(abs))
         continue;
       const newMtime = st(abs).mtimeMs;
       if (newMtime !== oldMtime) {
@@ -21823,7 +23175,7 @@ program.command("watch").description("Watch known config files for changes and a
     for (const k of KNOWN_CONFIGS) {
       if (k.rulesDir) {
         const absDir = expandPath2(k.rulesDir);
-        if (!existsSync23(absDir))
+        if (!existsSync24(absDir))
           continue;
         for (const f of rd(absDir).filter((f2) => f2.endsWith(".md"))) {
           const abs = join25(absDir, f);
@@ -21834,7 +23186,7 @@ program.command("watch").description("Watch known config files for changes and a
         }
       } else {
         const abs = expandPath2(k.path);
-        if (existsSync23(abs) && !mtimes.has(abs)) {
+        if (existsSync24(abs) && !mtimes.has(abs)) {
           mtimes.set(abs, st(abs).mtimeMs);
           changed++;
         }
@@ -21862,11 +23214,11 @@ program.command("report").description("Summary of stored configs, drift, and eco
     if (!c.target_path)
       continue;
     const abs = expandPath(c.target_path);
-    if (!existsSync23(abs)) {
+    if (!existsSync24(abs)) {
       missing++;
       continue;
     }
-    const disk = readFileSync17(abs, "utf-8");
+    const disk = readFileSync18(abs, "utf-8");
     const { content: redactedDisk } = redactContent(disk, redactFormatForTarget(c.target_path, c.format));
     if (redactedDisk !== c.content)
       drifted++;
@@ -21933,7 +23285,7 @@ program.command("clean").description("Remove configs from DB whose target files
     if (!c.target_path)
       continue;
     const abs = expandPath(c.target_path);
-    if (!existsSync23(abs)) {
+    if (!existsSync24(abs)) {
       if (printed < maxPrinted) {
         if (opts.dryRun) {
           console.log(chalk.yellow("  would remove:") + ` ${c.slug} ${chalk.dim(`(${truncateMiddle(c.target_path, 88)})`)}`);
@@ -21966,12 +23318,9 @@ program.command("bootstrap").description("Install the full @hasna ecosystem: CLI
     { name: "@hasna/skills", bin: "skills", mcp: "skills-mcp" },
     { name: "@hasna/economy", bin: "economy", mcp: "economy-mcp" },
     { name: "@hasna/attachments", bin: "attachments", mcp: "attachments-mcp" },
-    { name: "@hasna/sessions", bin: "sessions", mcp: "sessions-mcp" },
     { name: "@hasna/emails", bin: "emails", mcp: "emails-mcp" },
     { name: "@hasna/recordings", bin: "recordings", mcp: "recordings-mcp" },
-    { name: "@hasna/testers", bin: "testers", mcp: "testers-mcp" },
-    { name: "@hasna/assistants", bin: "assistants", mcp: "assistants-mcp" },
-    { name: "@hasna/brains", bin: "brains", mcp: "brains-mcp" }
+    { name: "@hasna/assistants", bin: "assistants", mcp: "assistants-mcp" }
   ];
   console.log(chalk.bold("@hasna/instructions bootstrap") + chalk.dim(` \u2014 installing ${packages.length} ecosystem packages
 `));
@@ -22079,13 +23428,13 @@ providerContextCmd.command("resolve").description("Resolve the endpoint to a pro
   try {
     const rawEndpoint = opts.endpoint ?? process.env["ANTHROPIC_BASE_URL"] ?? "";
     const rawModel = opts.model ?? process.env["ANTHROPIC_MODEL"] ?? "";
-    const homeDir4 = opts.home ?? homedir15();
+    const homeDir6 = opts.home ?? homedir13();
     const origin = normalizeEndpointOrigin(rawEndpoint);
     const resolution = resolveAndRenderProviderContext({
       origin,
       rawEndpoint,
       rawModel,
-      homeDir: homeDir4
+      homeDir: homeDir6
     });
     if (opts.json) {
       printJson({