tickmarkr 2.8.4 → 2.8.5

package/dist/cli/commands/fleet.js

@@ -7,7 +7,7 @@ import { allAdapters, discoverChannels, doctorAgeMs, initDoctorReuse, modelAuthE
 import { catalogModelAdvisory, catalogTierRanking, declaredModelWindow, fleetUnclassifiedModels } from "../../adapters/model-lints.js";
 import { CATALOG_REFRESH_TIMEOUT_MS, formatCatalogRefreshLegs, readCachedCatalog, refreshCatalogCommand } from "../../adapters/catalog-remote.js";
 import { CLAUDE_ALIAS_IDENTITY_STAMPS, readClaudeAliasIdentity } from "../../adapters/claude-code.js";
-import { ConfigError, DEFAULT_CONFIG, fleetEditableFromConfig, fleetEditableEquals, formatFleetPrint, globalConfigDir, DENY_SCOPES, initialDenyPropOf, loadConfigWithMode, lowerLayerModelOverrides, overlayBytesLoadError, readOverlayFile, stagedDenyKeyOf, renderFleetOverlayWrite, repoOverlayPath, repoShadowedUserKeys, ROUTING_MODES, TIER_RANK, unifiedYamlDiff, universeEntryMatches, } from "../../config/config.js";
+import { ConfigError, DEFAULT_CONFIG, fleetEditableFromConfig, fleetEditableEquals, formatFleetPrint, globalConfigDir, DENY_SCOPES, initialDenyPropOf, loadConfigWithMode, lowerLayerModelOverrides, overlayBytesLoadError, ownRepoOverlayPath, readOverlayFile, stagedDenyKeyOf, renderFleetOverlayWrite, repoOverlayPath, repoShadowedUserKeys, ROUTING_MODES, TIER_RANK, unifiedYamlDiff, universeEntryMatches, } from "../../config/config.js";
 import { exclusionReason, projectFleetWhy, renderFleetWhy } from "../../config/fleet-why.js";
 import { overlayHoldingLine, overlayHoldsMap } from "../../config/fleet-overlay.js";
 import { SHAPES, TIERS } from "../../graph/schema.js";
@@ -355,7 +355,10 @@ export async function assembleFleetEditor(cwd, adapters, io, opts) {
     // them (destinationEdits below) — the repository overlay when it declares the key or masks it
     // with null at it or above, else the user overlay.
     const userPath = join(globalDir, "config.yaml");
-    const repoPath = repoOverlayPath(cwd);
+    // Queue row 195 / D-2102: the save destination is the checkout's OWN file even when the reader
+    // fallback (repoOverlayPath) has this linked worktree reading its main checkout's overlay — a
+    // first save here creates the worktree's own overlay, which then wins wholesale.
+    const repoPath = ownRepoOverlayPath(cwd);
     const currentUserText = () => (existsSync(userPath) ? readFileSync(userPath, "utf8") : "");
     const pathOf = (destination) => (destination === "repo" ? repoPath : userPath);
     // the candidate bytes stand in for the destination layer in the one loader path
@@ -1243,7 +1246,12 @@ export async function assembleFleetEditor(cwd, adapters, io, opts) {
     // T10: both overlays are guarded whichever one is written, so a holder that moved after the review
     // (the destination itself) refuses instead of retargeting. Null = still current.
     const stalePreview = (pending, reviewed, prior) => {
-        const destinationNow = prior ?? (pending.destination === "repo" ? currentRepoOverlayText(cwd) : currentUserText());
+        // Queue row 195 / D-2102: a repo-destination review renders against the EFFECTIVE repository
+        // overlay — in a linked worktree with no overlay of its own that is the main checkout's file,
+        // while the write lands in the worktree's own (ownRepoOverlayPath). The guard therefore
+        // re-reads the effective layer, not the destination's prior bytes; either file moving after
+        // the review moves that read (an own file appearing wins wholesale), so the refusal stands.
+        const destinationNow = pending.destination === "repo" ? currentRepoOverlayText(cwd) : (prior ?? currentUserText());
         const repoNow = pending.destination === "repo" ? destinationNow : currentRepoOverlayText(cwd);
         const userNow = pending.destination === "user" ? destinationNow : currentUserText();
         if (repoNow !== pending.repo) {

package/dist/cli/commands/init.js

@@ -24,7 +24,7 @@ const ENVIRONMENTS_FOOTER = [
     "environments:",
     "  herdr — the full cockpit — every worker, judge, and consult is a visible pane you can watch and unblock · https://herdr.dev · auto picks it first when HERDR_ENV=1",
     "  orca — visible terminals in the Orca app — auto picks it inside an Orca terminal after herdr and before subprocess; set driver: orca to force it · https://onorca.dev",
-    "  claude code — tickmarkr init --agent installs the /tkr skills + AGENTS.md so Claude Code (or any agent CLI) drives the loop natively",
+    "  claude code — tickmarkr init --agent installs the /tkr skills + AGENTS.md so Claude Code (or any agent CLI) drives the loop natively; in Claude Desktop's Code tab (neither herdr nor Orca) one single-tier session runs the loop on the headless subprocess driver, watched with tickmarkr status --watch --plain",
     "  anywhere — no herdr or Orca terminal? same fail-closed gates, headless subprocess driver (legacy: no herdr? same fail-closed gates, headless subprocess driver when Orca markers are absent)",
 ].join("\n");
 /** Current run truth, lock first; falls back to an abandoned journal. */
@@ -115,7 +115,7 @@ A run is green only when ALL of these hold: the run-end event exists in the jour
 
 ### Verified handoffs
 
-When relaying missions between agents, never use bare send-text (\`herdr agent send\` / pane send-text) — it omits Enter. Use \`herdr pane run <pane> "<message>"\` or \`herdr notification show "<message>"\`. Confirm delivery by reading the TARGET composer afterward; if the sent text still sits unsubmitted after ~15 s, retry the Enter only when that composer read shows the staged text and no permission prompt or numbered choice holds focus — an Enter sent onto an active prompt approves it or picks a choice instead of submitting the message (OBS-1119). Under that guard, send-keys enter to that pane once and read again (OBS-975); when a prompt or choice holds focus instead, resolve it first and re-read before retrying. Never report "relayed" without read-back.
+When relaying missions between agents, never use bare send-text (\`herdr agent send\` / pane send-text) — it omits Enter. Use \`herdr pane run <pane> "<message>"\` or \`herdr notification show "<message>"\`. Confirm delivery by reading the TARGET composer afterward; if the sent text still sits unsubmitted after ~15 s, retry the Enter only when that composer read shows the staged text and no permission prompt or numbered choice holds focus — an Enter sent onto an active prompt approves it or picks a choice instead of submitting the message (OBS-1119). Under that guard, send-keys enter to that pane once and read again (OBS-975); when a prompt or choice holds focus instead, resolve it first and re-read before retrying. Never report "relayed" without read-back. On a plain host (neither herdr nor Orca) there is no pane to read back: hand off through the host's cross-session message tool, and count the handoff confirmed only by the peer's reply.
 
 ### Orient before you act — this block may be the ONLY guidance your host loaded
 

package/dist/cli/commands/verify.js

@@ -14,7 +14,7 @@ import { getTask, loadGraph } from "../../graph/graph.js";
 import { GATE_NAMES } from "../../graph/schema.js";
 import { executionSignal } from "../../run/execution-budget.js";
 import { addDetachedWorktree, linkNodeModules, reflogWitness, removeWorktree, shGit, shGitOk } from "../../run/git.js";
-import { foldOwedChecks, integrationMapped, owedCriteria, Journal, OWED_DISCHARGE_EVENT } from "../../run/journal.js";
+import { foldOwedChecks, integrationMapped, owedCriteria, Journal, OWED_DISCHARGE_EVENT, parseRunId } from "../../run/journal.js";
 import { describeLeaseWait, withRepositoryLease } from "../../run/lease.js";
 import { isPidLive } from "../../run/lock.js";
 import { LAUNCHSERVICES_PORT_STOP, probeLaunchServicesPorts, recordLaunchServices } from "../../run/launchservices-check.js";
@@ -195,8 +195,17 @@ export async function verify(argv, cwd = process.cwd(), options = {}) {
     const stateRoot = await verifyStateRoot(cwd);
     const fileRoot = (file) => existsSync(join(cwd, ".tickmarkr", file)) ? cwd : stateRoot;
     if (resolve(stateRoot) !== resolve(cwd)) {
-        console.error(`verify: state files resolved read-only from ${join(stateRoot, ".tickmarkr")} (linked worktree; per-file origins: `
-            + STATE_FILES.map(file => `${file}: ${join(fileRoot(file), ".tickmarkr", file)} (${fileRoot(file) === cwd ? "local" : "common root"})`).join("; ") + ")");
+        // Queue row 195 / D-2102: the fallback is no longer "read-only" — the one line names every
+        // state file with the path it was read from and its origin, AND every path this invocation
+        // writes: the shared verdict store always, doctor.json when present, the --record journal when given.
+        const reads = STATE_FILES.map(file => `${file}: ${join(fileRoot(file), ".tickmarkr", file)} (${fileRoot(file) === cwd ? "local" : "common root"})`).join("; ");
+        const doctorPath = join(fileRoot("doctor.json"), ".tickmarkr", "doctor.json");
+        const writes = [
+            `verdict store ${getVerdictStore(join(stateRoot, ".tickmarkr")).dir}`,
+            ...(existsSync(doctorPath) ? [`doctor.json ${doctorPath}`] : []),
+            ...(values.record ? [`record journal ${join(stateRoot, ".tickmarkr", "runs", parseRunId(values.record), "journal.jsonl")}`] : []),
+        ].join("; ");
+        console.error(`verify: linked worktree — state files resolve from ${join(stateRoot, ".tickmarkr")} (reads: ${reads}; writes: ${writes})`);
     }
     const cfg = loadConfig(fileRoot("config.yaml"));
     const head = (await shGitOk("git rev-parse HEAD", cwd)).trim();

package/dist/compile/index.js

@@ -1,6 +1,7 @@
 import { existsSync, readFileSync, statSync } from "node:fs";
 import { join } from "node:path";
 import { parse } from "yaml";
+import { repoOverlayPath } from "../config/config.js";
 import { validateGraph } from "../graph/schema.js";
 import { taskUnitContractErrors } from "./collateral.js";
 import { blocksCompile, ownershipFindings, renderOwnershipFinding } from "./ownership.js";
@@ -37,7 +38,9 @@ function detect(src) {
 function repoOverlayMode(repoRoot) {
     if (!repoRoot)
         return undefined;
-    const path = join(repoRoot, ".tickmarkr", "config.yaml");
+    // Queue row 195 / D-2102: the ONE repo-layer path rule — a linked worktree without an overlay of
+    // its own proves against the main checkout's file, never against defaults.
+    const path = repoOverlayPath(repoRoot);
     if (!existsSync(path))
         return undefined;
     try {

package/dist/config/config.d.ts

@@ -459,6 +459,21 @@ export type FleetEditable = Partial<Record<DenyScopeKey, string[]>> & {
     map: Record<string, MapEntry>;
     floors: Record<string, Tier>;
 };
+/** The checkout's OWN repo-layer overlay — every writer's destination, and the reader's answer in
+ *  every case but the one fallback below. */
+export declare function ownRepoOverlayPath(repoRoot: string): string;
+/**
+ * Queue row 195 / D-2102: .tickmarkr/ is gitignored, so a fresh session worktree has no overlay of
+ * its own and every command there would silently run on defaults plus the global layer. ONE rule,
+ * and every repo-layer reader goes through it: a checkout whose own state-dir config.yaml exists
+ * reads it; otherwise a LINKED worktree — a gitfile checkout whose trusted common dir
+ * (src/run/git-trust.ts trustedCommonDir) lies outside it — reads
+ * dirname(common dir)/<state dir>/config.yaml when that file exists; every other case (a main
+ * checkout or its subdirectory, no enclosing checkout, a git trust refusal, an absent main file)
+ * keeps the checkout's own path. WRITERS never follow this fallback: they use ownRepoOverlayPath.
+ * The trust check includes missing, redirected or symlinked commondir metadata and config.worktree
+ * under extensions.worktreeConfig; none can authorize a shared overlay.
+ */
 export declare function repoOverlayPath(repoRoot: string): string;
 export declare function readOverlayFile(path: string): Record<string, unknown>;
 /** A discovered fleet universe row: the served models of one adapter and, per model, the resolved

package/dist/config/config.js

@@ -1,11 +1,12 @@
-import { existsSync, readFileSync } from "node:fs";
+import { existsSync, lstatSync, readFileSync, realpathSync } from "node:fs";
 import { homedir } from "node:os";
-import { join } from "node:path";
+import { dirname, join, sep } from "node:path";
 import { filesGlob } from "../graph/files-glob.js";
 import { Document, isScalar, parse } from "yaml";
 import { z } from "zod";
 import { CITED_MODEL_WINDOWS } from "../adapters/model-windows.js";
 import { stateDirName } from "../graph/graph.js";
+import { assertGitTrust, trustedCommonDir } from "../run/git-trust.js";
 import { EFFORTS, SHAPES, TIERS } from "../graph/schema.js";
 const TierEnum = z.enum(TIERS, {
     error: (iss) => `Invalid option: expected one of "cheap"|"mid"|"frontier" (got ${JSON.stringify(iss.input)})`,
@@ -744,7 +745,7 @@ export function globalConfigDir() {
 }
 export function overlayPreferShapes(repoRoot, opts = {}) {
     const shapes = new Set();
-    for (const layer of [readYaml(join(opts.globalDir ?? globalConfigDir(), "config.yaml")), readYaml(join(repoRoot, stateDirName(repoRoot), "config.yaml"))]) {
+    for (const layer of [readYaml(join(opts.globalDir ?? globalConfigDir(), "config.yaml")), readYaml(repoOverlayPath(repoRoot))]) {
         const map = layer?.routing?.map;
         if (!map)
             continue;
@@ -835,7 +836,7 @@ export function loadConfigWithMode(repoRoot, opts = {}) {
     // v1.52 T2: repoOverlayText substitutes candidate bytes for the on-disk repo layer — the fleet
     // write guard validates EXACTLY what it is about to write through this one loader path.
     const repoCfg = opts.repoOverlayText === undefined
-        ? readYaml(join(repoRoot, stateDirName(repoRoot), "config.yaml"))
+        ? readYaml(repoOverlayPath(repoRoot))
         : parse(opts.repoOverlayText);
     const merged = deepMerge(deepMerge(structuredClone(DEFAULT_CONFIG), globalCfg), repoCfg);
     const r = TickmarkrConfigSchema.safeParse(merged);
@@ -1017,9 +1018,70 @@ export function configTemplate(overlay) {
 }
 // Fleet overlay mutation, legacy serialization, and diff rendering live together in fleet-overlay.ts.
 export { FLEET_OVERLAY_KEYS, fleetEditableEquals, fleetRepoOverlayFromDelta, renderFleetOverlayWrite, repoOverlayYaml, serializeFleetOverlay, unifiedYamlDiff, } from "./fleet-overlay.js";
-export function repoOverlayPath(repoRoot) {
+/** The checkout's OWN repo-layer overlay — every writer's destination, and the reader's answer in
+ *  every case but the one fallback below. */
+export function ownRepoOverlayPath(repoRoot) {
     return join(repoRoot, stateDirName(repoRoot), "config.yaml");
 }
+/**
+ * Queue row 195 / D-2102: .tickmarkr/ is gitignored, so a fresh session worktree has no overlay of
+ * its own and every command there would silently run on defaults plus the global layer. ONE rule,
+ * and every repo-layer reader goes through it: a checkout whose own state-dir config.yaml exists
+ * reads it; otherwise a LINKED worktree — a gitfile checkout whose trusted common dir
+ * (src/run/git-trust.ts trustedCommonDir) lies outside it — reads
+ * dirname(common dir)/<state dir>/config.yaml when that file exists; every other case (a main
+ * checkout or its subdirectory, no enclosing checkout, a git trust refusal, an absent main file)
+ * keeps the checkout's own path. WRITERS never follow this fallback: they use ownRepoOverlayPath.
+ * The trust check includes missing, redirected or symlinked commondir metadata and config.worktree
+ * under extensions.worktreeConfig; none can authorize a shared overlay.
+ */
+export function repoOverlayPath(repoRoot) {
+    const own = ownRepoOverlayPath(repoRoot);
+    if (existsSync(own))
+        return own;
+    let dotGit;
+    try {
+        for (let dir = realpathSync(repoRoot);;) {
+            const candidate = join(dir, ".git");
+            try {
+                lstatSync(candidate);
+                dotGit = candidate;
+                break;
+            }
+            catch { /* keep walking */ }
+            const up = dirname(dir);
+            if (up === dir)
+                break;
+            dir = up;
+        }
+    }
+    catch {
+        return own;
+    }
+    // A directory .git is a main checkout (or one of its subdirectories); only a gitfile can be linked.
+    if (!dotGit)
+        return own;
+    try {
+        if (!lstatSync(dotGit).isFile())
+            return own;
+    }
+    catch {
+        return own;
+    }
+    let common;
+    try {
+        assertGitTrust(repoRoot);
+        common = trustedCommonDir(repoRoot);
+    }
+    catch {
+        return own;
+    }
+    const checkoutRoot = dirname(dotGit);
+    if (common === checkoutRoot || common.startsWith(`${checkoutRoot}${sep}`))
+        return own; // not linked
+    const shared = ownRepoOverlayPath(dirname(common));
+    return existsSync(shared) ? shared : own;
+}
 export function readOverlayFile(path) {
     const raw = readYaml(path);
     if (raw === undefined || raw === null)

package/dist/drivers/host-env.d.ts

@@ -0,0 +1,3 @@
+export declare const HOST_SESSION_VARS: readonly ["CLAUDECODE", "CLAUDE_CODE_ENTRYPOINT", "CLAUDE_CODE_SESSION_ID", "CLAUDE_CODE_HOST_SESSION_ID", "CLAUDE_CODE_CHILD_SESSION", "CLAUDE_CODE_MESSAGING_SOCKET", "CLAUDE_CODE_MESSAGING_TOKEN", "CLAUDE_CODE_SDK_HAS_HOST_AUTH_REFRESH", "CLAUDE_CODE_SESSION_ATTENDED", "CLAUDE_CODE_EXECPATH", "CLAUDE_CODE_DESKTOP_APP_VERSION", "CLAUDE_CODE_TERMINAL_MCP_TOOLS", "CLAUDE_CODE_ENABLE_ASK_USER_QUESTION_TOOL", "CLAUDE_CODE_EMIT_TOOL_USE_SUMMARIES", "CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING", "CLAUDE_CODE_REPORT_FINDINGS", "CLAUDE_CODE_STARTUP_FAILURE_RESULTS", "CLAUDE_CODE_EAGER_FLUSH", "CLAUDE_CODE_DISABLE_CRON", "CLAUDE_CODE_SIMPLE", "CLAUDE_CODE_DISABLE_TERMINAL_TITLE", "CLAUDE_CODE_ACCOUNT_UUID", "CLAUDE_CODE_ORGANIZATION_UUID", "CLAUDE_CODE_USER_EMAIL", "CLAUDE_CODE_OAUTH_SCOPES", "CLAUDE_AGENT_SDK_VERSION", "CLAUDE_AGENT_SDK_MCP_NO_PREFIX", "CLAUDE_PID", "CLAUDE_EFFORT", "CLAUDE_PREVIEW_CLASSIFIER_FLOOR", "CLAUDE_CODE_BRIDGE_SESSION_ID"];
+/** A copy of `env` without the host-session names; the input (the daemon's own process.env) is never mutated. */
+export declare function withoutHostSession(env?: NodeJS.ProcessEnv): NodeJS.ProcessEnv;

package/dist/drivers/host-env.js

@@ -0,0 +1,47 @@
+// Queue row 193 (D-2102 add.1): a daemon launched from an agent session (the Claude Desktop Code tab, or a
+// claude CLI seat on Orca or herdr) carries that session's host variables, and an agent CLI that inherits
+// them gains the host's tools and effort. This CLOSED denylist is stripped at every choke point an agent
+// CLI or gate command passes: the shell seam, the subprocess driver's seal, the pane seeds and the bare
+// probes. Exact names only — never a prefix: an unlisted CLAUDE_CODE variable and every user auth or
+// provider variable reach children byte-equal. Declared residual: a host variable a future host adds
+// reaches children until it is listed here. Leaf module: imports nothing from src/.
+export const HOST_SESSION_VARS = [
+    "CLAUDECODE",
+    "CLAUDE_CODE_ENTRYPOINT",
+    "CLAUDE_CODE_SESSION_ID",
+    "CLAUDE_CODE_HOST_SESSION_ID",
+    "CLAUDE_CODE_CHILD_SESSION",
+    "CLAUDE_CODE_MESSAGING_SOCKET",
+    "CLAUDE_CODE_MESSAGING_TOKEN",
+    "CLAUDE_CODE_SDK_HAS_HOST_AUTH_REFRESH",
+    "CLAUDE_CODE_SESSION_ATTENDED",
+    "CLAUDE_CODE_EXECPATH",
+    "CLAUDE_CODE_DESKTOP_APP_VERSION",
+    "CLAUDE_CODE_TERMINAL_MCP_TOOLS",
+    "CLAUDE_CODE_ENABLE_ASK_USER_QUESTION_TOOL",
+    "CLAUDE_CODE_EMIT_TOOL_USE_SUMMARIES",
+    "CLAUDE_CODE_ENABLE_SDK_FILE_CHECKPOINTING",
+    "CLAUDE_CODE_REPORT_FINDINGS",
+    "CLAUDE_CODE_STARTUP_FAILURE_RESULTS",
+    "CLAUDE_CODE_EAGER_FLUSH",
+    "CLAUDE_CODE_DISABLE_CRON",
+    "CLAUDE_CODE_SIMPLE",
+    "CLAUDE_CODE_DISABLE_TERMINAL_TITLE",
+    "CLAUDE_CODE_ACCOUNT_UUID",
+    "CLAUDE_CODE_ORGANIZATION_UUID",
+    "CLAUDE_CODE_USER_EMAIL",
+    "CLAUDE_CODE_OAUTH_SCOPES",
+    "CLAUDE_AGENT_SDK_VERSION",
+    "CLAUDE_AGENT_SDK_MCP_NO_PREFIX",
+    "CLAUDE_PID",
+    "CLAUDE_EFFORT",
+    "CLAUDE_PREVIEW_CLASSIFIER_FLOOR",
+    "CLAUDE_CODE_BRIDGE_SESSION_ID",
+];
+/** A copy of `env` without the host-session names; the input (the daemon's own process.env) is never mutated. */
+export function withoutHostSession(env = process.env) {
+    const out = { ...env };
+    for (const k of HOST_SESSION_VARS)
+        delete out[k];
+    return out;
+}

package/dist/drivers/orca.js

@@ -7,6 +7,7 @@ import { createWorktree, FORK_CAP_ENV, resolvedForkCap, sh } from "../run/git.js
 import { Journal, parseRunId } from "../run/journal.js";
 import { stateDirName } from "../graph/graph.js";
 import { readWatchBoard, requestWatchBoardStop, stopWatchBoard, supervisionPresencePath, WATCH_OWNER_ENV } from "../run/supervision.js";
+import { HOST_SESSION_VARS } from "./host-env.js";
 import { MAX_BUF } from "./subprocess.js";
 import { formatOwnedName, panesToClose, parseOwnedName } from "./types.js";
 // Orca (onorca.dev) as a third execution surface beside herdr and subprocess. tickmarkr keeps
@@ -966,7 +967,8 @@ export class OrcaDriver {
         // UI's active worktree (`active`/`current`) nor the daemon's cwd — and the command itself moves
         // into the checkout, because Orca cannot be asked to place a terminal in a path it does not
         // track (OBS-1004). Shell startup can swallow that prefix; prove it from scrollback below.
-        const payload = `export ${FORK_CAP_ENV}=${shq(process.env[FORK_CAP_ENV] ?? resolvedForkCap())}; ${cmd}`;
+        // Queue row 193: the fork cap stays first; the agent session's host variables never reach the worker.
+        const payload = `export ${FORK_CAP_ENV}=${shq(process.env[FORK_CAP_ENV] ?? resolvedForkCap())}; unset ${HOST_SESSION_VARS.join(" ")}; ${cmd}`;
         launchGuards.getStore()?.(); // v2.6.8 T1: eligibility is re-read here, after every awaited lookup above
         const env = await this.call("create", [
             "terminal", "create", "--worktree", `path:${tracked}`, "--title", st.title, "--command", inCheckout(st.cwd, payload),

package/dist/drivers/subprocess.d.ts

@@ -2,7 +2,7 @@ import type { ExecutorDriver, NotifyOpts, Slot, TransportState } from "./types.j
 export declare const MAX_BUF: number;
 export declare const HERDR_CONTROL_VARS: readonly ["HERDR_ENV", "HERDR_SOCKET_PATH", "ORCA_TERMINAL_HANDLE", "ORCA_PANE_KEY", "ORCA_TAB_ID"];
 /**
- * Copy of worker env with the fork cap applied and host control-plane vars stripped.
+ * Copy of worker env with the fork cap applied and host control-plane and host-session vars stripped.
  * Workers retain the run's concurrency-derived cap (resolvedForkCap), independently of
  * verification's suite-window budget. The operator's own export still wins.
  */

package/dist/drivers/subprocess.js

@@ -1,6 +1,7 @@
 import { spawn } from "node:child_process";
 import { shq } from "../adapters/types.js";
 import { createWorktree, FORK_CAP_ENV, resolvedForkCap } from "../run/git.js";
+import { HOST_SESSION_VARS, withoutHostSession } from "./host-env.js";
 // HARD-03: cap retained worker output so a chatty worker can't grow tickmarkr's heap unbounded.
 // 2MB is safe against BOTH consumers: the largest read() call site asks for 1000 lines
 // (daemon.ts:217/247), and every marker (TICKMARKR_RESULT, TICKMARKR_EXIT_<nonce>) is emitted at the
@@ -21,12 +22,12 @@ export const HERDR_CONTROL_VARS = [
     "ORCA_TAB_ID",
 ];
 /**
- * Copy of worker env with the fork cap applied and host control-plane vars stripped.
+ * Copy of worker env with the fork cap applied and host control-plane and host-session vars stripped.
  * Workers retain the run's concurrency-derived cap (resolvedForkCap), independently of
  * verification's suite-window budget. The operator's own export still wins.
  */
 export function sealHerdrEnv(env = process.env) {
-    const out = { ...env };
+    const out = withoutHostSession(env); // queue row 193
     if (!(FORK_CAP_ENV in out))
         out[FORK_CAP_ENV] = resolvedForkCap();
     for (const k of HERDR_CONTROL_VARS)
@@ -37,7 +38,7 @@ export function sealHerdrEnv(env = process.env) {
 export function herdrSealShellPrefix(env = process.env) {
     const forkCap = sealHerdrEnv(env)[FORK_CAP_ENV] ?? resolvedForkCap();
     return `export ${FORK_CAP_ENV}=${shq(forkCap)}; ` +
-        HERDR_CONTROL_VARS.map((k) => `unset ${k}`).join("; ") + "; ";
+        HERDR_CONTROL_VARS.map((k) => `unset ${k}`).join("; ") + `; unset ${HOST_SESSION_VARS.join(" ")}; `;
 }
 export class SubprocessDriver {
     id = "subprocess";

package/dist/gates/baseline.d.ts

@@ -60,7 +60,7 @@ export declare function beginGateEvidence(cwd: string, gate: string, command: st
             subjectCommit: string | null;
         };
         termination: {
-            kind: "unknown" | "timeout" | "signal" | "not-started" | "exit";
+            kind: "unknown" | "signal" | "timeout" | "not-started" | "exit";
             exitCode: number | null;
             signal: string | null;
             timedOut: boolean | null;

package/dist/run/git.js

@@ -3,13 +3,14 @@ import { executionSignal, withoutExecutionBudget } from "./execution-budget.js";
 import { commandLeaseEnvironment, repositoryLeaseEnvironment, registerRepositoryChild, withCommandLease } from "./lease.js";
 import { AsyncLocalStorage } from "node:async_hooks";
 import { execFile, execFileSync, spawn } from "node:child_process";
-import { existsSync, lstatSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, readlinkSync, realpathSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
+import { existsSync, lstatSync, mkdirSync, mkdtempSync, readdirSync, readFileSync, readlinkSync, realpathSync, rmdirSync, rmSync, statSync, symlinkSync, writeFileSync } from "node:fs";
 import { availableParallelism, homedir, tmpdir } from "node:os";
 import { isAbsolute, join, relative, resolve, sep } from "node:path";
 import { StringDecoder } from "node:string_decoder";
 import { shq } from "../adapters/types.js";
 import { tickmarkrDir } from "../graph/graph.js";
 import { ROUTING_ENV_SEAMS } from "../route/router.js";
+import { HOST_SESSION_VARS } from "../drivers/host-env.js";
 import { titleEnvironment } from "./title-environment.js";
 import { assertGitTrust, GitTrustRefusal, ownGitPin, protectedGitEnv, trustedCommonDir } from "./git-trust.js";
 export { ROUTING_ENV_SEAMS };
@@ -330,6 +331,9 @@ function executeShell(cmd, cwd, timeoutMs, login, options, observation, ownGit)
     const env = ownGit ? protectedGitEnv(payloadEnv) : payloadEnv;
     for (const k of ROUTING_ENV_SEAMS)
         delete env[k];
+    // Queue row 193 (D-2102 add.1): no gate or agent child inherits the launching agent session's host variables.
+    for (const k of HOST_SESSION_VARS)
+        delete env[k];
     // A run freezes the operator override and cores at startup; admission can lower the round cap.
     env[FORK_CAP_ENV] = verificationBudget.getStore()
         ? String(resolvedCapacity().forkCap)
@@ -1089,19 +1093,14 @@ export async function probeRefsWritable(cwd = process.cwd()) {
         const error = (delRes.stderr || delRes.stdout).trim() || `git update-ref -d failed (${delRes.code})`;
         return { ok: false, path: refsDir, refsDir, error };
     }
-    // Clean up empty directories left behind by git
-    try {
-        const preflightDir = join(refsDir, "tickmarkr", "preflight");
-        if (existsSync(preflightDir) && readdirSync(preflightDir).length === 0) {
-            rmSync(preflightDir, { recursive: true, force: true });
-        }
-        const tmDir = join(refsDir, "tickmarkr");
-        if (existsSync(tmDir) && readdirSync(tmDir).length === 0) {
-            rmSync(tmDir, { recursive: true, force: true });
+    // Queue row 194 (D-2102): remove only EMPTY directories git left behind, non-recursively — rmdir(2)
+    // refuses (ENOTEMPTY) a ref another process writes under refs/tickmarkr at this moment, where an
+    // emptiness check followed by a recursive remove deleted it. Best-effort: a refusal leaves the tree.
+    for (const dir of [join(refsDir, "tickmarkr", "preflight"), join(refsDir, "tickmarkr")]) {
+        try {
+            rmdirSync(dir);
         }
-    }
-    catch {
-        // best-effort cleanup of empty dirs
+        catch { /* absent, or no longer empty */ }
     }
     return { ok: true, path: refsDir, refsDir };
 }

package/dist/run/journal.js

@@ -1,7 +1,7 @@
 import { AsyncLocalStorage } from "node:async_hooks";
 import { execFileSync } from "node:child_process";
 import { createHash } from "node:crypto";
-import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync } from "node:fs";
+import { appendFileSync, existsSync, mkdirSync, readFileSync, readdirSync, rmdirSync } from "node:fs";
 import { join } from "node:path";
 import { z } from "zod";
 import { channelKey, shq, TokenUsageSchema } from "../adapters/types.js";
@@ -11,7 +11,7 @@ import { channelRouteIdentity, modelProvider } from "../route/preference.js";
 import { buildProfile, classify } from "../route/profile.js";
 import { DecisionEventSchema, trackJournalRows, } from "./protocol.js";
 import { PRESERVE_COMMIT_SUBJECT, PRESERVE_PRODUCER_TRAILER } from "./git.js";
-import { assertGitTrust, protectedGitEnv } from "./git-trust.js";
+import { assertGitTrust, protectedGitEnv, trustedCommonDir } from "./git-trust.js";
 import { normalizeGateOutcome } from "./outcome.js";
 import { redactSecrets } from "./redact.js";
 export function phaseForGate(gate) {
@@ -1651,30 +1651,59 @@ export function engagementComparable(events, loadedHash) {
     return recorded === loadedHash ? { comparable: true, recorded } : { comparable: false, reason: "mismatch", recorded };
 }
 const RUN_SEQUENCE_WIDTH = 16;
+const TICKET = /^\d{16}$/;
+const ticketsIn = (dir) => {
+    try {
+        return readdirSync(dir).filter((name) => TICKET.test(name));
+    }
+    catch (error) {
+        if (error.code === "ENOENT")
+            return [];
+        throw error;
+    }
+};
+const highest = (tickets) => tickets.reduce((max, name) => (BigInt(name) > max ? BigInt(name) : max), 0n);
 // The daemon mints before acquiring graph.lock, and each CLI invocation has fresh module state. Claim
-// a repository-state ticket with mkdir's atomic EEXIST boundary instead: a losing process advances and
-// retries, while the winning directory remains as the durable high-water evidence for later invocations.
+// a ticket with mkdir's atomic EEXIST boundary: a losing process advances and retries. Queue row 194
+// (D-2102): the sequence lives at the trusted common git dir, shared by the main checkout and every
+// linked worktree (a trust refusal refuses — never a per-checkout fallback), and its first ticket sits
+// above this checkout's own pre-change sequence. Pruning keeps it bounded, and the durable high-water
+// mark is the highest ticket itself: a prune removes a ticket only after seeing a higher one, so the
+// highest ever claimed survives. A stale reader can recreate a pruned ticket, but then sees that higher
+// one and claims again above it — only a ticket that is the highest after its own mkdir is issued.
 function claimRunSequence(repoRoot = process.cwd()) {
-    const dir = join(tickmarkrDir(repoRoot), "run-id-sequence");
+    const dir = join(trustedCommonDir(repoRoot), "tickmarkr-run-id-sequence");
     mkdirSync(dir, { recursive: true });
-    const allocated = readdirSync(dir).filter((name) => /^\d{16}$/.test(name));
-    let candidate = allocated.reduce((max, name) => {
-        const value = BigInt(name);
-        return value > max ? value : max;
-    }, 0n) + 1n;
+    const own = highest(ticketsIn(join(repoRoot, stateDirName(repoRoot), "run-id-sequence")));
+    const shared = highest(ticketsIn(dir));
+    let candidate = (own > shared ? own : shared) + 1n;
     while (true) {
         const suffix = candidate.toString().padStart(RUN_SEQUENCE_WIDTH, "0");
         if (suffix.length > RUN_SEQUENCE_WIDTH)
             throw new Error("run id sequence exhausted");
         try {
             mkdirSync(join(dir, suffix));
-            return suffix;
         }
         catch (error) {
             if (error.code !== "EEXIST")
                 throw error;
             candidate += 1n;
+            continue;
+        }
+        const tickets = ticketsIn(dir);
+        const top = highest(tickets);
+        if (top > candidate) {
+            candidate = top + 1n;
+            continue;
+        }
+        for (const name of tickets) {
+            if (BigInt(name) < candidate)
+                try {
+                    rmdirSync(join(dir, name));
+                }
+                catch { /* a concurrent prune took it */ }
         }
+        return suffix;
     }
 }
 export function newRunId(now = new Date()) {

package/dist/run/lock.d.ts

@@ -3,6 +3,8 @@ export declare const STALE_MS = 60000;
 export interface Inspection {
     pid?: number;
     runId?: string;
+    startedAt?: number;
+    checkout?: string;
     garbage: boolean;
     dead: boolean;
     expired: boolean;
@@ -15,6 +17,9 @@ export type RunLineEvent = {
 };
 export declare function shouldRefuse(i: Pick<Inspection, "garbage" | "dead">): boolean;
 export declare function isPidLive(pid: number): boolean;
+/** The repository run claim for the checkout enclosing `repoRoot`; undefined when no checkout encloses it
+ * (graph.lock alone guards there, as before). Any other git trust refusal propagates: fail closed. */
+export declare function repositoryClaimPath(repoRoot: string): string | undefined;
 export declare function acquireRunLock(repoRoot: string, runId: string): {
     reclaimed?: {
         pid: number;