@amsterdamdatalabs/adl-agent-control-linux-x64 0.1.10 → 0.1.26

package/packages/fleet/src/install-adl-package.ts

@@ -10,16 +10,19 @@ import {
   readlinkSync,
   renameSync,
   rmSync,
+  statSync,
   symlinkSync,
 } from 'node:fs'
 import { dirname, isAbsolute, join, relative, resolve, sep } from 'node:path'
 
 // Exported so tests can pin this list against the packages that actually
-// import cross-package by relative path (STATUS.md 12p, finding C1) — a
-// package added to those imports but not here breaks every managed repo's
-// git hooks with "Cannot find module" the next time reconcile projects this
-// payload.
-export const payloadDirectories = ['packages/agent-skills', 'packages/repo-controls', 'packages/agent-hooks', 'packages/azdo']
+// import cross-package by relative path — a package added to those imports
+// but not here breaks every managed repo's git hooks with "Cannot find module"
+// the next time reconcile projects this payload.
+// Every package apps/cli reads from /usr/local/libexec/adl (hooks.ts, skills.ts, settings.ts,
+// repo-controls.ts: DEFAULT_LIBEXEC_DIR) plus azdo, which they import by relative path.
+// install-adl-package.test.ts pins both against the real sources.
+export const payloadDirectories = ['packages/agent-skills', 'packages/repo-controls', 'packages/agent-hooks', 'packages/agent-settings', 'packages/azdo']
 const payloadScripts = ['bin/git', 'bin/git-ado']
 const requiredFiles = [
   'bin/reconcile',
@@ -27,12 +30,13 @@ const requiredFiles = [
   'packages/agent-skills/dist/index.js',
   'packages/repo-controls/bin/adl-repo-controls.ts',
   'packages/agent-hooks/src/log/writer.ts',
+  'packages/agent-settings/deploy-profile.json',
   // repo-controls, fleet and agent-hooks each import THE one Azure DevOps
   // identity resolver/minter by relative path (`../../azdo/src/lib/...`,
   // `../../../../azdo/src/lib/...`) rather than as a package dependency, so
   // this directory must ship as a sibling of theirs under packages/ or every
   // managed repo's git hooks break with "Cannot find module" the next time
-  // reconcile projects this payload (STATUS.md 12p, finding C1).
+  // reconcile projects this payload. install-adl-package.test.ts pins this.
   'packages/azdo/src/lib/agent-identity.ts',
   'packages/azdo/src/lib/agent-token.ts',
 ]
@@ -41,6 +45,15 @@ const managedScriptMarkers = ['# Managed by adl global-tools.', '# Managed by En
 export interface InstallAdlPackageOptions {
   packageRoot: string
   systemRoot?: string
+  /**
+   * Package mode: link /usr/local/bin/adl to THIS package's own bin/adl. Hosts
+   * install the package with bun, which links `adl` into the owner's ~/.bun/bin
+   * only, yet bin/git-ado's `adl id token`, the MCP server command, the managed
+   * surface hooks and GUI-launched agents all run a bare `adl` without that
+   * shell PATH. Checkout mode (a developer build, no compiled bin/adl in the
+   * tree) leaves it off.
+   */
+  linkAdl?: boolean
 }
 
 function isPathInside(parent: string, candidate: string): boolean {
@@ -48,7 +61,7 @@ function isPathInside(parent: string, candidate: string): boolean {
   return pathFromParent === '' || (pathFromParent !== '..' && !pathFromParent.startsWith(`..${sep}`) && !isAbsolute(pathFromParent))
 }
 
-function assertPackageRoot(packageRoot: string): string {
+function assertPackageRoot(packageRoot: string, linkAdl: boolean): string {
   const root = realpathSync(packageRoot)
   const rootStat = lstatSync(root)
   if (!rootStat.isDirectory()) throw new Error(`Adl platform package root is not a directory: ${packageRoot}`)
@@ -64,13 +77,20 @@ function assertPackageRoot(packageRoot: string): string {
     }
     if (!stat.isFile()) throw new Error(`required package file is not a regular file: ${relative}`)
     if (payloadScripts.includes(relative)) {
-      if ((stat.mode & 0o111) === 0) throw new Error(`package script must be executable: ${relative}`)
+      // No exec-bit requirement: bun leaves every shipped file but the `bin`
+      // targets 0644; replaceManagedScript installs the copy 0755.
       const firstLines = readFileSync(source, 'utf8').split('\n', 3)
       if (!managedScriptMarkers.some((marker) => firstLines.includes(marker))) {
         throw new Error(`package script is missing its managed marker: ${relative}`)
       }
     }
   }
+  if (linkAdl) {
+    const adl = join(root, 'bin/adl')
+    if (!existsSync(adl) || !lstatSync(adl).isFile() || (statSync(adl).mode & 0o111) === 0) {
+      throw new Error('package adl must be an executable file: bin/adl')
+    }
+  }
   return root
 }
 
@@ -137,9 +157,45 @@ function replaceManagedScript(source: string, target: string): void {
   }
 }
 
+// A link this function made points into some install's platform package. Anything else at the
+// path is someone else's adl and is never replaced silently.
+const managedAdlLinkTarget = /\/adl-agent-control-[a-z0-9]+-[a-z0-9]+\/bin\/adl$/
+
+function adlLinkStatus(link: string, source: string): 'current' | 'replace' | 'create' {
+  if (!lstatExists(link)) return 'create'
+  if (!lstatSync(link).isSymbolicLink()) {
+    const date = new Date().toISOString().slice(0, 10).replaceAll('-', '')
+    throw new Error(
+      `refusing to replace ${link}: a different adl (a legacy compiled one from before the package existed) shadows this package. Move it aside, never delete it, then run this again: sudo mv ${link} ${link}.legacy-${date}`,
+    )
+  }
+  const current = readlinkTarget(link)
+  if (current === source) return 'current'
+  if (!managedAdlLinkTarget.test(current)) throw new Error(`refusing to replace unmanaged symlink: ${link} -> ${current}`)
+  return 'replace'
+}
+
+function linkAdlToPackage(packageRoot: string, systemRoot: string, status: 'current' | 'replace' | 'create'): void {
+  if (status === 'current') return
+  const link = join(systemRoot, 'usr/local/bin/adl')
+  mkdirSync(dirname(link), { recursive: true })
+  const tempDirectory = mkdtempSync(join(dirname(link), '.adl-package-link-'))
+  const temp = join(tempDirectory, 'adl')
+  try {
+    symlinkSync(join(packageRoot, 'bin/adl'), temp)
+    renameSync(temp, link)
+  } finally {
+    rmSync(tempDirectory, { recursive: true, force: true })
+  }
+}
+
 export function installAdlPackage(options: InstallAdlPackageOptions): void {
-  const packageRoot = assertPackageRoot(options.packageRoot)
+  const packageRoot = assertPackageRoot(options.packageRoot, options.linkAdl === true)
   const systemRoot = resolve(options.systemRoot ?? '/')
+  // Refusals come before any replacement, so a shadowing legacy adl leaves the host untouched.
+  const adlLink = options.linkAdl
+    ? adlLinkStatus(join(systemRoot, 'usr/local/bin/adl'), join(packageRoot, 'bin/adl'))
+    : undefined
   for (const relative of payloadDirectories) {
     replacePayloadSymlink(
       join(packageRoot, relative),
@@ -153,23 +209,25 @@ export function installAdlPackage(options: InstallAdlPackageOptions): void {
       join(systemRoot, 'usr/local/bin', relative.split('/').at(-1)!),
     )
   }
+  if (adlLink !== undefined) linkAdlToPackage(packageRoot, systemRoot, adlLink)
 }
 
 if (import.meta.main) {
   const args = process.argv.slice(2)
-  if (args[0] !== 'install') throw new Error('usage: install-adl-package.ts install --package-root PATH [--system-root PATH]')
+  if (args[0] !== 'install') throw new Error('usage: install-adl-package.ts install --package-root PATH [--system-root PATH] [--link-adl]')
   let packageRoot = ''
   let systemRoot = '/'
-  for (let index = 1; index < args.length; index += 2) {
+  let linkAdl = false
+  for (let index = 1; index < args.length; index += 1) {
     const option = args[index]
-    const value = args[index + 1] ?? ''
-    if (option === '--package-root') packageRoot = value
-    else if (option === '--system-root') systemRoot = value
+    if (option === '--link-adl') linkAdl = true
+    else if (option === '--package-root') packageRoot = args[++index] ?? ''
+    else if (option === '--system-root') systemRoot = args[++index] ?? ''
     else throw new Error(`unknown option: ${option}`)
   }
   if (!packageRoot) throw new Error('missing --package-root')
   try {
-    installAdlPackage({ packageRoot, systemRoot })
+    installAdlPackage({ packageRoot, systemRoot, linkAdl })
     console.log(`projected Adl package payload from ${packageRoot}`)
   } catch (error) {
     console.error(error instanceof Error ? error.message : String(error))

package/packages/fleet/src/install-embedding-model.ts

@@ -1,7 +1,7 @@
 /**
- * Global installer for the `adl-embedding` static (Model2Vec) embedding
+ * Global installer for the `enact-embedding` static (Model2Vec) embedding
  * artifact that `adl hook`'s skill-match hook loads from
- * `${XDG_CACHE_HOME:-$HOME/.cache}/adl-embedding/model/` (falling back to
+ * `${XDG_CACHE_HOME:-$HOME/.cache}/enact-embedding/model/` (falling back to
  * BM25 when absent) — see enact-repo-controls-m5's
  * `src/hooks/user-prompt-submit/vector.ts`, which this script's output must
  * satisfy exactly: `model.bin`, `tokenizer.json`, `tokenizer_config.json`,
@@ -32,7 +32,7 @@
  * bytes because they merely arrived over HTTPS. `revision` is then recorded
  * in the installed `manifest.json` so the next run can skip the rebuild
  * (network round-trip to resolve latest + a local file read) instead of
- * re-downloading and re-verifying multi-hundred-MB files on every six-hour
+ * re-downloading and re-verifying multi-hundred-MB files on every 12-hour
  * reconcile just to reach the same answer.
  *
  * `manifest.json`'s `source`, `vocab_limit`, and `dim` come from
@@ -76,7 +76,7 @@ const UPSTREAM_FILE_NAMES = ['model.safetensors', 'tokenizer.json', 'tokenizer_c
 export function resolveArtifactDir(env: Readonly<Record<string, string | undefined>>): string {
   const xdgCacheHome = env.XDG_CACHE_HOME
   const base = xdgCacheHome && xdgCacheHome.trim() !== '' ? xdgCacheHome : join(requireHome(env), '.cache')
-  return join(base, 'adl-embedding', 'model')
+  return join(base, 'enact-embedding', 'model')
 }
 
 function requireHome(env: Readonly<Record<string, string | undefined>>): string {
@@ -255,7 +255,7 @@ export interface EmbeddingModelDeps {
   readonly downloadFile: (url: string, dest: string) => void
 }
 
-export const defaultDeps: EmbeddingModelDeps = {
+const defaultDeps: EmbeddingModelDeps = {
   resolveLatestRevision: defaultResolveLatestRevision,
   fetchPathsInfo: defaultFetchPathsInfo,
   downloadFile: defaultDownloadFile,
@@ -279,13 +279,13 @@ export async function install(spec: EmbeddingModelSpec, artifactDir: string, dep
   const revision = await deps.resolveLatestRevision(spec.source)
 
   if (isInstalledAtRevision(artifactDir, revision)) {
-    console.log(`adl-embedding: already installed and verified at ${artifactDir} (${spec.source}@${revision})`)
+    console.log(`enact-embedding: already installed and verified at ${artifactDir} (${spec.source}@${revision})`)
     return
   }
 
-  const work = mkdtempSync(join(tmpdir(), 'adl-embedding-install-'))
+  const work = mkdtempSync(join(tmpdir(), 'enact-embedding-install-'))
   try {
-    console.log(`adl-embedding: installing ${spec.package} ${spec.version} (${spec.source}@${revision})`)
+    console.log(`enact-embedding: installing ${spec.package} ${spec.version} (${spec.source}@${revision})`)
 
     const pathsInfo = await deps.fetchPathsInfo(spec.source, revision, UPSTREAM_FILE_NAMES)
     const downloadedPaths: Record<string, string> = {}
@@ -345,7 +345,7 @@ export async function install(spec: EmbeddingModelSpec, artifactDir: string, dep
       writeFileSync(staged, readFileSync(join(outDir, name)))
       renameSync(staged, join(artifactDir, name))
     }
-    console.log(`adl-embedding: installed and verified at ${artifactDir} (${spec.source}@${revision})`)
+    console.log(`enact-embedding: installed and verified at ${artifactDir} (${spec.source}@${revision})`)
   } finally {
     rmSync(work, { recursive: true, force: true })
   }
@@ -353,18 +353,18 @@ export async function install(spec: EmbeddingModelSpec, artifactDir: string, dep
 
 export function uninstall(artifactDir: string): void {
   if (!existsSync(artifactDir)) {
-    console.log(`adl-embedding: nothing to remove at ${artifactDir}`)
+    console.log(`enact-embedding: nothing to remove at ${artifactDir}`)
     return
   }
   rmSync(artifactDir, { recursive: true, force: true })
-  console.log(`adl-embedding: removed ${artifactDir}`)
+  console.log(`enact-embedding: removed ${artifactDir}`)
 }
 
 function usage(): never {
   throw new Error('usage: install-embedding-model <install|check|uninstall> --spec JSON [--home ABSOLUTE_PATH]')
 }
 
-export async function main(argv: readonly string[]): Promise<void> {
+async function main(argv: readonly string[]): Promise<void> {
   const mode = argv[0]
   if (mode !== 'install' && mode !== 'check' && mode !== 'uninstall') usage()
 
@@ -394,8 +394,8 @@ export async function main(argv: readonly string[]): Promise<void> {
     const ok = isInstalledAtRevision(artifactDir, revision)
     console.log(
       ok
-        ? `adl-embedding: installed and verified at ${artifactDir} (${spec.source}@${revision})`
-        : `adl-embedding: NOT installed at latest revision ${revision} at ${artifactDir}`,
+        ? `enact-embedding: installed and verified at ${artifactDir} (${spec.source}@${revision})`
+        : `enact-embedding: NOT installed at latest revision ${revision} at ${artifactDir}`,
     )
     process.exitCode = ok ? 0 : 1
     return

package/packages/fleet/src/managed-settings.ts

@@ -1,6 +1,6 @@
 /**
- * Render and install the managed baseline hook artifacts (adl items 10/17,
- * `docs/architecture/cli-design.md` §2/§3) from the committed templates in
+ * Render and install the managed baseline hook artifacts
+ * (`docs/architecture/cli-design.md` §2/§3) from the committed templates in
  * `packages/agent-settings/managed/` onto the real, per-platform system
  * paths -- the "fleet installation" that directory's own README used to say
  * was a separate, later item. It is this reconcile pass.
@@ -70,7 +70,7 @@
  *          best-effort, never depended on) -- the actual, CONFIRMED
  *          enforcement is `allow_managed_hooks_only` above plus the
  *          fail-closed managed baseline hook
- *          (`adl.session-required-for-writes`): a missing or overridden
+ *          (`adl.run-required-for-writes`): a missing or overridden
  *          `ADL_AGENT_ID_AGENT` denies Azure DevOps writes for that session,
  *          exactly like a plain `codex` with no `adl run` today -- it never
  *          grants anything by being absent. Installed at
@@ -92,8 +92,8 @@ import { DEFAULT_AGENT_PATTERN } from './default-agent-file.ts'
 export type FleetPlatform = 'mac' | 'linux'
 
 const MANAGED_DIR = fileURLToPath(new URL('../../agent-settings/managed', import.meta.url))
-export const CLAUDE_TEMPLATE_PATH = join(MANAGED_DIR, 'claude-managed-settings.json')
-export const CODEX_REQUIREMENTS_TEMPLATE_PATH = join(MANAGED_DIR, 'codex-requirements.toml')
+const CLAUDE_TEMPLATE_PATH = join(MANAGED_DIR, 'claude-managed-settings.json')
+const CODEX_REQUIREMENTS_TEMPLATE_PATH = join(MANAGED_DIR, 'codex-requirements.toml')
 
 export function claudeManagedSettingsPath(platform: FleetPlatform, root = ''): string {
   switch (platform) {
@@ -153,7 +153,7 @@ export function renderCodexManagedConfig(agent: string): string {
 # https://developers.openai.com/codex/config-reference. Deployed anyway
 # because it is harmless if ignored or overridden: unsetting
 # ADL_AGENT_ID_AGENT here grants nothing -- the managed baseline hook
-# (adl.session-required-for-writes, CONFIRMED enforced from
+# (adl.run-required-for-writes, CONFIRMED enforced from
 # allow_managed_hooks_only in requirements.toml in this same directory) then
 # denies Azure DevOps writes for that session, fail-closed, exactly like a
 # plain \`codex\` with no \`adl run\` today. That hook is the real backstop,
@@ -168,7 +168,7 @@ set = { ADL_AGENT_ID_AGENT = "${agent}" }
 `
 }
 
-export interface FileWriteResult {
+interface FileWriteResult {
   readonly path: string
   readonly changed: boolean
 }