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

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

@@ -1,23 +1,20 @@
 /**
  * The single entry points `adl settings deploy` / `adl settings doctor`
- * call: MCP servers + agents + lean-ctx config, deployed/checked together
- * against one target repo. Each part keeps its own conflict/issue
- * reporting (deployMcp/deployAgents/deployLeanCtx, doctorMcp/doctorAgents/
- * doctorLeanCtx); this module only aggregates them so the CLI has one
- * function to call for each verb, and fails (deploySettings.ok === false,
- * or doctorSettings.ok === false) if any one part fails.
+ * call MCP servers and agents against one target repository. Deploy also
+ * performs the one-time locked cleanup for artifacts written by older
+ * releases.
  */
 import { join } from "node:path";
 import { deployAgents, type DeployAgentsResult } from "./agents-deploy.js";
 import { loadAgentSources, type AgentDef } from "./agent-toml.js";
-import { doctorAgents, doctorLeanCtx, doctorMcp, mergeDoctorResults, type DoctorResult } from "./doctor.js";
-import { deployLeanCtx, type DeployLeanCtxResult } from "./lean-ctx-deploy.js";
+import { doctorAgents, doctorMcp, mergeDoctorResults, type DoctorResult } from "./doctor.js";
 import { deployMcp, type DeployMcpResult } from "./mcp-deploy.js";
 import { loadMcpSource, type McpServerSpec } from "./mcp-source.js";
 import { type DeployProfile, loadProfile } from "./profile.js";
+import { retireLeanCtx } from "./retire-lean-ctx.js";
 
 export interface SettingsTargetOptions {
-  readonly assetsRoot: string; // packages/agent-settings package root (holds assets/mcp.json, assets/agents/, assets/lean-ctx/)
+  readonly assetsRoot: string; // packages/agent-settings package root
   readonly targetRepo: string;
   readonly profile?: DeployProfile;
   readonly servers?: readonly McpServerSpec[];
@@ -29,40 +26,38 @@ export interface SettingsTargetOptions {
 export interface DeploySettingsResult {
   readonly mcp: DeployMcpResult;
   readonly agents: DeployAgentsResult;
-  readonly leanCtx: DeployLeanCtxResult;
+  readonly retiredLeanCtx: readonly string[];
   readonly ok: boolean;
 }
 
-function resolveDirs(options: SettingsTargetOptions, profile: DeployProfile): { readonly agentsAssetsDir: string; readonly leanCtxAssetsDir: string } {
-  const agentsAssetsDir = join(options.assetsRoot, profile.agents.source);
-  const leanCtxAssetsDir = join(options.assetsRoot, profile.leanCtx?.source ?? "assets/lean-ctx");
-  return { agentsAssetsDir, leanCtxAssetsDir };
-}
-
 export function deploySettings(options: SettingsTargetOptions): DeploySettingsResult {
   const profile = options.profile ?? loadProfile();
   const servers = options.servers ?? loadMcpSource();
-  const { agentsAssetsDir, leanCtxAssetsDir } = resolveDirs(options, profile);
+  const agentsAssetsDir = join(options.assetsRoot, profile.agents.source);
   const agents = options.agents ?? loadAgentSources(agentsAssetsDir);
 
   const dryRun = options.dryRun === true;
+  const legacyLockPath = profile.legacyLock === undefined ? undefined : join(options.targetRepo, profile.legacyLock);
+  const retiredLeanCtx = retireLeanCtx({
+    targetRepo: options.targetRepo,
+    ...(legacyLockPath === undefined ? {} : { legacyLockPath }),
+    dryRun,
+  }).removed;
   const mcp = deployMcp({ targetRepo: options.targetRepo, profile, servers, dryRun });
   const agentsResult = deployAgents({ assetsDir: agentsAssetsDir, targetRepo: options.targetRepo, profile, agents, dryRun });
-  const leanCtx = deployLeanCtx({ assetsDir: leanCtxAssetsDir, targetRepo: options.targetRepo, profile, dryRun });
 
-  const ok = mcp.conflicts.length === 0 && agentsResult.conflicts.length === 0 && leanCtx.conflicts.length === 0;
-  return { mcp, agents: agentsResult, leanCtx, ok };
+  const ok = mcp.conflicts.length === 0 && agentsResult.conflicts.length === 0;
+  return { mcp, agents: agentsResult, retiredLeanCtx, ok };
 }
 
 export function doctorSettings(options: SettingsTargetOptions): DoctorResult {
   const profile = options.profile ?? loadProfile();
   const servers = options.servers ?? loadMcpSource();
-  const { agentsAssetsDir, leanCtxAssetsDir } = resolveDirs(options, profile);
+  const agentsAssetsDir = join(options.assetsRoot, profile.agents.source);
   const agents = options.agents ?? loadAgentSources(agentsAssetsDir);
 
   return mergeDoctorResults([
     doctorMcp({ targetRepo: options.targetRepo, profile, servers }),
     doctorAgents({ assetsDir: agentsAssetsDir, targetRepo: options.targetRepo, profile, agents }),
-    doctorLeanCtx({ assetsDir: leanCtxAssetsDir, targetRepo: options.targetRepo, profile }),
   ]);
 }

package/packages/agent-settings/src/global-surface-sweep.ts

@@ -41,8 +41,6 @@ const LAUNCH_AGENTS_DIR = 'Library/LaunchAgents'
  * updaters) is not an agent surface and is neither a candidate nor reported.
  */
 export const AGENT_TOOL_TOKENS = [
-  'lean-ctx',
-  'leanctx',
   'adl',
   'jcode',
   'claude',