@aligndottech/cli 0.47.1 → 0.49.0

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":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,sBAAsB,CAAC;AAGtD,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,SAAS,CAAC;IAChB,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,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,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,CAGtC"}
+{"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"}

package/dist/lib/launch/agents.js

@@ -1,16 +1,38 @@
-import { AGENT_REGISTRY } from './registry/index.js';
-export const LAUNCH_AGENTS = AGENT_REGISTRY.map(({ name, label, bin, injection, supported, install }) => ({ name, label, bin, injection, supported, install }));
+import { installText } from './install.js';
+import { AGENT_REGISTRY, specByName } from './registry/index.js';
+export const LAUNCH_AGENTS = AGENT_REGISTRY.map(({ name, label, bin, injection, supported, install }) => ({ name, label, bin, injection, supported, install: installText(install) }));
 export function agentByName(name) {
     return LAUNCH_AGENTS.find((a) => a.name === name);
 }
 export const supportedAgents = () => LAUNCH_AGENTS.filter((a) => a.supported);
+/**
+ * Which agent to take when several are installed and nobody can be asked (no terminal, or
+ * --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'];
+/** 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']);
+export function byPriority(agents) {
+    const rank = (a) => {
+        const i = PICK_PRIORITY.indexOf(a.name);
+        return i < 0 ? PICK_PRIORITY.length : i;
+    };
+    return [...agents].sort((a, b) => rank(a) - rank(b));
+}
 /**
  * The agent's binary on PATH, and where. Only `bin` is accepted: for Cursor that is `cursor-agent`,
  * which its installer always creates. Cursor's docs also call the command `agent`, but that name
- * is too generic to run on a guess, so a bare `agent` on PATH is not Cursor.
+ * is too generic to run on a guess, so a bare `agent` on PATH is not Cursor. A spec whose `bin` is
+ * generic (Grok Build's `grok`) also names `acceptsBin`, and a `bin` it refuses is not installed.
  */
 export function resolveAgentBin(a, find, env, platform) {
     const found = find(a.bin, env, platform);
-    return found ? { bin: a.bin, path: found } : null;
+    if (!found)
+        return null;
+    const accepts = specByName(a.name)?.acceptsBin;
+    return accepts && !accepts(found, env, platform) ? null : { bin: a.bin, path: found };
 }
 //# sourceMappingURL=agents.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"agents.js","sourceRoot":"","sources":["../../../src/lib/launch/agents.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAarD,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,CAAC,CAC/G,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,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,OAAO,KAAK,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;AACpD,CAAC"}
+{"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"}

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

@@ -0,0 +1,21 @@
+import { type AlignLocalState } from './strict-entry.js';
+export interface AmpProjectState extends AlignLocalState {
+    /** The user settings file Amp reads this session: the one align adds to. */
+    settingsFile: string;
+    /** It parses only with its comments stripped: align never rewrites it (the comments would go). */
+    commented: boolean;
+}
+/** Amp's user settings file: `--settings-file`, else AMP_SETTINGS_FILE, else $XDG_CONFIG_HOME (or ~/.config)/amp/settings.json. */
+export declare function ampSettingsFile(home: string, env: Record<string, string | undefined>, passthrough: string[]): string;
+/**
+ * What Amp would already load for align (amp 0.0.1791576029; it reads its settings as JSONC):
+ *  - the user settings file align adds to: a canonical `align` or align-local there is present;
+ *    a non-canonical align-local is a conflict, because the writer adds and never edits;
+ *  - a workspace `.amp/settings.json` (Amp uses the nearest one, up to the git root; every
+ *    ancestor is read here, a superset): a non-canonical align-local there is a conflict. A
+ *    workspace server waits for `amp mcp approve`, so it never stands in for us.
+ */
+export declare function readAmpState(cwd: string, home: string, opts: {
+    localIsDefault: boolean;
+}, env: Record<string, string | undefined>, platform: string, passthrough: string[]): AmpProjectState;
+//# sourceMappingURL=amp-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"amp-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/amp-state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAAqC,MAAM,mBAAmB,CAAC;AAE5F,MAAM,WAAW,eAAgB,SAAQ,eAAe;IACtD,4EAA4E;IAC5E,YAAY,EAAE,MAAM,CAAC;IACrB,kGAAkG;IAClG,SAAS,EAAE,OAAO,CAAC;CACpB;AAMD,mIAAmI;AACnI,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,CAKpH;AAWD;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAC1B,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,eAAe,CA0BjB"}

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

