@edspencer/paddock 0.61.1 → 0.63.0

package/packages/server/dist/claude-settings.js

@@ -0,0 +1,159 @@
+/**
+ * The `claude.hooks` lever (#691): whether this instance runs the host machine's
+ * Claude Code hooks.
+ *
+ * This is the one lever in the `claude:` block that is about code execution
+ * rather than data. A hook is a shell command Claude Code runs on `PreToolUse`,
+ * `PostToolUse`, `SessionStart` and friends, and since #620 paddock has symlinked
+ * the user's `~/.claude/settings.json` into its own home unconditionally — so
+ * every hook the user has ever configured fires inside every paddock turn, with
+ * no key to turn it off. "Isolate it by just trying paddock" was not true, and
+ * this is why.
+ *
+ * ## Why this cannot be a symlink decision
+ *
+ * `settings.json` is a mixed bag. It carries `hooks`, and also `permissions`,
+ * `model`, `statusLine`, `enabledPlugins`, `env`, `outputStyle` — the things a
+ * user configures once and expects everywhere. A symlink is all-or-nothing and
+ * the file is not, so `hooks: own` has to leave the rest inherited while dropping
+ * one key.
+ *
+ * So paddock WRITES `<ownHome>/settings.json` itself: parse the user's, drop
+ * {@link HOST_ONLY_SETTINGS_KEYS}, serialise the remainder. `hooks: host` is the
+ * old symlink, unchanged.
+ *
+ * ### The staleness this buys, which is real
+ *
+ * A copy diverges the moment the user edits theirs; a symlink does not — and
+ * **that difference is live, not just at the next process start.** Claude Code
+ * runs a settings-change watcher (~1s poll + 500ms debounce) that follows the
+ * symlink to its real target, clears its whole settings memo and re-applies the
+ * result mid-session; verified by mutating a symlink target under a running
+ * `query()` and watching `Detected change to … (via symlink target …)` come back.
+ * So the honest statement is that a symlink propagates an edit in about a second
+ * and the copy propagates it at the next paddock restart. Two things make that
+ * an acceptable price rather than a design flaw:
+ *
+ * 1. **Only users who actually have hooks pay it.** {@link planHostSettings}
+ *    returns `link` when the user's file has none of the governed keys, which is
+ *    most files — nothing to filter, so nothing is copied and there is nothing to
+ *    go stale. The copy exists exactly where filtering is doing work.
+ * 2. **It is regenerated on every boot** (`ensureClaudeHome`), so a restart is
+ *    the whole of the fix, and paddock says so in the boot notice.
+ *
+ * A file-watcher on the user's file, re-running the filter, would close the gap
+ * — and because Claude Code's own watcher fires on content change regardless of
+ * who wrote it, paddock re-writing the copy WOULD be picked up live. That is a
+ * real option if the cadence ever matters. It is not taken here: it puts a
+ * watcher on a path in the user's home, races paddock's own write against the
+ * 5s echo-suppression window Claude Code uses for exactly this, and buys a
+ * narrower window on a file people edit a handful of times a year.
+ *
+ * ### Which turns this actually governs today, which is not all of them
+ *
+ * `<claudeHome>/settings.json` is Claude Code's `userSettings` source, and
+ * **herdctl does not load that source on the SDK runtime.** `sdk-adapter.js`
+ * defaults `settingSources` to `["project"]` for any agent with a
+ * `working_directory` — which is every paddock keeper — so the SDK is invoked
+ * with `--setting-sources=project` and never reads this file at all. The CLI
+ * runtime passes `--setting-sources` only when an agent declares
+ * `setting_sources`, and paddock declares none, so `claude -p` runs on the
+ * default `["user","project","local"]` and DOES read it.
+ *
+ * So the host's hooks execute in the sweeper, in triggers, and in
+ * `driveMode: batch` chats — and not, today, in a default SDK chat turn. That
+ * makes this lever narrower than #691 assumed, and worth keeping regardless:
+ * those paths are real code execution, the asymmetry is a herdctl default rather
+ * than a guarantee, and a lever that is correct before the default changes is
+ * the only kind worth having. The same caveat applies to the keys it KEEPS —
+ * the user's `permissions` and `model` reach the CLI paths and not the SDK ones,
+ * which was true before this change too.
+ *
+ * ## What `own` does NOT stop, and should
+ *
+ * `hooks` is not the only key in `settings.json` that names a command to run.
+ * Read straight out of the SDK's own settings schema
+ * (`@anthropic-ai/claude-agent-sdk/sdk.mjs`), these do too:
+ *
+ * - `apiKeyHelper` — "Path to a script that outputs authentication values"
+ * - `awsCredentialExport` — "Path to a script that exports AWS credentials"
+ * - `awsAuthRefresh` — "Path to a script that refreshes AWS authentication"
+ * - `gcpAuthRefresh` — "Command to refresh GCP authentication"
+ * - `proxyAuthHelper` — "Shell command that outputs a Proxy-Authorization header"
+ * - `otelHeadersHelper` — "Path to a script that outputs OpenTelemetry headers"
+ * - `statusLine`, `subagentStatusLine`, `fileSuggestion` — `{type:"command", …}`
+ *
+ * #691 scopes this lever to `hooks`, so `hooks` is what {@link
+ * HOST_ONLY_SETTINGS_KEYS} contains — widening a default-on security lever past
+ * its brief is the maintainer's call, not this module's. It is one line when he
+ * makes it, and the trade-off is not obvious in either direction: the first five
+ * of those are how a user's login WORKS on a corporate setup, so dropping them
+ * under a key named `hooks` would break authentication for exactly the people who
+ * did nothing wrong — an argument that they belong under `claude.credentials`
+ * rather than here. Until someone decides, `hooks: own` means "no host hooks",
+ * not "no host commands", and this comment is the difference.
+ */
+/**
+ * Isolation is the default, and here it is the only defensible one: `host` means
+ * arbitrary commands from outside the data dir execute inside paddock's turns,
+ * and that is not something a user should opt out of after the fact.
+ */
+export const DEFAULT_HOOKS_MODE = "own";
+/** Type guard, so an unknown config value falls back instead of failing a boot. */
+export function isKnownHooksMode(value) {
+    return value === "own" || value === "host";
+}
+/** The Claude home entry this lever filters. */
+export const SETTINGS_ENTRY = "settings.json";
+/**
+ * Keys of `settings.json` that `hooks: own` drops. See the module doc for the
+ * several others that arguably belong here and are deliberately not.
+ */
+export const HOST_ONLY_SETTINGS_KEYS = ["hooks"];
+/**
+ * Where paddock records the SHA-256 of each file it generated in its own home,
+ * so a later boot can tell its own output from something a human put there.
+ *
+ * A marker key inside `settings.json` would need no second file, but the schema
+ * is Claude Code's and adding a key to it is asking for a validation warning on
+ * some future version. A hash sidecar is inert by construction.
+ */
+export const GENERATED_MARKER_FILE = ".paddock-generated.json";
+/**
+ * Decide what paddock's own `settings.json` should be, given the user's.
+ *
+ * Pure, so the whole decision is testable without a filesystem.
+ *
+ * The `skip` case is the security-relevant one. A `settings.json` that will not
+ * parse cannot be filtered, and the safe response is to plant NOTHING rather than
+ * fall back to a symlink — a symlink would hand over the hooks this lever exists
+ * to withhold, and it would do it precisely when something is already wrong.
+ * Claude Code will not be able to read that file either, so the instance loses
+ * nothing it would otherwise have had.
+ */
+export function planHostSettings(mode, raw) {
+    if (mode === "host")
+        return { action: "link" };
+    let parsed;
+    try {
+        parsed = JSON.parse(raw);
+    }
+    catch (err) {
+        return { action: "skip", reason: `it is not valid JSON (${String(err)})` };
+    }
+    if (parsed === null || typeof parsed !== "object" || Array.isArray(parsed)) {
+        return { action: "skip", reason: "its top level is not a JSON object" };
+    }
+    const settings = parsed;
+    const dropped = HOST_ONLY_SETTINGS_KEYS.filter((k) => k in settings);
+    if (dropped.length === 0)
+        return { action: "link" };
+    const kept = {};
+    // Insertion order preserved, minus the dropped keys — a user comparing the two
+    // files should see a deletion, not a reshuffle.
+    for (const [k, v] of Object.entries(settings)) {
+        if (!dropped.includes(k))
+            kept[k] = v;
+    }
+    return { action: "write", content: `${JSON.stringify(kept, null, 2)}\n`, dropped: [...dropped] };
+}

