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

package/bin/validate-manifest

@@ -11,11 +11,17 @@ manifest="${1:-}"
 
 if ! jq -e '
   def relpath: type == "string" and length > 0 and (startswith("/") | not) and (split("/") | index("..") | not);
+  # git_global_config (bin/git-defaults): key -> string, or key -> non-empty ordered array of strings.
+  # {git-credential-manager} is the only placeholder a value may carry (gh/GitHub is not managed by adl).
+  def gitcfg_value: type == "string" and ([match("\\{[^}]*\\}"; "g").string] | all(. == "{git-credential-manager}"));
+  def gitcfg: type == "object" and
+    (to_entries | all((.key | test("^[A-Za-z][A-Za-z0-9-]*\\..+")) and
+      (.value | gitcfg_value or (type == "array" and length > 0 and all(gitcfg_value)))));
   keys == ["config", "linux", "mac"] and
   .config.schema == 1 and
   (.config.repository | type == "string" and test("^https://dev\\.azure\\.com/[A-Za-z0-9._-]+/[A-Za-z0-9._-]+/_git/[A-Za-z0-9._-]+$")) and
   .config.branch == "main" and
-  .config.interval_seconds == 21600 and
+  .config.interval_seconds == 43200 and
   .config.update_policy == "latest-stable" and
   .config.allow_major_updates == true and
   .config.remove_deleted_entries == true and
@@ -26,15 +32,21 @@ if ! jq -e '
   .config.surface_policy == {"enabled": true} and
   .config.global_agents == {"enabled": true} and
   .config.vscode_settings == {"enabled": true} and
+  (.config.repo_maintain | type == "object") and
+  (.config.repo_maintain | keys == ["branch_max_age_days"]) and
+  (.config.repo_maintain.branch_max_age_days | type == "number" and . >= 1 and floor == .) and
   (.config.scratch_reap | type == "object") and
   (.config.scratch_reap | keys == ["enabled", "idle_days", "reap_days", "remove_worktrees"]) and
   .config.scratch_reap.enabled == true and
   (.config.scratch_reap.idle_days | type == "number" and . >= 0 and floor == .) and
   (.config.scratch_reap.reap_days | type == "number" and . >= 1 and floor == .) and
   (.config.scratch_reap.remove_worktrees | type == "boolean") and
+  (.config.brew_upgrade_exclude | type == "array" and
+    (. | unique | length) == length and
+    all(type == "string" and test("^[A-Za-z0-9][A-Za-z0-9@._+/-]*$"))) and
   (.config.protected_tools | type == "array") and
