@songsid/agend 2.2.0-beta.2 → 2.2.0-beta.20

package/dist/backend/claude-carry.js

@@ -0,0 +1,170 @@
+/**
+ * #1753: carry a Claude Code conversation across a credential-profile switch.
+ *
+ * Each profile is its own `CLAUDE_CONFIG_DIR`, and a conversation is a transcript under it:
+ * `<config>/projects/<cwd key>/<session id>.jsonl`, with its `<session id>/` folder (subagents, tool results) beside it.
+ * The new profile has no conversation for this directory, so a switch used to start fresh with a handover. Copying the
+ * session into the new profile and making it the newest there lets the relaunch's `--continue` pick it up — verified on
+ * a real account with claude 2.1.296 (#1753).
+ *
+ * Copy, never move: the old profile keeps its original untouched, so switching back still has it. Everything is written
+ * under a temporary name and renamed into place, so claude never sees a half-copied transcript. A failure says why, and
+ * the caller then starts fresh with a handover, as before. Up to the rename into place the target is left as it was;
+ * the one step after it (dating the copy as the newest) can fail with the copy already there — or, switching back,
+ * already in place of the older one — which the fresh start leaves unused.
+ */
+import { constants as fsConstants } from "node:fs";
+import { copyFile, cp, mkdir, open, readdir, rename, rm, stat, statfs, utimes } from "node:fs/promises";
+import { join } from "node:path";
+import { claudeProjectKey } from "./claude-code.js";
+const SESSION_ID = /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+/** Room kept free beyond the copy itself. */
+const SPACE_MARGIN = 64 * 1024 * 1024;
+/** How much of an existing copy is compared, at its start and at its end, to tell an older copy from another history. */
+const PREFIX_PROBE = 64 * 1024;
+async function defaultFreeBytes(dir) {
+    const s = await statfs(dir);
+    return Number(s.bavail) * Number(s.bsize);
+}
+async function sizeOf(path) {
+    try {
+        return (await stat(path)).size;
+    }
+    catch {
+        return null;
+    }
+}
+async function treeBytes(dir) {
+    let total = 0;
+    let entries;
+    try {
+        entries = await readdir(dir, { withFileTypes: true });
+    }
+    catch {
+        return 0;
+    }
+    for (const e of entries) {
+        const p = join(dir, e.name);
+        if (e.isDirectory())
+            total += await treeBytes(p);
+        else if (e.isFile())
+            total += (await sizeOf(p)) ?? 0;
+    }
+    return total;
+}
+async function readAt(path, offset, length) {
+    const fh = await open(path, "r");
+    try {
+        const buf = Buffer.alloc(length);
+        const { bytesRead } = await fh.read(buf, 0, length, offset);
+        return buf.subarray(0, bytesRead);
+    }
+    finally {
+        await fh.close();
+    }
+}
+/**
+ * Is `target` an older copy of `source` — the same conversation, cut shorter? (Switching back: A → B → A finds A's
+ * original, which B's copy has since grown past.) Its start and its end must match the source at the same offsets.
+ */
+async function isOlderCopy(target, targetSize, source, sourceSize) {
+    if (targetSize > sourceSize)
+        return false;
+    const head = Math.min(PREFIX_PROBE, targetSize);
+    const tailAt = Math.max(0, targetSize - PREFIX_PROBE);
+    const [th, sh, tt, st] = await Promise.all([
+        readAt(target, 0, head), readAt(source, 0, head),
+        readAt(target, tailAt, targetSize - tailAt), readAt(source, tailAt, targetSize - tailAt),
+    ]);
+    return th.equals(sh) && tt.equals(st);
+}
+/** The newest mtime (ms) among the other transcripts in the target's project folder. */
+async function newestOtherTranscript(dir, except) {
+    let newest = 0;
+    try {
+        for (const e of await readdir(dir, { withFileTypes: true })) {
+            if (!e.isFile() || !e.name.endsWith(".jsonl") || e.name === except)
+                continue;
+            const m = (await stat(join(dir, e.name))).mtimeMs;
+            if (m > newest)
+                newest = m;
+        }
+    }
+    catch { /* no folder yet */ }
+    return newest;
+}
+export async function carryClaudeConversation(req) {
+    const started = performance.now();
+    const sid = (req.sessionId ?? "").trim();
+    if (!SESSION_ID.test(sid))
+        return { carried: false, reason: "no session id to carry" };
+    if (!req.workingDirectory.trim())
+        return { carried: false, reason: "no working directory" };
+    if (req.fromConfigDir === req.toConfigDir)
+        return { carried: false, reason: "same config dir" };
+    const key = claudeProjectKey(req.workingDirectory);
+    const fromDir = join(req.fromConfigDir, "projects", key);
+    const toDir = join(req.toConfigDir, "projects", key);
+    const name = `${sid}.jsonl`;
+    const source = join(fromDir, name), target = join(toDir, name);
+    const sourceSize = await sizeOf(source);
+    if (sourceSize === null)
+        return { carried: false, reason: "the session's transcript is not in the old profile" };
+    const targetSize = await sizeOf(target);
+    let replacedOlderCopy = false;
+    if (targetSize !== null) {
+        if (!await isOlderCopy(target, targetSize, source, sourceSize).catch(() => false)) {
+            return { carried: false, reason: "the new profile already holds a different version of this conversation" };
+        }
+        replacedOlderCopy = true;
+    }
+    const folderBytes = await treeBytes(join(fromDir, sid));
+    const needed = sourceSize + folderBytes + SPACE_MARGIN;
+    try {
+        await mkdir(toDir, { recursive: true });
+        const free = await (req.freeBytes ?? defaultFreeBytes)(toDir);
+        if (free < needed)
+            return { carried: false, reason: `not enough free space (${needed} bytes needed, ${free} free)` };
+    }
+    catch (err) {
+        return { carried: false, reason: `the new profile's folder is not usable: ${err.message}` };
+    }
+    const tag = `.carry-${process.pid}-${Math.floor(started)}`;
+    const tmpFile = join(toDir, `.${name}${tag}`);
+    const tmpFolder = join(toDir, `.${sid}${tag}`);
+    try {
+        // A copy-on-write clone where the filesystem has one (btrfs, xfs, APFS), a plain copy elsewhere.
+        await copyFile(source, tmpFile, fsConstants.COPYFILE_FICLONE);
+        // The session's folder first, so the transcript never appears before the files it refers to.
+        if (await sizeOf(join(fromDir, sid)) !== null) {
+            await cp(join(fromDir, sid), tmpFolder, { recursive: true, errorOnExist: false, force: true });
+            if (await sizeOf(join(toDir, sid)) === null)
+                await rename(tmpFolder, join(toDir, sid));
+            else {
+                // Switching back: the folder is there already. It takes the copy's files; its own extra files stay.
+                await cp(tmpFolder, join(toDir, sid), { recursive: true, errorOnExist: false, force: true });
+                await rm(tmpFolder, { recursive: true, force: true });
+            }
+        }
+        await rename(tmpFile, target);
+    }
+    catch (err) {
+        await rm(tmpFile, { force: true }).catch(() => undefined);
+        await rm(tmpFolder, { recursive: true, force: true }).catch(() => undefined);
+        return { carried: false, reason: `copy failed: ${err.message}` };
+    }
+    // Newest in its folder, so `--continue` picks it — even past another transcript dated ahead of this clock.
+    const now = (req.now ?? Date.now)();
+    const mtime = Math.max(now, (await newestOtherTranscript(toDir, name)) + 1_000);
+    try {
+        await utimes(target, mtime / 1000, mtime / 1000);
+    }
+    catch (err) {
+        return { carried: false, reason: `could not date the copy as the newest: ${err.message}` };
+    }
+    // `/rewind` reaches edits from before the switch: the session's file history, merged, never overwriting. Best effort.
+    await cp(join(req.fromConfigDir, "file-history", sid), join(req.toConfigDir, "file-history", sid), { recursive: true, errorOnExist: false, force: false })
+        .catch(() => undefined);
+    return { carried: true, sessionId: sid, bytes: sourceSize + folderBytes, ms: Math.round(performance.now() - started), replacedOlderCopy };
+}
+//# sourceMappingURL=claude-carry.js.map

