orion-super-agent-dev 0.1.34 → 0.1.35

package/out/main.js

@@ -29984,6 +29984,81 @@ var require_http = __commonJS({
   }
 });
 
+// ../packages/orion-client-core/dist/auth/refreshOnRefusal.js
+var require_refreshOnRefusal = __commonJS({
+  "../packages/orion-client-core/dist/auth/refreshOnRefusal.js"(exports2) {
+    "use strict";
+    Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.RefreshOnRefusal = exports2.FAILED_REFRESH_HOLDOFF_MS = exports2.REFUSED_FRESH_TOKEN_HOLDOFF_MS = exports2.REFUSED_FRESH_TOKEN_WINDOW_MS = void 0;
+    exports2.REFUSED_FRESH_TOKEN_WINDOW_MS = 2 * 6e4;
+    exports2.REFUSED_FRESH_TOKEN_HOLDOFF_MS = 5 * 6e4;
+    exports2.FAILED_REFRESH_HOLDOFF_MS = 2e4;
+    var RefreshOnRefusal = class {
+      deps;
+      inFlight = null;
+      holdoffUntil = 0;
+      /** The token in hand right after this policy's last successful refresh, and when. */
+      obtained = null;
+      obtainedAt = 0;
+      constructor(deps2) {
+        this.deps = deps2;
+      }
+      /** Answer a 401 that refused `refused` — the bearer the request carried, or null when it
+       *  carried none. Resolves true when a token the caller should retry with is now in hand. */
+      refresh(refused) {
+        if (this.inFlight)
+          return this.inFlight;
+        const run3 = this.decide(refused).finally(() => {
+          if (this.inFlight === run3)
+            this.inFlight = null;
+        });
+        this.inFlight = run3;
+        return run3;
+      }
+      async decide(refused) {
+        const current2 = await this.deps.currentToken();
+        if (current2 !== null && current2 !== refused) {
+          this.obtained = current2;
+          this.obtainedAt = this.now();
+          this.trace("refusal: the token in hand was already replaced \u2014 retrying with it, no mint");
+          return true;
+        }
+        const now2 = this.now();
+        if (now2 < this.holdoffUntil) {
+          this.trace(`refusal: holding off ${Math.ceil((this.holdoffUntil - now2) / 1e3)}s \u2014 no mint`);
+          return false;
+        }
+        if (refused !== null && refused === this.obtained && now2 - this.obtainedAt < exports2.REFUSED_FRESH_TOKEN_WINDOW_MS) {
+          this.holdoffUntil = now2 + exports2.REFUSED_FRESH_TOKEN_HOLDOFF_MS;
+          this.trace(`refusal: the token minted ${Math.round((now2 - this.obtainedAt) / 1e3)}s ago was refused too \u2014 not a freshness problem, holding off ${exports2.REFUSED_FRESH_TOKEN_HOLDOFF_MS / 6e4}min`);
+          return false;
+        }
+        const ok2 = await this.deps.refresh();
+        const after = this.now();
+        if (!ok2) {
+          this.holdoffUntil = after + exports2.FAILED_REFRESH_HOLDOFF_MS;
+          this.trace(`refusal: refresh did not produce a token \u2014 holding off ${exports2.FAILED_REFRESH_HOLDOFF_MS / 1e3}s`);
+          return false;
+        }
+        this.obtained = await this.deps.currentToken();
+        this.obtainedAt = after;
+        this.trace("refusal: refreshed \u2014 retrying with the new token");
+        return this.obtained !== null;
+      }
+      now() {
+        return this.deps.now?.() ?? Date.now();
+      }
+      trace(line) {
+        try {
+          this.deps.trace?.(line);
+        } catch {
+        }
+      }
+    };
+    exports2.RefreshOnRefusal = RefreshOnRefusal;
+  }
+});
+
 // ../packages/orion-client-core/dist/atomicWrite.js
 var require_atomicWrite = __commonJS({
   "../packages/orion-client-core/dist/atomicWrite.js"(exports2) {
@@ -34513,6 +34588,7 @@ var require_customProviders = __commonJS({
         delete config.extraBody;
       else
         config.extraBody = extraBody;
+      normalizeNumber(config, "firstTokenTimeoutS", 0, 86400);
       return config;
     }
     function normalizeDeclaredReasoning(raw) {
@@ -35099,6 +35175,7 @@ var require_customProviders = __commonJS({
         ...knob("topP"),
         ...knob("topK"),
         ...knob("repetitionPenalty"),
+        ...knob("firstTokenTimeoutS"),
         ...word("promptCache"),
         ...word("responseCache"),
         ...extraBody !== void 0 ? { extraBody } : {}
@@ -35373,6 +35450,7 @@ var require_httpTransport = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.HttpSyncTransport = exports2.REQUEST_TIMEOUT_MS = exports2.SyncHttpError = exports2.SyncAuthRequiredError = void 0;
     var http_js_1 = require_http();
+    var refreshOnRefusal_js_1 = require_refreshOnRefusal();
     var SyncAuthRequiredError = class extends Error {
       constructor() {
         super("o-vault sync requires a signed-in Orion account");
@@ -35394,8 +35472,14 @@ var require_httpTransport = __commonJS({
       auth;
       /** fingerprint → bank_id, so the engine's resolve inside `sync()` never re-hits the API. */
       bankIds = /* @__PURE__ */ new Map();
+      /** The verdict on a 401 — the same policy the bridge applies: once per refused token, never for
+       *  a token a sibling already replaced, and holdoffs when a fresh token is refused too or the
+       *  refresh fails. Absent when the host wired no refresh. */
+      refreshOnRefusal;
       constructor(auth) {
         this.auth = auth;
+        const refresh = auth.refresh;
+        this.refreshOnRefusal = refresh ? new refreshOnRefusal_js_1.RefreshOnRefusal({ currentToken: () => auth.accessToken(), refresh }) : null;
       }
       async request(method, path15, body2, retried = false) {
         const token = await this.auth.accessToken();
@@ -35410,8 +35494,8 @@ var require_httpTransport = __commonJS({
           body: body2 === void 0 ? void 0 : JSON.stringify(body2),
           signal: AbortSignal.timeout(exports2.REQUEST_TIMEOUT_MS)
         });
-        if (res.status === 401 && !retried && this.auth.refresh) {
-          if (await this.auth.refresh())
+        if (res.status === 401 && !retried && this.refreshOnRefusal) {
+          if (await this.refreshOnRefusal.refresh(token))
             return this.request(method, path15, body2, true);
           throw new SyncAuthRequiredError();
         }
@@ -36648,6 +36732,7 @@ var require_segmentDriver = __commonJS({
     exports2.turnAbortController = turnAbortController;
     exports2.jitteredDelayMs = jitteredDelayMs;
     exports2.effectiveWirePermissionMode = effectiveWirePermissionMode2;
+    exports2.abortTurnNow = abortTurnNow;
     exports2.armGracefulCancel = armGracefulCancel2;
     exports2.isStreamingNdjsonBody = isStreamingNdjsonBody;
     exports2.readNdjson = readNdjson;
@@ -36704,6 +36789,13 @@ var require_segmentDriver = __commonJS({
     function effectiveWirePermissionMode2(turbo, configured2) {
       return turbo ? "full_access" : configured2;
     }
+    function abortTurnNow(opts) {
+      try {
+        void Promise.resolve(opts.sendCancel()).catch(() => void 0);
+      } catch {
+      }
+      opts.controller.abort();
+    }
     function armGracefulCancel2(opts) {
       try {
         void Promise.resolve(opts.sendCancel()).catch(() => void 0);
@@ -38667,12 +38759,14 @@ var require_bridge = __commonJS({
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.OrionBridge = exports2.WATCH_IDLE_TIMEOUT_MS = exports2.WATCH_RECONNECT_MAX_MS = exports2.WATCH_RECONNECT_MIN_MS = exports2.MAX_PROXY_STREAM_RETRIES = void 0;
     exports2.streamErrorIsProxyAuth = streamErrorIsProxyAuth;
+    exports2.streamErrorIsAuthRefusal = streamErrorIsAuthRefusal;
     exports2.describeHttpFailure = describeHttpFailure;
     var zlib = __importStar(__require("node:zlib"));
     var eventsource_1 = __importDefault(require_eventsource());
     var dial_1 = require_dial();
     var networkFailure_1 = require_networkFailure();
     var http_1 = require_http();
+    var refreshOnRefusal_1 = require_refreshOnRefusal();
     var segmentDriver_1 = require_segmentDriver();
     var enhancedRetrieval_1 = require_enhancedRetrieval();
     var GZIP_MIN_BYTES = 1500;
@@ -38687,6 +38781,18 @@ var require_bridge = __commonJS({
       const details = event;
       return details?.status === 407 || (0, dial_1.isProxyAuthMessage)(details?.message);
     }
+    function streamErrorIsAuthRefusal(event) {
+      const details = event;
+      return details?.status === 401;
+    }
+    function describeStreamError(event) {
+      const details = event;
+      if (typeof details?.status === "number")
+        return `status ${details.status}`;
+      if (typeof details?.message === "string" && details.message)
+        return details.message;
+      return "no status";
+    }
     function describeHttpFailure(context, status) {
       if (status === 413) {
         return `${context} http 413: this conversation has outgrown the backend's request-size limit \u2014 start a new chat (or remove very large pasted content) to continue`;
@@ -38719,6 +38825,11 @@ var require_bridge = __commonJS({
       // backend's refresh-reuse detection — the classic "token cycled mid-chat → logged out" race.
       // Cleared once the refresh settles so a later expiry can refresh again.
       refreshInFlight = null;
+      /** The verdict on every 401 — request/response and stream alike: refresh once per refused
+       *  token, never for a token a sibling already replaced, and hold off when a fresh token is
+       *  refused too or the refresh itself fails. See `RefreshOnRefusal`. */
+      refreshOnRefusal;
+      trace;
       _onDidChangeFocusedSession;
       onDidChangeFocusedSession;
       _onDidStartSession;
@@ -38738,10 +38849,21 @@ var require_bridge = __commonJS({
        * the next turn would tell the backend "I've seen this file" even
        * though the contents on disk are now newer than what was read. */
       onDidChangeWorkspaceFile;
-      constructor(apiUrl, authToken, emitters, refreshAuth = async () => false) {
+      constructor(apiUrl, authToken, emitters, refreshAuth = async () => false, options = {}) {
         this.apiUrl = apiUrl;
         this.authToken = authToken;
         this.refreshAuth = refreshAuth;
+        this.trace = (line) => {
+          try {
+            options.trace?.(line);
+          } catch {
+          }
+        };
+        this.refreshOnRefusal = new refreshOnRefusal_1.RefreshOnRefusal({
+          currentToken: () => this.authToken(),
+          refresh: () => this.ensureRefreshed(),
+          trace: this.trace
+        });
         this._onDidChangeFocusedSession = emitters();
         this.onDidChangeFocusedSession = this._onDidChangeFocusedSession.event;
         this._onDidStartSession = emitters();
@@ -38818,8 +38940,10 @@ var require_bridge = __commonJS({
        * then re-prompts for sign-in). */
       async authedFetch(url, opts) {
         const wire = opts.body !== void 0 ? maybeGzip(opts.body) : null;
+        let sent = null;
         const send = async () => {
           const token = await this.authToken();
+          sent = token;
           const cookie = this.cookieHeader();
           const resp2 = await (0, http_1.httpFetch)(url, {
             method: opts.method,
@@ -38845,7 +38969,7 @@ var require_bridge = __commonJS({
           }
           throw error;
         }
-        if (resp.status === 401 && await this.ensureRefreshed()) {
+        if (resp.status === 401 && await this.refreshOnRefusal.refresh(sent)) {
           return send();
         }
         return resp;
@@ -39238,7 +39362,10 @@ var require_bridge = __commonJS({
               reconnect();
               return;
             }
-            void this.ensureRefreshed().then(async () => {
+            const refusal = streamErrorIsAuthRefusal(event);
+            this.trace(`stream ${path15}: died before its first event (${describeStreamError(event)})${refusal ? " \u2014 a refusal, asking for a refresh" : " \u2014 not a refusal, no refresh"}`);
+            const settled = refusal ? this.refreshOnRefusal.refresh(token) : Promise.resolve(false);
+            void settled.then(async () => {
               if (!closed && await this.authToken() !== null)
                 reconnect();
             });
@@ -39392,7 +39519,10 @@ var require_bridge = __commonJS({
             this.scheduleReconnect(sessionId);
             return;
           }
-          void this.ensureRefreshed().then(async () => {
+          const refusal = streamErrorIsAuthRefusal(event);
+          this.trace(`stream /events/${sessionId}: died before its first event (${describeStreamError(event)})${refusal ? " \u2014 a refusal, asking for a refresh" : " \u2014 not a refusal, no refresh"}`);
+          const settled = refusal ? this.refreshOnRefusal.refresh(token) : Promise.resolve(false);
+          void settled.then(async () => {
             if (await this.authToken() !== null) {
               this.scheduleReconnect(sessionId);
             } else {
@@ -48177,7 +48307,7 @@ var require_agentAuth = __commonJS({
   "../packages/orion-client-core/dist/auth/agentAuth.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.USAGE_TOPUP_COVERING_LABEL = exports2.NO_USAGE_LIMIT_LABEL = exports2.AgentSession = exports2.BRAIN_RENEW_DEADLINE_MS = exports2.RENEW_BUDGET_MS = exports2.SECRET_READ_TIMEOUT_MS = exports2.TOKEN_REQUEST_TIMEOUT_MS = exports2.AgentAuthError = void 0;
+    exports2.USAGE_TOPUP_COVERING_LABEL = exports2.NO_USAGE_LIMIT_LABEL = exports2.AgentSession = exports2.PROACTIVE_REFRESH_HOLDOFF_MS = exports2.BRAIN_RENEW_DEADLINE_MS = exports2.RENEW_BUDGET_MS = exports2.SECRET_READ_TIMEOUT_MS = exports2.TOKEN_REQUEST_TIMEOUT_MS = exports2.AgentAuthError = void 0;
     exports2.isAgentSessionKey = isAgentSessionKey;
     exports2.pkcePair = pkcePair;
     exports2.buildConnectUrl = buildConnectUrl;
@@ -48362,6 +48492,7 @@ var require_agentAuth = __commonJS({
     exports2.BRAIN_RENEW_DEADLINE_MS = 9e4;
     var RENEWED_TOKEN_MIN_REMAINING_MS = 5 * 6e4;
     var READ_TIMED_OUT = Symbol("orion.secret-read-timed-out");
+    exports2.PROACTIVE_REFRESH_HOLDOFF_MS = 2e4;
     var AgentSession = class {
       store;
       apiBaseUrl;
@@ -48373,6 +48504,9 @@ var require_agentAuth = __commonJS({
        * START a refresh: a cached refresh token may be rotated-away by a sibling, and replaying
        * one late revokes the whole token family server-side. */
       lastSaved = null;
+      /** When a refresh last failed transiently — the proactive read's holdoff clock
+       *  ({@link PROACTIVE_REFRESH_HOLDOFF_MS}). Zero after any success. */
+      lastRefreshFailedAt = 0;
       constructor(store, apiBaseUrl, options = {}) {
         this.store = store;
         this.apiBaseUrl = apiBaseUrl;
@@ -48419,7 +48553,9 @@ var require_agentAuth = __commonJS({
        *  - under the buffer (or no readable `exp`): refresh-then-use, so a segment never starts
        *    on a token about to expire when a fresh one is a round trip away.
        * Refresh failure degrades to the stored token (the caller's error path is no worse than
-       * today). */
+       * today) — and for {@link PROACTIVE_REFRESH_HOLDOFF_MS} afterwards the stored token is handed
+       * out without another attempt, so a backend asking for room is not asked again at every
+       * segment start. */
       async currentFreshAccessToken() {
         const token = await this.currentAccessToken();
         if (!token)
@@ -48427,6 +48563,8 @@ var require_agentAuth = __commonJS({
         const remainingMs = remainingValidityMs(token);
         if (remainingMs > EARLY_REFRESH_MS)
           return token;
+        if (Date.now() - this.lastRefreshFailedAt < exports2.PROACTIVE_REFRESH_HOLDOFF_MS)
+          return token;
         if (remainingMs > FRESH_TOKEN_BUFFER_MS) {
           void this.refresh();
           return token;
@@ -48629,6 +48767,14 @@ var require_agentAuth = __commonJS({
       }
       async save(tokens) {
         this.lastSaved = tokens;
+        if (this.store.storeMany) {
+          await this.store.storeMany({
+            [ACCESS_KEY]: tokens.accessToken,
+            [REFRESH_KEY]: tokens.refreshToken,
+            [TIER_KEY]: tokens.tier
+          });
+          return;
+        }
         await this.store.store(ACCESS_KEY, tokens.accessToken);
         await this.store.store(REFRESH_KEY, tokens.refreshToken);
         await this.store.store(TIER_KEY, tokens.tier);
@@ -48648,15 +48794,44 @@ var require_agentAuth = __commonJS({
         this.inflightRefresh = inflight;
         return inflight;
       }
+      /** The refresh's critical section — read, mint, save — runs under the store's exclusive
+       * section when the store offers one (the encrypted file shared by every terminal on the
+       * machine): N processes waking for the same expiry then produce ONE mint, and the ones that
+       * waited find it and adopt it instead of replaying a token the server has already rotated.
+       * A keychain or the editor's SecretStorage offers no lock, and the section runs as before —
+       * the rotation-race adoption in {@link refreshWith} still catches the collision after the fact. */
       async doRefresh() {
+        const store = this.store;
+        if (!store.withExclusive)
+          return this.refreshWith(null);
+        const before = await this.boundedRead(REFRESH_KEY);
+        if (before === READ_TIMED_OUT) {
+          this.trace("refresh: store read unanswered before the lock \u2014 transient");
+          this.lastRefreshFailedAt = Date.now();
+          return false;
+        }
+        if (!before)
+          return false;
+        return store.withExclusive(() => this.refreshWith(before));
+      }
+      /** The refresh proper. `before` is the refresh token read BEFORE waiting for the store's lock
+       * (null when there is no lock): a different one now means a sibling refreshed while we waited,
+       * and its result is adopted without a mint. */
+      async refreshWith(before) {
         const started = Date.now();
         const refreshToken = await this.boundedRead(REFRESH_KEY);
         if (refreshToken === READ_TIMED_OUT) {
           this.trace(`refresh: store read unanswered after ${Date.now() - started}ms \u2014 transient`);
+          this.lastRefreshFailedAt = Date.now();
           return false;
         }
         if (!refreshToken)
           return false;
+        if (before !== null && refreshToken !== before) {
+          this.trace("refresh: a sibling refreshed while we waited for the store \u2014 adopted, no mint");
+          this.lastRefreshFailedAt = 0;
+          return true;
+        }
         try {
           const minted = await refreshTokens({
             apiBaseUrl: this.apiBaseUrl(),
@@ -48665,6 +48840,7 @@ var require_agentAuth = __commonJS({
           });
           if (!minted.accessToken) {
             this.trace("refresh: malformed 200 (empty access token) \u2014 transient");
+            this.lastRefreshFailedAt = Date.now();
             return false;
           }
           const tokens = minted.refreshToken ? minted : { ...minted, refreshToken };
@@ -48673,16 +48849,19 @@ var require_agentAuth = __commonJS({
             sleep(3 * (this.options.secretReadTimeoutMs ?? exports2.SECRET_READ_TIMEOUT_MS)).then(() => false)
           ]);
           this.trace(written ? `refresh: minted in ${Date.now() - started}ms` : `refresh: minted in ${Date.now() - started}ms, store write still pending \u2014 tokens live in the process cache`);
+          this.lastRefreshFailedAt = 0;
           return true;
         } catch (err2) {
           if (err2 instanceof AgentAuthError && isDefinitiveAuthRejection(err2)) {
             const current2 = await this.boundedRead(REFRESH_KEY);
             if (current2 === READ_TIMED_OUT) {
               this.trace("refresh: rejected, but the store is unreachable \u2014 clear deferred");
+              this.lastRefreshFailedAt = Date.now();
               return false;
             }
             if (current2 && current2 !== refreshToken) {
               this.trace("refresh: rejection was a rotation-race replay \u2014 sibling's session adopted");
+              this.lastRefreshFailedAt = 0;
               return true;
             }
             this.trace("refresh: definitively rejected \u2014 session cleared");
@@ -48690,6 +48869,7 @@ var require_agentAuth = __commonJS({
             return false;
           }
           this.trace(`refresh: transient failure (${err2 instanceof AgentAuthError ? err2.status : "malformed reply"})`);
+          this.lastRefreshFailedAt = Date.now();
           return false;
         }
       }
@@ -48702,6 +48882,10 @@ var require_agentAuth = __commonJS({
       }
       async clear() {
         this.lastSaved = null;
+        if (this.store.deleteMany) {
+          await this.store.deleteMany([ACCESS_KEY, REFRESH_KEY, TIER_KEY]);
+          return;
+        }
         await this.store.delete(ACCESS_KEY);
         await this.store.delete(REFRESH_KEY);
         await this.store.delete(TIER_KEY);
@@ -58052,12 +58236,19 @@ var require_steerPromotion = __commonJS({
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
     exports2.promoteLeftoverSteers = promoteLeftoverSteers2;
+    exports2.settleSteers = settleSteers;
     function promoteLeftoverSteers2(leftovers) {
       const kept = leftovers.map((text) => text.trim()).filter((text) => text.length > 0);
       if (kept.length === 0)
         return null;
       return kept.join("\n\n");
     }
+    function settleSteers(sendNow, leftovers) {
+      const prompt = sendNow?.trim() ?? "";
+      if (prompt.length > 0)
+        return { prompt, leftoversKept: true };
+      return { prompt: promoteLeftoverSteers2(leftovers), leftoversKept: false };
+    }
   }
 });
 
@@ -63745,7 +63936,7 @@ var require_codebaseIndex = __commonJS({
   "../packages/orion-client-core/dist/codebaseIndex.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.WorkspaceIndexStore = exports2.CONTENT_PROBE_DEADLINE_MS = exports2.RETRIEVAL_LEVELS = exports2.DEFAULT_RETRIEVAL_LEVEL = void 0;
+    exports2.WorkspaceIndexStore = exports2.CONTENT_PROBE_DEADLINE_MS = exports2.RETRIEVAL_LEVEL_UI_VISIBLE = exports2.RETRIEVAL_LEVELS = exports2.DEFAULT_RETRIEVAL_LEVEL = void 0;
     exports2.normalizeRetrievalLevel = normalizeRetrievalLevel3;
     exports2.parseRetrievalLevelArg = parseRetrievalLevelArg2;
     exports2.normalizeRetrievalJudge = normalizeRetrievalJudge2;
@@ -63892,6 +64083,7 @@ var require_codebaseIndex = __commonJS({
     }
     exports2.DEFAULT_RETRIEVAL_LEVEL = "normal";
     exports2.RETRIEVAL_LEVELS = ["normal", "enhanced"];
+    exports2.RETRIEVAL_LEVEL_UI_VISIBLE = false;
     function normalizeRetrievalLevel3(value, fallback = exports2.DEFAULT_RETRIEVAL_LEVEL) {
       return value === "normal" || value === "enhanced" ? value : fallback;
     }
@@ -73293,12 +73485,12 @@ ${notes.join("\n\n")}`;
         const params = req.params;
         const pathParam = typeof params.path === "string" && params.path ? params.path : null;
         if (req.name === "write_file" && pathParam) {
-          this.fileHistory.record(sessionId, snapshotId, this.fileHistoryPath(pathParam, params), payload.pre_write_content ?? null, { pinOriginal: true, pinKey: this.pinKeyFor(pathParam, params) });
+          this.fileHistory.record(sessionId, snapshotId, this.fileHistoryPath(pathParam, params), payload.pre_write_content ?? null, { pinOriginal: true, pinKey: this.pinKeyFor(pathParam, params, sessionId) });
           return;
         }
         if ((req.name === "edit_file" || req.name === "delete_file") && pathParam) {
           if (payload.pre_write_content !== void 0) {
-            this.fileHistory.record(sessionId, snapshotId, this.fileHistoryPath(pathParam, params), payload.pre_write_content, { pinOriginal: true, pinKey: this.pinKeyFor(pathParam, params) });
+            this.fileHistory.record(sessionId, snapshotId, this.fileHistoryPath(pathParam, params), payload.pre_write_content, { pinOriginal: true, pinKey: this.pinKeyFor(pathParam, params, sessionId) });
           }
           return;
         }
@@ -73319,8 +73511,18 @@ ${notes.join("\n\n")}`;
        *  same way the write itself resolved (worktree `_root` wins, then the
        *  workspace root, then home — the shell default). Pinning by absolute path
        *  keeps Reject working even if the workspace root changes mid-session;
-       *  manifest keys stay param-spelled (wire parity). */
-      pinKeyFor(p, params) {
+       *  manifest keys stay param-spelled (wire parity).
+       *
+       *  `resolveToolPath` first, because it is the resolution the write ACTUALLY
+       *  used: it expands `~`, so a skill/hook write pinned under
+       *  `<workspace>/~/.orion/…` — a directory that exists nowhere — now pins under
+       *  the real home, where the host's Reject looks for it. The lexical fallback
+       *  below is unchanged for every path the working set cannot place, and both
+       *  agree for an ordinary relative or absolute path. */
+      pinKeyFor(p, params, sessionId) {
+        const resolved = this.resolveToolPath(p, sessionId, params._root);
+        if (resolved)
+          return resolved;
         if (path15.isAbsolute(p))
           return p;
         const root2 = typeof params._root === "string" && params._root || this.getWorkspaceRoot() || os9.homedir();
@@ -73478,6 +73680,35 @@ ${notes.join("\n\n")}`;
           scratchZones: this.scratchZones(access, sessionId)
         });
       }
+      /**
+       * The absolute path a tool path names on THIS machine, resolved exactly the way
+       * the write that produced it resolved: `~` expanded, the working-directory SET
+       * consulted (primary root + host-approved additional directories + this
+       * session's scratchpad), a worktree-isolated child's `_root` honoured.
+       * `null` when the path cannot be placed — outside the approved set, a symlink
+       * escape, or empty.
+       *
+       * Exists so that UI does not re-derive it. A `file_modified` event carries the
+       * path the MODEL wrote (the engine reads `input["path"]` verbatim), so a
+       * consumer that re-joins that string onto the primary workspace folder answers
+       * differently than the write did for every `~` spelling, every added directory
+       * and every remote window — which is how a working-set row came to open the
+       * editor's "Create File" placeholder for a file that had been written perfectly
+       * well somewhere else. One resolver: the side that owns the disk.
+       *
+       * Never throws. A caller decorating a row has no better answer to a resolution
+       * failure than to fall back to the raw spelling, and an exception on that path
+       * would take the whole row down with it.
+       */
+      resolveToolPath(p, sessionId, rootOverride) {
+        if (typeof p !== "string" || p.length === 0)
+          return null;
+        try {
+          return this.resolveWithinWorkspace(p, sessionId, rootOverride);
+        } catch {
+          return null;
+        }
+      }
       /** True when `p` names a file inside THIS session's own scratchpad.
        *
        *  Used to exempt scratch writes from the read-only/plan mode clamp, because a
@@ -75730,12 +75961,56 @@ var require_encryptedFileStore = __commonJS({
       };
     }();
     Object.defineProperty(exports2, "__esModule", { value: true });
-    exports2.EncryptedFileSecretStore = void 0;
+    exports2.EncryptedFileSecretStore = exports2.LOCK_STALE_MS = exports2.LOCK_WAIT_MS = void 0;
     exports2.deriveKey = deriveKey;
     var crypto2 = __importStar(__require("crypto"));
     var fs13 = __importStar(__require("fs"));
     var os9 = __importStar(__require("os"));
     var path15 = __importStar(__require("path"));
+    exports2.LOCK_WAIT_MS = 1e4;
+    exports2.LOCK_STALE_MS = 3e4;
+    var LOCK_POLL_MIN_MS = 25;
+    var LOCK_POLL_JITTER_MS = 50;
+    function sleep(ms) {
+      return new Promise((resolve5) => {
+        const timer = setTimeout(resolve5, ms);
+        timer.unref?.();
+      });
+    }
+    async function acquireLock(lockPath, waitMs) {
+      const deadline = Date.now() + waitMs;
+      for (; ; ) {
+        try {
+          const fd = fs13.openSync(lockPath, "wx", 384);
+          try {
+            fs13.writeSync(fd, `${process.pid} ${Date.now()}
+`);
+          } finally {
+            fs13.closeSync(fd);
+          }
+          return () => {
+            try {
+              fs13.rmSync(lockPath, { force: true });
+            } catch {
+            }
+          };
+        } catch (error) {
+          if (error.code !== "EEXIST")
+            return null;
+          try {
+            if (Date.now() - fs13.statSync(lockPath).mtimeMs > exports2.LOCK_STALE_MS) {
+              fs13.rmSync(lockPath, { force: true });
+              continue;
+            }
+          } catch {
+            continue;
+          }
+          if (Date.now() >= deadline)
+            return null;
+          await sleep(LOCK_POLL_MIN_MS + Math.random() * LOCK_POLL_JITTER_MS);
+        }
+      }
+    }
     function deriveKey(keyContext, fallbackIdent) {
       let ident = fallbackIdent;
       try {
@@ -75748,10 +76023,19 @@ var require_encryptedFileStore = __commonJS({
       file;
       legacy;
       key;
+      lockWaitMs;
+      /** In-process serialization of the exclusive section: a second caller in this process queues
+       *  behind the first instead of contending for its own lock file. */
+      exclusive = Promise.resolve();
       constructor(config) {
         this.file = config.file;
         this.legacy = config.legacy;
         this.key = deriveKey(config.keyContext, config.fallbackIdent);
+        this.lockWaitMs = config.lockWaitMs ?? exports2.LOCK_WAIT_MS;
+      }
+      /** The lock file beside the store — see {@link withExclusive}. */
+      get lockFile() {
+        return `${this.file}.lock`;
       }
       encrypt(data) {
         const iv = crypto2.randomBytes(12);
@@ -75786,8 +76070,19 @@ var require_encryptedFileStore = __commonJS({
       }
       writeAll(data) {
         fs13.mkdirSync(path15.dirname(this.file), { recursive: true });
-        fs13.writeFileSync(this.file, `${this.encrypt(data)}
-`, { mode: 384 });
+        const payload = `${this.encrypt(data)}
+`;
+        const tmp = `${this.file}.${process.pid}.${crypto2.randomBytes(4).toString("hex")}.tmp`;
+        try {
+          fs13.writeFileSync(tmp, payload, { mode: 384 });
+          fs13.renameSync(tmp, this.file);
+        } catch {
+          try {
+            fs13.rmSync(tmp, { force: true });
+          } catch {
+          }
+          fs13.writeFileSync(this.file, payload, { mode: 384 });
+        }
         try {
           fs13.chmodSync(this.file, 384);
         } catch {
@@ -75813,6 +76108,38 @@ var require_encryptedFileStore = __commonJS({
         delete all[key];
         this.writeAll(all);
       }
+      /** Several keys in ONE write — a session's access/refresh pair lands together. */
+      async storeMany(entries) {
+        const all = this.readAll();
+        Object.assign(all, entries);
+        this.writeAll(all);
+      }
+      /** Several keys removed in ONE write. */
+      async deleteMany(keys) {
+        const all = this.readAll();
+        for (const key of keys)
+          delete all[key];
+        this.writeAll(all);
+      }
+      /** Run `fn` as the only holder of this store's exclusive section, across every process on
+       *  the machine that shares the file (the lock file beside it) and every caller in this one
+       *  (an in-process queue). What the token refresh runs under, so N terminals waking for the
+       *  same expiry produce one mint and N-1 adoptions instead of N rotations racing the server.
+       *  A holder that died leaves a stale lock, which is broken; a live holder that outlasts the
+       *  wait is not fought — `fn` then runs unlocked, the pre-lock behaviour. */
+      async withExclusive(fn) {
+        const run3 = this.exclusive.then(() => this.locked(fn), () => this.locked(fn));
+        this.exclusive = run3.catch(() => void 0);
+        return run3;
+      }
+      async locked(fn) {
+        const release = await acquireLock(this.lockFile, this.lockWaitMs);
+        try {
+          return await fn();
+        } finally {
+          release?.();
+        }
+      }
     };
     exports2.EncryptedFileSecretStore = EncryptedFileSecretStore2;
   }
@@ -81672,6 +81999,7 @@ var require_dist = __commonJS({
     __exportStar(require_workspaceIndex(), exports2);
     __exportStar(require_processWorkspaceIndex(), exports2);
     __exportStar(require_agentAuth(), exports2);
+    __exportStar(require_refreshOnRefusal(), exports2);
     __exportStar(require_loopbackReceiver(), exports2);
     __exportStar(require_browserLogin(), exports2);
     __exportStar(require_deviceLogin(), exports2);
@@ -81836,15 +82164,20 @@ var require_interruptedTurn = __commonJS({
   "../packages/orion-client-ui-core/dist/interruptedTurn.js"(exports2) {
     "use strict";
     Object.defineProperty(exports2, "__esModule", { value: true });
+    exports2.MOVED_ON_NOTE = void 0;
     exports2.interruptedTurnMessages = interruptedTurnMessages2;
     var textBlock = (text) => ({ type: "text", text });
-    function interruptedTurnMessages2(messages, prompt, partialReply) {
+    exports2.MOVED_ON_NOTE = "[Reply cut off here \u2014 the user sent their next message before it finished. That message is what they want now: pick up from this point as it directs, without restarting this reply or remarking on the cut.]";
+    function interruptedTurnMessages2(messages, prompt, partialReply, cause = "stopped") {
       const out2 = [...messages];
       if (prompt && prompt.trim().length > 0) {
         out2.push({ role: "user", content: [textBlock(prompt)] });
       }
       if (partialReply && partialReply.trim().length > 0) {
-        out2.push({ role: "assistant", content: [textBlock(partialReply)] });
+        const content = [textBlock(partialReply)];
+        if (cause === "moved_on")
+          content.push(textBlock(exports2.MOVED_ON_NOTE));
+        out2.push({ role: "assistant", content });
       }
       return out2;
     }
@@ -81942,7 +82275,11 @@ var require_permissionCard = __commonJS({
     exports2.LABEL_SUBJECT_MAX_CHARS = exports2.DESTINATIONS = exports2.TURBO_CONFIRM_MESSAGE = void 0;
     exports2.elideLabelSubject = elideLabelSubject;
     exports2.buildPermissionCard = buildPermissionCard2;
-    exports2.editDiffLines = editDiffLines2;
+    exports2.changeLines = changeLines2;
+    exports2.unifiedDiffText = unifiedDiffText;
+    exports2.changeCounts = changeCounts2;
+    exports2.subjectTrailText = subjectTrailText;
+    exports2.changeFlagLabels = changeFlagLabels2;
     exports2.permissionDecisionFor = permissionDecisionFor2;
     exports2.resolveCardChoice = resolveCardChoice2;
     var client_core_1 = require_dist();
@@ -81967,14 +82304,6 @@ var require_permissionCard = __commonJS({
       return `${chars.slice(0, head).join("")}\u2026${chars.slice(chars.length - tail).join("")}`;
     }
     var COMMAND_TOOLS = /* @__PURE__ */ new Set(["bash", "bash_background", "powershell"]);
-    function firstLine(text) {
-      return text.split("\n", 1)[0] ?? text;
-    }
-    function basename2(path15) {
-      const normalized = path15.replace(/\\/g, "/").replace(/\/+$/, "");
-      const i2 = normalized.lastIndexOf("/");
-      return i2 === -1 ? normalized : normalized.slice(i2 + 1);
-    }
     function urlHost(url) {
       const afterScheme = url.includes("://") ? url.slice(url.indexOf("://") + 3) : url;
       const end = afterScheme.search(/[/?#]/);
@@ -81982,6 +82311,23 @@ var require_permissionCard = __commonJS({
       const hostPort = authority.includes("@") ? authority.slice(authority.lastIndexOf("@") + 1) : authority;
       return hostPort.split(":")[0] ?? hostPort;
     }
+    function splitSubject(path15) {
+      const normalized = path15.replace(/\\/g, "/").replace(/\/+$/, "");
+      if (normalized === "")
+        return null;
+      const i2 = normalized.lastIndexOf("/");
+      if (i2 === -1)
+        return { name: normalized, dir: null };
+      return { name: normalized.slice(i2 + 1), dir: normalized.slice(0, i2) || "/" };
+    }
+    function textLines(text) {
+      if (text === "")
+        return [];
+      const lines = text.split("\n");
+      if (lines.length > 1 && lines[lines.length - 1] === "")
+        lines.pop();
+      return lines;
+    }
     function inputPreview(input, maxChars = 220) {
       const parts2 = Object.entries(input).filter(([key]) => !key.startsWith("_")).map(([key, value]) => {
         const text = typeof value === "string" ? value : JSON.stringify(value);
@@ -81994,50 +82340,53 @@ var require_permissionCard = __commonJS({
     function buildPermissionCard2(req, opts = {}) {
       const input = req.input ?? {};
       const tool = req.tool_name;
-      let header;
       let body2;
+      let question;
       if (COMMAND_TOOLS.has(tool)) {
         const command = String(input.command ?? "");
-        header = { verb: "Run", subject: firstLine(command) };
+        question = "Run this command?";
         body2 = { kind: "command", command };
       } else if (tool === "edit_file") {
         const path15 = String(input.path ?? "");
-        header = { verb: "Edit", subject: basename2(path15) };
+        question = "Apply this edit?";
         body2 = {
           kind: "edit",
           path: path15,
           oldString: String(input.old_string ?? ""),
-          newString: String(input.new_string ?? "")
+          newString: String(input.new_string ?? ""),
+          replaceAll: input.replace_all === true
         };
       } else if (tool === "write_file") {
         const path15 = String(input.path ?? "");
-        header = { verb: "Write", subject: basename2(path15) };
-        body2 = { kind: "content", path: path15, content: String(input.content ?? "") };
+        const forceOverwrite = input.force_overwrite === true;
+        question = forceOverwrite ? "Overwrite this file?" : "Create this file?";
+        body2 = { kind: "content", path: path15, content: String(input.content ?? ""), forceOverwrite };
       } else if (tool === "delete_file" || tool === "delete_dir") {
         const path15 = String(input.path ?? "");
-        header = { verb: "Delete", subject: basename2(path15) };
+        question = tool === "delete_dir" ? "Delete this folder?" : "Delete this file?";
         body2 = { kind: "path", path: path15 };
       } else if (tool === "copy_dir") {
         const dst = String(input.dst ?? "");
-        header = { verb: "Copy", subject: basename2(dst) };
-        body2 = { kind: "path", path: dst };
+        question = "Copy this folder?";
+        body2 = { kind: "copy", src: String(input.src ?? ""), dst };
       } else if (tool === "read_file") {
         const path15 = String(input.path ?? "");
-        header = { verb: "Read", subject: basename2(path15) };
+        question = "Read this file?";
         body2 = { kind: "path", path: path15 };
       } else if (tool === "web_fetch") {
         const url = String(input.url ?? "");
-        header = { verb: "Fetch", subject: urlHost(url) };
+        question = "Fetch this URL?";
         body2 = { kind: "fetch", url };
       } else {
-        header = { verb: "Use", subject: (0, toolLabel_1.toolDisplayName)(tool) };
+        question = `Use ${(0, toolLabel_1.toolDisplayName)(tool)}?`;
         body2 = { kind: "tool", toolName: tool, inputPreview: inputPreview(input) };
       }
       const suggestions = req.suggestions ?? [];
       const grantDir = suggestions.find((s) => s.kind === "add_directories")?.directories[0];
       return {
-        askTitle: opts.agentLabel ? `${opts.agentLabel} is asking for permission` : "Orion is asking for permission",
-        header,
+        question,
+        subject: subjectFor(body2),
+        change: changeFor(body2),
         body: body2,
         reason: req.reason_code && req.reason_code !== "no_matching_rule" ? req.reason?.trim() || null : null,
         outside: req.reason_code === "outside_working_directories" && req.blocked_path ? { blockedPath: req.blocked_path, grantDir: grantDir ?? req.blocked_path } : void 0,
@@ -82098,12 +82447,92 @@ var require_permissionCard = __commonJS({
       }
       return options;
     }
-    function editDiffLines2(body2, maxLines = 60) {
-      const lines = [
-        ...body2.oldString.split("\n").map((line) => `- ${line}`),
-        ...body2.newString.split("\n").map((line) => `+ ${line}`)
-      ];
-      return lines.length > maxLines ? [...lines.slice(0, maxLines), `\u2026 (+${lines.length - maxLines} more lines)`] : lines;
+    function subjectFor(body2) {
+      switch (body2.kind) {
+        case "edit":
+        case "content":
+        case "path":
+          return splitSubject(body2.path);
+        case "copy":
+          return splitSubject(body2.dst);
+        case "fetch":
+          return { name: urlHost(body2.url), dir: null };
+        case "command":
+        case "tool":
+          return null;
+      }
+    }
+    function changeFor(body2) {
+      if (body2.kind === "edit") {
+        return {
+          added: textLines(body2.newString).length,
+          removed: textLines(body2.oldString).length,
+          everyOccurrence: body2.replaceAll,
+          overwrite: false
+        };
+      }
+      if (body2.kind === "content") {
+        return {
+          added: textLines(body2.content).length,
+          removed: 0,
+          everyOccurrence: false,
+          overwrite: body2.forceOverwrite
+        };
+      }
+      return null;
+    }
+    function changeLines2(body2, maxLines = 60) {
+      const all = [];
+      if (body2.kind === "edit") {
+        for (const text of textLines(body2.oldString))
+          all.push({ sign: "-", text });
+        for (const text of textLines(body2.newString))
+          all.push({ sign: "+", text });
+      } else if (body2.kind === "content") {
+        for (const text of textLines(body2.content))
+          all.push({ sign: "+", text });
+      }
+      return all.length > maxLines ? { lines: all.slice(0, maxLines), more: all.length - maxLines } : { lines: all, more: 0 };
+    }
+    var UNIFIED_DIFF_MAX_LINES = 200;
+    function unifiedDiffText(body2) {
+      const { lines, more } = changeLines2(body2, UNIFIED_DIFF_MAX_LINES);
+      if (lines.length === 0)
+        return null;
+      const removed = lines.filter((l3) => l3.sign === "-").length;
+      const added = lines.length - removed;
+      const header = body2.kind === "content" ? `@@ -0,0 +1,${added} @@` : `@@ -1,${removed} +1,${added} @@`;
+      const out2 = [header, ...lines.map((l3) => `${l3.sign}${l3.text}`)];
+      if (more > 0)
+        out2.push("... (truncated)");
+      return out2.join("\n");
+    }
+    function changeCounts2(change) {
+      const out2 = [];
+      if (change.added > 0)
+        out2.push({ sign: "+", label: `+${change.added}` });
+      if (change.removed > 0)
+        out2.push({ sign: "-", label: `\u2212${change.removed}` });
+      return out2;
+    }
+    function subjectTrailText(card) {
+      if (!card.subject)
+        return "";
+      const parts2 = [];
+      if (card.subject.dir)
+        parts2.push(card.subject.dir);
+      const counts = card.change ? changeCounts2(card.change).map((c3) => c3.label) : [];
+      if (counts.length > 0)
+        parts2.push(counts.join(" "));
+      return parts2.join(" \xB7 ");
+    }
+    function changeFlagLabels2(change) {
+      const out2 = [];
+      if (change.everyOccurrence)
+        out2.push("every occurrence");
+      if (change.overwrite)
+        out2.push("overwrites the existing file");
+      return out2;
     }
     function permissionDecisionFor2(resolved) {
       return {
@@ -103184,7 +103613,11 @@ function indexDataView(detail, mode = "on") {
       ...distributionRows("Symbol kinds", detail.byKind),
       ...distributionRows("Relationship types", detail.byEdge)
     ],
-    footer: `Normal retrieval ranks ${detail.pathIndexFiles} path-indexed files + ${detail.chunks} content chunks; Enhanced adds semantic embeddings and model reranking \u2014 switch with /retrieval.`
+    // ORION: the footer names the level in force and stops there. It used to describe
+    // Enhanced and point at `/retrieval`, which is hidden while the level is not a
+    // user-facing choice (RETRIEVAL_LEVEL_UI_VISIBLE) — a hint pointing at a command that
+    // no longer exists is worse than no hint. Restore both together.
+    footer: import_client_core20.RETRIEVAL_LEVEL_UI_VISIBLE ? `Normal retrieval ranks ${detail.pathIndexFiles} path-indexed files + ${detail.chunks} content chunks; Enhanced adds semantic embeddings and model reranking \u2014 switch with /retrieval.` : `Retrieval ranks ${detail.pathIndexFiles} path-indexed files + ${detail.chunks} content chunks.`
   };
 }
 function configView(cfg, path15) {
@@ -104374,6 +104807,45 @@ async function openRetrievalVotesPicker(ctx, workspaceRoot) {
     }
   }));
 }
+var retrievalModelsCommand = {
+  kind: "local",
+  name: "retrieval-models",
+  aliases: ["retrieval-model"],
+  description: "Choose the models behind the enhanced codebase search \u2014 embedding, rewrite, rerank, linking",
+  keywords: ["model", "retrieval", "embedding", "search", "index", "enhanced"],
+  run: async (_args, ctx) => {
+    const workspaceRoot = ctx.config?.workspaceRoot;
+    const config = await (0, import_client_core25.loadRetrievalModels)({ workspaceRoot });
+    ctx.appStore.setState((s) => ({
+      ...s,
+      activeDialog: {
+        kind: "select",
+        title: "Enhanced retrieval models",
+        options: [
+          ...import_client_core25.RETRIEVAL_SLOTS.map((slot) => ({
+            label: slot.label,
+            value: slot.key,
+            hint: config[slot.key] ? formatModelName(config[slot.key].model) : slot.defaultLabel
+          })),
+          {
+            label: import_client_core25.RETRIEVAL_LINKING_VOTES.label,
+            value: import_client_core25.RETRIEVAL_LINKING_VOTES.key,
+            hint: (0, import_client_core25.retrievalLinkingVoteLabel)(config.linkingVotes)
+          }
+        ],
+        onSelect: (key) => {
+          ctx.appStore.setState((s2) => ({ ...s2, activeDialog: null }));
+          if (key === import_client_core25.RETRIEVAL_LINKING_VOTES.key) {
+            void openRetrievalVotesPicker(ctx, workspaceRoot);
+            return;
+          }
+          const slot = import_client_core25.RETRIEVAL_SLOTS.find((entry) => entry.key === key);
+          if (slot) void openRetrievalModelPicker(ctx, slot, workspaceRoot);
+        }
+      }
+    }));
+  }
+};
 function promptReasoning(ctx, sid, modelLabel, reasoning) {
   const levels = reasoning.levels.filter((l3) => l3 !== "off");
   if (levels.length === 0) return;
@@ -104418,6 +104890,22 @@ function applyRetrievalLevel(ctx, level) {
   ctx.appStore.setState((s) => ({ ...s, retrievalLevel: level }));
   ctx.print(`Retrieval level: ${(0, import_client_core23.retrievalLevelLabel)(level)}`, "success");
 }
+var retrievalLevelCommand = {
+  kind: "local",
+  name: "retrieval",
+  description: "Set the retrieval level: normal or enhanced",
+  argumentHint: "[normal|enhanced|toggle]",
+  run: (args2, ctx) => {
+    const current2 = ctx.appStore.getState().retrievalLevel;
+    const requested = args2.trim();
+    if (!requested || requested.toLowerCase() === "status") {
+      return ctx.printInfo(retrievalView(current2));
+    }
+    const next = (0, import_client_core23.parseRetrievalLevelArg)(requested, current2);
+    if (!next) return ctx.print("Usage: /retrieval [normal|enhanced|toggle]", "warning");
+    applyRetrievalLevel(ctx, next);
+  }
+};
 function channelGuards(prefix, guards) {
   return guards.filter(({ id }) => import_client_core23.GUARD_FIELDS[id].startsWith(prefix));
 }
@@ -104897,45 +105385,7 @@ function registerBuiltins(registry) {
         }));
       }
     },
-    {
-      kind: "local",
-      name: "retrieval-models",
-      aliases: ["retrieval-model"],
-      description: "Choose the models behind the enhanced codebase search \u2014 embedding, rewrite, rerank, linking",
-      keywords: ["model", "retrieval", "embedding", "search", "index", "enhanced"],
-      run: async (_args, ctx) => {
-        const workspaceRoot = ctx.config?.workspaceRoot;
-        const config = await (0, import_client_core25.loadRetrievalModels)({ workspaceRoot });
-        ctx.appStore.setState((s) => ({
-          ...s,
-          activeDialog: {
-            kind: "select",
-            title: "Enhanced retrieval models",
-            options: [
-              ...import_client_core25.RETRIEVAL_SLOTS.map((slot) => ({
-                label: slot.label,
-                value: slot.key,
-                hint: config[slot.key] ? formatModelName(config[slot.key].model) : slot.defaultLabel
-              })),
-              {
-                label: import_client_core25.RETRIEVAL_LINKING_VOTES.label,
-                value: import_client_core25.RETRIEVAL_LINKING_VOTES.key,
-                hint: (0, import_client_core25.retrievalLinkingVoteLabel)(config.linkingVotes)
-              }
-            ],
-            onSelect: (key) => {
-              ctx.appStore.setState((s2) => ({ ...s2, activeDialog: null }));
-              if (key === import_client_core25.RETRIEVAL_LINKING_VOTES.key) {
-                void openRetrievalVotesPicker(ctx, workspaceRoot);
-                return;
-              }
-              const slot = import_client_core25.RETRIEVAL_SLOTS.find((entry) => entry.key === key);
-              if (slot) void openRetrievalModelPicker(ctx, slot, workspaceRoot);
-            }
-          }
-        }));
-      }
-    },
+    ...import_client_core23.RETRIEVAL_LEVEL_UI_VISIBLE ? [retrievalModelsCommand] : [],
     {
       kind: "local",
       name: "duet-executor",
@@ -105652,22 +106102,15 @@ ${(0, import_client_core25.duetRoutingSummaryLine)(await (0, import_client_core2
         if (requested !== "off") ctx.print(`Index mode: ${requested}`, "success");
       }
     },
-    {
-      kind: "local",
-      name: "retrieval",
-      description: "Set the retrieval level: normal or enhanced",
-      argumentHint: "[normal|enhanced|toggle]",
-      run: (args2, ctx) => {
-        const current2 = ctx.appStore.getState().retrievalLevel;
-        const requested = args2.trim();
-        if (!requested || requested.toLowerCase() === "status") {
-          return ctx.printInfo(retrievalView(current2));
-        }
-        const next = (0, import_client_core23.parseRetrievalLevelArg)(requested, current2);
-        if (!next) return ctx.print("Usage: /retrieval [normal|enhanced|toggle]", "warning");
-        applyRetrievalLevel(ctx, next);
-      }
-    },
+    // ORION: `/retrieval` and `/retrieval-models` are OFFERED only while the retrieval
+    // level is a user-facing choice (RETRIEVAL_LEVEL_UI_VISIBLE, false today). Out of the
+    // registry entirely — no row in the list, no completion, no help entry — rather than
+    // commands that answer "not available", which would advertise the very thing being
+    // withheld. Only the registration is gated: both command objects are declared above,
+    // unchanged and still tested, and the session still RUNS whatever level it has (the
+    // config key and ORION_RETRIEVAL_LEVEL are untouched), so flipping the flag back
+    // restores the commands and every saved preference with them.
+    ...import_client_core23.RETRIEVAL_LEVEL_UI_VISIBLE ? [retrievalLevelCommand] : [],
     {
       kind: "local",
       name: "theme",
@@ -125321,7 +125764,7 @@ function OrionRing() {
 
 // src/services/version.ts
 function tuiVersion() {
-  return "0.1.34".length > 0 ? "0.1.34" : null;
+  return "0.1.35".length > 0 ? "0.1.35" : null;
 }
 
 // src/components/layout/WelcomeCard.tsx
@@ -127987,7 +128430,7 @@ function SelectList({
   const end = windowed ? Math.min(start2 + maxRows, view.length) : view.length;
   const totalSelectable = filterable ? options.filter((o) => !o.separator).length : 0;
   return /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
-    /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: title }),
+    title ? /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { colorKey: "listSelection", bold: true, children: title }) : null,
     body2 ? /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(Box2, { marginTop: 1, children: /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { children: body2 }) }) : null,
     filterable ? /* @__PURE__ */ (0, import_jsx_runtime57.jsxs)(Box2, { children: [
       /* @__PURE__ */ (0, import_jsx_runtime57.jsx)(ThemedText, { dim: true, children: "Search: " }),
@@ -128107,42 +128550,33 @@ function PermissionPrompt({
         ] }) : null
       ] });
     }
-    if (body2.kind === "edit") {
-      const { shown, more } = cap((0, import_client_ui_core26.editDiffLines)(body2, 60));
+    if (body2.kind === "edit" || body2.kind === "content") {
+      const { lines, more } = (0, import_client_ui_core26.changeLines)(body2, 60);
+      const shown = lines.slice(0, BODY_CAP);
+      const hidden = more + Math.max(0, lines.length - BODY_CAP);
       return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box2, { flexDirection: "column", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { dim: true, wrap: "truncate-middle", children: body2.path }),
         shown.map((line2, i2) => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
           ThemedText,
           {
-            colorKey: line2.startsWith("+") ? "success" : line2.startsWith("-") ? "error" : void 0,
+            colorKey: line2.sign === "+" ? "success" : "error",
             wrap: "truncate-end",
-            children: line2 || " "
+            children: `${line2.sign} ${line2.text}`
           },
           i2
         )),
-        more > 0 ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(ThemedText, { dim: true, children: [
-          "\u2026 (+",
-          more,
-          " more lines)"
-        ] }) : null
-      ] });
-    }
-    if (body2.kind === "content") {
-      const { shown, more } = cap(body2.content.split("\n"));
-      return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box2, { flexDirection: "column", children: [
-        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { dim: true, wrap: "truncate-middle", children: body2.path }),
-        shown.map((line2, i2) => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "toolArgs", wrap: "truncate-end", children: line2 || " " }, i2)),
-        more > 0 ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(ThemedText, { dim: true, children: [
+        hidden > 0 ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(ThemedText, { dim: true, children: [
           "\u2026 (+",
-          more,
+          hidden,
           " more lines)"
         ] }) : null
       ] });
     }
-    const line = body2.kind === "path" ? body2.path : body2.kind === "fetch" ? body2.url : body2.inputPreview;
+    const line = (
+      // A delete/read names its target on the subject row — a second copy says nothing.
+      body2.kind === "path" ? null : body2.kind === "copy" ? `from ${body2.src}` : body2.kind === "fetch" ? body2.url : body2.inputPreview
+    );
     return line ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "toolArgs", wrap: "truncate-end", children: line }) : null;
   })();
-  const question = body2.kind === "command" ? "Do you want to run this command?" : body2.kind === "edit" ? "Do you want to make this edit?" : body2.kind === "content" ? "Do you want to create this file?" : "Do you want to proceed?";
   const theme = useTheme();
   return /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(
     Box2,
@@ -128153,10 +128587,20 @@ function PermissionPrompt({
       borderColor: theme.permissionMarker,
       paddingX: 1,
       children: [
-        /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box2, { flexDirection: "row", children: [
-          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "warning", bold: true, children: `${model.attribution ? `${model.attribution} \u2014 ` : ""}${model.header.verb}${count > 1 ? ` (1 of ${count})` : ""} ` }),
-          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "toolName", bold: true, wrap: "truncate-end", children: model.header.subject })
-        ] }),
+        /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Box2, { flexDirection: "row", children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "warning", bold: true, children: `${model.attribution ? `${model.attribution} \u2014 ` : ""}${model.question}${count > 1 ? ` (1 of ${count})` : ""}` }) }),
+        model.subject ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box2, { flexDirection: "row", paddingLeft: 2, children: [
+          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "toolName", wrap: "truncate-end", children: model.subject.name }),
+          model.subject.dir ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { dim: true, wrap: "truncate-middle", children: ` ${model.subject.dir}` }) : null,
+          model.change ? (0, import_client_ui_core26.changeCounts)(model.change).map((count2) => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+            ThemedText,
+            {
+              colorKey: count2.sign === "+" ? "success" : "error",
+              children: `  ${count2.label}`
+            },
+            count2.sign
+          )) : null,
+          model.change ? (0, import_client_ui_core26.changeFlagLabels)(model.change).map((flag) => /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { colorKey: "warning", children: `  ${flag}` }, flag)) : null
+        ] }) : null,
         bodyBlock ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Box2, { paddingLeft: 2, marginTop: 1, flexDirection: "column", children: bodyBlock }) : null,
         model.reason ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Box2, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { dim: true, wrap: "wrap", children: model.reason }) }) : null,
         model.outside ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(Box2, { paddingLeft: 2, children: /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(ThemedText, { dim: true, children: [
@@ -128170,10 +128614,7 @@ function PermissionPrompt({
           data.consecutive_denials,
           "\xD7 in a row)"
         ] }) }) : null,
-        stage.kind === "choose" ? /* @__PURE__ */ (0, import_jsx_runtime58.jsxs)(Box2, { flexDirection: "column", marginTop: 1, children: [
-          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(ThemedText, { bold: true, children: question }),
-          /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(SelectList, { title: "", options, onSelect: choose, numbered: true, maxVisible: 6 })
-        ] }) : stage.kind === "edit-rule" ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
+        stage.kind === "choose" ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(SelectList, { title: "", options, onSelect: choose, numbered: true, maxVisible: 6 }) : stage.kind === "edit-rule" ? /* @__PURE__ */ (0, import_jsx_runtime58.jsx)(
           LineEditor,
           {
             label: "Don't ask again for",
@@ -132807,7 +133248,8 @@ async function runHeadless(flags2) {
     () => config.apiUrl,
     authToken,
     import_client_core53.nodeEmitterFactory,
-    () => session.refresh().then(() => true, () => false)
+    () => session.refresh().then(() => true, () => false),
+    { trace: (line) => console.error(`[orion-bridge] ${line}`) }
   );
   const brainLog = (message, error) => console.error(`[orion-brain] ${message}${error ? `: ${String(error)}` : ""}`);
   const brain = (0, import_client_core53.createHostBrain)({
@@ -133307,7 +133749,11 @@ async function main() {
     // token cycling mid-chat never logs the user out. `refreshAndSyncGate` also re-derives the
     // projected account slice so a definitively-revoked session re-gates the chat cleanly (no
     // stale "signed in") and a rotated token's plan lands in the status line.
-    () => refreshAndSyncGate(session, appStore)
+    () => refreshAndSyncGate(session, appStore),
+    // The bridge's auth breadcrumbs (a stream that died before its first event, a refusal's
+    // verdict) ride the same debug log as the session's — the evidence the 2026-09-14 refresh
+    // storm left nowhere.
+    { trace: (line) => console.error(`[orion-bridge] ${line}`) }
   );
   const brainLog = (message, error) => console.error(`[orion-brain] ${message}${error ? `: ${String(error)}` : ""}`);
   let brainInstance;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orion-super-agent-dev",
-  "version": "0.1.34",
+  "version": "0.1.35",
   "description": "[dev] Orion \u2014 a terminal AI super-agent, strongest at coding. Local brain, local disk: the agent loop runs on your machine; only the metered model call leaves it.",
   "license": "MIT",
   "type": "module",