-  (.config.git_global_config | type == "object" and
-    (to_entries | all((.key | test("^[A-Za-z][A-Za-z0-9-]*\\..+")) and (.value | type) == "string"))) and
+  (.config.git_global_config | gitcfg) and
+  ([.mac.common, .linux.common] | all((.git_global_config // {}) | gitcfg)) and
   (.mac.common.tools | type == "object") and
   (.mac.devices | type == "object") and
   (.linux.common.tools | type == "object") and
@@ -43,28 +55,23 @@ if ! jq -e '
     all(.minimum_free_gib >= 1) and
     all((.home | type) == "string" and (.home | startswith("/"))) and
     all((.default_agent | type) == "string" and (.default_agent | test("^agent-[a-z0-9-]+$"))) and
-    all((keys - ["administrator", "default_agent", "home", "launch_agents", "minimum_free_gib", "schedule_minute", "scratch_repos", "brew_upgrade_all", "surface_clis", "git_maintain_repos", "tools"] | length) == 0) and
+    all((.git_user | type == "object" and (keys | sort) == ["email", "name"] and
+      all(.[]; type == "string" and length > 0))) and
+    all((keys - ["administrator", "default_agent", "git_user", "home", "minimum_free_gib", "schedule_minute", "scratch_repos", "brew_upgrade_all", "surface_clis", "repo_location", "tools"] | length) == 0) and
     all((.scratch_repos // []) | type == "array" and (. | unique | length) == length and
       all(type == "string" and startswith("/") and . != "/" and
         (endswith("/") | not) and (contains("..") | not) and (test("\\s") | not))) and
-    # git_maintain_repos (2026-09-30): an explicit, closed list of
-    # repositories bin/reconcile passes to git-maintain via --repo argv --
-    # never a recursive scan root, deliberately, since these devices own
-    # checkouts that sit at a fixed path outside any device home (the Linux
-    # VPSes use /opt/adl-azdo) and a recursive scan of a shared parent like
-    # /opt would also walk into unrelated, explicitly off-limits
-    # directories. The azagent/vsts.agent substring bans are exactly that
-    # guard, enforced at the schema layer (case-insensitively -- a manifest
-    # value could be typed AzAgent2 as easily as azagent2) so a mistyped or
-    # copy-pasted entry can never point there. git-maintain itself refuses
-    # the same names again, case-insensitively and by realpath too, at the
-    # point of actual use (jobs/git-maintain/src/main.ts,
-    # isForbiddenAzurePipelinesPath) -- this schema check alone only ever
-    # sees the manifest literal string, never what a symlink resolves to.
-    all((.git_maintain_repos // []) | type == "array" and (. | unique | length) == length and
-      all(type == "string" and startswith("/") and . != "/" and
-        (endswith("/") | not) and (contains("..") | not) and (test("\\s") | not) and
-        (ascii_downcase | contains("azagent") | not) and (ascii_downcase | contains("vsts.agent") | not))) and
+    # repo_location (2026-09-30): the ONE directory `adl reconcile` maintains
+    # repositories under (immediate children carrying adl-config.toml only). It
+    # is the whole scope of that step, so it must be an exact absolute directory
+    # path: never "/", no trailing slash, no "..", no whitespace. The
+    # azagent/vsts.agent substring bans keep it off Azure Pipelines agent
+    # installs (case-insensitively -- a value could be typed AzAgent2 as easily
+    # as azagent2); the maintenance step refuses the same names again, by
+    # realpath too, at the point of use.
+    all((.repo_location // "/ok") | type == "string" and startswith("/") and . != "/" and
+      (endswith("/") | not) and (contains("..") | not) and (test("\\s") | not) and
+      (ascii_downcase | contains("azagent") | not) and (ascii_downcase | contains("vsts.agent") | not)) and
     all((.brew_upgrade_all // false) | type == "boolean") and
     all(
       (.surface_clis // []) as $surfaces |
@@ -72,13 +79,23 @@ if ! jq -e '
       ($surfaces | map(.name) | length == (unique | length)) and
       ($surfaces | all(
         (.name | type == "string" and length > 0) and
-        (.manager | type == "string" and (. == "native" or . == "npm" or . == "brew" or . == "unknown")) and
+        (.manager | type == "string" and (. == "native" or . == "npm" or . == "brew" or . == "bun" or . == "unknown")) and
         ((.report_only // false) | type == "boolean") and
-        (if (.report_only // false) == true then
-           (.executable | type == "string" and startswith("/"))
+        # manager bun (2026-10-01): installed and updated as `bun add -g <package>@latest`, so it
+        # names a bare registry package (no version spec: versions are never pinned) and a command,
+        # and carries no update_args (the manager fixes the argv) and no report_only.
+        (if .manager == "bun" then
+           ((.package | type == "string") and (.package | test("^(@[a-z0-9][a-z0-9._-]*/)?[a-z0-9][a-z0-9._-]*$"))) and
+           ((.command | type == "string") and (.command | length > 0) and (.command | contains("/") | not)) and
+           (has("update_args") | not) and (has("version") | not) and ((.report_only // false) == false)
          else
-           (.command | type == "string" and length > 0 and (contains("/") | not)) and
-           (.update_args | type == "array" and length > 0 and all(type == "string" and length > 0))
+           (has("package") | not) and
+           (if (.report_only // false) == true then
+              (.executable | type == "string" and startswith("/"))
+            else
+              (.command | type == "string" and length > 0 and (contains("/") | not)) and
+              (.update_args | type == "array" and length > 0 and all(type == "string" and length > 0))
+            end)
          end) and
         (.manager != "brew" or
           ((.report_only // false) == false and .command == "brew" and
@@ -159,30 +176,8 @@ if ! jq -e '
       ((.allow_scripts // []) | type == "array" and
         all(type == "string" and test("^(@[a-z0-9][a-z0-9._-]*/)?[a-z0-9][a-z0-9._-]*$")))
     else true end)) and
-  (.linux.common | has("launch_agents") | not) and
-  ([.linux.devices[] | has("launch_agents")] | any | not) and
-  (.mac.common.launch_agents["git-maintain"] as $job |
-    ($job | type == "object") and
-    ($job.repo_scope | type == "object" and keys == ["glob", "recursive", "root"] and
-      (.root | relpath) and .glob == "*" and .recursive == true) and
-    ($job.environment | has("GIT_MAINTAIN_ROOT") | not) and
-    ($job.environment | has("GIT_MAINTAIN_GLOB") | not)) and
-  ([.mac.common.launch_agents, .mac.devices[].launch_agents] | map(. // {}) |
-    all(type == "object") and
-    ([.[] | to_entries[] | .value] |
-      all(
-        type == "object" and
-        (keys - ["label", "source", "entry", "start_interval_seconds", "run_at_load", "environment", "log", "replaces", "repo_scope"] | length == 0) and
-        ((.label | type) == "string" and (.label | test("^[A-Za-z0-9][A-Za-z0-9._-]*$"))) and
-        (.source | relpath) and
-        (.entry | relpath) and
-        ((.start_interval_seconds | type) == "number" and .start_interval_seconds >= 60 and (.start_interval_seconds | floor) == .start_interval_seconds) and
-        ((.run_at_load | type) == "boolean") and
-        ((.environment | type) == "object" and (.environment | to_entries | all((.key | test("^[A-Z_][A-Z0-9_]*$")) and (.value | type) == "string"))) and
-        (.log | relpath) and
-        ((.replaces // []) | type == "array" and all(relpath))
-      ) and
-      (map(.label) | length == (unique | length))))
+  # launch_agents are gone (2026-09-30): a stale declaration must fail loud.
+  ([.mac.common, .linux.common] | all(keys - ["os_upgrade", "git_global_config", "tools"] | length == 0))
 ' "$manifest" >/dev/null; then
   echo "global-tools manifest: INVALID ($manifest does not satisfy bin/validate-manifest's schema)" >&2
   exit 1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amsterdamdatalabs/adl-agent-control-linux-x64",
-  "version": "0.1.10",
+  "version": "0.1.26",
   "description": "adl CLI binary for linux/x64 (agent identity + Azure DevOps front door — see docs/architecture/cli-design.md)",
   "license": "UNLICENSED",
   "os": [
@@ -14,13 +14,7 @@
     "packages/fleet/manifest.json",
     "packages/fleet/manifest.schema.json",
     "packages/fleet/src",
-    "packages/fleet/jobs",
-    "packages/fleet/systemd",
-    "packages/agent-settings/surface-policy.json",
-    "packages/agent-settings/protected.json",
-    "packages/agent-settings/src",
-    "packages/agent-settings/assets",
-    "packages/agent-settings/managed",
+    "packages/agent-settings",
     "packages/agent-skills",
     "packages/repo-controls",
     "packages/agent-hooks",
@@ -31,13 +25,9 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.5",
-    "@tailwindcss/node": "4.2.1",
     "ajv": "^8.17.1",
     "ajv-formats": "^3.0.1",
-    "istanbul-lib-coverage": "3.2.2",
     "minisearch": "7.2.0",
-    "svelte": "5.38.10",
-    "tailwindcss": "4.1.11",
     "typescript": "5.9.3",
     "yaml": "^2.9.0"
   }

package/packages/agent-hooks/README.md

@@ -213,14 +213,16 @@ directory containing a `.git` entry) and checking for
 
 ### File format
 
-Six top-level keys are recognized: `version`, `[hooks]`, `[rules]`, `[repo]`,
-`[controls]`, and `[skills]`. `[controls]` and `[skills]` are reserved root
-tables owned by other tools (`enact-repo-controls` and `adl-extensions`,
-respectively) that share this same file; `adl hook` accepts and ignores
-them without ever reading their contents. Every other top-level key — and
-every unrecognized key inside `[hooks]` or `[repo]` — is a decode error
-(fails loud, non-zero exit, reason on stderr), never silently ignored; see
-"Unknown keys fail loud" below.
+The recognized root keys include `version`, `[hooks]`, `[rules]`, `[repo]`,
+`[agent]`, `[controls]`, `[skills]`, `[extensions]`, and `[azdo]`. `[controls]`
+and `[skills]` belong to other tools sharing this file; `[azdo]` is reserved
+for shared Azure DevOps configuration. `adl hook` accepts these tables without
+reading their contents, so optional tables such as `[azdo.scope]` can be present
+while its hook configuration remains independent. `[extensions]` is also a
+shared table, but `adl hook` reads its sub-table names to locate extension
+skills. Every other top-level key — and every unrecognized key inside `[hooks]`
+or `[repo]` — is a decode error (fails loud, non-zero exit, reason on stderr),
+never silently ignored; see "Unknown keys fail loud" below.
 
 ```toml
 version = 1                     # optional; accepted for the marker file's
@@ -353,7 +355,10 @@ fixed in the process (see `src/lib/spawn-with-timeout.ts`,
    `XDG_CONFIG_HOME` / `XDG_DATA_HOME` / `XDG_STATE_HOME` / `XDG_CACHE_HOME`
    environment (rooted at `<repo root>/.agents/lean-ctx/`) that wrapper used
    to set, so `lean-ctx`'s state stays per-repository even though the
-   binary itself is shared.
+   binary itself is shared. In a linked git worktree the four stores root at
+   the main checkout (resolved from the worktree's own `.git` file), so
+   worktree sessions share the accumulated knowledge instead of starting
+   cold.
 
 ## Integration pass (three independently-migrated slices + foundation)
 

package/packages/agent-hooks/assets/hooks.json

@@ -21,16 +21,6 @@
             "timeout": 10
           }
         ]
-      },
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "adl hook lean-ctx pre-tool-use",
-            "statusMessage": "adl-repo: lean-ctx pre-tool-use",
-            "timeout": 10
-          }
-        ]
       }
     ],
     "UserPromptSubmit": [
@@ -69,16 +59,6 @@
             "timeout": 5
           }
         ]
-      },
-      {
-        "hooks": [
-          {
-            "type": "command",
-            "command": "adl hook lean-ctx post-tool-use",
-            "statusMessage": "adl-repo: lean-ctx post-tool-use",
-            "timeout": 10
-          }
-        ]
       }
     ],
     "SessionEnd": [

package/packages/agent-hooks/package.json

@@ -8,8 +8,7 @@
     "start": "bun src/main.ts",
     "build": "bun ../../workflows/scripts/build/agent-hooks/build.ts",
     "typecheck": "tsc --noEmit",
-    "test": "bun test --timeout 30000",
-    "test:coverage": "bun test --coverage --timeout 30000",
+    "test": "bun test --coverage --timeout 30000",
     "check": "bun run typecheck && bun test --coverage"
   },
   "dependencies": {

package/packages/agent-hooks/src/cli/args.ts

@@ -70,7 +70,7 @@ function isDirectory(path: string): boolean {
 }
 
 /** The built-in config an unmanaged repo is described with — the decode of an empty file, i.e. the schema defaults. */
-export function defaultConfig(): AdlRepoConfig {
+function defaultConfig(): AdlRepoConfig {
   return (decodeConfig('') as { readonly value: AdlRepoConfig }).value
 }
 

package/packages/agent-hooks/src/cli/doctor.ts

@@ -13,13 +13,10 @@
  *          signal for that lives now, since UserPromptSubmit only WARNS -- an
  *          empty corpus has an innocent explanation once it is per-host and
  *          per-extension, and a dead prompt is worse than a missing hint);
- *          `lean-ctx` not on PATH or `--version` failing (briefing and the
- *          lean-ctx hooks shell out to it); `code-review-graph` not on PATH
- *          (the crg hooks shell out to it).
+ *          `code-review-graph` not on PATH (the crg hooks shell out to it).
  *   warn — unmanaged repo (hooks no-op by design); `[hooks] enabled = false`;
  *          embedding model missing/corrupt (user-prompt-submit falls back to
- *          BM25-only, never fatal); vector half disabled; lean-ctx allowlist
- *          count not readable.
+ *          BM25-only, never fatal); vector half disabled.
  *
  * The vector half is "effectively disabled by cosineFloor" when the floor
  * exceeds 1: a vector hit must reach `cosine >= cosineFloor` to enter fusion
@@ -36,8 +33,6 @@ import { scanSkills } from '../hooks/user-prompt-submit/skills.ts'
 import { loadTokenizer } from '../hooks/user-prompt-submit/tokenizer.ts'
 import { loadVectorHalf, resolveGlobalArtifactDir } from '../hooks/user-prompt-submit/vector.ts'
 import { HOOKS_DENY_LOG_REL, HOOKS_LOG_REL } from '../hooks/log.ts'
-import { DEFAULT_LEAN_CTX_DIR, leanCtxEnv } from '../lean-ctx/env.ts'
-import { spawnWithTimeout } from '../lib/spawn-with-timeout.ts'
 import { buildEngineContext } from '../rules/engine.ts'
 import { liveEnv, liveRepoIndex } from '../rules/ports.ts'
 import { BUILTIN_RULES, requireRegistered } from '../rules/registry.ts'
@@ -46,6 +41,9 @@ import { type CliResult, type LoadedRepo, cliError, loadRepo, parseArgs, unmanag
 type Status = 'ok' | 'warn' | 'FAIL' | 'skip' | 'info'
 type Env = Readonly<Record<string, string | undefined>>
 
+/** Reserved for callers that previously supplied process-check timeouts. */
+export interface DoctorOptions { readonly timeoutMs?: number }
+
 interface Check {
   readonly status: Status
   readonly text: string
@@ -53,13 +51,6 @@ interface Check {
 
 const check = (status: Status, name: string, detail: string): Check => ({ status, text: `${name}: ${detail}` })
 
-export interface DoctorOptions {
-  /** Per-subprocess timeout for `lean-ctx --version` / `lean-ctx doctor --json`. */
-  readonly timeoutMs?: number
-}
-
-const DEFAULT_TIMEOUT_MS = 10_000
-
 /** Config + rule resolution, and the config the downstream checks use (null when unusable). */
 function repoChecks(loaded: LoadedRepo): { readonly checks: Check[]; readonly config: AdlRepoConfig | null } {
   const { state } = loaded
@@ -148,48 +139,6 @@ function modelAndVector(env: Env): Check[] {
   return [model, vector]
 }
 
-async function leanCtxChecks(
-  loaded: LoadedRepo,
-  config: AdlRepoConfig | null,
-  env: Env,
-  timeoutMs: number,
-): Promise<Check[]> {
-  const path = Bun.which('lean-ctx', { PATH: env.PATH ?? '' })
-  const skipAllowlist = check('skip', 'lean-ctx allowlist', 'lean-ctx not usable')
-  if (path === null) return [check('FAIL', 'lean-ctx', `not found on PATH (${env.PATH ?? ''})`), skipAllowlist]
-  const version = await spawnWithTimeout(path, ['--version'], { env, timeoutMs })
-  if (version.exitCode !== 0) {
-    const reason = version.timedOut ? `timed out after ${timeoutMs}ms` : `exited ${version.exitCode}: ${version.stderr.trim()}`
-    return [check('FAIL', 'lean-ctx', `${path} --version ${reason}`), skipAllowlist]
-  }
-  const binary = check('ok', 'lean-ctx', `${path} (${version.stdout.trim().split('\n')[0]})`)
-
-  // Same env the hooks give lean-ctx: repo-rooted LEAN_CTX_* in a managed repo, lean-ctx's own defaults otherwise (mcp.ts).
-  // `config` is the value `repoChecks` already decoded — reusing it keeps an invalid
-  // `adl-config.toml` reported by the `config` check above rather than thrown from here.
-  const root = loaded.state.managed && config !== null ? (loaded.state.root as string) : null
-  const childEnv = root === null ? { ...env } : leanCtxEnv(root, env, config?.hooks.leanCtxDir ?? DEFAULT_LEAN_CTX_DIR)
-  const scope = root === null ? 'lean-ctx defaults; LEAN_CTX_CONFIG_DIR unset' : `LEAN_CTX_CONFIG_DIR=${childEnv.LEAN_CTX_CONFIG_DIR}`
-  const unavailable = (reason: string): Check[] => [binary, check('warn', 'lean-ctx allowlist', `unavailable (${reason})`)]
-  const doctor = await spawnWithTimeout(path, ['doctor', '--json'], { env: childEnv, timeoutMs, ...(root === null ? {} : { cwd: root }) })
-  if (doctor.timedOut) return unavailable(`lean-ctx doctor --json timed out after ${timeoutMs}ms`)
-  // A non-zero exit alone is not a failure: lean-ctx 3.10.1 exits 1 whenever any of its OWN checks fail
-  // (e.g. no shell aliases) while still printing the full report. Only a report we cannot read is.
-  let parsed: { readonly checks?: readonly { readonly name?: string }[] }
-  try {
-    parsed = JSON.parse(doctor.stdout) as typeof parsed
-  } catch {
-    return unavailable(
-      doctor.exitCode === 0
-        ? 'lean-ctx doctor --json printed invalid JSON'
-        : `lean-ctx doctor --json exited ${doctor.exitCode}: ${doctor.stderr.trim()}`,
-    )
-  }
-  const count = (parsed.checks ?? []).map((entry) => /Shell allowlist\s+(\d+) command/.exec(entry.name ?? '')?.[1]).find((n) => n !== undefined)
-  if (count === undefined) return unavailable('no "Shell allowlist" check in lean-ctx doctor --json')
-  return [binary, check('ok', 'lean-ctx allowlist', `${count} command(s) enforced (${scope})`)]
-}
-
 /** Both hook logs: path, row count, and for the deny log its last 5 rows. JSON Lines (docs/architecture/cli-design.md §5a): every line is a record, there is no header row to skip. */
 function logChecks(loaded: LoadedRepo): Check[] {
   if (!loaded.state.managed) return [check('skip', 'logs', 'not a managed repo (hooks log nothing here)')]
@@ -216,7 +165,7 @@ function crgCheck(env: Env): Check {
 }
 
 /** `argv` is everything after `doctor`. */
-export async function runDoctor(argv: readonly string[], cwd: string, env: Env, options: DoctorOptions = {}): Promise<CliResult> {
+export async function runDoctor(argv: readonly string[], cwd: string, env: Env, _options: DoctorOptions = {}): Promise<CliResult> {
   const parsed = parseArgs(argv, false)
   if ('error' in parsed) return cliError(parsed.error)
   if (parsed.positionals.length > 0) return cliError(`unexpected argument '${parsed.positionals[0]}'`)
@@ -228,7 +177,6 @@ export async function runDoctor(argv: readonly string[], cwd: string, env: Env,
     ...repo.checks,
     ...hooksAndSkills(loaded, repo.config),
     ...modelAndVector(env),
-    ...(await leanCtxChecks(loaded, repo.config, env, options.timeoutMs ?? DEFAULT_TIMEOUT_MS)),
     crgCheck(env),
     ...logChecks(loaded),
   ]

package/packages/agent-hooks/src/deploy/deploy.ts

@@ -23,7 +23,6 @@ import {
   readLegacyLock,
   sha256Hex,
   stripLegacyOwnership,
-  unionOwnedCommands,
 } from './legacy-lock.ts'
 import { type HookLockEntry, lockPathFor, readLock, writeLock } from './lock.ts'
 import { type HookDeployProfile, type HookSurface, loadProfile } from './profile.ts'
@@ -51,13 +50,13 @@ export interface DeployHooksOptions {
   readonly dryRun?: boolean
 }
 
-export interface HookConflict {
+interface HookConflict {
   readonly file: string
   readonly reason: string
 }
 
 /** One hook healed via the PAIR fallback (not hash, not the legacy channel) this run — see json-merge.ts's `RestoredHook` for the full rationale (2026-09-30, round 5, finding 2). */
-export interface RestoredHookReport {
+interface RestoredHookReport {
   readonly file: string
   readonly event: string
   readonly command: string
@@ -78,17 +77,6 @@ export interface DeployHooksResult {
   readonly unchanged: readonly string[]
   readonly conflicts: readonly HookConflict[]
   readonly lockPath: string
-  /**
-   * Surface files whose lock entry moved from the legacy
-   * (`ownedCommands`-only) shape to the content-addressed one
-   * (`ownedEntries`) on THIS run (independent review, 2026-09-30, finding
-   * 7). This can be non-empty even when the surface's own `written`/
-   * `unchanged` outcome looks like nothing happened — the deployed JSON
-   * file can stay byte-identical while the LOCK itself is rewritten, and
-   * that rewrite deserves its own truthful line in the CLI's output
-   * rather than being folded silently into "unchanged".
-   */
-  readonly lockMigrated: readonly string[]
   /** Hooks healed via the pair fallback this run, named explicitly (round 5, finding 2) so deploy's own output, doctor's preview, and `adl install` can all say "restored adl hook <event>/<matcher>/<command> — local changes to it were replaced". */
   readonly restored: readonly RestoredHookReport[]
 }
@@ -134,12 +122,11 @@ export function deployHooks(options: DeployHooksOptions): DeployHooksResult {
   const written: string[] = []
   const unchanged: string[] = []
   const conflicts: HookConflict[] = []
-  const lockMigrated: string[] = []
   const restored: RestoredHookReport[] = []
   const takeover = { any: false }
 
   for (const surface of profile.surfaces) {
-    deploySurface(surface, { assetsDir, targetRepo, hooksDoc, lock, legacyDoc, takeover, newEntries, written, unchanged, conflicts, lockMigrated, restored, dryRun })
+    deploySurface(surface, { assetsDir, targetRepo, hooksDoc, lock, legacyDoc, takeover, newEntries, written, unchanged, conflicts, restored, dryRun })
   }
 
   if (!dryRun) writeLock(targetRepo, { version: 1, entries: newEntries })
@@ -158,7 +145,6 @@ export function deployHooks(options: DeployHooksOptions): DeployHooksResult {
     unchanged: unchanged.sort(),
     conflicts: conflicts.sort((a, b) => a.file.localeCompare(b.file)),
     lockPath: lockPathFor(targetRepo),
-    lockMigrated: lockMigrated.sort(),
     restored,
   }
 }
@@ -176,7 +162,6 @@ interface DeploySurfaceContext {
   readonly written: string[]
   readonly unchanged: string[]
   readonly conflicts: HookConflict[]
-  readonly lockMigrated: string[]
   readonly restored: RestoredHookReport[]
   readonly dryRun: boolean
 }
@@ -212,38 +197,24 @@ function deploySurface(surface: HookSurface, ctx: DeploySurfaceContext): void {
   // Ownership is content-addressed (json-merge.ts's own header, second
   // independent review 2026-09-29): `recordedEntries` is THIS package's own
   // prior write, read straight from the lock as hash+command pairs, never
-  // derived from command text alone. A lock with no `ownedEntries` at all
-  // (every repo enrolled before this fix) has no hashes to give — for
-  // exactly this one transitional deploy, its OLD `ownedCommands` feeds the
-  // command-anywhere fallback channel instead, unioned with
-  // `legacyTakeover.ownedByEvent` (the pre-agent-hooks engine's own
-  // hash-verified takeover signal — a different legacy source, same
-  // "command text is the only proof we have" shape).
+  // derived from command text alone. `readLock` (lock.ts) has already
+  // refused any entry without `ownedEntries` (Tarun, 2026-10-01: the legacy
+  // `ownedCommands`-only shape is no longer migrated). The command-anywhere
+  // channel below is fed ONLY by `legacyTakeover.ownedByEvent` — the
+  // pre-agent-hooks engine's own hash-verified takeover signal, a different
+  // legacy source that is deliberately kept.
   const sameFormatPrev = prevEntry !== undefined && prevEntry.format === surface.format ? prevEntry : undefined
-  const isLegacyShapedLock = sameFormatPrev !== undefined && sameFormatPrev.ownedEntries === undefined
-  // Independent review, 2026-09-30, finding 7: this transitional deploy
-  // rewrites the LOCK from the legacy (`ownedCommands`-only) shape to the
-  // content-addressed one — report it, since the deployed JSON file can
-  // stay byte-identical while that rewrite happens underneath it.
-  if (isLegacyShapedLock) ctx.lockMigrated.push(surface.file)
   const recordedEntries = sameFormatPrev?.ownedEntries ?? {}
-  const ownCommandsLegacyFallback = isLegacyShapedLock ? sameFormatPrev.ownedCommands : {}
   const existingRaw = readExistingJson(targetAbs)
   const legacyTakeover = legacyTakeoverForJsonHooksSurface(existingRaw, ctx.legacyDoc, surface.file)
   if (legacyTakeover.matched) ctx.takeover.any = true
-  const legacyCommandsAnywhere = unionOwnedCommands(ownCommandsLegacyFallback, legacyTakeover.ownedByEvent)
+  const legacyCommandsAnywhere = legacyTakeover.ownedByEvent
 
   if (surface.format === 'cursor-hooks-v1') {
     const desired = renderCursorEntries(ctx.hooksDoc, surface)
     const { fileContent, ownedCommands, ownedEntries, changed, restored, ambiguousConflicts } = mergeCursorHooksFile(existingRaw, desired, recordedEntries, legacyCommandsAnywhere)
     writeJsonIfChanged(targetAbs, fileContent, changed, ctx.dryRun)
-    // Independent review, 2026-09-30, round 5, finding 4: a legacy lock
-    // migration rewrites the LOCK for real even when this surface's own
-    // deployed content stays byte-identical — count that as "written",
-    // not "unchanged", so a caller reading these two arrays (which is
-    // exactly what "up to date (no changes)" and "written: N" do) never
-    // reports a pure no-op when something real did change on disk.
-    ;(changed || isLegacyShapedLock ? ctx.written : ctx.unchanged).push(surface.file)
+    ;(changed ? ctx.written : ctx.unchanged).push(surface.file)
     ctx.newEntries[surface.file] = { format: 'cursor-hooks-v1', ownedCommands, ownedEntries }
     for (const hook of restored) ctx.restored.push(makeRestoredReport(surface.file, hook))
     for (const conflict of ambiguousConflicts) ctx.conflicts.push({ file: surface.file, reason: ambiguousConflictReason(conflict) })
@@ -254,7 +225,7 @@ function deploySurface(surface: HookSurface, ctx: DeploySurfaceContext): void {
   const desired = renderJsonHooksGroups(ctx.hooksDoc, surface)
   const { fileContent, ownedCommands, ownedEntries, changed, restored, ambiguousConflicts } = mergeJsonHooksFile(existingRaw, desired, recordedEntries, legacyCommandsAnywhere)
   writeJsonIfChanged(targetAbs, fileContent, changed, ctx.dryRun)
-  ;(changed || isLegacyShapedLock ? ctx.written : ctx.unchanged).push(surface.file)
+  ;(changed ? ctx.written : ctx.unchanged).push(surface.file)
   ctx.newEntries[surface.file] = { format: surface.format, ownedCommands, ownedEntries }
   for (const hook of restored) ctx.restored.push(makeRestoredReport(surface.file, hook))
   for (const conflict of ambiguousConflicts) ctx.conflicts.push({ file: surface.file, reason: ambiguousConflictReason(conflict) })

package/packages/agent-hooks/src/deploy/doctor.ts

@@ -29,7 +29,7 @@ import {
 import { renderCursorEntries, renderJsonHooksGroups } from './render.ts'
 import { type CanonicalHooksDoc, loadHooksSource } from './source.ts'
 
-export interface DoctorIssue {
+interface DoctorIssue {
   readonly severity: 'error' | 'info'
   readonly path: string
   readonly reason: string
@@ -44,7 +44,7 @@ function toResult(issues: readonly DoctorIssue[]): DoctorResult {
   return { ok: issues.every((issue) => issue.severity !== 'error'), issues }
 }
 
-export { validateProfileDocument }
+
 
 export interface DoctorDeploymentOptions {
   readonly assetsDir: string
@@ -71,13 +71,10 @@ function doctorJsonSurface(surface: HookSurface, targetRepo: string, hooksDoc: C
   const targetAbs = join(targetRepo, surface.file)
   const exists = existsSync(targetAbs)
   const lockEntry = lock.entries[surface.file]?.format === surface.format ? (lock.entries[surface.file] as JsonHooksLockEntry) : undefined
-  // Same fallback deploy.ts itself uses: a lock with no ownedEntries at all
-  // (every repo enrolled before the content-hash fix) has no hashes to
-  // give, so its OLD ownedCommands feeds the command-anywhere channel
-  // instead -- otherwise doctor would report drift for every currently-
-  // enrolled repo's untouched content that deploy itself recognizes fine.
+  // `readLock` has already refused any entry without `ownedEntries`
+  // (Tarun, 2026-10-01: the legacy `ownedCommands`-only shape is no longer
+  // migrated), so ownership here is always the content-addressed record.
   const recordedEntries = lockEntry?.ownedEntries ?? {}
-  const legacyCommandsAnywhere = lockEntry !== undefined && lockEntry.ownedEntries === undefined ? lockEntry.ownedCommands : {}
 
   let parseFailed = false
   if (exists) {
@@ -92,8 +89,8 @@ function doctorJsonSurface(surface: HookSurface, targetRepo: string, hooksDoc: C
   const existingRaw = readExistingJson(targetAbs)
   const merged =
     surface.format === 'cursor-hooks-v1'
-      ? mergeCursorHooksFile(existingRaw, renderCursorEntries(hooksDoc, surface), recordedEntries, legacyCommandsAnywhere)
-      : mergeJsonHooksFile(existingRaw, renderJsonHooksGroups(hooksDoc, surface), recordedEntries, legacyCommandsAnywhere)
+      ? mergeCursorHooksFile(existingRaw, renderCursorEntries(hooksDoc, surface), recordedEntries)
+      : mergeJsonHooksFile(existingRaw, renderJsonHooksGroups(hooksDoc, surface), recordedEntries)
 
   if (!exists) {
     return [{ severity: 'error', path: surface.file, reason: 'expected hook wiring has not been deployed' }]
@@ -144,7 +141,7 @@ function doctorJsonSurface(surface: HookSurface, targetRepo: string, hooksDoc: C
         severity: 'error' as const,
         path: `${surface.file}#${event}`,
         reason:
-          recordedEntries[event] !== undefined || legacyCommandsAnywhere[event] !== undefined
+          recordedEntries[event] !== undefined
             ? 'deploy-written hook entries were modified since deploy, or assets/hooks.json changed since; run deploy to update'
             : 'expected hook wiring for this event has not been deployed',
       }

package/packages/agent-hooks/src/deploy/index.ts

@@ -1,17 +1,17 @@
-export { deployHooks, type DeployHooksOptions, type DeployHooksResult, type HookConflict } from './deploy.ts'
-export { doctorDeployment, type DoctorDeploymentOptions, type DoctorIssue, type DoctorResult } from './doctor.ts'
-export { formatHookLine, listHooks, type HookListing, type HookListingEntry, type HookOwner, type ListHooksOptions } from './list.ts'
-export { type HookLock, type HookLockEntry, LOCK_RELATIVE_PATH, lockPathFor, readLock, writeLock } from './lock.ts'
+export { deployHooks,  type DeployHooksResult,  } from './deploy.ts'
+export { doctorDeployment,   type DoctorResult } from './doctor.ts'
+export { formatHookLine, listHooks,     } from './list.ts'
+
 export {
-  DEFAULT_PROFILE_PATH,
-  DEFAULT_PROFILE_SCHEMA_PATH,
-  type HookDeployProfile,
-  HOOK_WIRE_FORMATS,
-  type HookSurface,
-  type HookWireFormat,
+  
+  
+  
+  
+  
+  
   loadProfile,
-  type ProfileIssue,
-  validateProfileDocument,
+  
+  
 } from './profile.ts'
-export { renderCursorEntries, renderJsonHooksGroups, renderOpencodeSlots } from './render.ts'
-export { DEFAULT_HOOKS_SOURCE_PATH, flattenSourceHooks, hookLabel, loadHooksSource, type CanonicalHooksDoc } from './source.ts'
+
+