package/dist/backend/claude-carry.js.map

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

package/dist/backend/claude-code.d.ts

@@ -1,6 +1,39 @@
 import { type CliBackend, type CliBackendConfig, type ErrorPattern, type InputBox, type RuntimeDialog, type StartupDialog } from "./types.js";
 /** Mirror Claude Code's ~/.claude/projects key for a working directory. Exported for the detection-signal seam. */
 export declare function claudeProjectKey(cwd: string): string;
+/**
+ * #1754: the directory Claude Code keys a project's auto-memory by — the repository's own root, which for a git
+ * worktree is the main checkout's (its memory sits under `projects/<that root's key>/memory/`, shared by every worktree),
+ * and for a directory outside any repository the directory itself. Read from the files git leaves (`.git` as a folder,
+ * or a worktree's `.git` file → its `commondir`), never by running git: this runs at an instance's launch.
+ */
+export declare function claudeMemoryRoot(cwd: string): string;
+/**
+ * #1754: a named profile is its own `projects/`, so Claude Code's auto-memory for this project would start empty there
+ * and stay apart from every other instance's. Memory is knowledge, not an account — shared like the instructions,
+ * agents and skills are (#1699 (a)): `<profile>/projects/<repo key>/memory` becomes a link to the shared one
+ * (`<shared config>/projects/<repo key>/memory`). Transcripts beside it stay the profile's own.
+ * Never replaces anything real: a non-empty memory folder in the profile is left as it is (and said so); an empty one
+ * — what claude makes before it has written anything — gives way to the link. Returns what it found or did.
+ */
+export declare function linkSharedClaudeMemory(profileDir: string, workingDirectory: string, sharedConfigDir?: string): "linked" | "already-linked" | "kept-own" | "kept-other-link" | "failed";
+/**
+ * #1699: the config dir of a NAMED credential profile — the one string every writer and reader of that profile uses
+ * (claude names its macOS Keychain item after it). Null for no profile.
+ */
+export declare function claudeProfileConfigDir(backendOptions: Record<string, unknown> | undefined): string | null;
+/**
+ * Claude Code's config dir as an instance's CLI sees it: its profile's (#1699), else exactly as before —
+ * `CLAUDE_CONFIG_DIR` from the fleet's own environment, or `~/.claude`.
+ */
+export declare function claudeConfigDirFor(profileDir: string | null | undefined): string;
+/**
+ * #1699: the macOS Keychain item holding the login of claude run with `CLAUDE_CONFIG_DIR=<configDir>` — claude
+ * 2.1.296's own naming: the exact string it was given, NFC-normalised, hashed (sha256, first 8 hex digits). So the dir
+ * must be spelled exactly as at launch (credentialProfileHome: absolute, no trailing slash). Only a named profile has
+ * one: the shared login, with the variable unset, is the unsuffixed "Claude Code-credentials".
+ */
+export declare function claudeKeychainService(configDir: string): string;
 /**
  * Take `lockPath` via exclusive create, recording {pid, token} so a stale lock
  * can be attributed. Returns the token to release with, or null when the lock
@@ -71,6 +104,33 @@ export declare function claudeColdResumePromptState(pane: string): {
  * is why the box is found by its frame and never by the glyph. Anything else — no frame near the bottom, a first row
  * that is not the prompt, a row that is not indented — is not a box this reader can vouch for: null.
  */
