@datalabrotterdam/nova-ai-cli 1.2.0-alpha.4 → 1.2.0-alpha.6

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+# [@datalabrotterdam/nova-ai-cli-v1.2.0-alpha.6](https://github.com/Datalab-Rotterdam/nova-ai-cli/compare/@datalabrotterdam/nova-ai-cli@1.2.0-alpha.5...@datalabrotterdam/nova-ai-cli@1.2.0-alpha.6) (2026-10-23)
+
+
+### Bug Fixes
+
+* **cli:** start the session before the first prompt ([0c26456](https://github.com/Datalab-Rotterdam/nova-ai-cli/commit/0c26456b8126e3b42a6de2e38212213ae5380e62))
+
+
+### Features
+
+* **agent:** set workspace trust over ACP ([cec4a89](https://github.com/Datalab-Rotterdam/nova-ai-cli/commit/cec4a8949a4232f46448219e4d5363289651215d))
+
+# [@datalabrotterdam/nova-ai-cli-v1.2.0-alpha.5](https://github.com/Datalab-Rotterdam/nova-ai-cli/compare/@datalabrotterdam/nova-ai-cli@1.2.0-alpha.4...@datalabrotterdam/nova-ai-cli@1.2.0-alpha.5) (2026-10-23)
+
+
+### Bug Fixes
+
+* **cli:** keep the full-screen frame one row short of the terminal ([37355f4](https://github.com/Datalab-Rotterdam/nova-ai-cli/commit/37355f4efb8a237f204c061ad7008faf54a0dd9e))
+* **cli:** pick the account's default model when none is set ([fb0f34c](https://github.com/Datalab-Rotterdam/nova-ai-cli/commit/fb0f34c7bac26f1b59c4b6b2245e6fb8365f99f1))
+
+
+### Features
+
+* **cli:** full-screen TUI with a pinned prompt and mouse-wheel scrolling ([a68d693](https://github.com/Datalab-Rotterdam/nova-ai-cli/commit/a68d6930945bd6440de22c709fc14ae32a9c9f65))
+
 # [@datalabrotterdam/nova-ai-cli-v1.2.0-alpha.4](https://github.com/Datalab-Rotterdam/nova-ai-cli/compare/@datalabrotterdam/nova-ai-cli@1.2.0-alpha.3...@datalabrotterdam/nova-ai-cli@1.2.0-alpha.4) (2026-10-05)
 
 

package/README.md

@@ -71,9 +71,11 @@ Interactive options:
 
 ## Terminal UI
 
-The UI renders inline below your shell prompt. Finished messages go to the
-terminal's own scrollback (scroll, search and copy as usual); only the
-streaming answer, running tools, the prompt and the status rows are redrawn.
+The UI runs full screen (the terminal's alternate screen, like `less` or
+`vim`) and gives your shell its screen back on exit. The mouse wheel or
+PgUp/PgDn scroll the transcript, Esc jumps back to the newest output, and
+while you read an answer the prompt that asked for it stays pinned on the top
+row. To select text, hold Shift (Option in some macOS terminals) while dragging.
 
 - **Modes** (Shift+Tab): `agent` does the work; `plan` reads the code, asks
   questions and builds a task list but changes nothing; `ask` only answers.

package/dist/{chunk-NHGIUEIR.js → chunk-QSNU4H55.js}

@@ -1,147 +1,3 @@
-// src/tui/settings/workspace-mcp.ts
-import { readFileSync as readFileSync2 } from "fs";
-import { join as join2 } from "path";
-import { isWorkspaceTrusted } from "@datalabrotterdam/nova-ai-agent/core/nova-home.js";
-import { readSettings } from "@datalabrotterdam/nova-ai-agent/core/policy/settings.js";
-
-// src/tui/settings/workspace-settings.ts
-import { readFileSync } from "fs";
-import { join } from "path";
-function settingsPath(cwd) {
-  return join(cwd, ".nova-ai", "settings.json");
-}
-function readWorkspaceSettings(cwd) {
-  try {
-    const raw = readFileSync(settingsPath(cwd), "utf8");
-    return JSON.parse(raw);
-  } catch {
-    return {};
-  }
-}
-
-// src/tui/settings/workspace-mcp.ts
-var UNTRUSTED_MCP_MESSAGE = "Not started: MCP servers declared by this workspace only run once you trust it (/trust in the TUI, --trust-workspace headless).";
-function readWorkspaceMcpConfiguration(cwd, options = {}) {
-  const configured = readWorkspaceSettings(cwd).mcpServers ?? [];
-  const project = readProjectMcpConfiguration(cwd);
-  const servers = new Map(configured.map((server) => [server.name, server]));
-  for (const server of project.servers) servers.set(server.name, server);
-  const declared = [...servers.values()];
-  if (declared.length && !(options.trusted ?? isWorkspaceTrusted(cwd))) {
-    return {
-      servers: [],
-      failures: [
-        ...project.failures,
-        ...declared.map((server) => ({ serverName: server.name, message: UNTRUSTED_MCP_MESSAGE }))
-      ],
-      untrusted: declared.map((server) => server.name)
-    };
-  }
-  return { servers: declared, failures: project.failures };
-}
-function workspaceNeedsTrust(cwd) {
-  if (isWorkspaceTrusted(cwd)) return false;
-  if (readWorkspaceMcpConfiguration(cwd, { trusted: true }).servers.length) return true;
-  return loadWorkspaceAllowRules(cwd).length > 0;
-}
-function loadWorkspaceAllowRules(cwd) {
-  return ["settings.json", "settings.local.json"].flatMap((name) => {
-    const allow = readSettings(join2(cwd, ".nova-ai", name))?.permissions?.allow;
-    return Array.isArray(allow) ? allow : [];
-  });
-}
-function readProjectMcpConfiguration(cwd) {
-  const path = join2(cwd, ".mcp.json");
-  let raw;
-  try {
-    raw = readFileSync2(path, "utf8");
-  } catch (error) {
-    if (error.code === "ENOENT") return { servers: [], failures: [] };
-    return { servers: [], failures: [{ serverName: ".mcp.json", message: errorMessage(error, "Could not read file") }] };
-  }
-  let document;
-  try {
-    document = JSON.parse(raw);
-  } catch (error) {
-    return { servers: [], failures: [{ serverName: ".mcp.json", message: errorMessage(error, "Invalid JSON") }] };
-  }
-  const root = asRecord(document);
-  const definitions = root ? asRecord(root.mcpServers) : null;
-  if (!definitions) {
-    return {
-      servers: [],
-      failures: [{ serverName: ".mcp.json", message: 'Expected an "mcpServers" object.' }]
-    };
-  }
-  const servers = [];
-  const failures = [];
-  for (const [name, value] of Object.entries(definitions)) {
-    const config = asRecord(value);
-    if (config?.disabled === true || config?.enabled === false) continue;
-    try {
-      servers.push(normalizeProjectServer(name, config));
-    } catch (error) {
-      failures.push({ serverName: `.mcp.json:${name}`, message: errorMessage(error, "Invalid server configuration") });
-    }
-  }
-  return { servers, failures };
-}
-function normalizeProjectServer(name, config) {
-  if (!config) throw new Error("Server definition must be an object.");
-  const type = typeof config.type === "string" ? config.type : config.url ? "http" : "stdio";
-  if (type === "http" || type === "sse") {
-    if (typeof config.url !== "string" || !config.url) throw new Error(`${type} server requires a URL.`);
-    try {
-      new URL(config.url);
-    } catch {
-      throw new Error(`${type} server requires a valid URL.`);
-    }
-    return {
-      name,
-      type,
-      url: config.url,
-      headers: normalizePairs(config.headers, "headers")
-    };
-  }
-  if (type !== "stdio") throw new Error(`Unsupported transport type: ${type}.`);
-  if (typeof config.command !== "string" || !config.command) throw new Error("stdio server requires a command.");
-  if (config.args !== void 0 && (!Array.isArray(config.args) || !config.args.every((arg) => typeof arg === "string"))) {
-    throw new Error("args must be an array of strings.");
-  }
-  return {
-    name,
-    command: config.command,
-    args: config.args ?? [],
-    env: normalizePairs(config.env, "env")
-  };
-}
-function normalizePairs(value, label) {
-  if (value === void 0) return [];
-  if (Array.isArray(value)) {
-    if (!value.every((entry) => {
-      const pair = asRecord(entry);
-      return typeof pair?.name === "string" && typeof pair.value === "string";
-    })) {
-      throw new Error(`${label} must contain name/value strings.`);
-    }
-    return value.map((entry) => {
-      const pair = entry;
-      return { name: pair.name, value: pair.value };
-    });
-  }
-  const record = asRecord(value);
-  if (!record || !Object.values(record).every((entry) => typeof entry === "string")) {
-    throw new Error(`${label} must be an object of string values.`);
-  }
-  return Object.entries(record).map(([name, entry]) => ({ name, value: entry }));
-}
-function asRecord(value) {
-  return value && typeof value === "object" && !Array.isArray(value) ? value : null;
-}
-function errorMessage(error, fallback) {
-  return error instanceof Error && error.message ? `${fallback}: ${error.message}` : fallback;
-}
-
 // src/tui/session/tui-acp-client.ts
 import { NOVA_NOTIFICATIONS } from "@datalabrotterdam/nova-ai-agent/acp/extensions.js";
 import { readFile, writeFile, mkdir } from "fs/promises";
@@ -746,8 +602,6 @@ function createStore(initial) {
 }
 
 export {
-  readWorkspaceMcpConfiguration,
-  workspaceNeedsTrust,
   TuiAcpClient,
   choosePermissionOption,
   createStore

package/dist/{headless-OFJFVJ3O.js → headless-C36E4XSQ.js}

@@ -1,9 +1,8 @@
 import {
   TuiAcpClient,
   choosePermissionOption,
-  createStore,
-  readWorkspaceMcpConfiguration
-} from "./chunk-NHGIUEIR.js";
+  createStore
+} from "./chunk-QSNU4H55.js";
 
 // src/headless/index.ts
 import { resolve } from "path";
@@ -12,7 +11,6 @@ import * as acp from "@agentclientprotocol/sdk";
 import { NovaAgent } from "@datalabrotterdam/nova-ai-agent/acp/agent.js";
 import { clientFromContext } from "@datalabrotterdam/nova-ai-agent/client/context-client.js";
 import { startInProcessAgent } from "@datalabrotterdam/nova-ai-agent/client/in-process.js";
-import { setWorkspaceTrusted } from "@datalabrotterdam/nova-ai-agent/core/nova-home.js";
 import { listStoredSessions, loadStoredSession } from "@datalabrotterdam/nova-ai-agent/core/sessions.js";
 
 // src/headless/client.ts
@@ -191,15 +189,19 @@ ${HEADLESS_HELP}
     dependencies.agent ?? new NovaAgent()
   );
   const agent = connection.client;
-  if (options.trustWorkspace) setWorkspaceTrusted(options.cwd, true);
-  const mcpConfiguration = options.mcp ? readWorkspaceMcpConfiguration(options.cwd) : { servers: [], failures: [] };
-  for (const failure of mcpConfiguration.failures) {
-    output.write({
-      type: "mcp.configuration_error",
-      serverName: failure.serverName,
-      message: failure.message
-    });
-  }
+  const sessionMeta = { "nova-ai-cli/workspaceMcp": options.mcp };
+  const reportMcpFailures = (meta) => {
+    const failures = toRecord(toRecord(meta)?.["nova-ai-cli/mcp"])?.failures;
+    for (const failure of Array.isArray(failures) ? failures : []) {
+      const item = toRecord(failure);
+      if (typeof item?.serverName !== "string" || typeof item.message !== "string") continue;
+      output.write({
+        type: "mcp.configuration_error",
+        serverName: item.serverName,
+        message: item.message
+      });
+    }
+  };
   let sessionId = null;
   let interrupted = false;
   const onInterrupt = () => {
@@ -215,18 +217,23 @@ ${HEADLESS_HELP}
       clientCapabilities: client.capabilities,
       clientInfo: { name: "nova-ai-cli-headless", version: "1" }
     });
+    if (options.trustWorkspace) await agent.workspaceTrust({ cwd: options.cwd, trusted: true });
     if (options.resume) {
-      await agent.resumeSession({
+      const resumed = await agent.resumeSession({
         sessionId: options.resume,
         cwd: options.cwd,
-        mcpServers: mcpConfiguration.servers
+        mcpServers: [],
+        _meta: sessionMeta
       });
+      reportMcpFailures(resumed._meta);
       sessionId = options.resume;
     } else {
       const created = await agent.newSession({
         cwd: options.cwd,
-        mcpServers: mcpConfiguration.servers
+        mcpServers: [],
+        _meta: sessionMeta
       });
+      reportMcpFailures(created._meta);
       sessionId = created.sessionId;
     }
     await agent.setSessionConfigOption({

package/dist/index.js

@@ -140,7 +140,7 @@ ${MAIN_HELP}
     }
     case "print": {
       const update = startUpdateCheck();
-      const { default: runHeadless } = await import("./headless-OFJFVJ3O.js");
+      const { default: runHeadless } = await import("./headless-C36E4XSQ.js");
       const code = await runHeadless(command.args);
       if (update) await noticeUpdate(update, 500);
       return code;
@@ -175,7 +175,7 @@ ${MAIN_HELP}
         );
         return 2;
       }
-      const { default: runChat } = await import("./tui-OWU4YGTT.js");
+      const { default: runChat } = await import("./tui-TRADKND7.js");
       return runChat(options);
     }
   }

package/dist/{tui-OWU4YGTT.js → tui-TRADKND7.js}

@@ -9,16 +9,14 @@ import {
 } from "./chunk-FMHWW3E6.js";
 import {
   TuiAcpClient,
-  createStore,
-  readWorkspaceMcpConfiguration,
-  workspaceNeedsTrust
-} from "./chunk-NHGIUEIR.js";
+  createStore
+} from "./chunk-QSNU4H55.js";
 
 // src/tui/index.ts
 import { createInterface as createInterface2 } from "readline/promises";
 import { readCredentials } from "@datalabrotterdam/nova-ai-agent/core/credentials.js";
 import { listStoredSessions as listStoredSessions2, loadStoredSession as loadStoredSession2 } from "@datalabrotterdam/nova-ai-agent/core/sessions.js";
-import { setWorkspaceTrusted as setWorkspaceTrusted2 } from "@datalabrotterdam/nova-ai-agent/core/nova-home.js";
+import { setWorkspaceTrusted } from "@datalabrotterdam/nova-ai-agent/core/nova-home.js";
 
 // src/update-install.ts
 import { spawnSync } from "child_process";
@@ -115,16 +113,12 @@ The update did not install. Run it yourself: ${update.command}
 }
 
 // src/tui/ink/app.tsx
-import { Box as Box6, render, Static, Text as Text6, useBoxMetrics, useWindowSize } from "ink";
-import { useEffect, useRef, useState as useState2, useSyncExternalStore as useSyncExternalStore2 } from "react";
+import { Box as Box6, render, Text as Text6, useBoxMetrics, useInput as useInput3, useWindowSize } from "ink";
+import { memo, useEffect, useRef, useState as useState2, useSyncExternalStore as useSyncExternalStore2 } from "react";
 import { savedPermissionMode } from "@datalabrotterdam/nova-ai-agent/core/policy/settings.js";
 
 // src/tui/session/session-runner.ts
 import * as acp from "@agentclientprotocol/sdk";
-import {
-  NovaAIError
-} from "@datalabrotterdam/nova-sdk";
-import { createNovaClient } from "@datalabrotterdam/nova-ai-agent/core/nova-client.js";
 import { NovaAgent } from "@datalabrotterdam/nova-ai-agent/acp/agent.js";
 import { startInProcessAgent } from "@datalabrotterdam/nova-ai-agent/client/in-process.js";
 import { replayHistory } from "@datalabrotterdam/nova-ai-agent/core/history.js";
@@ -133,15 +127,6 @@ import {
   savePermissionMode
 } from "@datalabrotterdam/nova-ai-agent/core/policy/settings.js";
 import { loadStoredSession } from "@datalabrotterdam/nova-ai-agent/core/sessions.js";
-import { discoverSkills } from "@datalabrotterdam/nova-ai-agent/core/skills.js";
-import {
-  resolveModelContextWindow
-} from "@datalabrotterdam/nova-ai-agent/core/context-compaction.js";
-import {
-  chatModels,
-  resolveDefaultModel,
-  resolveModelSupportsImageInput
-} from "@datalabrotterdam/nova-ai-agent/core/model-capabilities.js";
 
 // src/tui/files/file-mentions.ts
 import { statSync } from "fs";
@@ -286,15 +271,6 @@ var SessionRunner = class {
   constructor(store, credentials, cwd) {
     this.store = store;
     this.credentials = credentials;
-    this.loadMcpConfiguration(cwd);
-    this.skills = discoverSkills(cwd).map(
-      ({ name, description, source, path }) => ({
-        name,
-        description,
-        source,
-        path
-      })
-    );
     this.cwd = cwd;
     this.acpClient = new TuiAcpClient(
       store,
@@ -309,13 +285,7 @@ var SessionRunner = class {
       clientCapabilities: this.acpClient.capabilities,
       clientInfo: { name: "nova-ai-cli-tui", version: "1" }
     });
-    this.novaClient = createNovaClient(credentials.apiKey);
-    const model = credentials.defaultModel ?? process.env.NOVA_MODEL;
-    if (!model)
-      throw new Error(
-        "No Nova model configured. Re-run authentication or set NOVA_MODEL."
-      );
-    this.model = model;
+    this.model = credentials.defaultModel ?? process.env.NOVA_MODEL ?? "";
     this.sessionId = crypto.randomUUID();
     this.sessionReady = Promise.resolve();
   }
@@ -332,15 +302,12 @@ var SessionRunner = class {
   connection;
   nova;
   initialized;
-  novaClient;
-  mcpServers = [];
-  mcpConfigurationFailures = [];
   mcpStatus = {
     configured: [],
     connected: [],
     failures: []
   };
-  skills;
+  skills = [];
   sessionReady;
   agentSessionLoaded = false;
   promptActive = false;
@@ -349,9 +316,6 @@ var SessionRunner = class {
   queuedAttachments = /* @__PURE__ */ new Map();
   editingQueuedMessageId = null;
   imageSupportByModel = /* @__PURE__ */ new Map();
-  contextWindow = null;
-  contextWindowModel = null;
-  contextWindowRequest = 0;
   contextUsageRequest = 0;
   modelCheck = null;
   resumeFrom(storedSessionId) {
@@ -364,15 +328,7 @@ var SessionRunner = class {
     this.sessionId = stored.sessionId;
     this.cwd = stored.cwd;
     this.title = stored.title;
-    this.loadMcpConfiguration(stored.cwd);
-    this.skills = discoverSkills(stored.cwd).map(
-      ({ name, description, source, path }) => ({
-        name,
-        description,
-        source,
-        path
-      })
-    );
+    this.skills = [];
     const messages = restoreSessionMessages(stored.messages);
     this.store.setState({
       messages,
@@ -391,7 +347,7 @@ var SessionRunner = class {
         return await this.nova.loadSession({
           sessionId: stored.sessionId,
           cwd: stored.cwd,
-          mcpServers: this.mcpServers
+          mcpServers: []
         });
       } finally {
         this.acpClient.muteSessionUpdates = false;
@@ -516,9 +472,6 @@ var SessionRunner = class {
     void this.enqueueQueuedPrompt(value, [], [], "steer", true);
     return true;
   }
-  configuredMcpServers() {
-    return [...this.mcpServers];
-  }
   mcpSessionStatus() {
     return {
       configured: this.mcpStatus.configured.map((server) => ({ ...server })),
@@ -529,27 +482,29 @@ var SessionRunner = class {
   skillSessionStatus() {
     return this.skills.map((skill) => ({ ...skill }));
   }
+  async trustWorkspace() {
+    await this.initialized;
+    await this.nova.workspaceTrust({ cwd: this.cwd, trusted: true });
+  }
+  /** Every skill of the workspace with its on/off state, from the agent. */
+  async listSkills() {
+    await this.initialized;
+    return (await this.nova.skillsList({ cwd: this.cwd })).skills;
+  }
+  async setSkillEnabled(name, enabled, global) {
+    await this.initialized;
+    return (await this.nova.skillsSetEnabled({
+      cwd: this.cwd,
+      name,
+      enabled,
+      scope: global ? "global" : "project"
+    })).skills;
+  }
   contextUsageSnapshot() {
     return this.store.getState().contextUsage;
   }
   async refreshContextUsage() {
     await this.ensureSession();
-    const sessionId = this.sessionId;
-    const model = this.model;
-    if (this.contextWindowModel !== model) {
-      const request = ++this.contextWindowRequest;
-      const contextWindow = await resolveModelContextWindow(
-        this.novaClient,
-        model
-      );
-      if (request === this.contextWindowRequest && model === this.model) {
-        this.contextWindow = contextWindow;
-        this.contextWindowModel = model;
-      }
-    }
-    if (sessionId !== this.sessionId || !this.agentSessionLoaded) {
-      return this.refreshContextUsage();
-    }
     const usage = await this.updateContextUsage();
     if (!usage)
       throw new Error(
@@ -565,13 +520,8 @@ var SessionRunner = class {
   }
   setModel(model) {
     this.model = model;
-    this.contextWindow = null;
-    this.contextWindowModel = null;
-    this.contextWindowRequest++;
     saveDefaultModel(model);
     if (this.agentSessionLoaded) void this.updateContextUsage();
-    void this.refreshContextUsage().catch(() => {
-    });
   }
   /**
    * Hands the mode to the agent's permission policy (which decides) and
@@ -629,27 +579,30 @@ var SessionRunner = class {
   }
   /** Chat models only: embedding, speech and transcription models can't run a session. */
   async listModels() {
-    const { data } = await this.novaClient.models.list({ limit: 100 });
-    return chatModels(data).map((model) => ({
-      id: model.id,
-      name: model.name ?? null
-    }));
+    await this.initialized;
+    const { models } = await this.nova.modelsList();
+    for (const model of models) this.imageSupportByModel.set(model.id, model.imageInput);
+    return models.map((model) => ({ id: model.id, name: model.name }));
   }
   /**
-   * Replaces a saved model that cannot chat (older logins saved the first
-   * model of the list, e.g. an embedding model) and saves the replacement.
+   * Takes the account's default model when none is set, and replaces a saved
+   * one that cannot chat (older logins saved the first model of the list,
+   * e.g. an embedding model); the agent decides, the choice is saved.
    * Runs once; a failed lookup keeps the model and the prompt reports errors.
    */
   ensureUsableModel() {
     this.modelCheck ??= (async () => {
       try {
-        const { data } = await this.novaClient.models.list({ limit: 100 });
-        const model = resolveDefaultModel(data, this.model);
-        if (!model || model === this.model) return;
+        await this.initialized;
+        const { models, defaultModel } = await this.nova.modelsList(
+          this.model ? { preferred: this.model } : {}
+        );
+        for (const model of models) this.imageSupportByModel.set(model.id, model.imageInput);
+        if (!defaultModel || defaultModel === this.model) return;
         const previous = this.model;
-        this.setModel(model);
+        this.setModel(defaultModel);
         this.store.setState({
-          statusLine: `${previous} is not a chat model; switched to ${model} (Ctrl+P to pick another).`
+          statusLine: previous ? `${previous} is not a chat model; switched to ${defaultModel} (Ctrl+P to pick another).` : `Using model ${defaultModel} (Ctrl+P switches).`
         });
       } catch {
       }
@@ -657,14 +610,8 @@ var SessionRunner = class {
     return this.modelCheck;
   }
   async supportsImageInput(model = this.model) {
-    const cached = this.imageSupportByModel.get(model);
-    if (cached !== void 0) return cached;
-    const supported = await resolveModelSupportsImageInput(
-      this.novaClient,
-      model
-    );
-    this.imageSupportByModel.set(model, supported);
-    return supported;
+    if (!this.imageSupportByModel.has(model)) await this.listModels();
+    return this.imageSupportByModel.get(model) ?? false;
   }
   async compactContext() {
     if (this.store.getState().busy || this.promptActive) {
@@ -788,7 +735,7 @@ var SessionRunner = class {
         });
       }
     } catch (err) {
-      const message = err instanceof NovaAIError ? `Nova AI request failed (status ${err.status}, requestId ${err.requestId}): ${err.message}` : err instanceof Error ? err.message : "Unknown error.";
+      const message = err instanceof Error ? err.message : "Unknown error.";
       pendingToolFailure = `Request failed: ${message}`;
       this.acpClient.appendError(message);
       this.store.setState({ statusLine: "Request failed." });
@@ -942,11 +889,10 @@ var SessionRunner = class {
     ];
   }
   async createSession() {
-    this.loadMcpConfiguration(this.cwd);
     await this.initialized;
     const { sessionId, _meta } = await this.nova.newSession({
       cwd: this.cwd,
-      mcpServers: this.mcpServers
+      mcpServers: []
     });
     this.sessionId = sessionId;
     this.applyMcpStatus(_meta);
@@ -970,10 +916,20 @@ var SessionRunner = class {
     const value = meta?.["nova-ai-cli/mcp"];
     if (!value || typeof value !== "object") return;
     const record = value;
+    const strings = (value2) => Array.isArray(value2) ? value2.filter((entry) => typeof entry === "string") : void 0;
     const configured = Array.isArray(record.configured) ? record.configured.flatMap((entry) => {
       if (!entry || typeof entry !== "object") return [];
       const item = entry;
-      return typeof item.name === "string" && typeof item.transport === "string" ? [{ name: item.name, transport: item.transport }] : [];
+      return typeof item.name === "string" && typeof item.transport === "string" ? [
+        {
+          name: item.name,
+          transport: item.transport,
+          ...typeof item.url === "string" ? { url: item.url } : {},
+          ...typeof item.command === "string" ? { command: item.command } : {},
+          ...strings(item.args) ? { args: strings(item.args) } : {},
+          ...strings(item.env) ? { env: strings(item.env) } : {}
+        }
+      ] : [];
     }) : [];
     const connected = Array.isArray(record.connected) ? record.connected.filter(
       (entry) => typeof entry === "string"
@@ -983,24 +939,7 @@ var SessionRunner = class {
       const item = entry;
       return typeof item.serverName === "string" && typeof item.message === "string" ? [{ serverName: item.serverName, message: item.message }] : [];
     }) : [];
-    this.mcpStatus = {
-      configured,
-      connected,
-      failures: [...this.mcpConfigurationFailures, ...failures]
-    };
-  }
-  loadMcpConfiguration(cwd) {
-    const configuration = readWorkspaceMcpConfiguration(cwd);
-    this.mcpServers = configuration.servers;
-    this.mcpConfigurationFailures = configuration.failures;
-    this.mcpStatus = {
-      configured: this.mcpServers.map((server) => ({
-        name: server.name,
-        transport: "type" in server ? server.type : "stdio"
-      })),
-      connected: [],
-      failures: [...this.mcpConfigurationFailures]
-    };
+    this.mcpStatus = { configured, connected, failures };
   }
   applySkillStatus(meta) {
     const value = meta?.["nova-ai-cli/skills"];
@@ -1018,12 +957,28 @@ var SessionRunner = class {
       ] : [];
     });
   }
+  /**
+   * Starts the session ahead of the first prompt, so the agent's MCP and
+   * skill status is there for /mcp and the status line. A failure is left to
+   * the first prompt, which tries again and reports it.
+   */
+  async prepareSession() {
+    try {
+      await this.ensureSession();
+    } catch {
+      this.sessionReady = Promise.resolve();
+    }
+  }
+  get sessionLoaded() {
+    return this.agentSessionLoaded;
+  }
   async ensureSession() {
     await this.ensureUsableModel();
-    await this.sessionReady;
-    if (!this.agentSessionLoaded) {
-      this.sessionReady = this.createSession();
-      await this.sessionReady;
+    for (; ; ) {
+      const ready = this.sessionReady;
+      await ready;
+      if (this.agentSessionLoaded) return;
+      if (this.sessionReady === ready) this.sessionReady = this.createSession();
     }
   }
   applyInteractionMode(mode, statusLine) {
@@ -1039,7 +994,7 @@ var SessionRunner = class {
     try {
       const usage = await this.nova.sessionContextUsage({
         sessionId,
-        contextWindow: this.contextWindow,
+        ...this.model ? { model: this.model } : {},
         mode: this.interactionMode
       });
       if (request === this.contextUsageRequest && sessionId === this.sessionId) {
@@ -1153,6 +1108,17 @@ function kittyKeyboardOverride(env = process.env) {
 function isLateTerminalReply(input) {
   return /^\u001b?\[\?[\d;]*[uc]$/.test(input);
 }
+var MOUSE_REPORTING_ON = "\x1B[?1000h\x1B[?1006h";
+var MOUSE_REPORTING_OFF = "\x1B[?1000l\x1B[?1006l";
+var MOUSE_INPUT = /^\u001b?\[<(\d+);\d+;\d+[Mm]$/;
+function isMouseInput(input) {
+  return MOUSE_INPUT.test(input);
+}
+function wheelRows(input) {
+  const button = Number(MOUSE_INPUT.exec(input)?.[1] ?? -1);
+  if (button < 0 || (button & 64) === 0) return 0;
+  return button & 1 ? -3 : 3;
+}
 
 // src/tui/ink/components/prompt-input.tsx
 import { Box, Text, useInput, usePaste } from "ink";
@@ -1170,7 +1136,8 @@ var palette = {
   faint: "#64748b",
   code: "#fcd34d",
   diffAddBg: "#1b3a24",
-  diffRemoveBg: "#3d1f1f"
+  diffRemoveBg: "#3d1f1f",
+  stickyBackground: "#1e293b"
 };
 var colors = {
   primary: chalk.hex(palette.primary),
@@ -1197,7 +1164,7 @@ function PromptInput({
 }) {
   useSyncExternalStore(editor.subscribe, editor.getVersion);
   useInput((input, key) => {
-    if (onKey(input, key)) return;
+    if (isMouseInput(input) || onKey(input, key)) return;
     editor.handleKey(input, key);
   });
   usePaste((text) => editor.paste(text));
@@ -1483,7 +1450,8 @@ import { Fragment as Fragment2, jsx as jsx2, jsxs as jsxs2 } from "react/jsx-run
 function StatusLine({
   ui,
   model,
-  mcp
+  mcp,
+  scroll = 0
 }) {
   const separator = /* @__PURE__ */ jsx2(Text2, { color: palette.faint, children: " | " });
   const usage = ui.contextUsage ? `ctx:${formatTokenCount(ui.contextUsage.totalTokens)}${ui.contextUsage.contextWindow ? `/${formatTokenCount(ui.contextUsage.contextWindow)}` : ""}` : null;
@@ -1511,6 +1479,10 @@ function StatusLine({
         `mcp:${mcp.connected}/${mcp.configured}`,
         mcp.failed ? /* @__PURE__ */ jsx2(Text2, { color: palette.danger, children: ` !${mcp.failed}` }) : null
       ] }) : null,
+      scroll ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
+        separator,
+        /* @__PURE__ */ jsx2(Text2, { color: palette.warning, children: `\u2191${scroll} lines \xB7 PgDn/Esc` })
+      ] }) : null,
       mcp.skills ? /* @__PURE__ */ jsxs2(Fragment2, { children: [
         separator,
         `skills:${mcp.skills}`
@@ -1831,12 +1803,6 @@ function PlanView({
 }
 
 // src/tui/ink/controller.ts
-import { setWorkspaceTrusted } from "@datalabrotterdam/nova-ai-agent/core/nova-home.js";
-import {
-  disabledSkillNames,
-  discoverSkills as discoverSkills2,
-  setSkillEnabled
-} from "@datalabrotterdam/nova-ai-agent/core/skills.js";
 import { INTERACTION_MODES } from "@datalabrotterdam/nova-ai-agent/core/interaction-modes.js";
 
 // src/tui/commands/builtins.ts
@@ -1961,8 +1927,8 @@ var builtinCommands = [
   {
     name: "trust",
     description: "Trust this workspace: start the MCP servers it declares and apply its .nova-ai allow rules",
-    run(ctx) {
-      ctx.print(ctx.trustWorkspace());
+    async run(ctx) {
+      ctx.print(await ctx.trustWorkspace());
     }
   },
   {
@@ -1989,16 +1955,16 @@ var builtinCommands = [
     name: "mcp",
     description: "Inspect configured MCP servers",
     run(ctx) {
-      ctx.openMcpInspector();
+      return ctx.openMcpInspector();
     }
   },
   {
     name: "skills",
     description: "List skills, or switch one: /skills on|off <name> [--global]",
-    run(ctx, args) {
+    async run(ctx, args) {
       const words = args.trim().split(/\s+/).filter(Boolean);
       if (!words.length) {
-        ctx.openSkillInspector();
+        await ctx.openSkillInspector();
         return;
       }
       const global = words.includes("--global");
@@ -2007,7 +1973,7 @@ var builtinCommands = [
         ctx.print("Usage: /skills, or /skills on|off <name> [--global]");
         return;
       }
-      ctx.print(ctx.switchSkill(name, action === "on", global));
+      ctx.print(await ctx.switchSkill(name, action === "on", global));
     }
   },
   {
@@ -3601,17 +3567,11 @@ var TranscriptCommitter = class {
   planSignature = null;
   snapshot = null;
   lastState = null;
-  redrawRequested = false;
-  /** The next sync starts a new epoch, e.g. after the terminal width changed. */
-  requestRedraw() {
-    this.redrawRequested = true;
-    this.lastState = null;
-  }
   sync(state, expanded) {
     if (this.snapshot && state === this.lastState && expanded === this.expanded)
       return this.snapshot;
     this.lastState = state;
-    if (this.redrawRequested || state.sessionId !== this.sessionId || expanded !== this.expanded || !this.prefixIntact(state.messages)) {
+    if (state.sessionId !== this.sessionId || expanded !== this.expanded || !this.prefixIntact(state.messages)) {
       this.startEpoch(state, expanded);
     }
     const messages = state.messages;
@@ -3764,7 +3724,6 @@ var TranscriptCommitter = class {
     return true;
   }
   startEpoch(state, expanded) {
-    this.redrawRequested = false;
     this.epoch++;
     this.sessionId = state.sessionId;
     this.expanded = expanded;
@@ -3810,7 +3769,6 @@ function safeSplitOffset(text, from) {
 }
 
 // src/tui/ink/controller.ts
-var CLEAR_SCREEN_AND_SCROLLBACK = "\x1B[2J\x1B[3J\x1B[H";
 var EXIT_CONFIRM_MS = 2e3;
 var TuiController = class {
   constructor(store, runner, io) {
@@ -3835,6 +3793,8 @@ var TuiController = class {
   exiting = false;
   view;
   lastEpoch = 0;
+  scroll = 0;
+  viewport = { rows: 10, contentRows: 0 };
   exitArmed = false;
   exitTimer;
   animationTimer;
@@ -3858,7 +3818,7 @@ var TuiController = class {
   };
   getView = () => this.view;
   start() {
-    void this.runner.ensureUsableModel().then(() => this.refresh());
+    void this.runner.prepareSession().then(() => this.refresh());
     this.syncWindowTitle();
     this.animationTimer = setInterval(() => this.syncWindowTitle(true), 120);
     this.animationTimer.unref?.();
@@ -3893,8 +3853,17 @@ var TuiController = class {
         this.runner.cancel();
         return true;
       }
+      if (this.scroll > 0) {
+        this.scrollTo(0);
+        return true;
+      }
       return false;
     }
+    if (key.pageUp || key.pageDown) {
+      const page = Math.max(1, this.viewport.rows - 2);
+      this.scrollBy(key.pageUp ? page : -page);
+      return true;
+    }
     if (key.tab && key.shift) {
       this.cycleInteractionMode();
       return true;
@@ -4059,9 +4028,13 @@ ${result.output}${result.truncated ? "\n\n[output truncated]" : ""}`
       state: new ToolInspectorState(() => this.toolCalls(), this.closeOverlay)
     });
   };
-  openMcpInspector = () => {
-    const servers = this.runner.configuredMcpServers();
+  openMcpInspector = async () => {
+    if (!this.runner.sessionLoaded) {
+      this.showText("MCP servers", "Connecting MCP servers...");
+      await this.runner.prepareSession();
+    }
     const connection = this.runner.mcpSessionStatus();
+    const servers = connection.configured;
     const configuredNames = new Set(servers.map((server) => server.name));
     const configurationFailures = connection.failures.filter((failure) => !configuredNames.has(failure.serverName)).map((failure) => `${failure.serverName}
 status: failed - ${failure.message}`);
@@ -4075,16 +4048,20 @@ status: failed - ${failure.message}`);
     );
   };
   /** Every discovered skill with its state; switched-off skills stay listed. */
-  openSkillInspector = () => {
-    const cwd = this.runner.cwd;
-    const skills = discoverSkills2(cwd);
-    const disabled = disabledSkillNames(cwd);
-    const on = skills.filter((skill) => !disabled.has(skill.name)).length;
+  openSkillInspector = async () => {
+    let skills;
+    try {
+      skills = await this.runner.listSkills();
+    } catch (error) {
+      this.showText("Skills", errorMessage(error, "Could not list the skills."));
+      return;
+    }
+    const on = skills.filter((skill) => skill.enabled).length;
     this.showText(
       `Skills (${on} on, ${skills.length - on} off)`,
       skills.length ? [
         ...skills.map(
-          (skill) => `${skill.name} [${skill.source}]${disabled.has(skill.name) ? " (off)" : ""}
+          (skill) => `${skill.name} [${skill.source}]${skill.enabled ? "" : " (off)"}
 ${skill.description}
 ${skill.path}`
         ),
@@ -4093,17 +4070,15 @@ ${skill.path}`
     );
   };
   /** /skills on|off <name> [--global]: applies from the next message. */
-  switchSkill = (name, enabled, global) => {
-    const cwd = this.runner.cwd;
-    if (!discoverSkills2(cwd).some((skill) => skill.name === name)) {
-      return `No skill named "${name}". /skills lists them.`;
-    }
+  switchSkill = async (name, enabled, global) => {
+    let skills;
     try {
-      setSkillEnabled(cwd, global ? "global" : "project", name, enabled);
+      skills = await this.runner.setSkillEnabled(name, enabled, global);
     } catch (error) {
-      return errorMessage(error, "Could not change the skill.");
+      const message = errorMessage(error, "Could not change the skill.");
+      return message.startsWith("No skill named") ? `${message} /skills lists them.` : message;
     }
-    const stillOff = enabled && disabledSkillNames(cwd).has(name);
+    const stillOff = enabled && skills.some((skill) => skill.name === name && !skill.enabled);
     return stillOff ? `Switched "${name}" on ${global ? "globally" : "in this project"}, but it is still off ${global ? "in this project" : "globally"} (use ${global ? "/skills on " + name : "/skills on " + name + " --global"}).` : `Skill "${name}" is ${enabled ? "on" : "off"} ${global ? "everywhere" : "in this project"} from the next message.`;
   };
   openUsageInspector = async () => {
@@ -4116,14 +4091,23 @@ ${skill.path}`
     }
   };
   /**
-   * Prints the whole transcript again. After the width changed, the terminal
-   * re-wrapped what is on screen on its own and the live area can't be
-   * erased exactly (Ink leaves stale prompt borders), and old scrollback keeps
-   * the old wrapping.
+   * The view reports its transcript size after each layout. While scrolled
+   * up, new output below grows the offset so the rows being read stay put.
    */
-  redrawAll() {
-    if (this.stopped || this.exiting) return;
-    this.committer.requestRedraw();
+  setViewport(rows, contentRows) {
+    const grown = contentRows - this.viewport.contentRows;
+    this.viewport = { rows, contentRows };
+    this.scrollTo(this.scroll > 0 && grown > 0 ? this.scroll + grown : this.scroll);
+  }
+  /** Positive scrolls toward older output. */
+  scrollBy(rows) {
+    this.scrollTo(this.scroll + rows);
+  }
+  scrollTo(offset) {
+    const max = Math.max(0, this.viewport.contentRows - this.viewport.rows);
+    const next = Math.max(0, Math.min(offset, max));
+    if (next === this.scroll) return;
+    this.scroll = next;
     this.refresh();
   }
   toggleToolDetails() {
@@ -4198,8 +4182,12 @@ ${skill.path}`
     getPermissionMode: () => this.store.getState().permissionMode,
     setPermissionMode: (mode) => this.setPermissionMode(mode),
     openPermissionPicker: this.openPermissionModes,
-    trustWorkspace: () => {
-      setWorkspaceTrusted(this.runner.cwd, true);
+    trustWorkspace: async () => {
+      try {
+        await this.runner.trustWorkspace();
+      } catch (error) {
+        return errorMessage(error, "Could not trust the workspace.");
+      }
       return "Workspace trusted: its allow rules apply now; MCP servers it declares start with the next session (/clear).";
     },
     openToolInspector: this.openToolInspector,
@@ -4224,6 +4212,7 @@ ${skill.path}`
   submit = async (text, images = [], pastes = []) => {
     const value = text.trim();
     if (!value) return;
+    this.scroll = 0;
     this.editor.addToHistory(value);
     this.store.setState((state) => ({
       inputHistory: [...state.inputHistory, value],
@@ -4325,7 +4314,10 @@ ${skill.path}`
     this.view = this.buildView();
     if (this.view.transcript.epoch !== this.lastEpoch) {
       this.lastEpoch = this.view.transcript.epoch;
-      this.io.write(CLEAR_SCREEN_AND_SCROLLBACK);
+      if (this.scroll) {
+        this.scroll = 0;
+        this.view = this.buildView();
+      }
     }
     for (const listener of this.listeners) listener();
   }
@@ -4339,7 +4331,8 @@ ${skill.path}`
       model: this.runner.model,
       mcp: mcpCounts(this.runner),
       expandedTools: this.expandedTools,
-      exiting: this.exiting
+      exiting: this.exiting,
+      scroll: this.scroll
     };
   }
   questionState(pending) {
@@ -4371,14 +4364,12 @@ ${skill.path}`
   }
 };
 function formatMcpServer(server, status) {
-  const type = "type" in server ? server.type : "stdio";
-  const lines = [`${server.name} [${type}]`];
-  if ("url" in server) lines.push(`url: ${server.url}`);
-  if ("command" in server) {
+  const lines = [`${server.name} [${server.transport}]`];
+  if (server.url) lines.push(`url: ${server.url}`);
+  if (server.command) {
     lines.push(`command: ${server.command}`);
-    if (server.args.length) lines.push(`args: ${server.args.join(" ")}`);
-    if (server.env.length)
-      lines.push(`env: ${server.env.map((entry) => entry.name).join(", ")} (values hidden)`);
+    if (server.args?.length) lines.push(`args: ${server.args.join(" ")}`);
+    if (server.env?.length) lines.push(`env: ${server.env.join(", ")} (values hidden)`);
   }
   const failure = status.failures.find((item) => item.serverName === server.name);
   lines.push(
@@ -4409,7 +4400,7 @@ function useDialogInput(handle, isActive) {
   const [, setTick] = useState(0);
   useInput2(
     (input, key) => {
-      if (handle(input, key) === "changed") setTick((tick) => tick + 1);
+      if (!isMouseInput(input) && handle(input, key) === "changed") setTick((tick) => tick + 1);
     },
     { isActive }
   );
@@ -4551,7 +4542,7 @@ function QuestionDialog({
   const [, setTick] = useState(0);
   useInput2(
     (input, key) => {
-      if (state.handleKey(input, key) === "changed") setTick((tick) => tick + 1);
+      if (!isMouseInput(input) && state.handleKey(input, key) === "changed") setTick((tick) => tick + 1);
     },
     { isActive }
   );
@@ -4633,7 +4624,7 @@ function PermissionDialog({
 }) {
   useInput2(
     (input, key) => {
-      if (permissionKey(request, input, key) === "closed") onClose();
+      if (!isMouseInput(input) && permissionKey(request, input, key) === "closed") onClose();
     },
     { isActive }
   );
@@ -4684,9 +4675,8 @@ function wrapPlain(text, width) {
 }
 
 // src/tui/ink/app.tsx
-import { Fragment as Fragment4, jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
+import { jsx as jsx6, jsxs as jsxs6 } from "react/jsx-runtime";
 var FRAME_MS = 120;
-var RESIZE_SETTLE_MS = 100;
 async function runInkTui(credentials, cwd, args, options = {}) {
   const store = createStore({
     messages: [],
@@ -4728,22 +4718,15 @@ async function runInkTui(credentials, cwd, args, options = {}) {
     // Ink otherwise turns non-interactive whenever CI is set in the
     // environment; the TUI only runs on a terminal anyway.
     interactive: Boolean(stdout.isTTY),
+    // Full screen: the transcript scrolls inside the app (PgUp/PgDn) and the
+    // terminal gets its own screen back on exit.
+    alternateScreen: Boolean(stdout.isTTY),
     kittyKeyboard: { mode: kittyKeyboard ? "enabled" : "disabled" }
   });
   controller.start();
+  if (stdout.isTTY) stdout.write(MOUSE_REPORTING_ON);
   const onSignal = () => controller.requestExit();
   process.once("SIGTERM", onSignal);
-  let printedColumns = stdout.columns;
-  let resizeTimer;
-  const onResize = () => {
-    if (resizeTimer) clearTimeout(resizeTimer);
-    resizeTimer = setTimeout(() => {
-      if (stdout.columns === printedColumns) return;
-      printedColumns = stdout.columns;
-      controller.redrawAll();
-    }, RESIZE_SETTLE_MS);
-  };
-  stdout.on("resize", onResize);
   void (options.checkForUpdate ?? checkForUpdate)().then((updateAvailable) => {
     if (updateAvailable) store.setState({ updateAvailable });
   });
@@ -4753,8 +4736,7 @@ async function runInkTui(credentials, cwd, args, options = {}) {
     await controller.stop();
   } finally {
     process.off("SIGTERM", onSignal);
-    stdout.off("resize", onResize);
-    if (resizeTimer) clearTimeout(resizeTimer);
+    if (stdout.isTTY) stdout.write(MOUSE_REPORTING_OFF);
     instance.unmount();
     await instance.waitUntilExit().catch(() => {
     });
@@ -4768,31 +4750,85 @@ function App({ controller }) {
   const { rows, columns } = useWindowSize();
   const bottomRef = useRef(null);
   const bottom = useBoxMetrics(bottomRef);
+  const contentRef = useRef(null);
+  const content = useBoxMetrics(contentRef);
   const working = useWorking(view);
+  const [userTops, setUserTops] = useState2(/* @__PURE__ */ new Map());
+  useInput3((input) => {
+    const rows2 = wheelRows(input);
+    if (rows2) controller.scrollBy(rows2);
+  });
+  const height = Math.max(4, rows - 1);
+  const viewportRows = Math.max(3, height - (bottom.hasMeasured ? bottom.height : 6));
+  useEffect(() => {
+    if (content.hasMeasured) controller.setViewport(viewportRows, content.height);
+  }, [controller, viewportRows, content.hasMeasured, content.height]);
+  if (view.exiting) return null;
   const { transcript } = view;
-  const scrollback = (
-    // <Static> is laid out as an absolute box; without a width its text
-    // wraps against its content and runs past the terminal edge.
-    /* @__PURE__ */ jsx6(Static, { items: [...transcript.committed], style: { width: columns }, children: (block) => /* @__PURE__ */ jsx6(Box6, { marginTop: 1, children: /* @__PURE__ */ jsx6(TranscriptBlockView, { block }) }, block.key) }, transcript.epoch)
-  );
-  if (view.exiting) return scrollback;
-  const liveRows = Math.max(3, rows - (bottom.hasMeasured ? bottom.height : 6) - 2);
-  const dialogRows = Math.max(6, rows - 4);
-  return /* @__PURE__ */ jsxs6(Fragment4, { children: [
-    scrollback,
-    /* @__PURE__ */ jsx6(Box6, { flexDirection: "column", maxHeight: liveRows, overflowY: "hidden", justifyContent: "flex-end", children: /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", flexShrink: 0, children: [
-      transcript.live.map((block) => /* @__PURE__ */ jsx6(Box6, { marginTop: 1, children: /* @__PURE__ */ jsx6(TranscriptBlockView, { block, frame: working.frame }) }, block.key)),
-      working.line ? /* @__PURE__ */ jsx6(Box6, { marginTop: 1, paddingLeft: 1, children: /* @__PURE__ */ jsxs6(Text6, { children: [
-        /* @__PURE__ */ jsx6(Text6, { color: palette.accent, children: WORKING_FRAMES[working.frame] }),
-        /* @__PURE__ */ jsx6(Text6, { color: palette.muted, children: ` ${working.line}` })
-      ] }) }) : null
-    ] }) }),
-    /* @__PURE__ */ jsxs6(Box6, { ref: bottomRef, flexDirection: "column", marginTop: 1, children: [
-      /* @__PURE__ */ jsx6(Surface, { controller, view, rows: dialogRows, columns }),
-      /* @__PURE__ */ jsx6(StatusLine, { ui: view.ui, model: view.model, mcp: view.mcp })
+  const blocks = [...transcript.committed, ...transcript.live];
+  const liveKeys = new Set(transcript.live.map((block) => block.key));
+  const onUserTop = (key, top) => setUserTops((tops) => tops.get(key) === top ? tops : new Map(tops).set(key, top));
+  const firstVisibleRow = content.height - viewportRows - view.scroll;
+  let sticky = null;
+  for (const block of blocks) {
+    if (block.kind !== "user") continue;
+    const top = userTops.get(block.key);
+    if (top !== void 0 && top < firstVisibleRow) sticky = block.text;
+  }
+  return /* @__PURE__ */ jsxs6(Box6, { flexDirection: "column", height, children: [
+    /* @__PURE__ */ jsxs6(
+      Box6,
+      {
+        flexDirection: "column",
+        height: viewportRows,
+        flexShrink: 0,
+        overflowY: "hidden",
+        justifyContent: "flex-end",
+        children: [
+          /* @__PURE__ */ jsxs6(Box6, { ref: contentRef, flexDirection: "column", flexShrink: 0, marginBottom: -view.scroll, children: [
+            blocks.map(
+              (block) => liveKeys.has(block.key) ? /* @__PURE__ */ jsx6(Box6, { marginTop: 1, children: /* @__PURE__ */ jsx6(TranscriptBlockView, { block, frame: working.frame }) }, block.key) : /* @__PURE__ */ jsx6(CommittedBlock, { block, onUserTop }, block.key)
+            ),
+            working.line ? /* @__PURE__ */ jsx6(Box6, { marginTop: 1, paddingLeft: 1, children: /* @__PURE__ */ jsxs6(Text6, { children: [
+              /* @__PURE__ */ jsx6(Text6, { color: palette.accent, children: WORKING_FRAMES[working.frame] }),
+              /* @__PURE__ */ jsx6(Text6, { color: palette.muted, children: ` ${working.line}` })
+            ] }) }) : null
+          ] }),
+          sticky !== null ? /* @__PURE__ */ jsx6(StickyPrompt, { text: sticky, columns }) : null
+        ]
+      }
+    ),
+    /* @__PURE__ */ jsxs6(Box6, { ref: bottomRef, flexDirection: "column", flexShrink: 0, children: [
+      /* @__PURE__ */ jsx6(Surface, { controller, view, rows: Math.max(6, rows - 4), columns }),
+      /* @__PURE__ */ jsx6(StatusLine, { ui: view.ui, model: view.model, mcp: view.mcp, scroll: view.scroll })
     ] })
   ] });
 }
+var CommittedBlock = memo(function CommittedBlock2({
+  block,
+  onUserTop
+}) {
+  if (block.kind !== "user") {
+    return /* @__PURE__ */ jsx6(Box6, { marginTop: 1, children: /* @__PURE__ */ jsx6(TranscriptBlockView, { block }) });
+  }
+  return /* @__PURE__ */ jsx6(UserAnchor, { block, onUserTop, children: /* @__PURE__ */ jsx6(TranscriptBlockView, { block }) });
+}, (before, after) => before.block === after.block);
+function UserAnchor({
+  block,
+  onUserTop,
+  children
+}) {
+  const ref = useRef(null);
+  const { top, hasMeasured } = useBoxMetrics(ref);
+  useEffect(() => {
+    if (hasMeasured) onUserTop(block.key, top);
+  }, [block.key, top, hasMeasured]);
+  return /* @__PURE__ */ jsx6(Box6, { ref, marginTop: 1, children });
+}
+function StickyPrompt({ text, columns }) {
+  const line = `> ${text.replace(/\s+/g, " ").trim()}`;
+  return /* @__PURE__ */ jsx6(Box6, { position: "absolute", top: 0, left: 0, width: columns, children: /* @__PURE__ */ jsx6(Text6, { color: palette.primary, backgroundColor: palette.stickyBackground, wrap: "truncate-end", children: line.padEnd(columns) }) });
+}
 function Surface({
   controller,
   view,
@@ -4853,13 +4889,15 @@ function useWorking(view) {
 }
 
 // src/tui/index.ts
+import { workspaceNeedsTrust } from "@datalabrotterdam/nova-ai-agent/core/workspace-mcp.js";
 async function runChat(options) {
   const stored = readCredentials();
   if (!stored) {
     console.error("nova-ai isn't connected to a Nova AI account yet. Run `nova-ai login` first.");
     return 1;
   }
-  const credentials = options.model ? { ...stored, defaultModel: options.model } : stored;
+  const model = options.model ?? stored.defaultModel ?? process.env.NOVA_MODEL;
+  const credentials = { ...stored, defaultModel: model };
   const updateCheck = checkForUpdate().then((update) => withInstallability(update));
   const updatedFrom = process.env[UPDATED_FROM_ENV];
   if (updatedFrom) {
@@ -4903,7 +4941,7 @@ ${cwd}`);
     console.log("Trusting it starts those servers and applies those rules. Only trust code you know.");
     const answer = (await prompt.question("Trust this workspace? [y/N] ")).trim().toLowerCase();
     if (answer === "y" || answer === "yes") {
-      setWorkspaceTrusted2(cwd, true);
+      setWorkspaceTrusted(cwd, true);
     } else {
       console.log("Not trusted: its MCP servers stay off and its allow rules are ignored. Use /trust later to change this.");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@datalabrotterdam/nova-ai-cli",
-  "version": "1.2.0-alpha.4",
+  "version": "1.2.0-alpha.6",
   "description": "Agentic coding with DataLab Rotterdam's Nova AI in your terminal: interactive TUI, headless mode, and an ACP agent for editors",
   "license": "Apache-2.0",
   "author": "DataLab Rotterdam",
@@ -39,8 +39,7 @@
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.29.0",
-    "@datalabrotterdam/nova-ai-agent": "^1.0.0-alpha.2",
-    "@datalabrotterdam/nova-sdk": "^1.3.2",
+    "@datalabrotterdam/nova-ai-agent": "^1.0.0-alpha.3",
     "chalk": "^5.3.0",
     "cli-highlight": "^2.1.11",
     "diff": "^9.0.0",
@@ -75,5 +74,8 @@
         }
       ]
     ]
+  },
+  "devDependencies": {
+    "@datalabrotterdam/nova-sdk": "^1.3.2"
   }
 }