@@ -0,0 +1,61 @@
+import path from 'node:path';
+import { ancestors, optionValue, readText } from './layer-files.js';
+import { isCanonicalLocalEntry, parseJsonc } from './strict-entry.js';
+const KEY = 'amp.mcpServers';
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+/** Amp's user settings file: `--settings-file`, else AMP_SETTINGS_FILE, else $XDG_CONFIG_HOME (or ~/.config)/amp/settings.json. */
+export function ampSettingsFile(home, env, passthrough) {
+    const flag = optionValue(passthrough, '--settings-file');
+    if (flag)
+        return path.resolve(flag);
+    if (env['AMP_SETTINGS_FILE'])
+        return path.resolve(env['AMP_SETTINGS_FILE']);
+    return path.join(env['XDG_CONFIG_HOME'] ? env['XDG_CONFIG_HOME'] : path.join(home, '.config'), 'amp', 'settings.json');
+}
+function strictParse(text) {
+    try {
+        JSON.parse(text);
+        return true;
+    }
+    catch {
+        return false;
+    }
+}
+/**
+ * What Amp would already load for align (amp 0.0.1791576029; it reads its settings as JSONC):
+ *  - the user settings file align adds to: a canonical `align` or align-local there is present;
+ *    a non-canonical align-local is a conflict, because the writer adds and never edits;
+ *  - a workspace `.amp/settings.json` (Amp uses the nearest one, up to the git root; every
+ *    ancestor is read here, a superset): a non-canonical align-local there is a conflict. A
+ *    workspace server waits for `amp mcp approve`, so it never stands in for us.
+ */
+export function readAmpState(cwd, home, opts, env, platform, passthrough) {
+    const o = { ...opts, platform, host: 'mcpServers' };
+    const settingsFile = ampSettingsFile(home, env, passthrough);
+    const servers = (text) => {
+        const s = parseJsonc(text)?.[KEY];
+        return isObject(s) ? s : undefined;
+    };
+    const text = readText(settingsFile);
+    const user = servers(text);
+    const state = {
+        present: isCanonicalLocalEntry(user?.['align'], o) || isCanonicalLocalEntry(user?.['align-local'], o),
+        overridden: [],
+        settingsFile,
+        commented: text !== null && text.trim() !== '' && !strictParse(text) && parseJsonc(text) !== null,
+    };
+    if (user && 'align-local' in user && !isCanonicalLocalEntry(user['align-local'], o))
+        state.conflict = settingsFile;
+    for (const dir of ancestors(cwd)) {
+        const file = path.join(dir, '.amp', 'settings.json');
+        if (file === settingsFile)
+            continue;
+        const ws = servers(readText(file));
+        if (ws && 'align-local' in ws && !isCanonicalLocalEntry(ws['align-local'], o)) {
+            state.conflict ??= file;
+            break;
+        }
+    }
+    return state;
+}
+//# sourceMappingURL=amp-state.js.map

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

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

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