+/**
+ * #1690: claude 2.1.296's cache-warning confirmation for a runtime `/model` (and, by its binary strings, `/effort`):
+ *
+ *      Switch model?                                   (or: Change effort level?)
+ *      Your next response will be slower and use more tokens
+ *      This conversation is cached for the current model. Switching to Opus 5.5 means …
+ *      ❯ 1. Yes, switch to Opus 5.5
+ *        2. No, go back
+ *
+ * Shown only with a warm cache for another model than the last turn's. The default cursor is Yes; Escape is a clean
+ * "No" (`Kept model as …`); a digit selects and confirms. `target` is what claude will switch to: a display name for a
+ * name it knows (`opus` → "Opus 5.5"), the raw input for one it does not (it validates nothing). Bottom-anchored: the
+ * options are the last rows apart from a short footer, so a transcript quoting the dialog is not it.
+ */
+export interface ClaudeSwitchDialog {
+    kind: "model" | "effort";
+    target: string;
+    cursor: 1 | 2 | null;
+}
+export declare function claudeSwitchDialog(pane: string): ClaudeSwitchDialog | null;
+/**
+ * #1690: does the model claude is about to switch to name the one AgEnD asked for? Display-name equality: case, a
+ * `claude-` prefix, separators and the 1M marker do not count (`claude-sonnet-5-5` ≡ "Sonnet 5.5"). A bare family alias
+ * matches its family's version (`opus` ≡ "Opus 5.5"); a dated id matches without its date. `default` / `opusplan` resolve to names AgEnD cannot predict:
+ * any name claude resolved (not the raw input echoed back) is theirs. Anything else is a mismatch.
+ */
+export declare function claudeSwitchTargetMatches(requested: string, shown: string): boolean;
 export declare function readClaudeInputBox(pane: string): InputBox | null;
 export interface ClaudeChoiceDialogState {
     /** The dialog is the live, bottom-most interactive region. */
@@ -157,6 +217,9 @@ export declare class ClaudeCodeBackend implements CliBackend {
     }): number | undefined;
     private binaryPath;
     constructor(instanceDir: string);
