@catalyst-cloud/cli 0.16.36 → 0.16.38

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.16.38
+
+On a Mac with thoughts custody, a runner update agent that 0.16.35 or 0.16.36 moved kept failing every update with `custody_restore_failed:runtime_custody_mismatch`, even after the CLI updated itself to 0.16.37. The scheduled update installs the new CLI beside the old one, not globally, so the 0.16.37 repair never ran. Now `catalyst runner update` checks which node it runs under. When that differs from the node the custody was set up with, it runs the same command again under the custody's node and exits with that run's result. The agent file is left as it is, and no run in progress is interrupted. `--check` and `--fleet`, a Mac without thoughts custody, and Linux are unchanged.
+
+`catalyst setup --only codex-attribution --codex-home <dir>` gives a second Codex home the default home's telemetry exporter, so its usage is reported too. It does this only for a home logged in to one of the workspace's coding accounts that has no exporter of its own. Before it changes that home's `config.toml`, it keeps a copy beside it, and the new file is never more readable than the original. A `config.toml` that is a link is left alone. `--dry-run` shows the exporter it would copy with every value except the endpoint, protocol and environment shown as `<hidden>`. `catalyst setup --remove-codex-attribution --codex-home <dir>` takes the copied exporter back out.
+
+## 0.16.37
+
+On a Mac with thoughts custody, every runner update failed after 0.16.35 or 0.16.36 pointed the runner update agent at a CLI installed under a different node. The update log showed `custody_restore_failed:runtime_custody_mismatch`. The custody records the node it was set up with, and refuses any other. The update agent now runs the CLI under that recorded node, whether `catalyst runner auto-update on` or the global install writes it. Installing this release globally repairs an agent that was already moved, and keeps the previous agent file beside it, as `<file>.before-0.16.37`. A Mac without thoughts custody, and Linux, are unchanged.
+
 ## 0.16.36
 
 `catalyst setup --only codex-attribution` turns on Codex attribution on a machine that is already set up, without running the other setup steps. It adds the codex function to `~/.zshrc` and `~/.bashrc`, and on a Mac the login agent. Before it first changes an rc file, it keeps a byte-for-byte copy beside it, ending in `.before-codex-attribution`, and never overwrites an earlier copy. Running it again changes nothing. `--dry-run` shows exactly what it would add and changes nothing, and `--json` prints the result as one document.

package/README.md