@@ -0,0 +1,31 @@
+import { type AlignLocalState } from './strict-entry.js';
+export type CodexProjectState = AlignLocalState;
+/**
+ * The profile a user's own args select (`-p name`, `--profile name`, `--profile=name`, before
+ * any `--`). Codex layers $CODEX_HOME/<name>.config.toml for it. A name that could leave that
+ * directory (a separator, `..`) is never made into a path: undefined.
+ */
+export declare function codexProfile(passthrough: string[]): string | undefined;
+/**
+ * What Codex would already load for align, read with a TOML parser (sub-tables, dotted keys and
+ * inline tables all land on the same object).
+ *
+ * The CONFLICT scan reads every layer Codex might load, whatever the trust state, and fails
+ * closed. align cannot reproduce Codex's project resolution: a worktree resolves to its main
+ * repo's trust, an untrusted repo becomes trusted with one Enter at Codex's prompt and reloads
+ * WITH our -c overrides, and `project_root_markers` can put the project root ABOVE the git
+ * root (all verified on 0.153.0). So: /etc/codex/config.toml and managed_config.toml (both
+ * named in the 0.153.0 binary), $CODEX_HOME (or ~/.codex)/config.toml, the profile file a
+ * `-p`/`--profile` in the user's args selects, and EVERY .codex/config.toml from cwd up to the
+ * filesystem root (a superset, so it can only over-refuse). The user config met again as an
+ * ancestor is read once, as the user layer.
+ *
+ * "Already present" counts only the user, profile and system layers. A project's canonical
+ * align-local is simply overwritten by our identical -c values; a project's canonical `align`
+ * at worst duplicates tools.
+ */
+export declare function readCodexState(cwd: string, home: string, opts: {
+    localIsDefault: boolean;
+    systemDir?: string;
+}, env: Record<string, string | undefined>, platform: string, passthrough?: string[]): CodexProjectState;
+//# sourceMappingURL=codex-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"codex-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/codex-state.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,KAAK,eAAe,EAA0B,MAAM,mBAAmB,CAAC;AAEjF,MAAM,MAAM,iBAAiB,GAAG,eAAe,CAAC;AA4BhD;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAUtE;AAKD;;;;;;;;;;;;;;;;;GAiBG;AACH,wBAAgB,cAAc,CAC5B,GAAG,EAAE,MAAM,EACX,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE;IAAE,cAAc,EAAE,OAAO,CAAC;IAAC,SAAS,CAAC,EAAE,MAAM,CAAA;CAAE,EACrD,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EACvC,QAAQ,EAAE,MAAM,EAChB,WAAW,GAAE,MAAM,EAAO,GACzB,iBAAiB,CA0BnB"}

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