+    /** #1811: what the last launch left out and why — the Log tab and daemon.log, never a channel. */
+    private quietLaunchNotes;
+    consumeQuietLaunchNotes(): string[];
     buildCommand(config: CliBackendConfig): string;
     private hasProjectSession;
     writeConfig(config: CliBackendConfig): void;
@@ -282,10 +345,10 @@ export declare class ClaudeCodeBackend implements CliBackend {
      * signal is projects[<cwd>].hasTrustDialogAccepted in claude.json. Also marks
      * onboarding complete for an already-authenticated account (see below).
      */
-    preTrust(workingDirectory: string): void;
+    preTrust(workingDirectory: string, config?: CliBackendConfig): void;
     /** Pre-approve ANTHROPIC_API_KEY in claude.json to skip the interactive prompt */
     private preApproveApiKey;
-    /** Check if user has an active OAuth session in claude.json */
+    /** Check if user has an active OAuth session in claude.json (#1699: the instance's own config dir). */
     private hasOAuthSession;
     private writeStatusLineScript;
 }

package/dist/backend/claude-code.js

@@ -1,7 +1,11 @@
 import { EFFORT_CAPABILITIES } from "./effort-metadata.js";
-import { dirname, join, resolve } from "node:path";
-import { chmodSync, existsSync, mkdirSync, readFileSync, readdirSync, realpathSync, renameSync, unlinkSync, writeFileSync } from "node:fs";
+import { flagEffort } from "./launch-effort.js";
+import { basename, dirname, join, resolve } from "node:path";
+import { chmodSync, existsSync, lstatSync, mkdirSync, readFileSync, readdirSync, readlinkSync, realpathSync, renameSync, rmdirSync, statSync, symlinkSync, unlinkSync, writeFileSync } from "node:fs";
 import { homedir } from "node:os";
+import { createHash } from "node:crypto";
+import { credentialHomeSpec, credentialProfileHome, prepareCredentialProfileHome, resolveCredentialProfile } from "./credential-profile.js";
+import { getAgendHome } from "../paths.js";
 import { CLI_PROBE_LONGEST_LEAF_MS, resolveBinary, shellQuote, validateModel, warnIfModelMismatch } from "./types.js";
 /** Mirror Claude Code's ~/.claude/projects key for a working directory. Exported for the detection-signal seam. */
 export function claudeProjectKey(cwd) {
@@ -24,9 +28,127 @@ export function claudeProjectKey(cwd) {
     }
     return `${sanitized.slice(0, 200)}-${Math.abs(hash).toString(36)}`;
 }
