@aligndottech/cli 0.49.0 → 0.51.0

package/dist/lib/launch/adapters/gemini-cli.js

@@ -1,72 +1,57 @@
 import { alignServerEntry } from '../../mcp-setup.js';
-import { COPY_PREFIX, geminiCopyName } from '../gemini-state.js';
-import { geminiSystemDefaultsPath } from '../gemini-trust.js';
-import { parseJsonc } from '../strict-entry.js';
+import { COPY_PREFIX } from '../gemini-state.js';
 /** Same reason as the Claude adapter: never shadow a user's own `align` server. */
 const INJECTED_SERVER_NAME = 'align-local';
 export const GEMINI_TRUST_NOTE = "Gemini turns off MCP servers, Align's included, in folders you haven't trusted. Trust this folder in Gemini to use the graph here.";
-const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
-/** The system settings (JSONC, as Gemini reads them) as an object we can add to, or null when we must not touch them. */
-function parseTheirs(text) {
-    if (text === null)
-        return {};
-    const parsed = parseJsonc(text);
-    if (!parsed)
-        return null;
-    if (parsed['mcpServers'] !== undefined && !isObject(parsed['mcpServers']))
-        return null;
-    return parsed;
-}
 /**
- * Gemini CLI, per session, nothing written to the user's own config (gemini 0.58.0):
- * GEMINI_CLI_SYSTEM_SETTINGS_PATH names the system settings file, and Gemini MERGES its
- * mcpServers with the user's (verified: `gemini mcp list` shows both). That variable REPLACES
- * the system file Gemini would otherwise read (the user's own value, or the platform default an
- * admin may have filled), so align points it at a COPY of that file with align-local added,
- * never at a file of align's alone. Gemini also derives system-defaults.json from that file's
- * directory, so the original location is pinned with GEMINI_CLI_SYSTEM_DEFAULTS_PATH unless the
- * user set it. A system file align cannot read or parse is never replaced: no injection, and
- * one line saying why (the same rule as OpenCode's OPENCODE_CONFIG_CONTENT).
+ * Gemini CLI, written ONCE (gemini 0.63.0): the `align-local` entry goes into the user's
+ * settings file by the safe writer, with a backup and an exact `align use --undo`.
+ *
+ * Not per session. The first design pointed GEMINI_CLI_SYSTEM_SETTINGS_PATH at a copy in the
+ * launch cache, and Gemini 0.63.0 skips any system settings file unless the file and every
+ * directory above it is root-owned and not group/other writable (gemini-system-file.ts), so
+ * Gemini users got no graph and only Gemini's own warning as a clue. A per-session
+ * GEMINI_CLI_HOME was rejected too: it would have to mirror the user's whole ~/.gemini (oauth
+ * credentials, history, trusted folders, extensions) and anything Gemini writes there during
+ * the session, a changed theme or a first login, would be lost with the session directory.
  *
- * Trust: Gemini turns off every MCP server in a folder it does not trust. align says so in one
- * line and never trusts a folder for the user (no --skip-trust, no GEMINI_CLI_TRUST_WORKSPACE).
+ * Nothing else changes: no flags, no GEMINI_CLI_* variable (so a repo .env cannot substitute
+ * one either), no --skip-trust. Trust: Gemini turns off every MCP server in a folder it does
+ * not trust. align says so in one line and never trusts a folder for the user.
  * Instructions come from the managed GEMINI.md block. Pass-through args are the whole of the args.
  */
 export function buildGeminiLaunch(c) {
-    const env = { ALIGN_WRAPPED: '1' };
-    const files = [];
+    const writes = [];
     const notes = [];
-    const copy = geminiCopyName(c.systemSettings.path);
-    let injected = false;
-    if (c.overridden.length > 0 || !c.present) {
-        const theirs = c.systemSettings.unreadable ? null : parseTheirs(c.systemSettings.text);
-        if (!theirs) {
-            notes.push(`Gemini's system settings file ${c.systemSettings.path} is not readable JSON with an object "mcpServers", so Align's graph tools were not added to this session. Fix the file, or point GEMINI_CLI_SYSTEM_SETTINGS_PATH at one that is.`);
-        }
-        else {
-            // Set unconditionally: a canonical align-local here would have made `present` true with
-            // nothing overridden, so whatever is under this name now is replaced by ours.
-            const merged = { ...theirs, mcpServers: { ...(theirs['mcpServers'] ?? {}), [INJECTED_SERVER_NAME]: alignServerEntry('mcpServers', 'local') } };
-            // 0600: the copy carries whatever the admin's system file holds.
-            files.push({ name: copy, content: `${JSON.stringify(merged, null, 2)}\n`, mode: 0o600 });
-            env['GEMINI_CLI_SYSTEM_SETTINGS_PATH'] = c.cachePath(copy);
-            if (!c.env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'])
-                env['GEMINI_CLI_SYSTEM_DEFAULTS_PATH'] = geminiSystemDefaultsPath(c.systemSettings.path, c.platform);
-            if (c.overridden.length > 0)
-                notes.push(`Gemini will use Align's own align-local MCP server this session, not the one in ${c.overridden.join(', ')}.`);
-            injected = true;
-        }
+    if (c.blocked) {
+        notes.push(`Gemini will not load Align's graph: ${c.blocked.file} - ${c.blocked.why}. Remove that to use the graph.`);
+    }
+    if (c.conflict) {
+        notes.push(`${c.conflict} defines its own align-local MCP server, so Align did not add its graph to Gemini. Remove that entry to use the graph.`);
+    }
+    else if (!c.present && !c.blocked) {
+        writes.push({
+            kind: 'mcp-entry',
+            file: c.settingsFile,
+            topKey: 'mcpServers',
+            name: INJECTED_SERVER_NAME,
+            entry: alignServerEntry('mcpServers', 'local'),
+            invalidJsonAdvice: ' (Gemini accepts comments in this file and align does not, so remove any comments or fix the syntax), then run align again',
+        });
+    }
+    if (c.repoAlign) {
+        notes.push(`${c.repoAlign} defines an \`align\` MCP server of its own that Gemini will run next to Align's. Check it before you trust this folder.`);
     }
     if (c.trust === 'untrusted' || c.trust === 'unknown')
         notes.push(GEMINI_TRUST_NOTE);
     return {
         bin: 'gemini',
         args: [...c.passthrough],
-        env,
-        files,
-        // This source's copy is refreshed when used and removed when not. Other sources' copies may
-        // belong to a concurrent session, so they only age out (pruneLaunchFiles).
-        prune: { prefix: COPY_PREFIX, ...(injected ? { keep: copy } : { remove: copy }) },
+        env: { ALIGN_WRAPPED: '1' },
+        files: [],
+        // Ages out the system-settings copies earlier align versions left in the cache.
+        prune: { prefix: COPY_PREFIX },
+        ...(writes.length > 0 ? { writes } : {}),
         ...(notes.length > 0 ? { notes } : {}),
     };
 }

package/dist/lib/launch/adapters/gemini-cli.js.map

@@ -1 +1 @@
-{"version":3,"file":"gemini-cli.js","sourceRoot":"","sources":["../../../../src/lib/launch/adapters/gemini-cli.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"gemini-cli.js","sourceRoot":"","sources":["../../../../src/lib/launch/adapters/gemini-cli.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,WAAW,EAA2B,MAAM,oBAAoB,CAAC;AAK1E,mFAAmF;AACnF,MAAM,oBAAoB,GAAG,aAAa,CAAC;AAE3C,MAAM,CAAC,MAAM,iBAAiB,GAAG,oIAAoI,CAAC;AAEtK;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,UAAU,iBAAiB,CAAC,CAAsB;IACtD,MAAM,MAAM,GAAkB,EAAE,CAAC;IACjC,MAAM,KAAK,GAAa,EAAE,CAAC;IAC3B,IAAI,CAAC,CAAC,OAAO,EAAE,CAAC;QACd,KAAK,CAAC,IAAI,CAAC,uCAAuC,CAAC,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,iCAAiC,CAAC,CAAC;IACxH,CAAC;IACD,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,QAAQ,wHAAwH,CAAC,CAAC;IACpJ,CAAC;SAAM,IAAI,CAAC,CAAC,CAAC,OAAO,IAAI,CAAC,CAAC,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,CAAC,IAAI,CAAC;YACV,IAAI,EAAE,WAAW;YACjB,IAAI,EAAE,CAAC,CAAC,YAAY;YACpB,MAAM,EAAE,YAAY;YACpB,IAAI,EAAE,oBAAoB;YAC1B,KAAK,EAAE,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAC;YAC9C,iBAAiB,EAAE,4HAA4H;SAChJ,CAAC,CAAC;IACL,CAAC;IACD,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC;QAChB,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,0HAA0H,CAAC,CAAC;IACvJ,CAAC;IACD,IAAI,CAAC,CAAC,KAAK,KAAK,WAAW,IAAI,CAAC,CAAC,KAAK,KAAK,SAAS;QAAE,KAAK,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;IACpF,OAAO;QACL,GAAG,EAAE,QAAQ;QACb,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;QACxB,GAAG,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE;QAC3B,KAAK,EAAE,EAAE;QACT,gFAAgF;QAChF,KAAK,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE;QAC9B,GAAG,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QACxC,GAAG,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACvC,CAAC;AACJ,CAAC"}

package/dist/lib/launch/adapters/goose.d.ts

@@ -0,0 +1,20 @@
+import type { GooseProjectState } from '../goose-state.js';
+import type { LaunchContext, LaunchSpec } from './claude-code.js';
+export interface GooseLaunchContext extends Pick<LaunchContext, 'passthrough'>, GooseProjectState {
+    /** A `--recipe` file of the user's that names align-local (its path), else undefined. */
+    recipeDefinesAlignLocal?: string;
+}
+/**
+ * Goose, per session, nothing written (goose 1.54.0, `goose session --help`):
+ * `--with-extension '[name:]command args...'` adds a stdio extension for that session, and the
+ * user's own extensions still load (Align never passes `--no-profile`). Verified with `goose run`,
+ * which takes the same flag, against a stub model: the request carried the user's tools and
+ * align-local's. The `align-local:` prefix names it.
+ *
+ * The chat and the one-shot run take it: with no subcommand (or only session options) Align opens
+ * `goose session`, the interactive command; `session`/`s` or `run` the user typed gets it right
+ * after; any other subcommand is left alone, with one line. When config.yaml already has align-local,
+ * nothing is added: an enabled same-named extension makes goose refuse to start.
+ */
+export declare function buildGooseLaunch(c: GooseLaunchContext): LaunchSpec;
+//# sourceMappingURL=goose.d.ts.map

package/dist/lib/launch/adapters/goose.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"goose.d.ts","sourceRoot":"","sources":["../../../../src/lib/launch/adapters/goose.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAE3D,OAAO,KAAK,EAAE,aAAa,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAElE,MAAM,WAAW,kBAAmB,SAAQ,IAAI,CAAC,aAAa,EAAE,aAAa,CAAC,EAAE,iBAAiB;IAC/F,yFAAyF;IACzF,uBAAuB,CAAC,EAAE,MAAM,CAAC;CAClC;AAOD;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,kBAAkB,GAAG,UAAU,CAuBlE"}

package/dist/lib/launch/adapters/goose.js

@@ -0,0 +1,47 @@
+import { alignServerEntry } from '../../mcp-setup.js';
+import { unreadableNote } from './notes.js';
+/** goose's root-only options: they print and exit, so there is no session to add to. */
+const ROOT_ONLY = new Set(['-h', '--help', '-V', '--version']);
+/** `goose session <sub>` commands that open no chat (goose 1.54.0, `goose session --help`). */
+const SESSION_SUBCOMMANDS = new Set(['list', 'remove', 'export', 'import', 'diagnostics', 'rename', 'help']);
+/**
+ * Goose, per session, nothing written (goose 1.54.0, `goose session --help`):
+ * `--with-extension '[name:]command args...'` adds a stdio extension for that session, and the
+ * user's own extensions still load (Align never passes `--no-profile`). Verified with `goose run`,
+ * which takes the same flag, against a stub model: the request carried the user's tools and
+ * align-local's. The `align-local:` prefix names it.
+ *
+ * The chat and the one-shot run take it: with no subcommand (or only session options) Align opens
+ * `goose session`, the interactive command; `session`/`s` or `run` the user typed gets it right
+ * after; any other subcommand is left alone, with one line. When config.yaml already has align-local,
+ * nothing is added: an enabled same-named extension makes goose refuse to start.
+ */
+export function buildGooseLaunch(c) {
+    const spec = { bin: 'goose', args: [...c.passthrough], env: { ALIGN_WRAPPED: '1' }, files: [] };
+    if (c.conflict) {
+        return { ...spec, notes: [`${c.conflict} defines its own align-local extension, so Align did not add its graph to Goose. Remove or rename that entry to use the graph.`] };
+    }
+    if (c.unreadable) {
+        return { ...spec, notes: [unreadableNote(c.unreadable)] };
+    }
+    if (c.recipeDefinesAlignLocal) {
+        return { ...spec, notes: [`${c.recipeDefinesAlignLocal} defines its own align-local extension, so Align did not add its graph to Goose. Remove or rename that entry to use the graph.`] };
+    }
+    if (c.present)
+        return spec;
+    const { command, args } = alignServerEntry('mcpServers', 'local');
+    const ext = ['--with-extension', `align-local:${[command, ...args].join(' ')}`];
+    const [first, ...rest] = c.passthrough;
+    if (first === undefined || (first.startsWith('-') && !ROOT_ONLY.has(first)))
+        return { ...spec, args: ['session', ...ext, ...c.passthrough] };
+    if (ROOT_ONLY.has(first))
+        return spec;
+    if (first === 'session' || first === 's') {
+        return rest[0] !== undefined && SESSION_SUBCOMMANDS.has(rest[0]) ? spec : { ...spec, args: [first, ...ext, ...rest] };
+    }
+    // `goose run` takes the same flag, and is the form that was checked against a stub model.
+    if (first === 'run')
+        return { ...spec, args: [first, ...ext, ...rest] };
+    return { ...spec, notes: [`Align adds its graph to \`goose session\` and \`goose run\` only, so \`goose ${first}\` opens without it.`] };
+}
+//# sourceMappingURL=goose.js.map

package/dist/lib/launch/adapters/goose.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"goose.js","sourceRoot":"","sources":["../../../../src/lib/launch/adapters/goose.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAQ5C,wFAAwF;AACxF,MAAM,SAAS,GAAG,IAAI,GAAG,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,CAAC;AAC/D,+FAA+F;AAC/F,MAAM,mBAAmB,GAAG,IAAI,GAAG,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;AAE7G;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAqB;IACpD,MAAM,IAAI,GAAe,EAAE,GAAG,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;IAC5G,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,QAAQ,gIAAgI,CAAC,EAAE,CAAC;IAC7K,CAAC;IACD,IAAI,CAAC,CAAC,UAAU,EAAE,CAAC;QACjB,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC;IAC5D,CAAC;IACD,IAAI,CAAC,CAAC,uBAAuB,EAAE,CAAC;QAC9B,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,uBAAuB,gIAAgI,CAAC,EAAE,CAAC;IAC5L,CAAC;IACD,IAAI,CAAC,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAC3B,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,gBAAgB,CAAC,YAAY,EAAE,OAAO,CAAwC,CAAC;IACzG,MAAM,GAAG,GAAG,CAAC,kBAAkB,EAAE,eAAe,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;IAChF,MAAM,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC;IACvC,IAAI,KAAK,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,SAAS,EAAE,GAAG,GAAG,EAAE,GAAG,CAAC,CAAC,WAAW,CAAC,EAAE,CAAC;IAC7I,IAAI,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IACtC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,GAAG,EAAE,CAAC;QACzC,OAAO,IAAI,CAAC,CAAC,CAAC,KAAK,SAAS,IAAI,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IACxH,CAAC;IACD,0FAA0F;IAC1F,IAAI,KAAK,KAAK,KAAK;QAAE,OAAO,EAAE,GAAG,IAAI,EAAE,IAAI,EAAE,CAAC,KAAK,EAAE,GAAG,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;IACxE,OAAO,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,CAAC,gFAAgF,KAAK,sBAAsB,CAAC,EAAE,CAAC;AAC3I,CAAC"}

package/dist/lib/launch/adapters/notes.d.ts

@@ -0,0 +1,7 @@
+/** The line for a config Align could not read with certainty (not a foreign align-local). */
+export declare function unreadableNote(u: {
+    file: string;
+    line: number;
+    reason: string;
+}): string;
+//# sourceMappingURL=notes.d.ts.map

package/dist/lib/launch/adapters/notes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"notes.d.ts","sourceRoot":"","sources":["../../../../src/lib/launch/adapters/notes.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,wBAAgB,cAAc,CAAC,CAAC,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAExF"}

package/dist/lib/launch/adapters/notes.js

@@ -0,0 +1,5 @@
+/** The line for a config Align could not read with certainty (not a foreign align-local). */
+export function unreadableNote(u) {
+    return `${u.file}: Align cannot be sure what line ${u.line} says (${u.reason}), so it did not add its graph for this session.`;
+}
+//# sourceMappingURL=notes.js.map

package/dist/lib/launch/adapters/notes.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"notes.js","sourceRoot":"","sources":["../../../../src/lib/launch/adapters/notes.ts"],"names":[],"mappings":"AAAA,6FAA6F;AAC7F,MAAM,UAAU,cAAc,CAAC,CAAiD;IAC9E,OAAO,GAAG,CAAC,CAAC,IAAI,oCAAoC,CAAC,CAAC,IAAI,UAAU,CAAC,CAAC,MAAM,kDAAkD,CAAC;AACjI,CAAC"}

package/dist/lib/launch/agents.d.ts

@@ -23,6 +23,8 @@ export declare const PICK_PRIORITY: readonly LaunchAgentId[];
 export declare const PRE_WAVE_A: ReadonlySet<LaunchAgentId>;
 /** The agents launchable before wave B (wave A included). */
 export declare const PRE_WAVE_B: ReadonlySet<LaunchAgentId>;
+/** The agents launchable before wave C (waves A and B included). */
+export declare const PRE_WAVE_C: ReadonlySet<LaunchAgentId>;
 export declare function byPriority(agents: LaunchAgent[]): LaunchAgent[];
 /**
  * The agent's binary on PATH, and where. Only `bin` is accepted: for Cursor that is `cursor-agent`,

package/dist/lib/launch/agents.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/agents.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,qFAAqF;IACrF,SAAS,EAAE,aAAa,GAAG,cAAc,CAAC;IAC1C,2FAA2F;IAC3F,SAAS,EAAE,OAAO,CAAC;IACnB,wFAAwF;IACxF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,aAAa,EAAE,SAAS,WAAW,EAE/C,CAAC;AAEF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAE7E;AAED,eAAO,MAAM,eAAe,QAAO,WAAW,EAA8C,CAAC;AAE7F;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,aAAa,EAAgI,CAAC;AACnL,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,aAAa,CAAwD,CAAC;AAC3G,6DAA6D;AAC7D,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,aAAa,CAA8D,CAAC;AAEjH,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAM/D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,CAAC,EAAE,WAAW,EACd,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,EAC/F,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,QAAQ,EAAE,MAAM,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKtC"}
+{"version":3,"file":"agents.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/agents.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,aAAa,CAAC;IACpB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,qFAAqF;IACrF,SAAS,EAAE,aAAa,GAAG,cAAc,CAAC;IAC1C,2FAA2F;IAC3F,SAAS,EAAE,OAAO,CAAC;IACnB,wFAAwF;IACxF,OAAO,EAAE,MAAM,CAAC;CACjB;AAED,eAAO,MAAM,aAAa,EAAE,SAAS,WAAW,EAE/C,CAAC;AAEF,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,SAAS,GAAG,WAAW,GAAG,SAAS,CAE7E;AAED,eAAO,MAAM,eAAe,QAAO,WAAW,EAA8C,CAAC;AAE7F;;;;GAIG;AACH,eAAO,MAAM,aAAa,EAAE,SAAS,aAAa,EAAiL,CAAC;AACpO,2CAA2C;AAC3C,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,aAAa,CAAwD,CAAC;AAC3G,6DAA6D;AAC7D,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,aAAa,CAA8D,CAAC;AACjH,oEAAoE;AACpE,eAAO,MAAM,UAAU,EAAE,WAAW,CAAC,aAAa,CAA0E,CAAC;AAE7H,wBAAgB,UAAU,CAAC,MAAM,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAM/D;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAC7B,CAAC,EAAE,WAAW,EACd,IAAI,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,EAC/F,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,QAAQ,EAAE,MAAM,GACf;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAKtC"}

package/dist/lib/launch/agents.js

@@ -10,11 +10,13 @@ export const supportedAgents = () => LAUNCH_AGENTS.filter((a) => a.supported);
  * --approve). The agents launchable before wave A keep their old order, Claude Code first, so a
  * scripted first run picks what it picked before; the wave A agents come after them.
  */
-export const PICK_PRIORITY = ['claude-code', 'cursor', 'opencode', 'pi', 'codex', 'copilot', 'gemini-cli', 'amp', 'droid', 'grok-build', 'kiro', 'qwen'];
+export const PICK_PRIORITY = ['claude-code', 'cursor', 'opencode', 'pi', 'codex', 'copilot', 'gemini-cli', 'amp', 'droid', 'grok-build', 'kiro', 'qwen', 'goose', 'auggie', 'continue', 'cline', 'aider'];
 /** The agents launchable before wave A. */
 export const PRE_WAVE_A = new Set(['claude-code', 'cursor', 'opencode', 'pi']);
 /** The agents launchable before wave B (wave A included). */
 export const PRE_WAVE_B = new Set([...PRE_WAVE_A, 'codex', 'copilot', 'gemini-cli']);
+/** The agents launchable before wave C (waves A and B included). */
+export const PRE_WAVE_C = new Set([...PRE_WAVE_B, 'amp', 'droid', 'grok-build', 'kiro', 'qwen']);
 export function byPriority(agents) {
     const rank = (a) => {
         const i = PICK_PRIORITY.indexOf(a.name);

package/dist/lib/launch/agents.js.map

@@ -1 +1 @@
-{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../../src/lib/launch/agents.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAejE,MAAM,CAAC,MAAM,aAAa,GAA2B,cAAc,CAAC,GAAG,CACrE,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC,CACrI,CAAC;AAEF,MAAM,UAAU,WAAW,CAAC,IAAwB;IAClD,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;AACpD,CAAC;AAED,MAAM,CAAC,MAAM,eAAe,GAAG,GAAkB,EAAE,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAE7F;;;;GAIG;AACH,MAAM,CAAC,MAAM,aAAa,GAA6B,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;AACnL,2CAA2C;AAC3C,MAAM,CAAC,MAAM,UAAU,GAA+B,IAAI,GAAG,CAAC,CAAC,aAAa,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAC;AAC3G,6DAA6D;AAC7D,MAAM,CAAC,MAAM,UAAU,GAA+B,IAAI,GAAG,CAAC,CAAC,GAAG,UAAU,EAAE,OAAO,EAAE,SAAS,EAAE,YAAY,CAAC,CAAC,CAAC;AAEjH,MAAM,UAAU,UAAU,CAAC,MAAqB;IAC9C,MAAM,IAAI,GAAG,CAAC,CAAc,EAAU,EAAE;QACtC,MAAM,CAAC,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1C,CAAC,CAAC;IACF,OAAO,CAAC,GAAG,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;AACvD,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,eAAe,CAC7B,CAAc,EACd,IAA+F,EAC/F,GAAuC,EACvC,QAAgB;IAEhB,MAAM,KAAK,GAAG,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC;IACzC,IAAI,CAAC,KAAK;QAAE,OAAO,IAAI,CAAC;IACxB,MAAM,OAAO,GAAG,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,UAAU,CAAC;IAC/C,OAAO,OAAO,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACxF,CAAC"}
+{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../../src/lib/launch/agents.ts"],"names":[],"mappings":"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"}

package/dist/lib/launch/auggie-state.d.ts

@@ -0,0 +1,25 @@
+import { type AlignLocalState } from './strict-entry.js';
+export interface AuggieProjectState extends AlignLocalState {
+    /** `<augment cache dir>/settings.json`, the user layer: the one file align adds to. */
+    settingsFile: string;
+    /** It parses only with its comments stripped: align never rewrites it (the comments would go). */
+    commented: boolean;
+}
+/**
+ * What Auggie would already load for align (auggie 0.36.0, read from its bundle and checked with
+ * `auggie mcp list --json` in a sandbox). Layers: managed, then for the workspace root
+ * `.augment/settings.local.json` and `.augment/settings.json`, then the user file
+ * `<--augment-cache-dir, default ~/.augment>/settings.json`. A same-named server in a workspace
+ * layer replaced the user's. So:
+ *  - a canonical align-local (or `align`) in any layer: present, nothing to add;
+ *  - a non-canonical align-local in any layer: a conflict. In a repo layer it would replace ours;
+ *    in the user file the writer adds and never edits.
+ * Files are parsed as Auggie parses them (comments and trailing commas allowed), and a layer align
+ * still cannot parse that names align at all is a conflict too (fail closed).
+ * The workspace root is the git root unless `-w/--workspace-root` names one: every ancestor of the
+ * cwd is read (a superset), plus the named root.
+ */
+export declare function readAuggieState(cwd: string, home: string, opts: {
+    localIsDefault: boolean;
+}, env: Record<string, string | undefined>, platform: string, passthrough: string[]): AuggieProjectState;
+//# sourceMappingURL=auggie-state.d.ts.map

package/dist/lib/launch/auggie-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"auggie-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/auggie-state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAA4E,MAAM,mBAAmB,CAAC;AAEnI,MAAM,WAAW,kBAAmB,SAAQ,eAAe;IACzD,uFAAuF;IACvF,YAAY,EAAE,MAAM,CAAC;IACrB,kGAAkG;IAClG,SAAS,EAAE,OAAO,CAAC;CACpB;AAqBD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,eAAe,CAC7B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,EACjC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAAE,GACpB,kBAAkB,CAmCpB"}

package/dist/lib/launch/auggie-state.js

@@ -0,0 +1,74 @@
+import path from 'node:path';
+import { ancestors, optionValue, readText } from './layer-files.js';
+import { isCanonicalLocalEntry, parseJsoncTrailingCommas, unreadableMentionsAlign } from './strict-entry.js';
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+function strictParse(text) {
+    try {
+        JSON.parse(text);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/** Auggie's managed settings: /etc/augment, or %ProgramData%\augment (its bundle, n1e()). */
+function managedFile(env, platform) {
+    return platform === 'win32'
+        ? path.win32.join(env['ProgramData'] || 'C:\\ProgramData', 'augment', 'settings.json')
+        : path.posix.join('/etc', 'augment', 'settings.json');
+}
+/**
+ * What Auggie would already load for align (auggie 0.36.0, read from its bundle and checked with
+ * `auggie mcp list --json` in a sandbox). Layers: managed, then for the workspace root
+ * `.augment/settings.local.json` and `.augment/settings.json`, then the user file
+ * `<--augment-cache-dir, default ~/.augment>/settings.json`. A same-named server in a workspace
+ * layer replaced the user's. So:
+ *  - a canonical align-local (or `align`) in any layer: present, nothing to add;
+ *  - a non-canonical align-local in any layer: a conflict. In a repo layer it would replace ours;
+ *    in the user file the writer adds and never edits.
+ * Files are parsed as Auggie parses them (comments and trailing commas allowed), and a layer align
+ * still cannot parse that names align at all is a conflict too (fail closed).
+ * The workspace root is the git root unless `-w/--workspace-root` names one: every ancestor of the
+ * cwd is read (a superset), plus the named root.
+ */
+export function readAuggieState(cwd, home, opts, env, platform, passthrough) {
+    const o = { ...opts, platform, host: 'auggie' };
+    const cacheDir = optionValue(passthrough, '--augment-cache-dir');
+    const settingsFile = cacheDir ? path.join(path.resolve(cacheDir), 'settings.json') : path.join(home, '.augment', 'settings.json');
+    const root = optionValue(passthrough, '--workspace-root') ?? optionValue(passthrough, '-w');
+    const roots = [...(root ? [path.resolve(cwd, root)] : []), ...ancestors(cwd)];
+    const files = [
+        managedFile(env, platform),
+        ...roots.flatMap((d) => [path.join(d, '.augment', 'settings.local.json'), path.join(d, '.augment', 'settings.json')]),
+        settingsFile,
+    ].filter((f, i, all) => all.indexOf(f) === i);
+    const text = readText(settingsFile);
+    const state = {
+        present: false,
+        overridden: [],
+        settingsFile,
+        // Comments or a trailing comma: Auggie accepts both, and a JSON rewrite would drop them.
+        commented: text !== null && text.trim() !== '' && !strictParse(text) && parseJsoncTrailingCommas(text) !== null,
+    };
+    for (const file of files) {
+        const body = file === settingsFile ? text : readText(file);
+        const parsed = parseJsoncTrailingCommas(body);
+        if (unreadableMentionsAlign(body, parsed)) {
+            state.conflict ??= file;
+            continue;
+        }
+        const servers = parsed?.['mcpServers'];
+        if (!isObject(servers))
+            continue;
+        if (isCanonicalLocalEntry(servers['align'], o))
+            state.present = true;
+        if (!('align-local' in servers))
+            continue;
+        if (isCanonicalLocalEntry(servers['align-local'], o))
+            state.present = true;
+        else
+            state.conflict ??= file;
+    }
+    return state;
+}
+//# sourceMappingURL=auggie-state.js.map

package/dist/lib/launch/auggie-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"auggie-state.js","sourceRoot":"","sources":["../../../src/lib/launch/auggie-state.ts"],"names":[],"mappings":"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"}

package/dist/lib/launch/cline-state.d.ts

@@ -0,0 +1,32 @@
+import { type AlignLocalState } from './strict-entry.js';
+export interface ClineProjectState extends AlignLocalState {
+    /** The one MCP settings file Cline CLI loads: the file align adds to. */
+    mcpFile: string;
+    /** The user's --config or --data-dir chose that file for this session only: align writes nothing there. */
+    oneSession: boolean;
+    /** Align's own entry, with an older key set or values that have changed since: refresh it. */
+    stale?: boolean;
+    /** The conflict is an env value Align did not write: which key. */
+    envConflictKey?: string;
+}
+export declare function clineMcpFile(home: string, env: Record<string, string | undefined>, passthrough: string[]): string;
+/**
+ * The variables that place Cline's files, as cline would resolve them this launch. Cline loads
+ * `.env`/`.env.local` from the cwd, so the launch pins them (only those the user did not export);
+ * a process variable wins over its dotenv. CLINE_DIR is pinned to the user's own dir even with
+ * `--config`, which beats it anyway; CLINE_DATA_DIR follows `--config` and `--data-dir`, because an
+ * exported one beats `--config` (checked) and must not undo the user's flag. Without `--data-dir`,
+ * the sandbox switches are pinned off: a repo `.env` with CLINE_SANDBOX=1 would move the data dir
+ * and the provider settings. Empty is a no-op for all three in cline's source (`?.trim()` checks).
+ */
+export declare function clinePins(home: string, env: Record<string, string | undefined>, passthrough: string[]): Record<string, string>;
+/**
+ * What Cline CLI would already load for align (cline 3.0.70): one MCP settings file, no repo
+ * layer (checked in a sandbox: a repo's `.cline/` MCP files were not listed by `cline config
+ * --json`). A canonical align-local or `align` there is present; any other align-local is a
+ * conflict, because the writer adds and never edits.
+ */
+export declare function readClineState(_cwd: string, home: string, opts: {
+    localIsDefault: boolean;
+}, env: Record<string, string | undefined>, platform: string, passthrough: string[]): ClineProjectState;
+//# sourceMappingURL=cline-state.d.ts.map

package/dist/lib/launch/cline-state.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cline-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/cline-state.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,eAAe,EAAqF,MAAM,mBAAmB,CAAC;AAE5I,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,yEAAyE;IACzE,OAAO,EAAE,MAAM,CAAC;IAChB,2GAA2G;IAC3G,UAAU,EAAE,OAAO,CAAC;IACpB,8FAA8F;IAC9F,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,mEAAmE;IACnE,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAwBD,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,CAEjH;AAED;;;;;;;;GAQG;AACH,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAS9H;AA2BD;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,cAAc,EAAE,OAAO,CAAA;CAAE,EACjC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,MAAM,EAAE,GACpB,iBAAiB,CAqBnB"}

package/dist/lib/launch/cline-state.js

@@ -0,0 +1,108 @@
+import path from 'node:path';
+import { optionValue, readText } from './layer-files.js';
+import { classifyChildEnv } from './mcp-child-env.js';
+import { isCanonicalLocalEntry, parseJsonc, unreadableMentionsAlign } from './strict-entry.js';
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+const FILE = 'cline_mcp_settings.json';
+/**
+ * Where a Cline session reads its MCP servers (cline 3.0.70, its bundled path code):
+ * CLINE_MCP_SETTINGS_PATH; else `<data dir>/settings/cline_mcp_settings.json`. The data dir is the
+ * user's `--data-dir` (its sandbox setup sets CLINE_DATA_DIR from it; checked in a real session:
+ * `cline --data-dir X "..."` loaded X/settings' server), else CLINE_DATA_DIR, else
+ * `<cline dir>/data`, the cline dir being the user's `--config` dir, else CLINE_DIR, else ~/.cline.
+ * (`cline config --json` ignores --data-dir, which is why an earlier check misread it.)
+ */
+function clineDirs(home, env, passthrough) {
+    const configFlag = optionValue(passthrough, '--config');
+    const dataFlag = optionValue(passthrough, '--data-dir');
+    const userDir = env['CLINE_DIR']?.trim() ? path.resolve(env['CLINE_DIR'].trim()) : path.join(home, '.cline');
+    const clineDir = configFlag ? path.resolve(configFlag) : userDir;
+    const dataDir = dataFlag ? path.resolve(dataFlag) : env['CLINE_DATA_DIR']?.trim() ? path.resolve(env['CLINE_DATA_DIR'].trim()) : path.join(clineDir, 'data');
+    const mcp = env['CLINE_MCP_SETTINGS_PATH']?.trim();
+    return { clineDir: userDir, dataDir, mcpFile: mcp ? path.resolve(mcp) : path.join(dataDir, 'settings', FILE) };
+}
+export function clineMcpFile(home, env, passthrough) {
+    return clineDirs(home, env, passthrough).mcpFile;
+}
+/**
+ * The variables that place Cline's files, as cline would resolve them this launch. Cline loads
+ * `.env`/`.env.local` from the cwd, so the launch pins them (only those the user did not export);
+ * a process variable wins over its dotenv. CLINE_DIR is pinned to the user's own dir even with
+ * `--config`, which beats it anyway; CLINE_DATA_DIR follows `--config` and `--data-dir`, because an
+ * exported one beats `--config` (checked) and must not undo the user's flag. Without `--data-dir`,
+ * the sandbox switches are pinned off: a repo `.env` with CLINE_SANDBOX=1 would move the data dir
+ * and the provider settings. Empty is a no-op for all three in cline's source (`?.trim()` checks).
+ */
+export function clinePins(home, env, passthrough) {
+    const d = clineDirs(home, env, passthrough);
+    // Cline reads each one with `?.trim()` and skips it when empty (cline 3.0.70 bundled binary:
+    // the sandbox switch in Ed(), P(), lh(), Xd(), xi(), oa()), so empty is a no-op. With
+    // --data-dir, cline's own sandbox setup sets these from the flag.
+    const sandboxOff = optionValue(passthrough, '--data-dir') === undefined
+        ? { CLINE_SANDBOX: '', CLINE_SANDBOX_DATA_DIR: '', CLINE_PROVIDER_SETTINGS_PATH: '', CLINE_GLOBAL_SETTINGS_PATH: '', CLINE_SESSION_DATA_DIR: '', CLINE_DB_DATA_DIR: '' }
+        : {};
+    return { CLINE_DIR: d.clineDir, CLINE_DATA_DIR: d.dataDir, CLINE_MCP_SETTINGS_PATH: d.mcpFile, ...sandboxOff };
+}
+/** `cline mcp add` wraps the command in `transport` (3.0.70); the flat form loads too. */
+function unwrap(entry) {
+    if (isObject(entry) && Object.keys(entry).length === 1 && isObject(entry['transport'])) {
+        const { type, ...rest } = entry['transport'];
+        return type === 'stdio' ? rest : undefined;
+    }
+    return entry;
+}
+/**
+ * Align's own entry, judged with today's environment: `present` (no env block, or a current
+ * one), `stale` (Align's block from an older key set, or values that have changed: refresh it),
+ * `envConflict` (an env value Align never writes) or `foreign` (anything else).
+ */
+function judge(entry, o, env) {
+    const e = unwrap(entry);
+    if (!isObject(e))
+        return { kind: 'foreign' };
+    if (!('env' in e))
+        return isCanonicalLocalEntry(e, o) ? { kind: 'present' } : { kind: 'foreign' };
+    const { env: block, ...rest } = e;
+    if (!isCanonicalLocalEntry(rest, o))
+        return { kind: 'foreign' };
+    const c = classifyChildEnv(block, env);
+    if (c.kind === 'foreign')
+        return { kind: 'envConflict', key: c.key };
+    return { kind: c.kind === 'current' ? 'present' : 'stale' };
+}
+/**
+ * What Cline CLI would already load for align (cline 3.0.70): one MCP settings file, no repo
+ * layer (checked in a sandbox: a repo's `.cline/` MCP files were not listed by `cline config
+ * --json`). A canonical align-local or `align` there is present; any other align-local is a
+ * conflict, because the writer adds and never edits.
+ */
+export function readClineState(_cwd, home, opts, env, platform, passthrough) {
+    const o = { ...opts, platform, host: 'mcpServers' };
+    const mcpFile = clineMcpFile(home, env, passthrough);
+    const oneSession = optionValue(passthrough, '--config') !== undefined || optionValue(passthrough, '--data-dir') !== undefined;
+    const state = { present: false, overridden: [], mcpFile, oneSession };
+    const text = readText(mcpFile);
+    const parsed = parseJsonc(text);
+    // Fail closed: a file align cannot parse but that names align may hold a server it cannot see.
+    if (unreadableMentionsAlign(text, parsed))
+        return { ...state, conflict: mcpFile };
+    const servers = parsed?.['mcpServers'];
+    if (!isObject(servers))
+        return state;
+    if (judge(servers['align'], o, env).kind === 'present')
+        state.present = true;
+    if (!('align-local' in servers))
+        return state;
+    const v = judge(servers['align-local'], o, env);
+    if (v.kind === 'present')
+        state.present = true;
+    else if (v.kind === 'stale')
+        state.stale = true;
+    else {
+        state.conflict = mcpFile;
+        if (v.kind === 'envConflict')
+            state.envConflictKey = v.key;
+    }
+    return state;
+}
+//# sourceMappingURL=cline-state.js.map

package/dist/lib/launch/cline-state.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cline-state.js","sourceRoot":"","sources":["../../../src/lib/launch/cline-state.ts"],"names":[],"mappings":"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"}

package/dist/lib/launch/config-writes.d.ts

@@ -18,6 +18,10 @@ export interface ConfigWrite {
     root?: string;
     /** One extra line after the first write (what the user has to do next). */
     hint?: string;
+    /** Replace an entry of this name that is Align's own (a stale env block), instead of adding only. */
+    replace?: true;
+    /** JSON only: the tail of the invalid-JSON message, for a file whose agent reads more than strict JSON (Gemini's settings take comments). */
+    invalidJsonAdvice?: string;
 }
 /**
  * Remembers a refused write, so its notice is printed once rather than on every launch. It is

package/dist/lib/launch/config-writes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-writes.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B,8HAA8H;IAC9H,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,yHAAyH;IACzH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAKD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,IAAI,CAoBvG;AAED,6FAA6F;AAC7F,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAExE"}
+{"version":3,"file":"config-writes.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"AAGA;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B,8HAA8H;IAC9H,IAAI,EAAE,WAAW,GAAG,gBAAgB,CAAC;IACrC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/B,yHAAyH;IACzH,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,2EAA2E;IAC3E,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qGAAqG;IACrG,OAAO,CAAC,EAAE,IAAI,CAAC;IACf,6IAA6I;IAC7I,iBAAiB,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED;;;;GAIG;AACH,MAAM,WAAW,WAAW;IAC1B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAC3B,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;IACxB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AAKD;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,EAAE,IAAI,CAAC,EAAE,WAAW,GAAG,IAAI,CAuBvG;AAED,6FAA6F;AAC7F,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAExE"}

package/dist/lib/launch/config-writes.js

@@ -13,15 +13,20 @@ export function applyConfigWrite(w, note, memo) {
         ? safeWriteText(w.file, (cur) => appendTomlServer(w, cur), { ...opts, markers: tomlMarkers(w.name), tomlTable: [w.topKey, w.name] })
         : safeWriteJson(w.file, (cur) => {
             const servers = isObject(cur[w.topKey]) ? cur[w.topKey] : {};
-            if (w.name in servers)
+            if (w.name in servers && !w.replace)
+                return undefined;
+            if (w.replace && JSON.stringify(servers[w.name]) === JSON.stringify(w.entry))
                 return undefined;
             return { ...cur, [w.topKey]: { ...servers, [w.name]: w.entry } };
-        }, { ...opts, trailingNewline: true });
+        }, { ...opts, trailingNewline: true, ...(w.invalidJsonAdvice ? { invalidJsonAdvice: w.invalidJsonAdvice } : {}) });
     if (status === 'symlink')
         memo?.add(w.file);
     else if (quiet)
         memo?.remove(w.file);
-    if (status === 'written') {
+    if (status === 'written' && w.replace) {
+        note(`Refreshed Align's own ${w.name} entry in ${w.file}. Undo: align use --undo`);
+    }
+    else if (status === 'written') {
         note(`Added the ${w.name} MCP server to ${w.file} (original kept at ${w.file}${BACKUP_SUFFIX}). Undo: align use --undo`);
         if (w.hint)
             note(w.hint);