@@ -0,0 +1,92 @@
+import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import { parse } from 'smol-toml';
+import { foldLayers } from './strict-entry.js';
+const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
+/**
+ * A config.toml as an object. Missing or unparseable reads as empty: Codex itself refuses to
+ * start on a config.toml it cannot parse and names the error, so no entry in it can run
+ * either, and injecting as if it were absent changes nothing about what the user sees.
+ */
+function readToml(file) {
+    try {
+        const parsed = parse(readFileSync(file, 'utf8'));
+        return isObject(parsed) ? parsed : {};
+    }
+    catch {
+        return {};
+    }
+}
+/** cwd and every directory above it, to the filesystem root. */
+function ancestors(cwd) {
+    const dirs = [];
+    for (let dir = path.resolve(cwd);; dir = path.dirname(dir)) {
+        dirs.push(dir);
+        if (path.dirname(dir) === dir)
+            return dirs;
+    }
+}
+/**
+ * The profile a user's own args select (`-p name`, `--profile name`, `--profile=name`, before
+ * any `--`). Codex layers $CODEX_HOME/<name>.config.toml for it. A name that could leave that
+ * directory (a separator, `..`) is never made into a path: undefined.
+ */
+export function codexProfile(passthrough) {
+    let name;
+    for (let i = 0; i < passthrough.length; i++) {
+        const a = passthrough[i];
+        if (a === '--')
+            break;
+        if (a === '-p' || a === '--profile')
+            name = passthrough[++i];
+        else if (a.startsWith('--profile='))
+            name = a.slice('--profile='.length);
+    }
+    if (!name || /[/\\]/.test(name) || name.includes('..'))
+        return undefined;
+    return name;
+}
+/** Every key -c overrides when it replaces align-local: command, args, and enabled=true. */
+const REPLACEABLE = new Set(['command', 'args', 'enabled']);
+/**
+ * What Codex would already load for align, read with a TOML parser (sub-tables, dotted keys and
+ * inline tables all land on the same object).
+ *
+ * The CONFLICT scan reads every layer Codex might load, whatever the trust state, and fails
+ * closed. align cannot reproduce Codex's project resolution: a worktree resolves to its main
+ * repo's trust, an untrusted repo becomes trusted with one Enter at Codex's prompt and reloads
+ * WITH our -c overrides, and `project_root_markers` can put the project root ABOVE the git
+ * root (all verified on 0.153.0). So: /etc/codex/config.toml and managed_config.toml (both
+ * named in the 0.153.0 binary), $CODEX_HOME (or ~/.codex)/config.toml, the profile file a
+ * `-p`/`--profile` in the user's args selects, and EVERY .codex/config.toml from cwd up to the
+ * filesystem root (a superset, so it can only over-refuse). The user config met again as an
+ * ancestor is read once, as the user layer.
+ *
+ * "Already present" counts only the user, profile and system layers. A project's canonical
+ * align-local is simply overwritten by our identical -c values; a project's canonical `align`
+ * at worst duplicates tools.
+ */
+export function readCodexState(cwd, home, opts, env, platform, passthrough = []) {
+    const o = { localIsDefault: opts.localIsDefault, platform, host: 'codex' };
+    const replaceable = (e) => isObject(e) && Object.keys(e).every((k) => REPLACEABLE.has(k));
+    const at = (file) => ({ file, servers: readToml(file)['mcp_servers'] });
+    const systemDir = opts.systemDir ?? '/etc/codex';
+    const codexHome = env['CODEX_HOME'] ? env['CODEX_HOME'] : path.join(home, '.codex');
+    const userFile = path.resolve(codexHome, 'config.toml');
+    const profile = codexProfile(passthrough);
+    const base = foldLayers([
+        at(path.join(systemDir, 'config.toml')),
+        at(userFile),
+        ...(profile ? [at(path.join(codexHome, `${profile}.config.toml`))] : []),
+        at(path.join(systemDir, 'managed_config.toml')),
+    ], o, replaceable);
+    const projectFiles = ancestors(cwd).map((d) => path.join(d, '.codex', 'config.toml')).filter((f) => f !== userFile);
+    const project = foldLayers(projectFiles.map(at), o, replaceable);
+    const conflict = base.conflict ?? project.conflict;
+    return {
+        present: base.present,
+        overridden: [...base.overridden, ...project.overridden],
+        ...(conflict ? { conflict } : {}),
+    };
+}
+//# sourceMappingURL=codex-state.js.map

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

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

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

@@ -8,7 +8,8 @@
  * hooks.json entry written for a CLI launch would not be known to run.
  */
 export interface ConfigWrite {
-    kind: 'mcp-entry';
+    /** mcp-entry: a key under `topKey` in a JSON file. toml-mcp-entry: a `[mcp_servers.<name>]` table appended to a TOML file. */
+    kind: 'mcp-entry' | 'toml-mcp-entry';
     file: string;
     topKey: string;
     name: string;
@@ -34,4 +35,9 @@ export interface RefusedMemo {
  * the caller reports it and launches anyway.
  */
 export declare function applyConfigWrite(w: ConfigWrite, note: (line: string) => void, memo?: RefusedMemo): void;
+/** The block align owns in a TOML file: `align use --undo` takes out exactly this region. */
+export declare function tomlMarkers(name: string): {
+    start: string;
+    end: string;
+};
 //# sourceMappingURL=config-writes.d.ts.map

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":"AAEA;;;;;;;;GAQG;AACH,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,WAAW,CAAC;IAClB,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,CAiBvG"}
+{"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"}

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

@@ -1,4 +1,5 @@
-import { BACKUP_SUFFIX, safeWriteJson } from '../safe-config-write.js';
+import { parse } from 'smol-toml';
+import { BACKUP_SUFFIX, safeWriteJson, safeWriteText } from '../safe-config-write.js';
 const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v);
 /**
  * Every line goes to `note` (stderr). An entry that is already there, under any shape, is
@@ -7,12 +8,15 @@ const isObject = (v) => typeof v === 'object' && v !== null && !Array.isArray(v)
  */
 export function applyConfigWrite(w, note, memo) {
     const quiet = memo?.has(w.file) === true;
-    const status = safeWriteJson(w.file, (cur) => {
-        const servers = isObject(cur[w.topKey]) ? cur[w.topKey] : {};
-        if (w.name in servers)
-            return undefined;
-        return { ...cur, [w.topKey]: { ...servers, [w.name]: w.entry } };
-    }, { note: quiet ? () => undefined : note, trailingNewline: true, ...(w.root ? { root: w.root } : {}) });
+    const opts = { note: quiet ? () => undefined : note, ...(w.root ? { root: w.root } : {}) };
+    const status = w.kind === 'toml-mcp-entry'
+        ? 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)
+                return undefined;
+            return { ...cur, [w.topKey]: { ...servers, [w.name]: w.entry } };
+        }, { ...opts, trailingNewline: true });
     if (status === 'symlink')
         memo?.add(w.file);
     else if (quiet)