-/** Claude Code's top-level config file, honoring CLAUDE_CONFIG_DIR. */
-function claudeJsonPath() {
-    const configDir = process.env.CLAUDE_CONFIG_DIR?.trim();
+/**
+ * #1754: the directory Claude Code keys a project's auto-memory by — the repository's own root, which for a git
+ * worktree is the main checkout's (its memory sits under `projects/<that root's key>/memory/`, shared by every worktree),
+ * and for a directory outside any repository the directory itself. Read from the files git leaves (`.git` as a folder,
+ * or a worktree's `.git` file → its `commondir`), never by running git: this runs at an instance's launch.
+ */
+export function claudeMemoryRoot(cwd) {
+    let dir = resolve(cwd);
+    try {
+        dir = realpathSync(dir);
+    }
+    catch { /* as given */ }
+    for (let at = dir;; at = dirname(at)) {
+        const dotGit = join(at, ".git");
+        let st;
+        try {
+            st = statSync(dotGit);
+        }
+        catch {
+            st = null;
+        }
+        if (st?.isDirectory())
+            return at;
+        if (st?.isFile()) {
+            try {
+                const gitdir = /^gitdir:\s*(.+)$/m.exec(readFileSync(dotGit, "utf-8"))?.[1]?.trim();
+                if (gitdir) {
+                    const worktreeGitDir = resolve(at, gitdir);
+                    const common = resolve(worktreeGitDir, readFileSync(join(worktreeGitDir, "commondir"), "utf-8").trim());
+                    if (basename(common) === ".git")
+                        return dirname(common);
+                }
+            }
+            catch { /* a submodule or an unusual layout: this directory is its own root */ }
+            return at;
+        }
+        if (dirname(at) === at)
+            return dir;
+    }
+}
+/**
+ * #1754: a named profile is its own `projects/`, so Claude Code's auto-memory for this project would start empty there
+ * and stay apart from every other instance's. Memory is knowledge, not an account — shared like the instructions,
+ * agents and skills are (#1699 (a)): `<profile>/projects/<repo key>/memory` becomes a link to the shared one
+ * (`<shared config>/projects/<repo key>/memory`). Transcripts beside it stay the profile's own.
+ * Never replaces anything real: a non-empty memory folder in the profile is left as it is (and said so); an empty one
+ * — what claude makes before it has written anything — gives way to the link. Returns what it found or did.
+ */
+export function linkSharedClaudeMemory(profileDir, workingDirectory, sharedConfigDir = claudeConfigDirFor(null)) {
+    const key = claudeProjectKey(claudeMemoryRoot(workingDirectory));
+    const shared = join(sharedConfigDir, "projects", key, "memory");
+    const target = join(profileDir, "projects", key, "memory");
+    try {
+        let existing;
+        try {
+            existing = lstatSync(target);
+        }
+        catch {
+            existing = null;
+        }
+        if (existing?.isSymbolicLink()) {
+            if (resolve(dirname(target), readlinkSync(target)) !== resolve(shared))
+                return "kept-other-link";
+            // Ours — but it may point at nothing yet (linked before the shared side was made, or that side since removed):
+            // the shared folder must be there for a note to land. A file in its place throws (EEXIST): the failure path below.
+            mkdirSync(shared, { recursive: true });
+            return "already-linked";
+        }
+        if (existing?.isDirectory()) {
+            if (readdirSync(target).length > 0) {
+                console.warn(`[agend] a credential profile has its own Claude memory, so it is not linked to the shared one: ${target}`);
+                return "kept-own";
+            }
+            rmdirSync(target);
+        }
+        else if (existing) {
+            return "kept-own";
+        }
+        mkdirSync(shared, { recursive: true });
+        mkdirSync(dirname(target), { recursive: true });
+        symlinkSync(shared, target, "dir");
+        return "linked";
+    }
+    catch (err) {
+        console.warn(`[agend] could not link a credential profile's Claude memory to the shared one (${err.message}): ${target}`);
+        return "failed";
+    }
+}
+/**
+ * #1699: the config dir of a NAMED credential profile — the one string every writer and reader of that profile uses
+ * (claude names its macOS Keychain item after it). Null for no profile.
+ */
+export function claudeProfileConfigDir(backendOptions) {
+    let profile;
+    try {
+        profile = resolveCredentialProfile(backendOptions);
+    }
+    catch {
+        return null;
+    }
+    return profile ? credentialProfileHome(getAgendHome(), "claude-code", profile) : null;
+}
+/**
+ * Claude Code's config dir as an instance's CLI sees it: its profile's (#1699), else exactly as before —
+ * `CLAUDE_CONFIG_DIR` from the fleet's own environment, or `~/.claude`.
+ */
+export function claudeConfigDirFor(profileDir) {
+    return profileDir || process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), ".claude");
+}
+/**
+ * #1699: the macOS Keychain item holding the login of claude run with `CLAUDE_CONFIG_DIR=<configDir>` — claude
+ * 2.1.296's own naming: the exact string it was given, NFC-normalised, hashed (sha256, first 8 hex digits). So the dir
+ * must be spelled exactly as at launch (credentialProfileHome: absolute, no trailing slash). Only a named profile has
+ * one: the shared login, with the variable unset, is the unsuffixed "Claude Code-credentials".
+ */
+export function claudeKeychainService(configDir) {
+    return `Claude Code-credentials-${createHash("sha256").update(configDir.normalize("NFC")).digest("hex").slice(0, 8)}`;
+}
+/** Claude Code's top-level config file: `<profile dir>/.claude.json` for a profile, else honoring CLAUDE_CONFIG_DIR. */
+function claudeJsonPath(profileDir) {
+    const configDir = profileDir || process.env.CLAUDE_CONFIG_DIR?.trim();
     return configDir ? join(configDir, ".claude.json") : join(homedir(), ".claude.json");
 }
 function sleepSync(ms) {
@@ -99,8 +221,8 @@ export function releaseClaudeJsonLock(lockPath, token) {
  * unparseable file is likewise left untouched — never clobber the user's whole
  * config over a parse error. Both give up to the getStartupDialogs() fallback.
  */
-function updateClaudeJson(mutate) {
-    const path = claudeJsonPath();
+function updateClaudeJson(mutate, profileDir) {
+    const path = claudeJsonPath(profileDir);
     // The parent must exist before both the lock create and the rename — on a
     // fresh machine (no ~/.claude.json yet) an ENOENT here previously made every
     // lock attempt fail, silently degrading to unlocked last-write-wins.
@@ -308,23 +430,61 @@ const CLAUDE_STATUS_TIP_ROW = /^ {2}⎿/;
 const CLAUDE_STATUS_SPINNER_ROW = /^[^\s❯●⎿]/;
 /** A paste Claude shows collapsed in the box; the pasted text itself is not on screen. */
 const CLAUDE_COLLAPSED_PASTE = /\[Pasted text #\d+(?: \+\d+ lines?)?\]/g;
+const SWITCH_TITLE = /^[ \t]*(Switch model\?|Change effort level\?)[ \t]*$/;
+const SWITCH_YES = /^[ \t]*(❯)?[ \t]*1\.[ \t]+Yes, switch to (.+?)[ \t]*$/;
+const SWITCH_NO = /^[ \t]*(❯)?[ \t]*2\.[ \t]+No, go back[ \t]*$/;
+export function claudeSwitchDialog(pane) {
+    const rows = pane.replace(/\r/g, "").split("\n").map(r => r.trimEnd());
+    let title = -1;
+    for (let i = rows.length - 1; i >= 0; i--)
+        if (SWITCH_TITLE.test(rows[i])) {
+            title = i;
+            break;
+        }
+    if (title < 0)
+        return null;
+    let yes = -1, no = -1;
+    for (let i = title + 1; i < rows.length && i <= title + 12; i++) {
+        if (yes < 0 && SWITCH_YES.test(rows[i]))
+            yes = i;
+        else if (yes >= 0 && SWITCH_NO.test(rows[i])) {
+            no = i;
+            break;
+        }
+    }
+    if (yes < 0 || no !== yes + 1)
+        return null;
+    if (rows.slice(no + 1).filter(r => r.trim() !== "").length > 3)
+        return null;
+    const y = SWITCH_YES.exec(rows[yes]), n = SWITCH_NO.exec(rows[no]);
+    const cursor = y[1] && !n[1] ? 1 : n[1] && !y[1] ? 2 : null;
+    return { kind: SWITCH_TITLE.exec(rows[title])[1].startsWith("Switch") ? "model" : "effort", target: y[2], cursor };
+}
 /**
- * Claude Code's live input box, read as a region (#1200). Captured live from 2.1.293 under the production launch
- * (tests/fixtures/claude-2.1.293-*.pane.txt):
- *
- *   ❯ draft one two three                 ← typed text: `❯` + U+00A0, then the text
- *   ──────────────────────────────────    ← the box's upper rule
- *   ❯ [Pasted text #1 +11 lines]          ← a long paste stays collapsed until it is submitted
- *   ──────────────────────────────────    ← lower rule
- *     ok                                  ← statusLine
- *     ⏵⏵ bypass permissions on (shift+tab to cycle)
- *
- * Bottom-anchored: the lower rule is the last `─` row, with at most CLAUDE_BOX_FOOTER_MAX_ROWS non-blank rows under it;
- * the upper rule is the previous `─` row. The first row inside starts with `❯` (an empty box is a bare `❯`), further
- * rows are indented two columns. Transcript echoes above the box also start with `❯` (with an ordinary space), which
- * is why the box is found by its frame and never by the glyph. Anything else — no frame near the bottom, a first row
- * that is not the prompt, a row that is not indented — is not a box this reader can vouch for: null.
+ * #1690: does the model claude is about to switch to name the one AgEnD asked for? Display-name equality: case, a
+ * `claude-` prefix, separators and the 1M marker do not count (`claude-sonnet-5-5` ≡ "Sonnet 5.5"). A bare family alias
+ * matches its family's version (`opus` ≡ "Opus 5.5"); a dated id matches without its date. `default` / `opusplan` resolve to names AgEnD cannot predict:
+ * any name claude resolved (not the raw input echoed back) is theirs. Anything else is a mismatch.
  */
+export function claudeSwitchTargetMatches(requested, shown) {
+    // A dated catalog id names the same model as its display name: claude-sonnet-4-5-20250929 ≡ "Sonnet 4.5" (live, 2.1.296).
+    const norm = (s) => s.toLowerCase().replace(/\(1m context\)|1m context|\[1m\]/g, " 1m").replace(/^claude[\s-]+/, "")
+        .replace(/[-_]\d{8}(?=$|\s)/g, "").replace(/[\s._-]+/g, "");
+    const want = norm(requested), got = norm(shown);
+    if (!want || !got)
+        return false;
+    if (want === "default" || want === "opusplan")
+        return shown.trim().toLowerCase() !== requested.trim().toLowerCase();
+    if (want === got)
+        return true;
+    const family = /^(opus|sonnet|haiku|fable)(1m)?$/.exec(want);
+    if (family) {
+        const m = /^(opus|sonnet|haiku|fable)(\d+)(1m)?$/.exec(got);
+        return !!m && m[1] === family[1] && (m[3] ?? "") === (family[2] ?? "");
+    }
+    return false;
+}
+const switchDialogActive = (pane) => claudeSwitchDialog(pane) !== null;
 export function readClaudeInputBox(pane) {
     const rows = claudeRows(pane).map(row => row.trimEnd());
     let bottom = -1;
@@ -804,13 +964,27 @@ export class ClaudeCodeBackend {
         this.instanceDir = instanceDir;
         this.binaryPath = resolveBinary("claude");
     }
+    /** #1811: what the last launch left out and why — the Log tab and daemon.log, never a channel. */
+    quietLaunchNotes = [];
+    consumeQuietLaunchNotes() { const notes = this.quietLaunchNotes; this.quietLaunchNotes = []; return notes; }
     buildCommand(config) {
         const settingsPath = join(this.instanceDir, "claude-settings.json");
         const mcpConfigPath = join(this.instanceDir, "mcp-config.json");
         const envPrefix = ["CMUX_CLAUDE_HOOKS_DISABLED=1", "CLAUDE_CODE_EXPERIMENTAL_AGENT_TEAMS=1"];
+        // #1699: a named credential profile is its own config dir — its login, account, trust and conversations. No profile:
+        // nothing added, nothing created (the command is exactly what it was).
+        const profileDir = claudeProfileConfigDir(config.backendOptions);
+        if (profileDir) {
+            prepareCredentialProfileHome(credentialHomeSpec("claude-code"), profileDir);
+            // #1754: the project's auto-memory is the shared one, as on the default login.
+            linkSharedClaudeMemory(profileDir, config.workingDirectory, credentialHomeSpec("claude-code").sharedRoot());
+            envPrefix.push(`CLAUDE_CONFIG_DIR=${shellQuote(profileDir)}`);
+        }
         if (process.env.ANTHROPIC_BASE_URL)
             envPrefix.push(`ANTHROPIC_BASE_URL=${shellQuote(process.env.ANTHROPIC_BASE_URL)}`);
-        if (process.env.ANTHROPIC_API_KEY && !this.hasOAuthSession()) {
+        // The fleet's API key only where this instance's own config dir has no OAuth login: a key in the environment wins
+        // over the login, so reading another dir here bills the wrong account (#1699).
+        if (process.env.ANTHROPIC_API_KEY && !this.hasOAuthSession(profileDir)) {
             envPrefix.push(`ANTHROPIC_API_KEY=${shellQuote(process.env.ANTHROPIC_API_KEY)}`);
         }
         let cmd = `${envPrefix.join(" ")} ${this.binaryPath} --settings ${settingsPath} --mcp-config ${mcpConfigPath}`;
@@ -824,7 +998,7 @@ export class ClaudeCodeBackend {
         // own project transcript as the source of truth instead of the generic
         // marker alone. This also makes an empty/missing Classic workspace start
         // fresh rather than entering a resume crash loop.
-        if (!config.skipResume && existsSync(sessionIdFile) && this.hasProjectSession(config.workingDirectory)) {
+        if (!config.skipResume && existsSync(sessionIdFile) && this.hasProjectSession(config.workingDirectory, profileDir)) {
             cmd += " --continue";
         }
         if (config.model) {
@@ -832,6 +1006,11 @@ export class ClaudeCodeBackend {
             warnIfModelMismatch("claude-code", model);
             cmd += ` --model ${shellQuote(model)}`;
         }
+        // #1811: the configured effort, where this claude takes it (launch-effort.ts); else a quiet note.
+        const effort = flagEffort("claude-code", config.effort, this.binaryPath);
+        if (effort.arg)
+            cmd += effort.arg;
+        this.quietLaunchNotes = effort.note ? [effort.note] : [];
         // Additive system prompt: append fleet instructions without overriding Claude's built-in prompt
         const instrFile = join(this.instanceDir, "fleet-instructions.md");
         if (existsSync(instrFile)) {
@@ -839,11 +1018,11 @@ export class ClaudeCodeBackend {
         }
         return cmd;
     }
-    hasProjectSession(workingDirectory) {
+    hasProjectSession(workingDirectory, profileDir) {
         const cwd = workingDirectory.trim();
         if (!cwd)
             return false;
-        const configDir = process.env.CLAUDE_CONFIG_DIR?.trim() || join(homedir(), ".claude");
+        const configDir = claudeConfigDirFor(profileDir);
         const encodedCwd = claudeProjectKey(cwd);
         try {
             return readdirSync(join(configDir, "projects", encodedCwd), { withFileTypes: true })
@@ -1276,6 +1455,17 @@ export class ClaudeCodeBackend {
             { pattern: /Choose the text style that looks best with your terminal/, isActive: claudeThemePickerActive, keys: ["Enter"], description: "Claude onboarding theme picker — accept the highlighted theme", blocksDelivery: true, verifyAfterKeys: true, autoResolutionKey: "claude-onboarding-theme" },
             { pattern: /Press Enter to continue/, isActive: claudeSecurityNotesActive, keys: ["Enter"], description: "Claude onboarding security notes — continue", blocksDelivery: true, verifyAfterKeys: true, autoResolutionKey: "claude-onboarding-security" },
             { pattern: /Use Claude Code's terminal setup\?/, isActive: claudeTerminalSetupActive, keys: ["Escape"], description: "Claude onboarding terminal-setup offer — skip", blocksDelivery: true, verifyAfterKeys: true, autoResolutionKey: "claude-onboarding-terminal-setup" },
+            // #1690: the model/effort switch confirmation. Held for every delivery while it is up (its default cursor is Yes:
+            // a stray Enter would confirm it) and never answered by the scanner — AgEnD's own /model answers it on a verified
+            // cursor (Daemon.answerOwnSwitchDialog); one AgEnD did not ask for is parked for a human.
+            {
+                pattern: /Switch model\?|Change effort level\?/,
+                isActive: switchDialogActive,
+                keys: [],
+                holdOnly: true,
+                blocksDelivery: true,
+                description: "Claude model/effort switch confirmation (\u201cSwitch model?\u201d) — not asked for by AgEnD, or its answer did not take",
+            },
         ];
     }
     getQuitCommand() { return "/exit"; }
@@ -1369,10 +1559,12 @@ export class ClaudeCodeBackend {
      * signal is projects[<cwd>].hasTrustDialogAccepted in claude.json. Also marks
      * onboarding complete for an already-authenticated account (see below).
      */
-    preTrust(workingDirectory) {
+    preTrust(workingDirectory, config) {
         const cwd = workingDirectory?.trim();
         if (!cwd)
             return;
+        // #1699: trust and onboarding are per config dir — a profile's own `.claude.json`, never the shared one.
+        const profileDir = claudeProfileConfigDir(config?.backendOptions);
         const literal = resolve(cwd);
         let canonical = literal;
         try {
@@ -1416,15 +1608,16 @@ export class ClaudeCodeBackend {
                     changed = true;
                 }
                 return changed;
-            });
+            }, profileDir);
         }
         catch { /* best effort — startup dialog auto-dismiss remains the fallback */ }
     }
     /** Pre-approve ANTHROPIC_API_KEY in claude.json to skip the interactive prompt */
-    preApproveApiKey(_config) {
+    preApproveApiKey(config) {
         const apiKey = process.env.ANTHROPIC_API_KEY;
         if (!apiKey)
             return;
+        const profileDir = claudeProfileConfigDir(config.backendOptions);
         const fingerprint = apiKey.length > 20 ? apiKey.slice(-20) : apiKey;
         try {
             updateClaudeJson(cfg => {
@@ -1437,14 +1630,14 @@ export class ClaudeCodeBackend {
                     rejected: existing?.rejected ?? [],
                 };
                 return true;
-            });
+            }, profileDir);
         }
         catch { /* best effort — the startup prompt remains the fallback */ }
     }
-    /** Check if user has an active OAuth session in claude.json */
-    hasOAuthSession() {
+    /** Check if user has an active OAuth session in claude.json (#1699: the instance's own config dir). */
+    hasOAuthSession(profileDir) {
         try {
-            const cfg = JSON.parse(readFileSync(claudeJsonPath(), "utf-8"));
+            const cfg = JSON.parse(readFileSync(claudeJsonPath(profileDir), "utf-8"));
             return !!cfg.oauthAccount?.accountUuid;
         }
         catch {