@@ -144,7 +144,7 @@ When Codex is on this computer (a `codex` command on your PATH, or `Codex.app` i
 
 On a Mac, setup also installs the `dev.catalystcloud.codex-attribution` LaunchAgent. It runs `catalyst codex-env --apply` when you log in, and again whenever Codex signs in to another account in its default home, so apps you start from the Dock or Finder, the Codex desktop app included, carry the same attributes. An app that is already open keeps the environment it started with. It picks up a change the next time it starts. On Linux, setup adds the shell function only. Without Codex, setup adds nothing and says it skipped this. Run `catalyst setup` again after you install Codex to add it.
 
-`catalyst status` ends with one line that says whether this is installed, which coding account the Codex home resolves to, and how old the cached account list is. `catalyst setup --no-shell-hook` skips all of it. On a machine that is already set up, `catalyst setup --only codex-attribution` adds just this and runs no other step. Before it first changes `~/.zshrc` or `~/.bashrc`, it keeps a copy of the file beside it, ending in `.before-codex-attribution`. Run again, it reports each file as unchanged. With `--dry-run` it prints the exact block each file would get and the LaunchAgent file, and changes nothing. `catalyst setup --remove-codex-attribution` removes it and runs nothing else. Each file goes back to exactly what it was before the block was added, the LaunchAgent is unloaded and deleted, and the two attributes it set (the coding account and the machine name) are taken back out of the launch environment. Attributes you set there yourself are kept. A fake HOME gets none of this.
+`catalyst status` ends with one line that says whether this is installed, which coding account the Codex home resolves to, and how old the cached account list is. `catalyst setup --no-shell-hook` skips all of it. On a machine that is already set up, `catalyst setup --only codex-attribution` adds just this and runs no other step. Before it first changes `~/.zshrc` or `~/.bashrc`, it keeps a copy of the file beside it, ending in `.before-codex-attribution`. Run again, it reports each file as unchanged. With `--dry-run` it prints the exact block each file would get and the LaunchAgent file, and changes nothing. A Codex home other than the default one sends no telemetry until its own `config.toml` has an exporter. Name it with `--codex-home <dir>` (repeatable): when it is logged in to one of the workspace's coding accounts and has no exporter of its own, setup copies the default home's `[otel]` tables into it, after keeping a copy of its `config.toml` beside it. A dry run shows those tables with every header value as `<hidden>`. A home that already has an exporter, or whose login is not a workspace coding account, is left as it is. `catalyst setup --remove-codex-attribution` removes it and runs nothing else; with `--codex-home <dir>` it also takes the copied exporter out of that home's `config.toml`. Each file goes back to exactly what it was before the block was added, the LaunchAgent is unloaded and deleted, and the two attributes it set (the coding account and the machine name) are taken back out of the launch environment. Attributes you set there yourself are kept. A fake HOME gets none of this.
 
 ### Headless setup (CI, image builds, agent VMs)
 

package/dist/agent-repoint.js

@@ -13,7 +13,7 @@ import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
 import { compareVersions, exactVersion } from "./approved-release.js";
 import { LEGACY_PACKAGE_NAME, readManifest } from "./config.js";
-import { AUTO_UPDATE_LABEL, defaultRun, enableAutoUpdate, launchAgentPath, scheduledPath, systemdUnitPaths, writeFileAtomic, } from "./runner-auto-update.js";
+import { AUTO_UPDATE_LABEL, custodyNode, defaultRun, enableAutoUpdate, launchAgentPath, scheduledPath, systemdUnitPaths, writeFileAtomic, } from "./runner-auto-update.js";
 import { CLAUDE_PATH_ENV, resolveClaude } from "./update-plugin.js";
 /** Long enough for an in-place update (under a minute on a Mac measured 2026-10-24), well inside the
  *  installer's 600-second budget for the whole npm install. */
@@ -47,13 +47,14 @@ function unitProgram(text) {
     return programOf(unitWords(exec), env("PATH"), env(CLAUDE_PATH_ENV));
 }
 function programOf(args, path, claude) {
-    const [cli, ...rest] = args;
-    if (cli === undefined || !cli.startsWith("/") || rest.length !== 5)
+    const node = args.length === 7 ? (args[0] ?? null) : null;
+    const [cli, ...rest] = node === null ? args : args.slice(1);
+    if (cli === undefined || !cli.startsWith("/") || (node !== null && !node.startsWith("/")) || rest.length !== 5)
         return null;
     const [a, b, c, d, dir] = rest;
     if (a !== "runner" || b !== "update" || c !== "--auto" || d !== "--dir" || dir === undefined || !dir.startsWith("/"))
         return null;
-    return { cli, dir, path, claude };
+    return { node, cli, dir, path, claude };
 }
 const real = (path) => {
     try {
@@ -165,12 +166,16 @@ function decide(deps, seen) {
             return { action: "skipped", reason: "agent_unrecognized" };
         seen.dir = program.dir;
         const from = real(program.cli);
-        if (from !== null && from === real(deps.self))
+        // CTC-7030: an agent already on this install is rewritten only when it runs under another node
+        // than its thoughts custody was set up with, which would refuse every update.
+        const node = platform === "darwin" ? custodyNode(program.dir) : null;
+        const current = from !== null && from === real(deps.self);
+        if (current && program.node === node)
             return { action: "skipped", reason: "already_current" };
         // A program that no longer exists runs nothing, so any working copy is better. One that exists
         // moves only when it is a catalyst CLI older than this one.
-        let fromVersion = null;
-        if (from !== null) {
+        let fromVersion = current ? deps.version : null;
+        if (from !== null && !current) {
             fromVersion = cliVersionAt(program.cli);
             if (fromVersion === null)
                 return { action: "skipped", reason: "agent_cli_unrecognized" };
@@ -195,6 +200,7 @@ function decide(deps, seen) {
                 home: deps.home,
                 uid: deps.uid,
                 cli: deps.self,
+                node,
                 path: scheduledPath(deps.self, deps.nodeExecutable, program.path ?? deps.env.PATH),
                 claude: program.claude ?? resolveClaude(deps.home, deps.env),
                 run: deps.run,
@@ -207,7 +213,7 @@ function decide(deps, seen) {
         }
         if (status.state !== "on")
             return { action: "failed", detail: status.detail };
-        return { action: "repointed", from: program.cli, fromVersion, to: deps.self, backup };
+        return { action: "repointed", from: program.cli, fromVersion, to: deps.self, backup, ...(node !== null ? { node } : {}) };
     }
     catch (err) {
         return { action: "failed", detail: (err instanceof Error ? err.message : String(err)).slice(0, 160) };
@@ -215,8 +221,10 @@ function decide(deps, seen) {
 }
 /** One line for the person, or null when there is nothing to say. */
 export function repointLine(result, version) {
-    if (result.action === "repointed")
-        return `catalyst: the runner update agent now runs ${result.to} (${version}) instead of ${result.from} (${result.fromVersion ?? "missing"}). The previous agent file is kept at ${result.backup}.`;
+    if (result.action === "repointed") {
+        const under = result.node === undefined ? "" : `, under ${result.node}, the node this machine's thoughts custody was set up with,`;
+        return `catalyst: the runner update agent now runs ${result.to} (${version})${under} instead of ${result.from} (${result.fromVersion ?? "missing"}). The previous agent file is kept at ${result.backup}.`;
+    }
     if (result.action === "skipped" && result.reason === "agent_not_writable")
         return `catalyst: the runner update agent at ${result.agent} runs an older catalyst, and this install cannot change it. Ask whoever installed it to run: catalyst runner auto-update on`;
     if (result.action === "skipped" && result.reason === "agent_busy")

package/dist/args.js

@@ -104,6 +104,11 @@ export const FLAG_TABLES = {
             help: "resume at a verified onboarding step",
         },
         only: { value: true, help: "run only the named onboarding step; codex-attribution adds only the Codex launch hooks, with no other step" },
+        "codex-home": {
+            value: true,
+            repeat: true,
+            help: "codex-attribution: a further Codex home to send telemetry, given the default home's exporter (repeatable; also taken out by --remove-codex-attribution)",
+        },
         yes: { value: false, help: "accept the plan's default choices" },
         "dry-run": {
             value: false,
@@ -607,7 +612,7 @@ export const VERB_USAGE = {
     update: "update [--check] [--project <absolute path>] [--dir <runner directory>] | update sdk --project <absolute path> | update policy [<component> on|off] | update policy sdk on|off --project <absolute path> | update policy windows <HH:MM,...>|default [--time-zone <zone>] [--json]   (components: runner, supervisor, watchdog, cli, skills-cloud, skills-dev, replica)",
     setup: "setup [onboard options]   (sets up Catalyst step by step; same as catalyst onboard) | setup --engine <file> --engine-sha256 <hex> [-- <install options>]   (run by install.sh; install.sh --help lists the options)",
     login: "login [--base-url <url>] [--start-replica]   (keyless; or --key <personal-key> / CATALYST_CLOUD_TOKEN)",
-    onboard: "onboard [--team <ID|key>] [--repo <owner/name>]... [--coding-account <slot>] [--resume-from <step>] [--only <step>] [--local-sync] [--remove-local-data] [--runner|--no-runner] [--no-shell-hook] [--no-color] [--yes] [--dry-run] [--json] | onboard --only codex-attribution [--dry-run] [--json] | onboard --remove-codex-attribution [--json] | onboard --headless [--key-file <path>] [--team ...] [--repo ...]... [--coding-account ...] [--runner yes|no] [--remove-local-data] [--json]",
+    onboard: "onboard [--team <ID|key>] [--repo <owner/name>]... [--coding-account <slot>] [--resume-from <step>] [--only <step>] [--local-sync] [--remove-local-data] [--runner|--no-runner] [--no-shell-hook] [--no-color] [--yes] [--dry-run] [--json] | onboard --only codex-attribution [--codex-home <dir>]... [--dry-run] [--json] | onboard --remove-codex-attribution [--codex-home <dir>]... [--json] | onboard --headless [--key-file <path>] [--team ...] [--repo ...]... [--coding-account ...] [--runner yes|no] [--remove-local-data] [--json]",
     install: "install [--skills-dir <dir>] [--force]",
     status: "status",
     notice: "notice",

package/dist/cli.js

@@ -8,7 +8,7 @@ import { createSetupRenderer, setupBanner, } from "./setup-render.js";
 import { existsSync, openSync, closeSync } from "node:fs";
 import { ReadStream as TerminalInput } from "node:tty";
 import { Writable } from "node:stream";
-import { flagBool, parseArgs, positionals, verbHelp } from "./args.js";
+import { flagBool, flagList, parseArgs, positionals, verbHelp } from "./args.js";
 import { reportCliVersion } from "./cli-version.js";
 import { CONFIG_MODE, DEFAULT_BASE_URL, LEGACY_PACKAGE_NAME, PACKAGE_NAME, cliPath, configPathFor, contractPathFor, defaultCtx, defaultReplicaDbFor, defaultSkillsDirFor, formatMode, loadConfig, modernCliPath, normalizeBaseUrl, readManifest, requireConfig, saveConfig, writeConfig, } from "./config.js";
 import { loadContract, pickPath } from "./contract.js";
@@ -88,7 +88,7 @@ export function usageText() {
         "  catalyst join ...   (deprecated alias of login; removed in the next minor version)",
         "  catalyst install [--skills-dir <dir>] [--force]   (repair path; your agent's own command installs the skills)",
         "  catalyst onboard [--resume-from <step>] [--only <step>] [--runner|--no-runner] [--no-shell-hook] [--yes] [--dry-run] [--json]",
-        "  catalyst setup --only codex-attribution [--dry-run] [--json]   (add only the Codex launch hook and login agent, keeping a copy of each rc file it changes)",
+        "  catalyst setup --only codex-attribution [--codex-home <dir>]... [--dry-run] [--json]   (add only the Codex launch hook and login agent, keeping a copy of each rc file it changes; each --codex-home also gets the default home's telemetry exporter)",
         "  catalyst setup --remove-codex-attribution   (take out the Codex launch hook and login agent setup added)",
         `  catalyst ${SETUP_USAGE}`,
         "  catalyst status | notice | me | ready | accounts",
@@ -295,14 +295,18 @@ export async function main(argv, ctx = defaultCtx(), deps = {}) {
                         throw new UsageError(`--${flag} needs --headless`);
                 if (typeof args.flags.runner === "string" && !onboardHeadlessRequested(args, ctx.env))
                     throw new UsageError("--runner yes|no needs --headless; use --runner or --no-runner interactively");
+                // CTC-7028: further Codex homes go with the hooks' own two paths only.
+                const codexHomes = flagList(args, "codex-home");
+                if (codexHomes.length > 0 && args.flags.only !== "codex-attribution" && args.flags["remove-codex-attribution"] !== true)
+                    throw new UsageError("--codex-home goes with --only codex-attribution or --remove-codex-attribution");
                 // The Codex launch hooks' removal runs on its own, with no onboarding around it.
                 if (args.flags["remove-codex-attribution"] === true) {
                     if (args.flags["dry-run"] === true)
                         throw new UsageError("--remove-codex-attribution changes files; run it without --dry-run");
                     deps.setupUi?.dispose();
-                    const removal = removeCodexAttribution(ctx, deps.codexAttribution);
+                    const removal = removeCodexAttribution(ctx, deps.codexAttribution, codexHomes);
                     if (args.json)
-                        ctx.stdout(JSON.stringify({ removed: removal.ok, files: removal.files, agent: removal.agent }));
+                        ctx.stdout(JSON.stringify({ removed: removal.ok, files: removal.files, agent: removal.agent, homes: removal.homes }));
                     else
                         for (const line of removal.lines)
                             ctx.stdout(line);
@@ -313,9 +317,9 @@ export async function main(argv, ctx = defaultCtx(), deps = {}) {
                     if (args.flags["no-shell-hook"] === true)
                         throw new UsageError("--only codex-attribution adds the Codex launch hooks; --no-shell-hook says not to");
                     deps.setupUi?.dispose();
-                    const only = onlyCodexAttribution(ctx, deps.codexAttribution, { dryRun: args.flags["dry-run"] === true });
+                    const only = onlyCodexAttribution(ctx, deps.codexAttribution, { dryRun: args.flags["dry-run"] === true, codexHomes });
                     if (args.json)
-                        ctx.stdout(JSON.stringify({ ok: only.ok, dryRun: only.dryRun, files: only.files, backups: only.backups, agent: only.agent }));
+                        ctx.stdout(JSON.stringify({ ok: only.ok, dryRun: only.dryRun, files: only.files, backups: only.backups, agent: only.agent, homes: only.homes }));
                     else
                         for (const line of only.lines)
                             ctx.stdout(line);

package/dist/codex-attribution.js

@@ -22,7 +22,8 @@
 import { accessSync, chmodSync, constants, existsSync, lstatSync, mkdirSync, readFileSync, realpathSync, renameSync, statSync, unlinkSync, writeFileSync, } from "node:fs";
 import { userInfo } from "node:os";
 import { basename, delimiter, dirname, isAbsolute, join, relative, resolve, sep, } from "node:path";
-import { ACCOUNT_SLOT_ATTRIBUTE, HOST_NAME_ATTRIBUTE, attrValue, defaultCodexHome, readCodexAccountId, readCodexAccountsCache, resolveSlot, } from "./codex-env.js";
+import { ACCOUNT_SLOT_ATTRIBUTE, HOST_NAME_ATTRIBUTE, attrValue, defaultCodexHome, NO_LOGIN_SLOT, readCodexAccountId, readCodexAccountsCache, resolveSlot, UNREGISTERED_SLOT, } from "./codex-env.js";
+import { hasOtel, maskedOtel, otelTables, withOtel, withoutOtel } from "./codex-otel.js";
 import { configDirFor, loadConfig } from "./config.js";
 import { defaultRun, scheduledPath, writeFileAtomic, xml, } from "./runner-auto-update.js";
 export const CODEX_ATTRIBUTION_LABEL = "dev.catalystcloud.codex-attribution";
@@ -641,6 +642,129 @@ export function setupCodexAttribution(ctx, deps = {}) {
 }
 /** The copy `--only codex-attribution` keeps of an rc file before it first changes it. */
 export const RC_BACKUP_SUFFIX = ".before-codex-attribution";
+/** The workspace's coding-account list as this machine cached it, or null when it is for another
+ *  workspace, missing, or this machine is logged out. */
+function accountsCache(ctx) {
+    let workspace;
+    try {
+        workspace = loadConfig(ctx.home)?.account ?? null;
+    }
+    catch {
+        workspace = null;
+    }
+    const cached = workspace === null ? null : readCodexAccountsCache(ctx.home);
+    return cached !== null && cached.workspace === workspace ? cached : null;
+}
+/** Why a named home cannot take the exporter, or null when it can: it is logged in to one of the
+ *  workspace's coding accounts and is not the default home the exporter comes from. */
+function homeRefusal(ctx, home) {
+    if (resolve(home) === resolve(defaultCodexHome(ctx)))
+        return "it is the default Codex home, which the exporter is copied from";
+    const slot = resolveSlot(readCodexAccountId(home), accountsCache(ctx));
+    if (slot === NO_LOGIN_SLOT)
+        return "there is no Codex login in it";
+    if (slot === UNREGISTERED_SLOT)
+        return "its Codex login is not one of this workspace's coding accounts (run catalyst codex-env --refresh if it was added just now)";
+    return null;
+}
+/** A home's config.toml as it is now: its text and mode, or why it cannot be changed. */
+function readHomeConfig(target) {
+    let stat;
+    try {
+        stat = lstatSync(target);
+    }
+    catch {
+        return { text: "", mode: 0o600, existed: false };
+    }
+    if (stat.isSymbolicLink())
+        return { why: "its config.toml is a link, which setup does not follow" };
+    if (!stat.isFile())
+        return { why: "its config.toml is not a regular file" };
+    try {
+        return { text: readFileSync(target, "utf8"), mode: stat.mode & 0o7777, existed: true };
+    }
+    catch (err) {
+        return { why: `its config.toml could not be read (${message(err)})` };
+    }
+}
+/** CTC-7028: each named Codex home gets the default home's exporter, after a copy of its config.toml
+ *  is kept beside it. Header values are never printed. */
+function exportFromHomes(ctx, homes, ops, dryRun, result) {
+    if (homes.length === 0)
+        return;
+    const sourcePath = join(defaultCodexHome(ctx), "config.toml");
+    const source = readOr(sourcePath);
+    const block = source === null ? null : otelTables(source);
+    // The copy carries the collector credential, so the target is never left more readable than the
+    // file it came from.
+    let sourceMode = 0o600;
+    try {
+        sourceMode = statSync(sourcePath).mode & 0o777;
+    }
+    catch {
+        // no source means no block, and nothing is written
+    }
+    for (const raw of homes) {
+        const home = resolve(raw);
+        const target = join(home, "config.toml");
+        const name = tilde(target, ctx.home);
+        const skip = (why) => {
+            result.homes.push({ home, state: "skipped", why });
+            result.lines.push(`Left ${tilde(home, ctx.home)} as it is: ${why}.`);
+        };
+        const refusal = homeRefusal(ctx, home);
+        if (refusal !== null) {
+            skip(refusal);
+            continue;
+        }
+        const config = readHomeConfig(target);
+        if ("why" in config) {
+            skip(config.why);
+            continue;
+        }
+        if (hasOtel(config.text)) {
+            result.homes.push({ home, state: "unchanged" });
+            result.lines.push(`${name} already has a telemetry exporter (unchanged).`);
+            continue;
+        }
+        if (block === null) {
+            skip(`${tilde(sourcePath, ctx.home)} has no [otel] exporter to copy`);
+            continue;
+        }
+        const backup = `${target}${RC_BACKUP_SUFFIX}`;
+        if (dryRun) {
+            result.homes.push({ home, state: "would_add" });
+            result.lines.push(config.existed
+                ? `Would add the telemetry exporter from ${tilde(sourcePath, ctx.home)} to ${name}, after keeping a copy of the file as ${tilde(backup, ctx.home)}${existsSync(backup) ? " (an earlier copy is already there and would be kept)" : ""}. Values other than the endpoint, protocol and environment are shown as <hidden>:`
+                : `Would create ${name} with the telemetry exporter from ${tilde(sourcePath, ctx.home)}. Values other than the endpoint, protocol and environment are shown as <hidden>:`, ...maskedOtel(block));
+            continue;
+        }
+        try {
+            if (config.existed) {
+                if (existsSync(backup))
+                    result.backups.push({ path: target, backup, kept: "earlier" });
+                else {
+                    writeRcAtomic(backup, readFileSync(target), config.mode, ops);
+                    result.backups.push({ path: target, backup, kept: "new" });
+                }
+            }
+            writeRcAtomic(target, withOtel(config.text, block), config.mode & sourceMode, ops);
+        }
+        catch (err) {
+            result.ok = false;
+            skip(`its config.toml could not be written (${message(err)})`);
+            continue;
+        }
+        result.homes.push({ home, state: "added" });
+        const kept = result.backups.find((b) => b.path === target);
+        result.lines.push(`Codex launches with ${tilde(home, ctx.home)} send their telemetry: the exporter from ${tilde(sourcePath, ctx.home)} is in ${name}.` +
+            (kept === undefined
+                ? ""
+                : kept.kept === "new"
+                    ? ` The file as it was is kept at ${tilde(kept.backup, ctx.home)}.`
+                    : ` An earlier copy of the file is kept at ${tilde(kept.backup, ctx.home)}.`));
+    }
+}
 /** `catalyst setup --only codex-attribution`: the hooks setup adds after a full run, and nothing else.
  *  Before it first changes an existing rc file it keeps a byte-for-byte copy beside it, and an earlier
  *  copy is never overwritten, so the copy is what the file was before any hook. `dryRun` writes
@@ -653,6 +777,7 @@ export function onlyCodexAttribution(ctx, deps = {}, options = {}) {
         files: [],
         backups: [],
         agent: { state: "other_home" },
+        homes: [],
         lines: [],
     };
     if (!ownsHome(ctx.home, deps)) {
@@ -725,6 +850,7 @@ export function onlyCodexAttribution(ctx, deps = {}, options = {}) {
     }
     if (result.files.length === 0)
         result.lines.push("No shell rc file got the Codex launch hook: there is no ~/.zshrc or ~/.bashrc, and your login shell is neither zsh nor bash.");
+    exportFromHomes(ctx, options.codexHomes ?? [], ops, dryRun, result);
     const d = resolved(ctx, deps);
     if (d.platform !== "darwin") {
         result.agent = { state: "not_macos" };
@@ -771,8 +897,43 @@ export function codexAttributionAfterSetup(args, ctx, deps = {}) {
     for (const line of setupCodexAttribution(ctx, deps))
         say(line);
 }
+/** Takes the copied exporter block out of each named home's config.toml. With nothing edited after
+ *  setup added it, the file is byte for byte what it was. */
+function removeHomeExporters(ctx, homes, ops) {
+    const out = [];
+    const lines = [];
+    for (const raw of homes) {
+        const home = resolve(raw);
+        const target = join(home, "config.toml");
+        const name = tilde(target, ctx.home);
+        const config = readHomeConfig(target);
+        if ("why" in config) {
+            out.push({ home, state: "skipped", why: config.why });
+            lines.push(`Left ${tilde(home, ctx.home)} as it is: ${config.why}.`);
+            continue;
+        }
+        const restored = config.existed ? withoutOtel(config.text) : null;
+        if (restored === null) {
+            out.push({ home, state: "absent" });
+            lines.push(`${name} had no telemetry exporter from setup.`);
+            continue;
+        }
+        try {
+            writeRcAtomic(target, restored, config.mode, ops);
+        }
+        catch (err) {
+            const why = `its config.toml could not be written (${message(err)})`;
+            out.push({ home, state: "skipped", why });
+            lines.push(`Left ${tilde(home, ctx.home)} as it is: ${why}.`);
+            continue;
+        }
+        out.push({ home, state: "removed" });
+        lines.push(`Took the copied telemetry exporter out of ${name}; the file is as it was before setup added it.`);
+    }
+    return { homes: out, lines };
+}
 /** `catalyst setup --remove-codex-attribution`. Run twice, the second run finds nothing to remove. */
-export function removeCodexAttribution(ctx, deps = {}) {
+export function removeCodexAttribution(ctx, deps = {}, codexHomes = []) {
     const files = shellRcFiles(ctx).flatMap((file) => {
         try {
             const outcome = removeShellHook(file.path, ctx.home, fileOps(deps));
@@ -810,12 +971,16 @@ export function removeCodexAttribution(ctx, deps = {}) {
         lines.push(`Took the coding account and machine name out of ${ENV_NAME} in the launch environment, and kept the attributes you set there yourself. Apps that are already open keep the old value until they restart.`);
     else if (agent.environment === "failed")
         lines.push(`Could not change ${ENV_NAME} in the launch environment. Run launchctl getenv ${ENV_NAME} to see it, and launchctl unsetenv ${ENV_NAME} to clear it.`);
+    const homes = removeHomeExporters(ctx, codexHomes, fileOps(deps));
+    lines.push(...homes.lines);
     return {
         ok: files.every((f) => f.state !== "skipped") &&
+            homes.homes.every((h) => h.state !== "skipped") &&
             agent.agent !== "failed" &&
             agent.environment !== "failed",
         files,
         agent,
+        homes: homes.homes,
         lines,
     };
 }

package/dist/codex-otel.js

@@ -0,0 +1,134 @@
+// codex-otel.ts — CTC-7028. A Codex home named with `--codex-home` sends its telemetry.
+//
+// Codex reads its exporter from the `[otel]` tables of its home's config.toml. A second home (a second
+// Codex login on the same machine) starts with none, so its launches send nothing, and the coding
+// account `catalyst setup --only codex-attribution` resolves for it never reaches a row. Setup copies
+// the default home's `[otel]` and `[otel.*]` tables, verbatim, into each named home that is logged in
+// to one of the workspace's coding accounts and has no exporter of its own.
+//
+// ⛔ HEADER VALUES CARRY THE COLLECTOR CREDENTIAL. They are copied file to file and never printed,
+// logged or put in argv. TOML can spell a header many ways (a headers table, an inline table, a
+// dotted or quoted key), so a dry run shows only an allow-list of plain values and hides the rest.
+//
+// The copy goes in as one marked block at the end of the file, so `--remove-codex-attribution` can
+// take it out again and leave the file byte for byte as it was.
+export const OTEL_BEGIN = "# >>> catalyst codex-attribution: telemetry exporter copied from the default Codex home >>>";
+/** The same marker when setup also had to end the file's last line before the block. */
+export const OTEL_BEGIN_NEWLINE = `${OTEL_BEGIN} (line break added)`;
+export const OTEL_END = "# <<< catalyst codex-attribution <<<";
+export const HIDDEN = "<hidden>";
+const TABLE = /^\s*\[\[?\s*([^\]]+?)\s*\]\]?\s*(#.*)?$/;
+const OTEL_NAME = /^"?otel"?(\.|$)/;
+const KEY = /^(\s*[^=\s][^=]*?)\s*=\s*(.*)$/;
+/** The only values a dry run shows. Everything else under otel (headers in any spelling, inline
+ *  tables, unknown keys) can carry the collector credential, so it is shown as <hidden>. */
+const SHOWN = new Set(["endpoint", "protocol", "environment", "exporter", "log_user_prompt"]);
+function lines(text) {
+    return text.split("\n");
+}
+/** How far a value opens brackets, counting none inside quoted strings or after a comment. */
+function depth(value) {
+    const bare = value.replace(/"(?:[^"\\]|\\.)*"|'[^']*'/g, "").replace(/#.*$/, "");
+    let d = 0;
+    for (const ch of bare)
+        d += ch === "[" || ch === "{" ? 1 : ch === "]" || ch === "}" ? -1 : 0;
+    return d;
+}
+/** Each line of a config.toml, read well enough to tell a table header from a value line. */
+function classify(text) {
+    let open = 0;
+    return lines(text).map((line) => {
+        if (open > 0) {
+            open += depth(line);
+            return { kind: "continued" };
+        }
+        const table = TABLE.exec(line);
+        if (table)
+            return { kind: "table", name: table[1] ?? "" };
+        const key = KEY.exec(line);
+        if (key && !line.trim().startsWith("#")) {
+            open = Math.max(0, depth(key[2] ?? ""));
+            return { kind: "key", key: key[1] ?? "", value: key[2] ?? "" };
+        }
+        return { kind: "other" };
+    });
+}
+/** The `[otel]` and `[otel.*]` tables of a config.toml, each with the lines up to the next table, in
+ *  file order; null when there is none. */
+export function otelTables(text) {
+    const out = [];
+    const all = lines(text);
+    let inOtel = false;
+    classify(text).forEach((line, i) => {
+        if (line.kind === "table")
+            inOtel = OTEL_NAME.test(line.name);
+        if (inOtel)
+            out.push(all[i] ?? "");
+    });
+    while (out.length > 0 && out[out.length - 1]?.trim() === "")
+        out.pop();
+    return out.length === 0 ? null : `${out.join("\n")}\n`;
+}
+/** True when the file already configures any exporter: an otel table, an `otel` key, or our block. */
+export function hasOtel(text) {
+    let inTable = false;
+    const all = lines(text);
+    return classify(text).some((line, i) => {
+        if (all[i] === OTEL_BEGIN || all[i] === OTEL_BEGIN_NEWLINE)
+            return true;
+        if (line.kind === "table") {
+            inTable = true;
+            return OTEL_NAME.test(line.name);
+        }
+        return !inTable && line.kind === "key" && /^\s*"?otel"?\s*(\.|$)/.test(line.key);
+    });
+}
+/** The block for display. Table headers, comments and the values of the keys in SHOWN are as they
+ *  are; every other value, any value under a headers table, and every continued line is <hidden>. */
+export function maskedOtel(block) {
+    let headers = false;
+    const all = lines(block.replace(/\n$/, ""));
+    return classify(all.join("\n")).map((line, i) => {
+        const raw = all[i] ?? "";
+        if (line.kind === "table") {
+            headers = /(^|\.)\s*"?headers"?$/.test(line.name);
+            return raw;
+        }
+        if (line.kind === "continued")
+            return `  ${HIDDEN}`;
+        if (line.kind === "other")
+            return raw.trim() === "" || raw.trim().startsWith("#") ? raw : HIDDEN;
+        const name = line.key.trim().replace(/^"|"$/g, "");
+        const plain = !/[{[]/.test(line.value);
+        return !headers && plain && SHOWN.has(name) ? raw : `${line.key} = ${HIDDEN}`;
+    });
+}
+/** The file with the block appended. A file that does not end its last line gets one line break first,
+ *  and the marker records it, so taking the block out restores the file byte for byte. */
+export function withOtel(original, block) {
+    const open = original === "" || original.endsWith("\n");
+    return `${original}${open ? "" : "\n"}${open ? OTEL_BEGIN : OTEL_BEGIN_NEWLINE}\n${block}${OTEL_END}\n`;
+}
+/** The file without our block, or null when it has none (or only half of one, which is left alone). */
+export function withoutOtel(text) {
+    let start = lineAt(text, OTEL_BEGIN);
+    let addedBreak = false;
+    if (start < 0) {
+        start = lineAt(text, OTEL_BEGIN_NEWLINE);
+        addedBreak = true;
+    }
+    if (start < 0)
+        return null;
+    const endAt = text.indexOf(`\n${OTEL_END}\n`, start);
+    if (endAt < 0)
+        return null;
+    const before = text.slice(0, start);
+    return (addedBreak && before.endsWith("\n") ? before.slice(0, -1) : before) + text.slice(endAt + OTEL_END.length + 2);
+}
+/** Where the line that is exactly `line` starts, or -1. */
+function lineAt(text, line) {
+    if (text.startsWith(`${line}\n`))
+        return 0;
+    const at = text.indexOf(`\n${line}\n`);
+    return at < 0 ? -1 : at + 1;
+}

package/dist/runner-auto-update.js

@@ -1,5 +1,5 @@
 import { spawnSync } from "node:child_process";
-import { existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { accessSync, constants, existsSync, mkdirSync, readFileSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";
 import { CLAUDE_PATH_ENV } from "./update-plugin.js";
 // The schedule that runs `catalyst runner update --auto` every 15 minutes (CTC-4646): a LaunchAgent
@@ -35,7 +35,7 @@ export function systemdUnitPaths(home) {
     return { service: join(base, `${AUTO_UPDATE_UNIT}.service`), timer: join(base, `${AUTO_UPDATE_UNIT}.timer`) };
 }
 export function launchAgentPlist(deps, dir) {
-    const args = [deps.cli, "runner", "update", "--auto", "--dir", dir];
+    const args = [...(deps.node ? [deps.node] : []), deps.cli, "runner", "update", "--auto", "--dir", dir];
     return [
         '<?xml version="1.0" encoding="UTF-8"?>',
         '<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">',
@@ -129,6 +129,23 @@ export function autoUpdateStatus(deps) {
     }
     return { state: "unsupported", detail: `platform_${platform}` };
 }
+/** CTC-7030: the node a Mac's thoughts custody was set up with, when that node is still there. The
+ *  custody records it by path and hash beside the runner directory, and every update re-attests the
+ *  custody under the node that runs it, refusing any other. A CLI installed under a different node
+ *  (the daily job's own prefix) must therefore still run under this one. */
+export function custodyNode(dir) {
+    try {
+        const runtime = JSON.parse(readFileSync(join(dirname(dir), "darwin-thoughts-custody", "runtime.json"), "utf8"));
+        const node = runtime.nodeExecutable;
+        if (typeof node !== "string" || !node.startsWith("/"))
+            return null;
+        accessSync(node, constants.X_OK);
+        return node;
+    }
+    catch {
+        return null;
+    }
+}
 /** Install and start the schedule. Rewrites the files every time, so a moved CLI or PATH is picked up. */
 export function enableAutoUpdate(deps, dir) {
     const platform = deps.platform ?? process.platform;
@@ -136,7 +153,7 @@ export function enableAutoUpdate(deps, dir) {
     if (platform === "darwin") {
         const uid = deps.uid ?? process.getuid?.() ?? 0;
         const path = launchAgentPath(deps.home);
-        const text = launchAgentPlist(deps, dir);
+        const text = launchAgentPlist({ ...deps, node: deps.node === undefined ? custodyNode(dir) : deps.node }, dir);
         const unchanged = existsSync(path) && readFileSync(path, "utf8") === text;
         const domain = `gui/${uid}`;
         const loaded = run("launchctl", ["print", `${domain}/${AUTO_UPDATE_LABEL}`]).status === 0;

package/dist/runner-command.js

@@ -1,7 +1,9 @@
+import { spawnSync } from "node:child_process";
+import { realpathSync } from "node:fs";
 import { isAbsolute, resolve } from "node:path";
 import { flagBool, flagString, positionals } from "./args.js";
 import { CliError, UsageError } from "./errors.js";
-import { autoUpdateStatus, disableAutoUpdate, enableAutoUpdate, scheduledPath, } from "./runner-auto-update.js";
+import { autoUpdateStatus, custodyNode, disableAutoUpdate, enableAutoUpdate, scheduledPath, } from "./runner-auto-update.js";
 import { dockerRunnerUpdateEngine, readReleaseState, RELEASE_COMPONENTS, runnerDir, runRunnerUpdate, updateResultLines, lastProblem, lastProblemLines, } from "./runner-update.js";
 import { dockerFleetUpdateEngine, runFleetUpdate } from "./runner-update-fleet.js";
 import { runUpdate, sharedReleaseRead, updateReportJson, updateReportLines } from "./update.js";
@@ -9,6 +11,32 @@ import { effectivePolicy, readUpdatePolicy, setComponentPolicy } from "./update-
 import { resolveClaude } from "./update-plugin.js";
 import { defaultWindows, windowBounds } from "./update-windows.js";
 import { cmdRunnerLifecycle, RUNNER_LIFECYCLE_ACTIONS } from "./runner.js";
+/** Set on the re-run, so it never re-runs itself again. */
+export const CUSTODY_RERUN_ENV = "CATALYST_CUSTODY_NODE_RERUN";
+const real = (path) => {
+    try {
+        return realpathSync(path);
+    }
+    catch {
+        return path;
+    }
+};
+/** CTC-7046: a Mac's thoughts custody refuses any update run under another node than the one it was
+ *  set up with. An update run under another node, by an agent written before 0.16.37 or by a person's
+ *  shell, re-runs itself under the custody's node and answers with that run's exit code. This works
+ *  whatever wrote the agent, and never reloads the agent mid-run. Null: carry on in this process. */
+function custodyRerun(ctx, deps, dir) {
+    if ((deps.platform ?? process.platform) !== "darwin" || ctx.env[CUSTODY_RERUN_ENV] === "1")
+        return null;
+    const node = (deps.node ?? custodyNode)(dir);
+    if (node === null || real(node) === real(deps.execPath ?? process.execPath))
+        return null;
+    const [script, ...rest] = deps.argv ?? process.argv.slice(1);
+    if (script === undefined)
+        return null;
+    const run = deps.run ?? ((command, args, env) => spawnSync(command, [...args], { stdio: "inherit", env }).status ?? 1);
+    return run(node, [script, ...rest], { ...ctx.env, [CUSTODY_RERUN_ENV]: "1" });
+}
 const USAGE = "catalyst runner [status] | stop | start | uninstall [--yes] [--delete-checkouts] | runner update [--check] [--dir <runner directory>] [--fleet] | runner auto-update [status|on|off]";
 const UPDATE_FLAGS = ["check", "auto", "dir", "fleet"];
 function schedulerDeps(ctx, deps) {
@@ -76,6 +104,11 @@ export async function cmdRunner(args, ctx, deps = {}) {
         const fleet = flagBool(args, "fleet");
         if (fleet && dirFlag === undefined)
             throw new UsageError("--fleet needs --dir, the directory that holds compose.json");
+        if (!fleet && !check) {
+            const rerun = custodyRerun(ctx, deps.custody ?? {}, dir());
+            if (rerun !== null)
+                return rerun;
+        }
         // One desired-release read serves the image check and the component report (CTC-6708).
         const engine = sharedReleaseRead(deps.engine ?? dockerRunnerUpdateEngine({ env: ctx.env }));
         // The 15-minute schedule runs `runner update --auto`. After the images it carries on with every

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@catalyst-cloud/cli",
-  "version": "0.16.36",
+  "version": "0.16.38",
   "description": "Set up Catalyst Cloud, check your tickets and manage your account from the command line.",
   "license": "MIT",
   "type": "module",

package/skills/catalyst-github/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Catalyst's GitHub: show a ticket's pull request with its checks, reviews and review threads, say whether it is mergeable under this repository's policy, and explain what a PR accumulates as the ticket moves (the branch, the draft, the rewrite, the force-pushes, the labels, the queue). Use when someone asks "show me the PR", "what are the checks saying", "why hasn't it merged", "what does the queue need", "what does that label mean", or wants the branch and merge conventions Catalyst follows.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # Catalyst's GitHub
 

package/skills/catalyst-linear/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Catalyst's view of Linear on the customer's own cloud account. Reads a ticket with its comments, relations, labels, linked pull requests and agent sessions inline, from the cloud API by default, with local replica reads available as an explicit opt-in, always naming the source; searches tickets, PRs, projects and initiatives; writes comments, card moves, labels and new tickets through the account's agent proxy as the app actor, with every route, stage id, label id and marker read from the account's contract. Knows what a ticket accumulates as Catalyst works it (phase-outcome comments, the document per phase, the agent session, the labels, the single blocks relation, the bookkeeping marker, the eyes acknowledgement). Use when a person says "show me the ticket", "what did Catalyst write on it", "comment on it", "move it", "label it" or "file a ticket". Not for raising a decision for a human (what-needs-me) and not for pull requests (catalyst-github).
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # Catalyst Linear
 

package/skills/catalyst-onboard/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Set up Catalyst Cloud and say whether setup is working. Walks a person from nothing to their first ticket running, one step at a time: the coding account, the project, the integrations and connected accounts, each repository's settings file, then one real ticket moving. Also logs this machine in, reads the readiness verdict with who can fix each failure, and checks the optional local replica. Use when someone says "set me up", "onboard me", "I just signed up", "get me started", "what do I do first", "log me in", "which account is this machine on", "am I set up", "what is missing", "why does nothing happen" or "is the replica running", when a login expired, or when a skill script exits 2 saying this machine is not connected. Does every step a key can do through the catalyst CLI, hands over the exact page for the steps only a browser can do, and never claims a step it did not watch succeed.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # Onboard me
 

package/skills/run-this-project/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Own one Catalyst Cloud project end to end until it closes. Use when the person says "run this project for me", "own this until it ships", "keep this moving", or hands you a project id or a set of tickets to drive. Subscribes to the account's event stream for the scope through the catalyst CLI, reacts to each change in the same turn, makes tickets ready and moves them to dispatch, parks what should stop, chases stalls, escalates inward, and keeps one status summary current. Writes to Linear as the app actor; never polls.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # Run this project
 

package/skills/unstick/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Get a stuck Catalyst Cloud ticket moving again. Use when the person asks "why is this parked and can you release it?", "unpark this", "get things flowing again", "the outage is over, retry what failed", or hands you a ticket that is not moving. Reads why nothing runs and what holds the ticket through the catalyst CLI, decides whether the recorded cause is fixed, previews the release, releases every governor holding the ticket the right way (or one failure class across a team), and raises an ask only for what a person has to do. Never releases a cause it cannot show changed without saying so.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # Unstick
 

package/skills/what-needs-me/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   The human's decision inbox on Catalyst Cloud, and the one way an agent raises a decision on their behalf. Use when the person asks "what needs me?", "what am I blocking?", or when active work is gated on a choice only they can make. Lists open asks ranked by how much open work each one holds, files an ask through the cloud's ask route with the account's own template, and records the answer so the held work releases. Never answers as the human, never duplicates an open ask.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # What needs me
 

package/skills/what-this-repo-needs/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   What environment variable names does this repository need, and where does each one come from? Scans the repository offline (no login, no network) and lists the names in three groups (build/test, deploy-only, bindings), each with where it was found, what uses it, and where a local value would come from. Never reads a value or prints one. Also checks the environment variable table in `.catalyst/catalyst.toml` offline. Use when someone asks "what does catalyst.env.json mean", "what env vars does this repo need", "why does the container need this", or before reviewing or writing the declaration.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # What this repository needs
 

package/skills/whats-happening/SKILL.md

@@ -4,7 +4,7 @@ description: >-
   Use for "what's happening?", "what machines do we have?", "how much capacity do we have?", "where are we?", "why is that stuck?", "what closed?", "what's next?", "how does this work?", "why did it do that?", "how does it prioritise?" and "what does this setting do, where is it set?" in Catalyst Cloud, or asks for something to be done rather than known. Reads the contract via catalyst CLI. Read-only: route work/decisions, never answer as the human.
 allowed-tools: Bash(catalyst:*) Bash(npx -p @catalyst-cloud/cli catalyst:*)
 ---
-<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.36 — written in this repository for customer accounts -->
+<!-- vendored-from: @catalyst-cloud/catalyst-skills@0.16.38 — written in this repository for customer accounts -->
 
 # What's happening