@@ -23,4 +27,53 @@ export function applyConfigWrite(w, note, memo) {
             note(w.hint);
     }
 }
+/** The block align owns in a TOML file: `align use --undo` takes out exactly this region. */
+export function tomlMarkers(name) {
+    return { start: `# >>> ${name}: added by align (undo: align use --undo)`, end: `# <<< ${name}` };
+}
+/** A TOML basic string. JSON's string syntax is valid TOML for the plain ASCII align writes. */
+const tomlString = (v) => {
+    if (typeof v !== 'string' || /[^\x20-\x7e]/.test(v))
+        throw new Error(`cannot write ${JSON.stringify(v)} as a TOML string`);
+    return JSON.stringify(v);
+};
+/**
+ * The new text of a TOML config with `[mcp_servers.<name>]` appended at the end, which keeps
+ * every byte the user wrote (comments included). undefined when a server of that name is
+ * already there, under any shape. Throws, and so writes nothing, when the file does not parse
+ * as TOML, or when the appended table would not land as written (an inline `mcp_servers = {...}`
+ * table cannot be extended): the result is parsed back and compared before it is accepted.
+ */
+function appendTomlServer(w, current) {
+    const before = current ?? '';
+    const { start, end } = tomlMarkers(w.name);
+    let parsed;
+    try {
+        parsed = parse(before);
+    }
+    catch {
+        throw new Error(`${w.file} is not valid TOML, so align left it alone`);
+    }
+    const servers = parsed['mcp_servers'];
+    if (isObject(servers) && w.name in servers)
+        return undefined;
+    // A marker already in the file (a stale one from a write that was cut short, or pasted text)
+    // would pair with ours, and undo would take out whatever sits between them.
+    if (before.includes(start) || before.includes(end)) {
+        throw new Error(`${w.file} already holds an align marker line ("${before.includes(start) ? start : end}"), so align left it alone. Remove that marker line by hand, then run align again`);
+    }
+    const body = Object.entries(w.entry).map(([k, v]) => `${k} = ${Array.isArray(v) ? `[${v.map(tomlString).join(', ')}]` : tomlString(v)}`);
+    const sep = before === '' ? '' : before.endsWith('\n') ? '\n' : '\n\n';
+    const next = `${before}${sep}${start}\n[mcp_servers.${w.name}]\n${body.join('\n')}\n${end}\n`;
+    let landed;
+    try {
+        landed = parse(next)['mcp_servers']?.[w.name];
+    }
+    catch {
+        landed = undefined;
+    }
+    if (JSON.stringify(landed) !== JSON.stringify(w.entry))
+        throw new Error(`align could not add [mcp_servers.${w.name}] to ${w.file} without changing what it means (an inline mcp_servers table?), so it left the file alone`);
+    return next;
+}
 //# sourceMappingURL=config-writes.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"config-writes.js","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AAmCvE,MAAM,QAAQ,GAAG,CAAC,CAAU,EAAa,EAAE,CAAC,OAAO,CAAC,KAAK,QAAQ,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;AAErG;;;;GAIG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAc,EAAE,IAA4B,EAAE,IAAkB;IAC/F,MAAM,KAAK,GAAG,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC;IACzC,MAAM,MAAM,GAAG,aAAa,CAC1B,CAAC,CAAC,IAAI,EACN,CAAC,GAAG,EAAE,EAAE;QACN,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAE,GAAG,CAAC,CAAC,CAAC,MAAM,CAAU,CAAC,CAAC,CAAC,EAAE,CAAC;QACvE,IAAI,CAAC,CAAC,IAAI,IAAI,OAAO;YAAE,OAAO,SAAS,CAAC;QACxC,OAAO,EAAE,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC;IACnE,CAAC,EACD,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CACrG,CAAC;IACF,IAAI,MAAM,KAAK,SAAS;QAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;SACvC,IAAI,KAAK;QAAE,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACrC,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,IAAI,CAAC,aAAa,CAAC,CAAC,IAAI,kBAAkB,CAAC,CAAC,IAAI,sBAAsB,CAAC,CAAC,IAAI,GAAG,aAAa,2BAA2B,CAAC,CAAC;QACzH,IAAI,CAAC,CAAC,IAAI;YAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;AACH,CAAC"}