package/packages/server/dist/cli/args.d.ts

@@ -32,14 +32,6 @@ export interface CliOptions {
     verbose: boolean;
     help: boolean;
     version: boolean;
-    /**
-     * Keep paddock's own Claude home instead of inheriting the user's (#683).
-     *
-     * The CLI defaults to running against `~/.claude` when there is no token and
-     * no explicit home, because that is the only way a macOS Keychain login is
-     * visible at all. This is the opt-out — see `cli/claude-home-choice.ts`.
-     */
-    isolatedClaudeHome: boolean;
 }
 /** A usage error. Thrown rather than exiting, so parsing stays testable. */
 export declare class CliError extends Error {
@@ -61,4 +53,4 @@ export declare function nodeVersionProblem(nodeVersion: string): string | undefi
  * flag that fixes it.
  */
 export declare function explainListenError(err: unknown, host: string, port: string): string;
-export declare const USAGE = "paddock \u2014 run a Paddock instance locally\n\nUsage\n  npx @edspencer/paddock [options]\n\nOptions\n  -p, --port <port>       HTTP/WS port (default 4000, or $PORT)\n      --host <host>       Bind address (default 127.0.0.1)\n  -d, --data-dir <path>   Projects + state (default ~/.paddock, or $PADDOCK_DATA_DIR)\n      --here              Open the CURRENT directory as the workspace (see below)\n  -o, --open              Open the app in your browser once it is listening\n      --verbose           Show the server's own logs (quiet by default)\n      --isolated-claude-home\n                          Use Paddock's own Claude home instead of ~/.claude\n                          (see Credentials below)\n  -v, --version           Print the Paddock version and exit\n  -h, --help              Show this help\n\nOpening a directory (--here)\n  Run `paddock --here` inside a project and Paddock opens THAT directory as its\n  workspace: Claude works in your files, and any Claude Code sessions you already\n  have for the directory are offered for import. It:\n\n    \u00B7 creates .paddock/ in the directory for this workspace's own state\n    \u00B7 creates .chats/ for transcripts, and adds both to .gitignore\n    \u00B7 offers your ~/.claude sessions for this directory for import \u2014 nothing\n      there is moved, copied or linked until you confirm\n\n  Once done, later runs in the same directory resume it \u2014 no flag needed.\n  Without --here, Paddock never touches the directory you ran it from.\n\nCredentials\n  Paddock drives Claude Code, so it needs Claude credentials. With no\n  CLAUDE_CODE_OAUTH_TOKEN or ANTHROPIC_API_KEY in the environment, it runs\n  against your own ~/.claude and uses the Claude Code login already there \u2014\n  including one held in the macOS Keychain, which cannot be shared any other\n  way. Paddock creates nothing under ~/.claude; your transcripts just stay\n  there rather than being relocated into .chats/, and existing sessions are\n  still offered for import rather than opened for you.\n\n  Pass --isolated-claude-home (or set CLAUDE_HOME) for a Claude home of its\n  own; then a login must be a token in the environment, a ~/.claude\n  .credentials.json, or `CLAUDE_CONFIG_DIR=<data-dir>/claude-home claude login`.\n  With no login at all anywhere, run `claude setup-token`.\n\nYour data\n  Everything lives in one directory \u2014 ~/.paddock unless you pass --data-dir.\n  Projects, chat transcripts and settings all persist there between runs. Move\n  that directory to move your instance; delete it to start over. Nothing is\n  stored anywhere else.\n\nNotes\n  Binds loopback with authentication disabled, which is safe for a laptop. To\n  expose it on a network, set PADDOCK_AUTH_MODE first \u2014 Paddock refuses to bind\n  a routable interface wide open. See AUTH.md.\n\nDocs: https://github.com/edspencer/paddock";
+export declare const USAGE = "paddock \u2014 run a Paddock instance locally\n\nUsage\n  npx @edspencer/paddock [options]\n\nOptions\n  -p, --port <port>       HTTP/WS port (default 4000, or $PORT)\n      --host <host>       Bind address (default 127.0.0.1)\n  -d, --data-dir <path>   Projects + state (default ~/.paddock, or $PADDOCK_DATA_DIR)\n      --here              Open the CURRENT directory as the workspace (see below)\n  -o, --open              Open the app in your browser once it is listening\n      --verbose           Show the server's own logs (quiet by default)\n  -v, --version           Print the Paddock version and exit\n  -h, --help              Show this help\n\nOpening a directory (--here)\n  Run `paddock --here` inside a project and Paddock opens THAT directory as its\n  workspace: Claude works in your files, and any Claude Code sessions you already\n  have for the directory are offered for import. It:\n\n    \u00B7 creates .paddock/ in the directory for this workspace's own state\n    \u00B7 creates .chats/ for transcripts, and adds both to .gitignore\n    \u00B7 offers your ~/.claude sessions for this directory for import \u2014 nothing\n      there is moved, copied or linked until you confirm\n\n  Once done, later runs in the same directory resume it \u2014 no flag needed.\n  Without --here, Paddock never touches the directory you ran it from.\n\nCredentials\n  Paddock drives Claude Code, so it needs Claude credentials \u2014 and if you\n  already use Claude Code on this machine, it uses the login you already have.\n  That is a macOS Keychain entry on a Mac, or your ~/.claude/.credentials.json\n  elsewhere (symlinked in, never copied). Reading a login writes nothing.\n\n  Otherwise: a CLAUDE_CODE_OAUTH_TOKEN or ANTHROPIC_API_KEY in the environment,\n  or a one-off `CLAUDE_CONFIG_DIR=<data-dir>/claude-home claude login`. With no\n  login at all anywhere, run `claude setup-token`. Paddock says at startup when\n  it can find none.\n\nSharing your Claude Code state\n  Apart from that login, Paddock writes nothing outside its data dir by\n  default: transcripts go to each project's .chats/, and your ~/.claude is read\n  for config only. Each thing it can share is one key in\n  <data-dir>/paddock.config.yaml:\n\n    claude:\n      transcripts: host   # own | host, default own\n      credentials: host   # own | host, default host\n      instructions: host  # own | host, default own\n      hooks: host         # own | host, default own\n      mcpServers: host    # own | host, default own\n\n  transcripts: host makes a chat and a `claude --resume` in the same directory\n  the same file, live in both directions; deleting such a chat in Paddock\n  releases it rather than removing it, because it is your history rather than\n  Paddock's copy. credentials: own is the opt-out from sharing the login above.\n\n  instructions: host loads your ~/.claude CLAUDE.md, agents/, commands/ and\n  plugins/. Off by default, which is a change: your curated CLAUDE.md does not\n  reach Paddock's agents unless you say so. Each project's own CLAUDE.md always\n  does.\n\n  hooks: host runs the shell commands your ~/.claude/settings.json binds to\n  tool use. Off by default \u2014 inheriting someone's hooks is not something to\n  discover after the fact. Its other keys (permissions, model, statusline)\n  apply either way: under hooks: own Paddock writes its own settings.json\n  carrying them with hooks dropped, regenerated at startup.\n\n  mcpServers: host attaches the MCP servers declared in your ~/.claude.json \u2014\n  the top-level ones, plus a project's own when its directory matches. To give\n  this instance a server your machine doesn't have, declare it instead in a\n  sibling mcpServers: block of the same file; use env:VAR_NAME anywhere a\n  string goes so tokens stay out of it. That keeps a token out of the file, not\n  out of `ps`: leave driveMode on its default (session) for a server holding\n  one, since batch passes the definition to claude as a command-line argument.\n\nYour data\n  Everything lives in one directory \u2014 ~/.paddock unless you pass --data-dir.\n  Projects, chat transcripts and settings all persist there between runs. Move\n  that directory to move your instance; delete it to start over. Nothing is\n  stored anywhere else.\n\nNotes\n  Binds loopback with authentication disabled, which is safe for a laptop. To\n  expose it on a network, set PADDOCK_AUTH_MODE first \u2014 Paddock refuses to bind\n  a routable interface wide open. See AUTH.md.\n\nDocs: https://github.com/edspencer/paddock";

package/packages/server/dist/cli/args.js

@@ -34,7 +34,6 @@ export function parseArgs(argv) {
         verbose: false,
         help: false,
         version: false,
-        isolatedClaudeHome: false,
     };
     for (let i = 0; i < argv.length; i++) {
         const arg = argv[i];
@@ -66,9 +65,6 @@ export function parseArgs(argv) {
             case "--verbose":
                 opts.verbose = true;
                 break;
-            case "--isolated-claude-home":
-                opts.isolatedClaudeHome = true;
-                break;
             case "-h":
             case "--help":
                 opts.help = true;
@@ -128,9 +124,6 @@ Options
       --here              Open the CURRENT directory as the workspace (see below)
   -o, --open              Open the app in your browser once it is listening
       --verbose           Show the server's own logs (quiet by default)
-      --isolated-claude-home
-                          Use Paddock's own Claude home instead of ~/.claude
-                          (see Credentials below)
   -v, --version           Print the Paddock version and exit
   -h, --help              Show this help
 
@@ -148,18 +141,52 @@ Opening a directory (--here)
   Without --here, Paddock never touches the directory you ran it from.
 
 Credentials
-  Paddock drives Claude Code, so it needs Claude credentials. With no
-  CLAUDE_CODE_OAUTH_TOKEN or ANTHROPIC_API_KEY in the environment, it runs
-  against your own ~/.claude and uses the Claude Code login already there —
-  including one held in the macOS Keychain, which cannot be shared any other
-  way. Paddock creates nothing under ~/.claude; your transcripts just stay
-  there rather than being relocated into .chats/, and existing sessions are
-  still offered for import rather than opened for you.
-
-  Pass --isolated-claude-home (or set CLAUDE_HOME) for a Claude home of its
-  own; then a login must be a token in the environment, a ~/.claude
-  .credentials.json, or \`CLAUDE_CONFIG_DIR=<data-dir>/claude-home claude login\`.
-  With no login at all anywhere, run \`claude setup-token\`.
+  Paddock drives Claude Code, so it needs Claude credentials — and if you
+  already use Claude Code on this machine, it uses the login you already have.
+  That is a macOS Keychain entry on a Mac, or your ~/.claude/.credentials.json
+  elsewhere (symlinked in, never copied). Reading a login writes nothing.
+
+  Otherwise: a CLAUDE_CODE_OAUTH_TOKEN or ANTHROPIC_API_KEY in the environment,
+  or a one-off \`CLAUDE_CONFIG_DIR=<data-dir>/claude-home claude login\`. With no
+  login at all anywhere, run \`claude setup-token\`. Paddock says at startup when
+  it can find none.
+
+Sharing your Claude Code state
+  Apart from that login, Paddock writes nothing outside its data dir by
+  default: transcripts go to each project's .chats/, and your ~/.claude is read
+  for config only. Each thing it can share is one key in
+  <data-dir>/paddock.config.yaml:
+
+    claude:
+      transcripts: host   # own | host, default own
+      credentials: host   # own | host, default host
+      instructions: host  # own | host, default own
+      hooks: host         # own | host, default own
+      mcpServers: host    # own | host, default own
+
+  transcripts: host makes a chat and a \`claude --resume\` in the same directory
+  the same file, live in both directions; deleting such a chat in Paddock
+  releases it rather than removing it, because it is your history rather than
+  Paddock's copy. credentials: own is the opt-out from sharing the login above.
+
+  instructions: host loads your ~/.claude CLAUDE.md, agents/, commands/ and
+  plugins/. Off by default, which is a change: your curated CLAUDE.md does not
+  reach Paddock's agents unless you say so. Each project's own CLAUDE.md always
+  does.
+
+  hooks: host runs the shell commands your ~/.claude/settings.json binds to
+  tool use. Off by default — inheriting someone's hooks is not something to
+  discover after the fact. Its other keys (permissions, model, statusline)
+  apply either way: under hooks: own Paddock writes its own settings.json
+  carrying them with hooks dropped, regenerated at startup.
+
+  mcpServers: host attaches the MCP servers declared in your ~/.claude.json —
+  the top-level ones, plus a project's own when its directory matches. To give
+  this instance a server your machine doesn't have, declare it instead in a
+  sibling mcpServers: block of the same file; use env:VAR_NAME anywhere a
+  string goes so tokens stay out of it. That keeps a token out of the file, not
+  out of \`ps\`: leave driveMode on its default (session) for a server holding
+  one, since batch passes the definition to claude as a command-line argument.
 
 Your data
   Everything lives in one directory — ~/.paddock unless you pass --data-dir.

package/packages/server/dist/cli/paddock.js

@@ -24,7 +24,6 @@ import path from "node:path";
 import { spawn } from "node:child_process";
 import { fileURLToPath } from "node:url";
 import { HERE_MARKER, isHereWorkspace, countClaudeSessions, ensureGitignored } from "./here.js";
-import { chooseClaudeHome, userClaudeHomePath } from "./claude-home-choice.js";
 import { CliError, USAGE, parseArgs, nodeVersionProblem, explainListenError, } from "./args.js";
 /** This module's own directory: `<…>/packages/server/dist/cli`. */
 const moduleDir = path.dirname(fileURLToPath(import.meta.url));
@@ -115,26 +114,19 @@ function noteFirstRun(dataDir) {
  * effects are announced rather than asked about. Printed only on the first
  * `--here` in a directory; resuming an already-opened one says nothing.
  */
-function announceHereConsent(dir, dataDir, inheritedHome) {
+function announceHereConsent(dir, dataDir) {
     console.log([
         "",
         `  Opening ${dir} as a Paddock workspace.`,
         `    · ${path.relative(dir, dataDir) || HERE_MARKER}/ and .chats/ created here, and added to .gitignore`,
-        // Import consent is UNCHANGED by continuity, which is worth stating
-        // because it is not what you would predict: reading the user's home does
-        // not turn their sessions into paddock's chats. Verified against a running
-        // instance — a pre-existing transcript for the directory comes back from
-        // `adoptable-chats` (offered) and NOT from `chats` (listed), because
-        // session discovery is attribution-based, not "whatever is in the folder".
-        // So #663's confirmation still gates every import.
-        //
-        // What continuity DOES change is where transcripts live: with no symlink
-        // planted in a home paddock does not own (#682), Claude Code keeps writing
-        // to `~/.claude/projects/<encoded-cwd>/` and `.chats/` stays empty.
-        inheritedHome === undefined
-            ? "    · ~/.claude sessions for this directory are offered for import (nothing is moved)"
-            : `    · running against your ${inheritedHome}: sessions there are offered for import ` +
-                `(nothing is moved), and new transcripts stay there rather than in .chats/`,
+        // Worth stating because it is not what you would predict: paddock reading
+        // the home a user's sessions live in does not turn them into paddock's
+        // chats. Verified against a running instance — a pre-existing transcript
+        // for the directory comes back from `adoptable-chats` (offered) and NOT
+        // from `chats` (listed), because session discovery is attribution-based,
+        // not "whatever is in the folder". So #663's confirmation still gates
+        // every import.
+        "    · ~/.claude sessions for this directory are offered for import (nothing is moved)",
         "  Later runs here resume it — no flag needed.",
         "",
     ].join("\n"));
@@ -146,7 +138,9 @@ function announceHereConsent(dir, dataDir, inheritedHome) {
  * transcripts and prints, and changes nothing on disk.
  */
 function offerHereIfSessionsExist(dir) {
-    const claudeHome = process.env.CLAUDE_HOME ?? path.join(os.homedir(), ".claude");
+    // The USER's own home, always: this is looking for `claude` history they made
+    // in a terminal, which is by definition in `~/.claude` and never in paddock's.
+    const claudeHome = path.join(os.homedir(), ".claude");
     let sessions = 0;
     try {
         sessions = countClaudeSessions(claudeHome, dir);
@@ -219,20 +213,13 @@ async function main() {
     // is `.git`. A flagless run anywhere else touches nothing.
     const resuming = !opts.here && isHereWorkspace(cwd);
     const hereMode = opts.here || resuming;
-    // Credential continuity (#683). Decided HERE, in the interactive CLI, and
-    // nowhere else: `resolveClaudeHome`'s precedence is untouched, so a server, a
-    // container and `node dist/index.js` all keep the owned home. All this does is
-    // set the same `CLAUDE_HOME` a user could set by hand — the difference is that
-    // on macOS they currently have no way to know they need to.
-    const userHome = userClaudeHomePath(os.homedir());
-    const homeChoice = chooseClaudeHome({
-        env: process.env,
-        userClaudeHome: userHome,
-        userHomeExists: fs.existsSync(userHome),
-        forceIsolated: opts.isolatedClaudeHome,
-    });
-    if (homeChoice.claudeHome !== undefined)
-        process.env.CLAUDE_HOME = homeChoice.claudeHome;
+    // No Claude-home choice happens here any more (#691). The CLI used to point
+    // `CLAUDE_HOME` at `~/.claude` so a macOS Keychain login would be visible
+    // (#683); paddock now always owns its home, and what a user actually wanted
+    // from that — shared transcripts, shared login — are separate `claude:` config
+    // keys. `claude.credentials` restores the Keychain half and defaults to `host`,
+    // so a Mac whose only login is a `claude /login` still works out of the box
+    // with no flag: see `claude-credentials.ts`.
     // Apply CLI defaults as env vars. This is the whole integration surface: the
     // server resolves config inside `buildApp()`, so anything set before the
     // dynamic import below is picked up with no special-casing in config.ts.
@@ -242,7 +229,7 @@ async function main() {
         (hereMode ? path.join(cwd, HERE_MARKER) : path.join(os.homedir(), ".paddock")));
     if (hereMode) {
         if (!resuming)
-            announceHereConsent(cwd, dataDir, homeChoice.claudeHome);
+            announceHereConsent(cwd, dataDir);
         // The root workspace IS `projectsRoot` (its key is ""), so pointing this at
         // the user's directory makes that directory the workspace. No schema change,
         // no new project type — see cli/here.ts.
@@ -308,12 +295,6 @@ async function main() {
         "",
         `  Paddock is running at ${url}`,
         `  Workspace: ${hereMode ? cwd : dataDir}${resuming ? "  (resumed)" : ""}`,
-        // Same rule as the workspace line: running against somebody's own Claude
-        // home is a real difference in what this instance reads and writes, so it
-        // is stated every run rather than only on the one that decided it.
-        ...(homeChoice.claudeHome !== undefined
-            ? [`  Claude home: ${homeChoice.claudeHome}  (yours — sessions and login shared)`]
-            : []),
         "  Press Ctrl-C to stop.",
         "",
     ].join("\n"));