+{"version":3,"file":"config-writes.js","sourceRoot":"","sources":["../../../src/lib/launch/config-writes.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,19 @@
+import { type AlignLocalState } from './strict-entry.js';
+export type CopilotProjectState = AlignLocalState;
+/**
+ * What Copilot CLI (1.0.95) would already load for align. User: $COPILOT_HOME (or ~/.copilot)
+ * /mcp-config.json. Workspace: .mcp.json and .github/mcp.json from cwd up to the git root.
+ *
+ * Copilot loads the workspace files only in a trusted folder, but that verdict comes from its
+ * native runtime and several sources (its own store, IDE workspace folders, settings), none of
+ * which align can read reliably; only COPILOT_ALLOW_ALL=true is certain. And whether
+ * --additional-mcp-config replaces a same-named server whole is also native. So, both ways safe:
+ *  - a workspace entry counts as "already present" only under COPILOT_ALLOW_ALL=true
+ *    (otherwise inject: the worst case is a duplicate server, never a missing graph);
+ *  - a non-canonical align-local in ANY of these files is a conflict (no injection), because
+ *    a merged, repo-shaped align-local must never be launched.
+ */
+export declare function readCopilotState(cwd: string, home: string, opts: {
+    localIsDefault: boolean;
+}, env: Record<string, string | undefined>, platform: string): CopilotProjectState;
+//# sourceMappingURL=copilot-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"copilot-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/copilot-state.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,eAAe,EAAsC,MAAM,mBAAmB,CAAC;AAE7F,MAAM,MAAM,mBAAmB,GAAG,eAAe,CAAC;AAsBlD;;;;;;;;;;;;GAYG;AACH,wBAAgB,gBAAgB,CAC9B,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,GACf,mBAAmB,CAgBrB"}

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

@@ -0,0 +1,51 @@
+import { existsSync, readFileSync } from 'node:fs';
+import path from 'node:path';
+import { foldLayers, parseJsonc } from './strict-entry.js';
+function layer(file) {
+    let text = null;
+    try {
+        text = readFileSync(file, 'utf8');
+    }
+    catch {
+        // missing or unreadable: no servers
+    }
+    return { file, servers: parseJsonc(text)?.['mcpServers'] };
+}
+/** cwd up to and including the git root; with no .git anywhere above, cwd alone. Never past the root. */
+function workspaceDirs(cwd) {
+    const dirs = [];
+    for (let dir = cwd;; dir = path.dirname(dir)) {
+        dirs.push(dir);
+        if (existsSync(path.join(dir, '.git')))
+            return dirs;
+        if (path.dirname(dir) === dir)
+            return [cwd];
+    }
+}
+/**
+ * What Copilot CLI (1.0.95) would already load for align. User: $COPILOT_HOME (or ~/.copilot)
+ * /mcp-config.json. Workspace: .mcp.json and .github/mcp.json from cwd up to the git root.
+ *
+ * Copilot loads the workspace files only in a trusted folder, but that verdict comes from its
+ * native runtime and several sources (its own store, IDE workspace folders, settings), none of
+ * which align can read reliably; only COPILOT_ALLOW_ALL=true is certain. And whether
+ * --additional-mcp-config replaces a same-named server whole is also native. So, both ways safe:
+ *  - a workspace entry counts as "already present" only under COPILOT_ALLOW_ALL=true
+ *    (otherwise inject: the worst case is a duplicate server, never a missing graph);
+ *  - a non-canonical align-local in ANY of these files is a conflict (no injection), because
+ *    a merged, repo-shaped align-local must never be launched.
+ */
+export function readCopilotState(cwd, home, opts, env, platform) {
+    const o = { ...opts, platform, host: 'copilot' };
+    const userFile = path.join(env['COPILOT_HOME'] ? env['COPILOT_HOME'] : path.join(home, '.copilot'), 'mcp-config.json');
+    const never = () => false;
+    const user = foldLayers([layer(userFile)], o, never);
+    const workspace = foldLayers(workspaceDirs(cwd).reverse().flatMap((d) => [layer(path.join(d, '.mcp.json')), layer(path.join(d, '.github', 'mcp.json'))]), o, never);
+    const conflict = user.conflict ?? workspace.conflict;
+    return {
+        present: user.present || (env['COPILOT_ALLOW_ALL'] === 'true' && workspace.present),
+        overridden: [],
+        ...(conflict ? { conflict } : {}),
+    };
+}
+//# sourceMappingURL=copilot-state.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"copilot-state.js","sourceRoot":"","sources":["../../../src/lib/launch/copilot-state.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,SAAS,CAAC;AACnD,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAwB,UAAU,EAAc,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI7F,SAAS,KAAK,CAAC,IAAY;IACzB,IAAI,IAAI,GAAkB,IAAI,CAAC;IAC/B,IAAI,CAAC;QACH,IAAI,GAAG,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACpC,CAAC;IAAC,MAAM,CAAC;QACP,oCAAoC;IACtC,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC;AAC7D,CAAC;AAED,yGAAyG;AACzG,SAAS,aAAa,CAAC,GAAW;IAChC,MAAM,IAAI,GAAa,EAAE,CAAC;IAC1B,KAAK,IAAI,GAAG,GAAG,GAAG,GAAI,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC9C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACf,IAAI,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;YAAE,OAAO,IAAI,CAAC;QACpD,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,GAAG;YAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAC9C,CAAC;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,gBAAgB,CAC9B,GAAW,EACX,IAAY,EACZ,IAAiC,EACjC,GAAuC,EACvC,QAAgB;IAEhB,MAAM,CAAC,GAAG,EAAE,GAAG,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAkB,EAAE,CAAC;IAC1D,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAE,iBAAiB,CAAC,CAAC;IACvH,MAAM,KAAK,GAAG,GAAY,EAAE,CAAC,KAAK,CAAC;IACnC,MAAM,IAAI,GAAG,UAAU,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;IACrD,MAAM,SAAS,GAAG,UAAU,CAC1B,aAAa,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,EAC3H,CAAC,EACD,KAAK,CACN,CAAC;IACF,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,SAAS,CAAC,QAAQ,CAAC;IACrD,OAAO;QACL,OAAO,EAAE,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,mBAAmB,CAAC,KAAK,MAAM,IAAI,SAAS,CAAC,OAAO,CAAC;QACnF,UAAU,EAAE,EAAE;QACd,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KAClC,CAAC;AACJ,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/detect.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAoBhH"}
+{"version":3,"file":"detect.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/detect.ts"],"names":[],"mappings":"AAGA;;;;GAIG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAqBhH"}

package/dist/lib/launch/detect.js

@@ -16,7 +16,8 @@ export function findOnPath(bin, env, platform) {
         if (!dir)
             continue;
         for (const name of names) {
-            const candidate = path.join(dir, name);
+            // Absolute, so what was checked here is what gets spawned whatever the cwd is by then.
+            const candidate = path.resolve(dir, name);
             try {
                 if (!statSync(candidate).isFile())
                     continue;

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

@@ -1 +1 @@
-{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../src/lib/launch/detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW,EAAE,GAAuC,EAAE,QAAgB;IAC/F,MAAM,GAAG,GAAG,QAAQ,KAAK,OAAO,CAAC;IACjC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpG,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YACvC,IAAI,CAAC;gBACH,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE;oBAAE,SAAS;gBAC5C,IAAI,CAAC,GAAG;oBAAE,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChD,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;gBACP,6CAA6C;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}
+{"version":3,"file":"detect.js","sourceRoot":"","sources":["../../../src/lib/launch/detect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,IAAI,MAAM,WAAW,CAAC;AAE7B;;;;GAIG;AACH,MAAM,UAAU,UAAU,CAAC,GAAW,EAAE,GAAuC,EAAE,QAAgB;IAC/F,MAAM,GAAG,GAAG,QAAQ,KAAK,OAAO,CAAC;IACjC,MAAM,GAAG,GAAG,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC;IAC7C,IAAI,CAAC,GAAG;QAAE,OAAO,IAAI,CAAC;IACtB,MAAM,IAAI,GAAG,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,IAAI,qBAAqB,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAC/F,MAAM,KAAK,GAAG,GAAG,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IACpG,KAAK,MAAM,GAAG,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAC7C,IAAI,CAAC,GAAG;YAAE,SAAS;QACnB,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,uFAAuF;YACvF,MAAM,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;YAC1C,IAAI,CAAC;gBACH,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE;oBAAE,SAAS;gBAC5C,IAAI,CAAC,GAAG;oBAAE,UAAU,CAAC,SAAS,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;gBAChD,OAAO,SAAS,CAAC;YACnB,CAAC;YAAC,MAAM,CAAC;gBACP,6CAA6C;YAC/C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC"}

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

@@ -0,0 +1,24 @@
+import { type AlignLocalState } from './strict-entry.js';
+export interface DroidProjectState extends AlignLocalState {
+    /** The user runs Droid with their own runtime settings (`--settings` or FACTORY_RUNTIME_SETTINGS_PATH). */
+    ownSettings?: string;
+    /** A guideline file Droid reads already carries align's managed instructions block. */
+    projectHasBlock: boolean;
+}
+/**
+ * What Factory Droid (droid 0.237.0) would already load for align. The project is `--cwd` when
+ * the user passes one (relative to the cwd), else the cwd; "home" is FACTORY_HOME_OVERRIDE when
+ * set (Droid's own home resolution).
+ *  - MCP: $home/.factory/mcp.json, and a `.factory/mcp.json` from the project up to the git root
+ *    (to the filesystem root with no git root). The per-process runtime settings win a same-named
+ *    server (verified with `droid --settings f mcp list`), so a non-canonical align-local is
+ *    overridden. Only the user's own canonical `align` stands in for us.
+ *  - Instructions: Droid's own guideline discovery (agentsMdGuidelines): the project up to the
+ *    git root, or only the project with none, each dir plus its .factory/.agents/.agent, plus
+ *    $home/.factory, .agents and .agent; CLAUDE.md, AGENTS.md and case variants; a linked file or
+ *    directory is ignored, as Droid's lstat checks ignore it.
+ */
+export declare function readDroidState(cwd: string, home: string, opts: {
+    localIsDefault: boolean;
+}, env: Record<string, string | undefined>, platform: string, passthrough: string[]): DroidProjectState;
+//# sourceMappingURL=droid-state.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"droid-state.d.ts","sourceRoot":"","sources":["../../../src/lib/launch/droid-state.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,KAAK,eAAe,EAA6D,MAAM,mBAAmB,CAAC;AAEpH,MAAM,WAAW,iBAAkB,SAAQ,eAAe;IACxD,2GAA2G;IAC3G,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,uFAAuF;IACvF,eAAe,EAAE,OAAO,CAAC;CAC1B;AAsCD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAC5B,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,iBAAiB,CAoBnB"}