Merge branch 'main' into fix-telemetry-truncation

Co-authored-by: Tommaso Sciortino <sciortino@gmail.com>

.gemini/settings.json

@@ -2,7 +2,7 @@
   "experimental": {
     "extensionReloading": true,
     "modelSteering": true,
-    "memoryManager": true
+    "autoMemory": true
   },
   "general": {
     "devtools": true

.github/actions/run-tests/action.yml

@@ -28,6 +28,7 @@ runs:
     - name: 'Run Tests'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
+        GEMINI_CLI_TRUST_WORKSPACE: true
       working-directory: '${{ inputs.working-directory }}'
       run: |-
         echo "::group::Build"

.github/actions/verify-release/action.yml

@@ -98,6 +98,7 @@ runs:
       working-directory: '${{ inputs.working-directory }}'
       env:
         GEMINI_API_KEY: '${{ inputs.gemini_api_key }}'
+        GEMINI_CLI_TRUST_WORKSPACE: true
         INTEGRATION_TEST_USE_INSTALLED_GEMINI: 'true'
         # We must diable CI mode here because it interferes with interactive tests.
         # See https://github.com/google-gemini/gemini-cli/issues/10517

.github/workflows/chained_e2e.yml

@@ -167,6 +167,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           VERBOSE: 'true'
           BUILD_SANDBOX_FLAGS: '--cache-from type=gha --cache-to type=gha,mode=max'
@@ -212,6 +213,7 @@ jobs:
         if: "${{runner.os != 'Windows'}}"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'
@@ -288,6 +290,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'

.github/workflows/ci.yml

@@ -179,6 +179,7 @@ jobs:
       - name: 'Run tests and generate reports'
         env:
           NO_COLOR: true
+          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
             npm run test:ci --workspace "@google/gemini-cli"
@@ -267,6 +268,7 @@ jobs:
       - name: 'Run tests and generate reports'
         env:
           NO_COLOR: true
+          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           if [[ "${{ matrix.shard }}" == "cli" ]]; then
             npm run test:ci --workspace "@google/gemini-cli" -- --coverage.enabled=false
@@ -430,6 +432,7 @@ jobs:
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
           NO_COLOR: true
+          GEMINI_CLI_TRUST_WORKSPACE: true
           NODE_OPTIONS: '--max-old-space-size=32768 --max-semi-space-size=256'
           UV_THREADPOOL_SIZE: '32'
           NODE_ENV: 'test'

.github/workflows/deflake.yml

@@ -62,6 +62,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           IS_DOCKER: "${{ matrix.sandbox == 'sandbox:docker' }}"
           KEEP_OUTPUT: 'true'
           RUNS: '${{ github.event.inputs.runs }}'
@@ -105,6 +106,7 @@ jobs:
         if: "runner.os != 'Windows'"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           RUNS: '${{ github.event.inputs.runs }}'
           SANDBOX: 'sandbox:none'
@@ -159,6 +161,7 @@ jobs:
       - name: 'Run E2E tests'
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
           KEEP_OUTPUT: 'true'
           SANDBOX: 'sandbox:none'
           VERBOSE: 'true'

.github/workflows/test-build-binary.yml

@@ -141,6 +141,7 @@ jobs:
         if: "github.event_name != 'pull_request'"
         env:
           GEMINI_API_KEY: '${{ secrets.GEMINI_API_KEY }}'
+          GEMINI_CLI_TRUST_WORKSPACE: true
         run: |
           echo "Running integration tests with binary..."
           if [[ "${{ matrix.os }}" == 'windows-latest' ]]; then

docs/cli/cli-reference.md

@@ -52,6 +52,7 @@ These commands are available within the interactive REPL.
 | `--prompt-interactive`           | `-i`  | string  | -         | Execute prompt and continue in interactive mode                                                                                                                        |
 | `--worktree`                     | `-w`  | string  | -         | Start Gemini in a new git worktree. If no name is provided, one is generated automatically. Requires `experimental.worktrees: true` in settings.                       |
 | `--sandbox`                      | `-s`  | boolean | `false`   | Run in a sandboxed environment for safer execution                                                                                                                     |
+| `--skip-trust`                   | -     | boolean | `false`   | Trust the current workspace for this session, skipping the folder trust check.                                                                                         |
 | `--approval-mode`                | -     | string  | `default` | Approval mode for tool execution. Choices: `default`, `auto_edit`, `yolo`, `plan`                                                                                      |
 | `--yolo`                         | `-y`  | boolean | `false`   | **Deprecated.** Auto-approve all actions. Use `--approval-mode=yolo` instead.                                                                                          |
 | `--experimental-acp`             | -     | boolean | -         | Start in ACP (Agent Code Pilot) mode. **Experimental feature.**                                                                                                        |

docs/cli/settings.md

@@ -161,19 +161,19 @@ they appear in the UI.
 
 ### Experimental
 
-| UI Label                                             | Setting                                         | Description                                                                                                                                               | Default |
-| ---------------------------------------------------- | ----------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
-| Enable Git Worktrees                                 | `experimental.worktrees`                        | Enable automated Git worktree management for parallel work.                                                                                               | `false` |
-| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`                    | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`                     | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it). | `false` |
-| Model Steering                                       | `experimental.modelSteering`                    | Enable model steering (user hints) to guide the model during tool execution.                                                                              | `false` |
-| Direct Web Fetch                                     | `experimental.directWebFetch`                   | Enable web fetch behavior that bypasses LLM summarization.                                                                                                | `false` |
-| Enable Gemma Model Router                            | `experimental.gemmaModelRouter.enabled`         | Enable the Gemma Model Router (experimental). Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.                            | `false` |
-| Auto-start LiteRT Server                             | `experimental.gemmaModelRouter.autoStartServer` | Automatically start the LiteRT-LM server when Gemini CLI starts and the Gemma router is enabled.                                                          | `false` |
-| Memory Manager Agent                                 | `experimental.memoryManager`                    | Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.             | `false` |
-| Auto Memory                                          | `experimental.autoMemory`                       | Automatically extract reusable skills from past sessions in the background. Review results with /memory inbox.                                            | `false` |
-| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`                | Suitable for general coding and software development tasks.                                                                                               | `false` |
-| Enable Context Management                            | `experimental.contextManagement`                | Enable logic for context management.                                                                                                                      | `false` |
+| UI Label                                             | Setting                                         | Description                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | Default |
+| ---------------------------------------------------- | ----------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |
+| Enable Git Worktrees                                 | `experimental.worktrees`                        | Enable automated Git worktree management for parallel work.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false` |
+| Use OSC 52 Paste                                     | `experimental.useOSC52Paste`                    | Use OSC 52 for pasting. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false` |
+| Use OSC 52 Copy                                      | `experimental.useOSC52Copy`                     | Use OSC 52 for copying. This may be more robust than the default system when using remote terminal sessions (if your terminal is configured to allow it).                                                                                                                                                                                                                                                                                                                                                                                                                                                            | `false` |
+| Model Steering                                       | `experimental.modelSteering`                    | Enable model steering (user hints) to guide the model during tool execution.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | `false` |
+| Direct Web Fetch                                     | `experimental.directWebFetch`                   | Enable web fetch behavior that bypasses LLM summarization.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           | `false` |
+| Enable Gemma Model Router                            | `experimental.gemmaModelRouter.enabled`         | Enable the Gemma Model Router (experimental). Requires a local endpoint serving Gemma via the Gemini API using LiteRT-LM shim.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false` |
+| Auto-start LiteRT Server                             | `experimental.gemmaModelRouter.autoStartServer` | Automatically start the LiteRT-LM server when Gemini CLI starts and the Gemma router is enabled.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                     | `false` |
+| Memory v2                                            | `experimental.memoryV2`                         | Disable the built-in save_memory tool and let the main agent persist project context by editing markdown files directly with edit/write_file. Route facts across four tiers: team-shared conventions go to project GEMINI.md files, project-specific personal notes go to the per-project private memory folder (MEMORY.md as index + sibling .md files for detail), and cross-project personal preferences go to the global ~/.gemini/GEMINI.md (the only file under ~/.gemini/ that the agent can edit — settings, credentials, etc. remain off-limits). Set to false to fall back to the legacy save_memory tool. | `true`  |
+| Auto Memory                                          | `experimental.autoMemory`                       | Automatically extract reusable skills from past sessions in the background. Review results with /memory inbox.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                       | `false` |
+| Use the generalist profile to manage agent contexts. | `experimental.generalistProfile`                | Suitable for general coding and software development tasks.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          | `false` |
+| Enable Context Management                            | `experimental.contextManagement`                | Enable logic for context management.                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 | `false` |
 
 ### Skills
 

docs/cli/trusted-folders.md

@@ -100,6 +100,30 @@ protect you. In this mode, the following features are disabled:
 Granting trust to a folder unlocks the full functionality of Gemini CLI for that
 workspace.
 
+## Headless and automated environments
+
+When running Gemini CLI in a headless environment (for example, a CI/CD
+pipeline) where interactive prompts are not possible, the trust dialog cannot be
+displayed. If the folder is untrusted and the Folder Trust feature is enabled,
+the CLI will throw a `FatalUntrustedWorkspaceError` and exit.
+
+To proceed in these environments, you can bypass the trust check using one of
+the following methods:
+
+- **Command-line flag:** Run the CLI with the `--skip-trust` flag.
+- **Environment variable:** Set the `GEMINI_CLI_TRUST_WORKSPACE=true`
+  environment variable.
+
+These methods will trust the current workspace for the duration of the session
+without prompting.
+
+## Overriding the trust file location
+
+By default, trust settings are saved to `~/.gemini/trustedFolders.json`. If you
+need to store this file in a different location, you can set the
+`GEMINI_CLI_TRUSTED_FOLDERS_PATH` environment variable to the desired absolute
+file path.
+
 ## Managing your trust settings
 
 If you need to change a decision or see all your settings, you have a couple of

docs/reference/configuration.md

@@ -1688,8 +1688,10 @@ their corresponding top-level category object in your `settings.json` file.
   - **Requires restart:** Yes
 
 - **`experimental.jitContext`** (boolean):
-  - **Description:** Enable Just-In-Time (JIT) context loading.
-  - **Default:** `false`
+  - **Description:** Enable Just-In-Time (JIT) context loading. Defaults to
+    true; set to false to opt out and load all GEMINI.md files into the system
+    instruction up-front.
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 - **`experimental.useOSC52Paste`** (boolean):
@@ -1754,11 +1756,17 @@ their corresponding top-level category object in your `settings.json` file.
   - **Default:** `"gemma3-1b-gpu-custom"`
   - **Requires restart:** Yes
 
-- **`experimental.memoryManager`** (boolean):
-  - **Description:** Replace the built-in save_memory tool with a memory manager
-    subagent that supports adding, removing, de-duplicating, and organizing
-    memories.
-  - **Default:** `false`
+- **`experimental.memoryV2`** (boolean):
+  - **Description:** Disable the built-in save_memory tool and let the main
+    agent persist project context by editing markdown files directly with
+    edit/write_file. Route facts across four tiers: team-shared conventions go
+    to project GEMINI.md files, project-specific personal notes go to the
+    per-project private memory folder (MEMORY.md as index + sibling .md files
+    for detail), and cross-project personal preferences go to the global
+    ~/.gemini/GEMINI.md (the only file under ~/.gemini/ that the agent can edit
+    — settings, credentials, etc. remain off-limits). Set to false to fall back
+    to the legacy save_memory tool.
+  - **Default:** `true`
   - **Requires restart:** Yes
 
 - **`experimental.autoMemory`** (boolean):
@@ -2148,6 +2156,14 @@ the `advanced.excludedEnvVars` setting in your `settings.json` file.
   - Overrides the hardcoded default
   - Example: `export GEMINI_MODEL="gemini-3-flash-preview"` (Windows PowerShell:
     `$env:GEMINI_MODEL="gemini-3-flash-preview"`)
+- **`GEMINI_CLI_TRUST_WORKSPACE`**:
+  - If set to `"true"`, trusts the current workspace for the duration of the
+    session, bypassing the folder trust check.
+  - Useful for headless environments (for example, CI/CD pipelines).
+- **`GEMINI_CLI_TRUSTED_FOLDERS_PATH`**:
+  - Overrides the default location for the `trustedFolders.json` file.
+  - Useful if you want to store this configuration in a custom location instead
+    of the default `~/.gemini/`.
 - **`GEMINI_CLI_IDE_PID`**:
   - Manually specifies the PID of the IDE process to use for integration. This
     is useful when running Gemini CLI in a standalone terminal while still

evals/save_memory.eval.ts

@@ -283,7 +283,7 @@ describe('save_memory', () => {
     name: proactiveMemoryFromLongSession,
     params: {
       settings: {
-        experimental: { memoryManager: true },
+        experimental: { memoryV2: true },
       },
     },
     messages: [
@@ -341,29 +341,75 @@ describe('save_memory', () => {
     prompt:
       'Please save any persistent preferences or facts about me from our conversation to memory.',
     assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall(
-        'invoke_agent',
-        undefined,
-        (args) => /save_memory/i.test(args) && /vitest/i.test(args),
-      );
+      // Under experimental.memoryV2, the agent persists memories by
+      // editing markdown files directly with write_file or replace — not via
+      // a save_memory subagent. The user said "I always prefer Vitest over
+      // Jest for testing in all my projects" — that matches the new
+      // cross-project cue phrase ("across all my projects"), so under the
+      // 4-tier model the correct destination is the global personal memory
+      // file (~/.gemini/GEMINI.md). It must NOT land in a committed project
+      // GEMINI.md (that tier is for team conventions) or the per-project
+      // private memory folder (that tier is for project-specific personal
+      // notes). The chat history mixes this durable preference with
+      // transient debugging chatter, so the eval also verifies the agent
+      // picks out the persistent fact among the noise.
+      await rig.waitForToolCall('write_file').catch(() => {});
+      const writeCalls = rig
+        .readToolLogs()
+        .filter((log) =>
+          ['write_file', 'replace'].includes(log.toolRequest.name),
+        );
+
+      const wroteVitestToGlobal = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/GEMINI\.md/i.test(args) &&
+          !/tmp\/[^/]+\/memory/i.test(args) &&
+          /vitest/i.test(args)
+        );
+      });
       expect(
-        wasToolCalled,
-        'Expected invoke_agent to be called with save_memory agent and the Vitest preference from the conversation history',
+        wroteVitestToGlobal,
+        'Expected the cross-project Vitest preference to be written to the global personal memory file (~/.gemini/GEMINI.md) via write_file or replace',
       ).toBe(true);
 
+      const leakedToCommittedProject = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /GEMINI\.md/i.test(args) &&
+          !/\.gemini\//i.test(args) &&
+          /vitest/i.test(args)
+        );
+      });
+      expect(
+        leakedToCommittedProject,
+        'Cross-project Vitest preference must NOT be mirrored into a committed project ./GEMINI.md (that tier is for team-shared conventions only)',
+      ).toBe(false);
+
+      const leakedToPrivateProject = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/tmp\/[^/]+\/memory\//i.test(args) && /vitest/i.test(args)
+        );
+      });
+      expect(
+        leakedToPrivateProject,
+        'Cross-project Vitest preference must NOT be mirrored into the private project memory folder (that tier is for project-specific personal notes only)',
+      ).toBe(false);
+
       assertModelHasOutput(result);
     },
   });
 
-  const memoryManagerRoutingPreferences =
-    'Agent routes global and project preferences to memory';
+  const memoryV2RoutesTeamConventionsToProjectGemini =
+    'Agent routes team-shared project conventions to ./GEMINI.md';
   evalTest('USUALLY_PASSES', {
     suiteName: 'default',
     suiteType: 'behavioral',
-    name: memoryManagerRoutingPreferences,
+    name: memoryV2RoutesTeamConventionsToProjectGemini,
     params: {
       settings: {
-        experimental: { memoryManager: true },
+        experimental: { memoryV2: true },
       },
     },
     messages: [
@@ -372,7 +418,7 @@ describe('save_memory', () => {
         type: 'user',
         content: [
           {
-            text: 'I always use dark mode in all my editors and terminals.',
+            text: 'For this project, the team always runs tests with `npm run test` — please remember that as our project convention.',
           },
         ],
         timestamp: '2026-01-01T00:00:00Z',
@@ -380,7 +426,9 @@ describe('save_memory', () => {
       {
         id: 'msg-2',
         type: 'gemini',
-        content: [{ text: 'Got it, I will keep that in mind!' }],
+        content: [
+          { text: 'Got it, I will keep `npm run test` in mind for tests.' },
+        ],
         timestamp: '2026-01-01T00:00:05Z',
       },
       {
@@ -404,16 +452,238 @@ describe('save_memory', () => {
     ],
     prompt: 'Please save the preferences I mentioned earlier to memory.',
     assert: async (rig, result) => {
-      const wasToolCalled = await rig.waitForToolCall(
-        'invoke_agent',
-        undefined,
-        (args) => /save_memory/i.test(args),
-      );
+      // Under experimental.memoryV2, the prompt enforces an explicit
+      // one-tier-per-fact rule: team-shared project conventions (the team's
+      // test command, project-wide indentation rules) belong in the
+      // committed project-root ./GEMINI.md and must NOT be mirrored or
+      // cross-referenced into the private project memory folder
+      // (~/.gemini/tmp/<hash>/memory/). The global ~/.gemini/GEMINI.md must
+      // never be touched in this mode either.
+      await rig.waitForToolCall('write_file').catch(() => {});
+      const writeCalls = rig
+        .readToolLogs()
+        .filter((log) =>
+          ['write_file', 'replace'].includes(log.toolRequest.name),
+        );
+
+      const wroteToProjectRoot = (factPattern: RegExp) =>
+        writeCalls.some((log) => {
+          const args = log.toolRequest.args;
+          return (
+            /GEMINI\.md/i.test(args) &&
+            !/\.gemini\//i.test(args) &&
+            factPattern.test(args)
+          );
+        });
+
       expect(
-        wasToolCalled,
-        'Expected invoke_agent to be called with save_memory agent',
+        wroteToProjectRoot(/npm run test/i),
+        'Expected the team test-command convention to be written to the project-root ./GEMINI.md',
       ).toBe(true);
 
+      expect(
+        wroteToProjectRoot(/2[- ]space/i),
+        'Expected the project-wide "2-space indentation" convention to be written to the project-root ./GEMINI.md',
+      ).toBe(true);
+
+      const leakedToPrivateMemory = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/tmp\/[^/]+\/memory\//i.test(args) &&
+          (/npm run test/i.test(args) || /2[- ]space/i.test(args))
+        );
+      });
+      expect(
+        leakedToPrivateMemory,
+        'Team-shared project conventions must NOT be mirrored into the private project memory folder (~/.gemini/tmp/<hash>/memory/) — each fact lives in exactly one tier.',
+      ).toBe(false);
+
+      const leakedToGlobal = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/GEMINI\.md/i.test(args) &&
+          !/tmp\/[^/]+\/memory/i.test(args)
+        );
+      });
+      expect(
+        leakedToGlobal,
+        'Project preferences must NOT be written to the global ~/.gemini/GEMINI.md',
+      ).toBe(false);
+
+      assertModelHasOutput(result);
+    },
+  });
+
+  const memoryV2RoutesUserProject =
+    'Agent routes personal-to-user project notes to user-project memory';
+  evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
+    name: memoryV2RoutesUserProject,
+    params: {
+      settings: {
+        experimental: { memoryV2: true },
+      },
+    },
+    prompt: `Please remember my personal local dev setup for THIS project's Postgres database. This is private to my machine — do NOT commit it to the repo.
+
+Connection details:
+- Host: localhost
+- Port: 6543 (non-standard, I run multiple Postgres instances)
+- Database: myproj_dev
+- User: sandy_local
+- Password: read from the SANDY_PG_LOCAL_PASS env var in my shell
+
+How I start it locally:
+1. Run \`brew services start postgresql@15\` to bring the server up.
+2. Run \`./scripts/seed-local-db.sh\` from the repo root to load my personal seed data.
+3. Verify with \`psql -h localhost -p 6543 -U sandy_local myproj_dev -c '\\dt'\`.
+
+Quirks to remember:
+- The migrations runner sometimes hangs on my machine if I forget step 1; kill it with Ctrl+C and rerun.
+- I keep an extra \`scratch\` schema for ad-hoc experiments — never reference it from project code.`,
+    assert: async (rig, result) => {
+      // Under experimental.memoryV2 with the Private Project Memory bullet
+      // surfaced in the prompt, a fact that is project-specific AND
+      // personal-to-the-user (must not be committed) should land in the
+      // private project memory folder under ~/.gemini/tmp/<hash>/memory/. The
+      // detailed note should be written to a sibling markdown file, with
+      // MEMORY.md updated as the index. It must NOT go to committed
+      // ./GEMINI.md or the global ~/.gemini/GEMINI.md.
+      await rig.waitForToolCall('write_file').catch(() => {});
+      const writeCalls = rig
+        .readToolLogs()
+        .filter((log) =>
+          ['write_file', 'replace'].includes(log.toolRequest.name),
+        );
+
+      const wroteUserProjectDetail = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/tmp\/[^/]+\/memory\/(?!MEMORY\.md)[^"]+\.md/i.test(args) &&
+          /6543/.test(args)
+        );
+      });
+      expect(
+        wroteUserProjectDetail,
+        'Expected the personal-to-user project note to be written to a private project memory detail file (~/.gemini/tmp/<hash>/memory/*.md)',
+      ).toBe(true);
+
+      const wroteUserProjectIndex = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return /\.gemini\/tmp\/[^/]+\/memory\/MEMORY\.md/i.test(args);
+      });
+      expect(
+        wroteUserProjectIndex,
+        'Expected the personal-to-user project note to update the private project memory index (~/.gemini/tmp/<hash>/memory/MEMORY.md)',
+      ).toBe(true);
+
+      // Defensive: should NOT have written this private note to the
+      // committed project GEMINI.md or the global GEMINI.md.
+      const leakedToCommittedProject = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\/GEMINI\.md/i.test(args) &&
+          !/\.gemini\//i.test(args) &&
+          /6543/.test(args)
+        );
+      });
+      expect(
+        leakedToCommittedProject,
+        'Personal-to-user note must NOT be written to the committed project GEMINI.md',
+      ).toBe(false);
+
+      const leakedToGlobal = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/GEMINI\.md/i.test(args) &&
+          !/tmp\/[^/]+\/memory/i.test(args) &&
+          /6543/.test(args)
+        );
+      });
+      expect(
+        leakedToGlobal,
+        'Personal-to-user project note must NOT be written to the global ~/.gemini/GEMINI.md',
+      ).toBe(false);
+
+      assertModelHasOutput(result);
+    },
+  });
+
+  const memoryV2RoutesCrossProjectToGlobal =
+    'Agent routes cross-project personal preferences to ~/.gemini/GEMINI.md';
+  evalTest('USUALLY_PASSES', {
+    suiteName: 'default',
+    suiteType: 'behavioral',
+    name: memoryV2RoutesCrossProjectToGlobal,
+    params: {
+      settings: {
+        experimental: { memoryV2: true },
+      },
+    },
+    prompt:
+      'Please remember this about me in general: across all my projects I always prefer Prettier with single quotes and trailing commas, and I always prefer tabs over spaces for indentation. These are my personal coding-style defaults that follow me into every workspace.',
+    assert: async (rig, result) => {
+      // Under experimental.memoryV2 with the Global Personal Memory
+      // tier surfaced in the prompt, a fact that explicitly applies to the
+      // user "across all my projects" / "in every workspace" must land in
+      // the global ~/.gemini/GEMINI.md (the cross-project tier). It must
+      // NOT be mirrored into a committed project-root ./GEMINI.md (that
+      // tier is for team-shared conventions) or into the per-project
+      // private memory folder (that tier is for project-specific personal
+      // notes). Each fact lives in exactly one tier across all four tiers.
+      await rig.waitForToolCall('write_file').catch(() => {});
+      const writeCalls = rig
+        .readToolLogs()
+        .filter((log) =>
+          ['write_file', 'replace'].includes(log.toolRequest.name),
+        );
+
+      const wroteToGlobal = (factPattern: RegExp) =>
+        writeCalls.some((log) => {
+          const args = log.toolRequest.args;
+          return (
+            /\.gemini\/GEMINI\.md/i.test(args) &&
+            !/tmp\/[^/]+\/memory/i.test(args) &&
+            factPattern.test(args)
+          );
+        });
+
+      expect(
+        wroteToGlobal(/Prettier/i),
+        'Expected the cross-project Prettier preference to be written to the global personal memory file (~/.gemini/GEMINI.md)',
+      ).toBe(true);
+
+      expect(
+        wroteToGlobal(/tabs/i),
+        'Expected the cross-project "tabs over spaces" preference to be written to the global personal memory file (~/.gemini/GEMINI.md)',
+      ).toBe(true);
+
+      const leakedToCommittedProject = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /GEMINI\.md/i.test(args) &&
+          !/\.gemini\//i.test(args) &&
+          (/Prettier/i.test(args) || /tabs/i.test(args))
+        );
+      });
+      expect(
+        leakedToCommittedProject,
+        'Cross-project personal preferences must NOT be mirrored into a committed project ./GEMINI.md (that tier is for team-shared conventions only)',
+      ).toBe(false);
+
+      const leakedToPrivateProject = writeCalls.some((log) => {
+        const args = log.toolRequest.args;
+        return (
+          /\.gemini\/tmp\/[^/]+\/memory\//i.test(args) &&
+          (/Prettier/i.test(args) || /tabs/i.test(args))
+        );
+      });
+      expect(
+        leakedToPrivateProject,
+        'Cross-project personal preferences must NOT be mirrored into the private project memory folder (that tier is for project-specific personal notes only)',
+      ).toBe(false);
+
       assertModelHasOutput(result);
     },
   });

integration-tests/context-compress-interactive.test.ts

@@ -8,7 +8,16 @@ import { expect, describe, it, beforeEach, afterEach } from 'vitest';
 import { TestRig } from './test-helper.js';
 import { join } from 'node:path';
 
-describe('Interactive Mode', () => {
+// Skip on macOS: every interactive test in this file is chronically flaky
+// because the captured pty buffer contains the CLI's startup escape
+// sequences (`q4;?m...true color warning`) instead of the streamed output,
+// causing `expectText(...)` to time out. Reproducible across unrelated
+// runs on `main` (24740161950, 24739323404) and on consecutive merge-queue
+// gates for #25753 (24743605639, 24747624513) — different tests in the
+// same describe fail on different runs. Not specific to any model.
+const skipOnDarwin = process.platform === 'darwin';
+
+describe.skipIf(skipOnDarwin)('Interactive Mode', () => {
   let rig: TestRig;
 
   beforeEach(() => {
@@ -49,7 +58,7 @@ describe('Interactive Mode', () => {
     );
 
     await run.expectText('Chat history compressed', 5000);
-  });
+  }, 60000);
 
   // TODO: Context compression is broken and doesn't include the system
   // instructions or tool counts, so it thinks compression is beneficial when
@@ -93,6 +102,9 @@ describe('Interactive Mode', () => {
     });
 
     const run = await rig.runInteractive();
+    await run.expectText('tips for getting started:', 5000);
+    // Wait for the async command loaders to finish so /compress is recognized
+    await new Promise((r) => setTimeout(r, 2000));
     await run.type('/compress');
     await run.type('\r');
 
@@ -107,5 +119,5 @@ describe('Interactive Mode', () => {
       foundEvent,
       'chat_compression telemetry event should not be found for NOOP',
     ).toBe(false);
-  });
+  }, 60000);
 });

integration-tests/file-system-interactive.test.ts

@@ -33,6 +33,8 @@ describe('Interactive file system', () => {
     rig.createFile(fileName, '1.0.0');
 
     const run = await rig.runInteractive();
+    await run.expectText('tips for getting started:', 5000);
+    await new Promise((r) => setTimeout(r, 1000));
 
     // Step 1: Read the file
     const readPrompt = `Read the version from ${fileName}`;
@@ -56,5 +58,5 @@ describe('Interactive file system', () => {
 
     // Wait for telemetry to flush and file system to sync, especially in sandboxed environments
     await rig.waitForTelemetryReady();
-  });
+  }, 60000);
 });

integration-tests/file-system.test.ts

@@ -134,7 +134,9 @@ describe('file-system', () => {
     ).toBeTruthy();
 
     const newFileContent = rig.readFile(fileName);
-    expect(newFileContent).toBe('hello');
+    // Trim to tolerate models that idiomatically append a trailing newline.
+    // This test is about path-with-spaces handling, not whitespace fidelity.
+    expect(newFileContent.trim()).toBe('hello');
   });
 
   it('should perform a read-then-write sequence', async () => {

integration-tests/plan-mode.test.ts

@@ -81,7 +81,10 @@ describe('Plan Mode', () => {
 
     await rig.run({
       approvalMode: 'plan',
-      args: 'Create a file called plan.md in the plans directory.',
+      args:
+        'Create a file called plan.md in the plans directory with the ' +
+        'content "# Plan". Treat this as a Directive and write the file ' +
+        'immediately without proposing strategy or asking for confirmation.',
     });
 
     const toolLogs = rig.readToolLogs();
@@ -194,7 +197,11 @@ describe('Plan Mode', () => {
 
     await rig.run({
       approvalMode: 'plan',
-      args: 'Create a file called plan-no-session.md in the plans directory.',
+      args:
+        'Create a file called plan-no-session.md in the plans directory ' +
+        'with the content "# Plan". Treat this as a Directive and write ' +
+        'the file immediately without proposing strategy or asking for ' +
+        'confirmation.',
     });
 
     const toolLogs = rig.readToolLogs();

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.40.0-nightly.20260414.g5b1f7375a",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@google/gemini-cli",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "workspaces": [
         "packages/*"
       ],
@@ -4593,56 +4593,6 @@
         }
       }
     },
-    "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.47.0.tgz",
-      "integrity": "sha512-a0TTJk4HXMkfpFkL9/WaGTNuv7JWfFTQFJd6zS9dVAjKsojmv9HT55xzbEpnZoY+VUb+YXLMp+ihMLz/UlZfDg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.47.0",
-        "@typescript-eslint/visitor-keys": "8.47.0"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/types": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.47.0.tgz",
-      "integrity": "sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
-    "node_modules/@vitest/eslint-plugin/node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.47.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.47.0.tgz",
-      "integrity": "sha512-SIV3/6eftCy1bNzCQoPmbWsRLujS8t5iDIZ4spZOBHqrM+yfX2ogg8Tt3PDTAVKw3sSCiUgg30uOAvK2r9zGjQ==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@typescript-eslint/types": "8.47.0",
-        "eslint-visitor-keys": "^4.2.1"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      }
-    },
     "node_modules/@vitest/expect": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.2.4.tgz",
@@ -17742,7 +17692,7 @@
     },
     "packages/a2a-server": {
       "name": "@google/gemini-cli-a2a-server",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "dependencies": {
         "@a2a-js/sdk": "0.3.11",
         "@google-cloud/storage": "^7.16.0",
@@ -17871,7 +17821,7 @@
     },
     "packages/cli": {
       "name": "@google/gemini-cli",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "license": "Apache-2.0",
       "dependencies": {
         "@agentclientprotocol/sdk": "^0.16.1",
@@ -18019,7 +17969,7 @@
     },
     "packages/core": {
       "name": "@google/gemini-cli-core",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "license": "Apache-2.0",
       "dependencies": {
         "@a2a-js/sdk": "0.3.11",
@@ -18329,7 +18279,7 @@
     },
     "packages/devtools": {
       "name": "@google/gemini-cli-devtools",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "license": "Apache-2.0",
       "dependencies": {
         "ws": "^8.16.0"
@@ -18344,7 +18294,7 @@
     },
     "packages/sdk": {
       "name": "@google/gemini-cli-sdk",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -18375,7 +18325,7 @@
     },
     "packages/test-utils": {
       "name": "@google/gemini-cli-test-utils",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "license": "Apache-2.0",
       "dependencies": {
         "@google/gemini-cli-core": "file:../core",
@@ -18407,7 +18357,7 @@
     },
     "packages/vscode-ide-companion": {
       "name": "gemini-cli-vscode-ide-companion",
-      "version": "0.40.0-nightly.20260414.g5b1f7375a",
+      "version": "0.41.0-nightly.20260423.gaa05b4583",
       "license": "LICENSE",
       "dependencies": {
         "@modelcontextprotocol/sdk": "^1.23.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.40.0-nightly.20260414.g5b1f7375a",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -14,7 +14,7 @@
     "url": "git+https://github.com/google-gemini/gemini-cli.git"
   },
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.0-nightly.20260414.g5b1f7375a"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.41.0-nightly.20260423.gaa05b4583"
   },
   "scripts": {
     "start": "cross-env NODE_ENV=development node scripts/start.js",

packages/a2a-server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-a2a-server",
-  "version": "0.40.0-nightly.20260414.g5b1f7375a",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
   "description": "Gemini CLI A2A Server",
   "repository": {
     "type": "git",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli",
-  "version": "0.40.0-nightly.20260414.g5b1f7375a",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
   "description": "Gemini CLI",
   "license": "Apache-2.0",
   "repository": {
@@ -27,7 +27,7 @@
     "dist"
   ],
   "config": {
-    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.40.0-nightly.20260414.g5b1f7375a"
+    "sandboxImageUri": "us-docker.pkg.dev/gemini-code-dev/gemini-cli/sandbox:0.41.0-nightly.20260423.gaa05b4583"
   },
   "dependencies": {
     "@agentclientprotocol/sdk": "^0.16.1",

packages/cli/src/config/config.ts

@@ -24,6 +24,7 @@ import {
   FileDiscoveryService,
   resolveTelemetrySettings,
   FatalConfigError,
+  getErrorMessage,
   getPty,
   debugLogger,
   loadServerHierarchicalMemory,
@@ -60,6 +61,7 @@ import {
 
 import { loadSandboxConfig } from './sandboxConfig.js';
 import { resolvePath } from '../utils/resolvePath.js';
+import { isRecord } from '../utils/settingsUtils.js';
 import { RESUME_LATEST } from '../utils/sessionUtils.js';
 
 import { isWorkspaceTrusted } from './trustedFolders.js';
@@ -106,6 +108,7 @@ export interface CliArgs {
   startupMessages?: string[];
   rawOutput: boolean | undefined;
   acceptRawOutputRisk: boolean | undefined;
+  skipTrust: boolean | undefined;
   isCommand: boolean | undefined;
 }
 
@@ -291,6 +294,11 @@ export async function parseArguments(
           description:
             'Execute the provided prompt and continue in interactive mode',
         })
+        .option('skip-trust', {
+          type: 'boolean',
+          description: 'Trust the current workspace for this session.',
+          default: false,
+        })
         .option('worktree', {
           alias: 'w',
           type: 'string',
@@ -459,9 +467,16 @@ export async function parseArguments(
   yargsInstance.wrap(yargsInstance.terminalWidth());
   let result;
   try {
-    result = await yargsInstance.parse();
+    const parsed = await yargsInstance.parse();
+    if (!isRecord(parsed)) {
+      throw new Error('Failed to parse arguments');
+    }
+    result = parsed;
+    if (result['skip-trust']) {
+      process.env['GEMINI_CLI_TRUST_WORKSPACE'] = 'true';
+    }
   } catch (e) {
-    const msg = e instanceof Error ? e.message : String(e);
+    const msg = getErrorMessage(e);
     debugLogger.error(msg);
     yargsInstance.showHelp();
     await runExitCleanup();
@@ -475,11 +490,13 @@ export async function parseArguments(
   }
 
   // Normalize query args: handle both quoted "@path file" and unquoted @path file
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-  const queryArg = (result as { query?: string | string[] | undefined }).query;
-  const q: string | undefined = Array.isArray(queryArg)
-    ? queryArg.join(' ')
-    : queryArg;
+  const queryArg = result['query'];
+  let q: string | undefined;
+  if (Array.isArray(queryArg)) {
+    q = queryArg.join(' ');
+  } else if (typeof queryArg === 'string') {
+    q = queryArg;
+  }
 
   // -p/--prompt forces non-interactive mode; positional args default to interactive in TTY
   if (q && !result['prompt']) {
@@ -494,8 +511,8 @@ export async function parseArguments(
   }
 
   // Keep CliArgs.query as a string for downstream typing
-  (result as Record<string, unknown>)['query'] = q || undefined;
-  (result as Record<string, unknown>)['startupMessages'] = startupMessages;
+  result['query'] = q || undefined;
+  result['startupMessages'] = startupMessages;
 
   // The import format is now only controlled by settings.memoryImportFormat
   // We no longer accept it as a CLI argument
@@ -547,7 +564,7 @@ export async function loadCliConfig(
       ? false
       : (settings.security?.folderTrust?.enabled ?? false);
   const trustedFolder =
-    isWorkspaceTrusted(settings, cwd, undefined, {
+    isWorkspaceTrusted(settings, cwd, {
       prompt: argv.prompt,
       query: argv.query,
     })?.isTrusted ?? false;
@@ -593,7 +610,7 @@ export async function loadCliConfig(
         return resolveToRealPath(trimmedPath) !== realCwd;
       } catch (e) {
         debugLogger.debug(
-          `[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${e instanceof Error ? e.message : String(e)})`,
+          `[IDE] Skipping inaccessible workspace folder: ${trimmedPath} (${getErrorMessage(e)})`,
         );
         return false;
       }
@@ -617,7 +634,7 @@ export async function loadCliConfig(
     .getExtensions()
     .find((ext) => ext.isActive && ext.plan?.directory)?.plan;
 
-  const experimentalJitContext = settings.experimental.jitContext;
+  const experimentalJitContext = settings.experimental.jitContext ?? true;
 
   let extensionRegistryURI =
     process.env['GEMINI_CLI_EXTENSION_REGISTRY_URI'] ??
@@ -991,8 +1008,8 @@ export async function loadCliConfig(
     enableEventDrivenScheduler: true,
     skillsSupport: settings.skills?.enabled ?? true,
     disabledSkills: settings.skills?.disabled,
-    experimentalJitContext: settings.experimental?.jitContext,
-    experimentalMemoryManager: settings.experimental?.memoryManager,
+    experimentalJitContext,
+    experimentalMemoryV2: settings.experimental?.memoryV2,
     experimentalAutoMemory: settings.experimental?.autoMemory,
     contextManagement,
     modelSteering: settings.experimental?.modelSteering,
@@ -1099,7 +1116,7 @@ async function resolveWorktreeSettings(
     worktreeBaseSha = stdout.trim();
   } catch (e: unknown) {
     debugLogger.debug(
-      `Failed to resolve worktree base SHA at ${worktreePath}: ${e instanceof Error ? e.message : String(e)}`,
+      `Failed to resolve worktree base SHA at ${worktreePath}: ${getErrorMessage(e)}`,
     );
   }
 

packages/cli/src/config/extension.test.ts

@@ -26,6 +26,7 @@ import {
   loadAgentsFromDirectory,
   loadSkillsFromDir,
   getRealPath,
+  normalizePath,
 } from '@google/gemini-cli-core';
 import {
   loadSettings,
@@ -1420,6 +1421,7 @@ name = "yolo-checker"
         '.gemini',
         'trustedFolders.json',
       );
+      vi.stubEnv('GEMINI_CLI_TRUSTED_FOLDERS_PATH', trustedFoldersPath);
       vi.mocked(isWorkspaceTrusted).mockReturnValue({
         isTrusted: false,
         source: undefined,
@@ -1438,7 +1440,9 @@ name = "yolo-checker"
       const trustedFolders = JSON.parse(
         fs.readFileSync(trustedFoldersPath, 'utf-8'),
       );
-      expect(trustedFolders[tempWorkspaceDir]).toBe('TRUST_FOLDER');
+      expect(trustedFolders[normalizePath(tempWorkspaceDir)]).toBe(
+        'TRUST_FOLDER',
+      );
     });
 
     describe.each([true, false])(

packages/cli/src/config/settings.test.ts

@@ -1912,6 +1912,9 @@ describe('Settings Loading and Merging', () => {
       const geminiEnvPath = path.resolve(
         path.join(MOCK_WORKSPACE_DIR, GEMINI_DIR, '.env'),
       );
+      const workspaceEnvPath = path.resolve(
+        path.join(MOCK_WORKSPACE_DIR, '.env'),
+      );
 
       vi.spyOn(trustedFolders, 'isWorkspaceTrusted').mockReturnValue({
         isTrusted: isWorkspaceTrustedValue,
@@ -1919,9 +1922,11 @@ describe('Settings Loading and Merging', () => {
       });
       (mockFsExistsSync as Mock).mockImplementation((p: fs.PathLike) => {
         const normalizedP = path.resolve(p.toString());
-        return [path.resolve(USER_SETTINGS_PATH), geminiEnvPath].includes(
-          normalizedP,
-        );
+        return [
+          path.resolve(USER_SETTINGS_PATH),
+          geminiEnvPath,
+          workspaceEnvPath,
+        ].includes(normalizedP);
       });
       const userSettingsContent: Settings = {
         ui: {
@@ -1941,7 +1946,7 @@ describe('Settings Loading and Merging', () => {
           const normalizedP = path.resolve(p.toString());
           if (normalizedP === path.resolve(USER_SETTINGS_PATH))
             return JSON.stringify(userSettingsContent);
-          if (normalizedP === geminiEnvPath)
+          if (normalizedP === geminiEnvPath || normalizedP === workspaceEnvPath)
             return 'TESTTEST=1234\nGEMINI_API_KEY=test-key';
           return '{}';
         },
@@ -1970,7 +1975,7 @@ describe('Settings Loading and Merging', () => {
       expect(process.env['TESTTEST']).not.toEqual('1234');
     });
 
-    it('does load env files from untrusted spaces when NOT sandboxed', () => {
+    it('does NOT load non-whitelisted env files from untrusted spaces even when NOT sandboxed', () => {
       setup({ isFolderTrustEnabled: true, isWorkspaceTrustedValue: false });
       const settings = {
         security: { folderTrust: { enabled: true } },
@@ -1978,7 +1983,8 @@ describe('Settings Loading and Merging', () => {
       } as Settings;
       loadEnvironment(settings, MOCK_WORKSPACE_DIR, isWorkspaceTrusted);
 
-      expect(process.env['TESTTEST']).toEqual('1234');
+      expect(process.env['TESTTEST']).not.toEqual('1234');
+      expect(process.env['GEMINI_API_KEY']).toEqual('test-key');
     });
 
     it('does not load env files when trust is undefined and sandboxed', () => {

packages/cli/src/config/settings.ts

@@ -499,13 +499,15 @@ export class LoadedSettings {
   }
 }
 
-function findEnvFile(startDir: string): string | null {
+function findEnvFile(startDir: string, isTrusted: boolean): string | null {
   let currentDir = path.resolve(startDir);
   while (true) {
     // prefer gemini-specific .env under GEMINI_DIR
-    const geminiEnvPath = path.join(currentDir, GEMINI_DIR, '.env');
-    if (fs.existsSync(geminiEnvPath)) {
-      return geminiEnvPath;
+    if (isTrusted) {
+      const geminiEnvPath = path.join(currentDir, GEMINI_DIR, '.env');
+      if (fs.existsSync(geminiEnvPath)) {
+        return geminiEnvPath;
+      }
     }
     const envPath = path.join(currentDir, '.env');
     if (fs.existsSync(envPath)) {
@@ -514,9 +516,11 @@ function findEnvFile(startDir: string): string | null {
     const parentDir = path.dirname(currentDir);
     if (parentDir === currentDir || !parentDir) {
       // check .env under home as fallback, again preferring gemini-specific .env
-      const homeGeminiEnvPath = path.join(homedir(), GEMINI_DIR, '.env');
-      if (fs.existsSync(homeGeminiEnvPath)) {
-        return homeGeminiEnvPath;
+      if (isTrusted) {
+        const homeGeminiEnvPath = path.join(homedir(), GEMINI_DIR, '.env');
+        if (fs.existsSync(homeGeminiEnvPath)) {
+          return homeGeminiEnvPath;
+        }
       }
       const homeEnvPath = path.join(homedir(), '.env');
       if (fs.existsSync(homeEnvPath)) {
@@ -559,10 +563,10 @@ export function loadEnvironment(
   workspaceDir: string,
   isWorkspaceTrustedFn = isWorkspaceTrusted,
 ): void {
-  const envFilePath = findEnvFile(workspaceDir);
   const trustResult = isWorkspaceTrustedFn(settings, workspaceDir);
-
   const isTrusted = trustResult.isTrusted ?? false;
+  const envFilePath = findEnvFile(workspaceDir, isTrusted);
+
   // Check settings OR check process.argv directly since this might be called
   // before arguments are fully parsed. This is a best-effort sniffing approach
   // that happens early in the CLI lifecycle. It is designed to detect the
@@ -597,8 +601,8 @@ export function loadEnvironment(
       for (const key in parsedEnv) {
         if (Object.hasOwn(parsedEnv, key)) {
           let value = parsedEnv[key];
-          // If the workspace is untrusted but we are sandboxed, only allow whitelisted variables.
-          if (!isTrusted && isSandboxed) {
+          // If the workspace is untrusted, only allow whitelisted variables.
+          if (!isTrusted) {
             if (!AUTH_ENV_VAR_WHITELIST.includes(key)) {
               continue;
             }

packages/cli/src/config/settingsSchema.ts

@@ -2140,8 +2140,9 @@ const SETTINGS_SCHEMA = {
         label: 'JIT Context Loading',
         category: 'Experimental',
         requiresRestart: true,
-        default: false,
-        description: 'Enable Just-In-Time (JIT) context loading.',
+        default: true,
+        description:
+          'Enable Just-In-Time (JIT) context loading. Defaults to true; set to false to opt out and load all GEMINI.md files into the system instruction up-front.',
         showInDialog: false,
       },
       useOSC52Paste: {
@@ -2274,14 +2275,14 @@ const SETTINGS_SCHEMA = {
           },
         },
       },
-      memoryManager: {
+      memoryV2: {
         type: 'boolean',
-        label: 'Memory Manager Agent',
+        label: 'Memory v2',
         category: 'Experimental',
         requiresRestart: true,
-        default: false,
+        default: true,
         description:
-          'Replace the built-in save_memory tool with a memory manager subagent that supports adding, removing, de-duplicating, and organizing memories.',
+          'Disable the built-in save_memory tool and let the main agent persist project context by editing markdown files directly with edit/write_file. Route facts across four tiers: team-shared conventions go to project GEMINI.md files, project-specific personal notes go to the per-project private memory folder (MEMORY.md as index + sibling .md files for detail), and cross-project personal preferences go to the global ~/.gemini/GEMINI.md (the only file under ~/.gemini/ that the agent can edit — settings, credentials, etc. remain off-limits). Set to false to fall back to the legacy save_memory tool.',
         showInDialog: true,
       },
       autoMemory: {

packages/cli/src/config/trustedFolders.test.ts

@@ -11,7 +11,7 @@ import * as os from 'node:os';
 import {
   FatalConfigError,
   ideContextStore,
-  coreEvents,
+  normalizePath,
 } from '@google/gemini-cli-core';
 import {
   loadTrustedFolders,
@@ -32,9 +32,14 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     ...actual,
     homedir: () => '/mock/home/user',
     isHeadlessMode: vi.fn(() => false),
-    coreEvents: {
-      emitFeedback: vi.fn(),
-    },
+    coreEvents: Object.assign(
+      Object.create(Object.getPrototypeOf(actual.coreEvents)),
+      actual.coreEvents,
+      {
+        emitFeedback: vi.fn(),
+      },
+    ),
+    FatalConfigError: actual.FatalConfigError,
   };
 });
 
@@ -53,6 +58,7 @@ describe('Trusted Folders', () => {
     // Reset the internal state
     resetTrustedFoldersForTesting();
     vi.clearAllMocks();
+    delete process.env['GEMINI_CLI_TRUST_WORKSPACE'];
   });
 
   afterEach(() => {
@@ -70,8 +76,14 @@ describe('Trusted Folders', () => {
 
       // Start two concurrent calls
       // These will race to acquire the lock on the real file system
-      const p1 = loadedFolders.setValue('/path1', TrustLevel.TRUST_FOLDER);
-      const p2 = loadedFolders.setValue('/path2', TrustLevel.TRUST_FOLDER);
+      const p1 = loadedFolders.setValue(
+        path.resolve('/path1'),
+        TrustLevel.TRUST_FOLDER,
+      );
+      const p2 = loadedFolders.setValue(
+        path.resolve('/path2'),
+        TrustLevel.TRUST_FOLDER,
+      );
 
       await Promise.all([p1, p2]);
 
@@ -80,8 +92,8 @@ describe('Trusted Folders', () => {
       const config = JSON.parse(content);
 
       expect(config).toEqual({
-        '/path1': TrustLevel.TRUST_FOLDER,
-        '/path2': TrustLevel.TRUST_FOLDER,
+        [normalizePath('/path1')]: TrustLevel.TRUST_FOLDER,
+        [normalizePath('/path2')]: TrustLevel.TRUST_FOLDER,
       });
     });
   });
@@ -95,13 +107,16 @@ describe('Trusted Folders', () => {
 
     it('should load rules from the configuration file', () => {
       const config = {
-        '/user/folder': TrustLevel.TRUST_FOLDER,
+        [normalizePath('/user/folder')]: TrustLevel.TRUST_FOLDER,
       };
       fs.writeFileSync(trustedFoldersPath, JSON.stringify(config), 'utf-8');
 
       const { rules, errors } = loadTrustedFolders();
       expect(rules).toEqual([
-        { path: '/user/folder', trustLevel: TrustLevel.TRUST_FOLDER },
+        {
+          path: normalizePath('/user/folder'),
+          trustLevel: TrustLevel.TRUST_FOLDER,
+        },
       ]);
       expect(errors).toEqual([]);
     });
@@ -143,14 +158,14 @@ describe('Trusted Folders', () => {
       const content = `
         {
           // This is a comment
-          "/path": "TRUST_FOLDER"
+          "${normalizePath('/path').replaceAll('\\', '\\\\')}": "TRUST_FOLDER"
         }
       `;
       fs.writeFileSync(trustedFoldersPath, content, 'utf-8');
 
       const { rules, errors } = loadTrustedFolders();
       expect(rules).toEqual([
-        { path: '/path', trustLevel: TrustLevel.TRUST_FOLDER },
+        { path: normalizePath('/path'), trustLevel: TrustLevel.TRUST_FOLDER },
       ]);
       expect(errors).toEqual([]);
     });
@@ -216,15 +231,18 @@ describe('Trusted Folders', () => {
       fs.writeFileSync(trustedFoldersPath, '{}', 'utf-8');
       const loadedFolders = loadTrustedFolders();
 
-      await loadedFolders.setValue('/new/path', TrustLevel.TRUST_FOLDER);
+      await loadedFolders.setValue(
+        normalizePath('/new/path'),
+        TrustLevel.TRUST_FOLDER,
+      );
 
-      expect(loadedFolders.user.config['/new/path']).toBe(
+      expect(loadedFolders.user.config[normalizePath('/new/path')]).toBe(
         TrustLevel.TRUST_FOLDER,
       );
 
       const content = fs.readFileSync(trustedFoldersPath, 'utf-8');
       const config = JSON.parse(content);
-      expect(config['/new/path']).toBe(TrustLevel.TRUST_FOLDER);
+      expect(config[normalizePath('/new/path')]).toBe(TrustLevel.TRUST_FOLDER);
     });
 
     it('should throw FatalConfigError if there were load errors', async () => {
@@ -237,28 +255,6 @@ describe('Trusted Folders', () => {
         loadedFolders.setValue('/some/path', TrustLevel.TRUST_FOLDER),
       ).rejects.toThrow(FatalConfigError);
     });
-
-    it('should report corrupted config via coreEvents.emitFeedback and still succeed', async () => {
-      // Initialize with valid JSON
-      fs.writeFileSync(trustedFoldersPath, '{}', 'utf-8');
-      const loadedFolders = loadTrustedFolders();
-
-      // Corrupt the file after initial load
-      fs.writeFileSync(trustedFoldersPath, 'invalid json', 'utf-8');
-
-      await loadedFolders.setValue('/new/path', TrustLevel.TRUST_FOLDER);
-
-      expect(coreEvents.emitFeedback).toHaveBeenCalledWith(
-        'error',
-        expect.stringContaining('may be corrupted'),
-        expect.any(Error),
-      );
-
-      // Should have overwritten the corrupted file with new valid config
-      const content = fs.readFileSync(trustedFoldersPath, 'utf-8');
-      const config = JSON.parse(content);
-      expect(config).toEqual({ '/new/path': TrustLevel.TRUST_FOLDER });
-    });
   });
 
   describe('isWorkspaceTrusted Integration', () => {
@@ -427,16 +423,28 @@ describe('Trusted Folders', () => {
       },
     };
 
-    it('should return true when isHeadlessMode is true, ignoring config', async () => {
+    it('should NOT return true when isHeadlessMode is true, ignoring config', async () => {
       const geminiCore = await import('@google/gemini-cli-core');
       vi.spyOn(geminiCore, 'isHeadlessMode').mockReturnValue(true);
 
       expect(isWorkspaceTrusted(mockSettings)).toEqual({
-        isTrusted: true,
+        isTrusted: undefined,
         source: undefined,
       });
     });
 
+    it('should return true when GEMINI_CLI_TRUST_WORKSPACE is true', async () => {
+      process.env['GEMINI_CLI_TRUST_WORKSPACE'] = 'true';
+      try {
+        expect(isWorkspaceTrusted(mockSettings)).toEqual({
+          isTrusted: true,
+          source: 'env',
+        });
+      } finally {
+        delete process.env['GEMINI_CLI_TRUST_WORKSPACE'];
+      }
+    });
+
     it('should fall back to config when isHeadlessMode is false', async () => {
       const geminiCore = await import('@google/gemini-cli-core');
       vi.spyOn(geminiCore, 'isHeadlessMode').mockReturnValue(false);
@@ -449,12 +457,12 @@ describe('Trusted Folders', () => {
       );
     });
 
-    it('should return true for isPathTrusted when isHeadlessMode is true', async () => {
+    it('should return undefined for isPathTrusted when isHeadlessMode is true', async () => {
       const geminiCore = await import('@google/gemini-cli-core');
       vi.spyOn(geminiCore, 'isHeadlessMode').mockReturnValue(true);
 
       const folders = loadTrustedFolders();
-      expect(folders.isPathTrusted('/any-untrusted-path')).toBe(true);
+      expect(folders.isPathTrusted('/any-untrusted-path')).toBe(undefined);
     });
   });
 

packages/cli/src/config/trustedFolders.ts

@@ -4,330 +4,29 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 
-import * as fs from 'node:fs';
-import * as path from 'node:path';
-import * as crypto from 'node:crypto';
-import { lock } from 'proper-lockfile';
 import {
-  FatalConfigError,
-  getErrorMessage,
-  isWithinRoot,
-  ideContextStore,
-  GEMINI_DIR,
-  homedir,
-  isHeadlessMode,
-  coreEvents,
   type HeadlessModeOptions,
+  checkPathTrust,
+  isHeadlessMode,
+  loadTrustedFolders as loadCoreTrustedFolders,
+  type LoadedTrustedFolders,
 } from '@google/gemini-cli-core';
 import type { Settings } from './settings.js';
-import stripJsonComments from 'strip-json-comments';
 
-const { promises: fsPromises } = fs;
+export {
+  TrustLevel,
+  isTrustLevel,
+  resetTrustedFoldersForTesting,
+  saveTrustedFolders,
+} from '@google/gemini-cli-core';
 
-export const TRUSTED_FOLDERS_FILENAME = 'trustedFolders.json';
-
-export function getUserSettingsDir(): string {
-  return path.join(homedir(), GEMINI_DIR);
-}
-
-export function getTrustedFoldersPath(): string {
-  if (process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH']) {
-    return process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'];
-  }
-  return path.join(getUserSettingsDir(), TRUSTED_FOLDERS_FILENAME);
-}
-
-export enum TrustLevel {
-  TRUST_FOLDER = 'TRUST_FOLDER',
-  TRUST_PARENT = 'TRUST_PARENT',
-  DO_NOT_TRUST = 'DO_NOT_TRUST',
-}
-
-export function isTrustLevel(
-  value: string | number | boolean | object | null | undefined,
-): value is TrustLevel {
-  return (
-    typeof value === 'string' &&
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-    Object.values(TrustLevel).includes(value as TrustLevel)
-  );
-}
-
-export interface TrustRule {
-  path: string;
-  trustLevel: TrustLevel;
-}
-
-export interface TrustedFoldersError {
-  message: string;
-  path: string;
-}
-
-export interface TrustedFoldersFile {
-  config: Record<string, TrustLevel>;
-  path: string;
-}
-
-export interface TrustResult {
-  isTrusted: boolean | undefined;
-  source: 'ide' | 'file' | undefined;
-}
-
-const realPathCache = new Map<string, string>();
-
-/**
- * Parses the trusted folders JSON content, stripping comments.
- */
-function parseTrustedFoldersJson(content: string): unknown {
-  return JSON.parse(stripJsonComments(content));
-}
-
-/**
- * FOR TESTING PURPOSES ONLY.
- * Clears the real path cache.
- */
-export function clearRealPathCacheForTesting(): void {
-  realPathCache.clear();
-}
-
-function getRealPath(location: string): string {
-  let realPath = realPathCache.get(location);
-  if (realPath !== undefined) {
-    return realPath;
-  }
-
-  try {
-    realPath = fs.existsSync(location) ? fs.realpathSync(location) : location;
-  } catch {
-    realPath = location;
-  }
-
-  realPathCache.set(location, realPath);
-  return realPath;
-}
-
-export class LoadedTrustedFolders {
-  constructor(
-    readonly user: TrustedFoldersFile,
-    readonly errors: TrustedFoldersError[],
-  ) {}
-
-  get rules(): TrustRule[] {
-    return Object.entries(this.user.config).map(([path, trustLevel]) => ({
-      path,
-      trustLevel,
-    }));
-  }
-
-  /**
-   * Returns true or false if the path should be "trusted". This function
-   * should only be invoked when the folder trust setting is active.
-   *
-   * @param location path
-   * @returns
-   */
-  isPathTrusted(
-    location: string,
-    config?: Record<string, TrustLevel>,
-    headlessOptions?: HeadlessModeOptions,
-  ): boolean | undefined {
-    if (isHeadlessMode(headlessOptions)) {
-      return true;
-    }
-    const configToUse = config ?? this.user.config;
-
-    // Resolve location to its realpath for canonical comparison
-    const realLocation = getRealPath(location);
-
-    let longestMatchLen = -1;
-    let longestMatchTrust: TrustLevel | undefined = undefined;
-
-    for (const [rulePath, trustLevel] of Object.entries(configToUse)) {
-      const effectivePath =
-        trustLevel === TrustLevel.TRUST_PARENT
-          ? path.dirname(rulePath)
-          : rulePath;
-
-      // Resolve effectivePath to its realpath for canonical comparison
-      const realEffectivePath = getRealPath(effectivePath);
-
-      if (isWithinRoot(realLocation, realEffectivePath)) {
-        if (rulePath.length > longestMatchLen) {
-          longestMatchLen = rulePath.length;
-          longestMatchTrust = trustLevel;
-        }
-      }
-    }
-
-    if (longestMatchTrust === TrustLevel.DO_NOT_TRUST) return false;
-    if (
-      longestMatchTrust === TrustLevel.TRUST_FOLDER ||
-      longestMatchTrust === TrustLevel.TRUST_PARENT
-    )
-      return true;
-
-    return undefined;
-  }
-
-  async setValue(folderPath: string, trustLevel: TrustLevel): Promise<void> {
-    if (this.errors.length > 0) {
-      const errorMessages = this.errors.map(
-        (error) => `Error in ${error.path}: ${error.message}`,
-      );
-      throw new FatalConfigError(
-        `Cannot update trusted folders because the configuration file is invalid:\n${errorMessages.join('\n')}\nPlease fix the file manually before trying to update it.`,
-      );
-    }
-
-    const dirPath = path.dirname(this.user.path);
-    if (!fs.existsSync(dirPath)) {
-      await fsPromises.mkdir(dirPath, { recursive: true });
-    }
-
-    // lockfile requires the file to exist
-    if (!fs.existsSync(this.user.path)) {
-      await fsPromises.writeFile(this.user.path, JSON.stringify({}, null, 2), {
-        mode: 0o600,
-      });
-    }
-
-    const release = await lock(this.user.path, {
-      retries: {
-        retries: 10,
-        minTimeout: 100,
-      },
-    });
-
-    try {
-      // Re-read the file to handle concurrent updates
-      const content = await fsPromises.readFile(this.user.path, 'utf-8');
-      let config: Record<string, TrustLevel>;
-      try {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-        config = parseTrustedFoldersJson(content) as Record<string, TrustLevel>;
-      } catch (error) {
-        coreEvents.emitFeedback(
-          'error',
-          `Failed to parse trusted folders file at ${this.user.path}. The file may be corrupted.`,
-          error,
-        );
-        config = {};
-      }
-
-      const originalTrustLevel = config[folderPath];
-      config[folderPath] = trustLevel;
-      this.user.config[folderPath] = trustLevel;
-
-      try {
-        saveTrustedFolders({ ...this.user, config });
-      } catch (e) {
-        // Revert the in-memory change if the save failed.
-        if (originalTrustLevel === undefined) {
-          delete this.user.config[folderPath];
-        } else {
-          this.user.config[folderPath] = originalTrustLevel;
-        }
-        throw e;
-      }
-    } finally {
-      await release();
-    }
-  }
-}
-
-let loadedTrustedFolders: LoadedTrustedFolders | undefined;
-
-/**
- * FOR TESTING PURPOSES ONLY.
- * Resets the in-memory cache of the trusted folders configuration.
- */
-export function resetTrustedFoldersForTesting(): void {
-  loadedTrustedFolders = undefined;
-  clearRealPathCacheForTesting();
-}
-
-export function loadTrustedFolders(): LoadedTrustedFolders {
-  if (loadedTrustedFolders) {
-    return loadedTrustedFolders;
-  }
-
-  const errors: TrustedFoldersError[] = [];
-  const userConfig: Record<string, TrustLevel> = {};
-
-  const userPath = getTrustedFoldersPath();
-  try {
-    if (fs.existsSync(userPath)) {
-      const content = fs.readFileSync(userPath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-type-assertion
-      const parsed = parseTrustedFoldersJson(content) as Record<string, string>;
-
-      if (
-        typeof parsed !== 'object' ||
-        parsed === null ||
-        Array.isArray(parsed)
-      ) {
-        errors.push({
-          message: 'Trusted folders file is not a valid JSON object.',
-          path: userPath,
-        });
-      } else {
-        for (const [path, trustLevel] of Object.entries(parsed)) {
-          if (isTrustLevel(trustLevel)) {
-            userConfig[path] = trustLevel;
-          } else {
-            const possibleValues = Object.values(TrustLevel).join(', ');
-            errors.push({
-              message: `Invalid trust level "${trustLevel}" for path "${path}". Possible values are: ${possibleValues}.`,
-              path: userPath,
-            });
-          }
-        }
-      }
-    }
-  } catch (error) {
-    errors.push({
-      message: getErrorMessage(error),
-      path: userPath,
-    });
-  }
-
-  loadedTrustedFolders = new LoadedTrustedFolders(
-    { path: userPath, config: userConfig },
-    errors,
-  );
-  return loadedTrustedFolders;
-}
-
-export function saveTrustedFolders(
-  trustedFoldersFile: TrustedFoldersFile,
-): void {
-  // Ensure the directory exists
-  const dirPath = path.dirname(trustedFoldersFile.path);
-  if (!fs.existsSync(dirPath)) {
-    fs.mkdirSync(dirPath, { recursive: true });
-  }
-
-  const content = JSON.stringify(trustedFoldersFile.config, null, 2);
-  const tempPath = `${trustedFoldersFile.path}.tmp.${crypto.randomUUID()}`;
-
-  try {
-    fs.writeFileSync(tempPath, content, {
-      encoding: 'utf-8',
-      mode: 0o600,
-    });
-    fs.renameSync(tempPath, trustedFoldersFile.path);
-  } catch (error) {
-    // Clean up temp file if it was created but rename failed
-    if (fs.existsSync(tempPath)) {
-      try {
-        fs.unlinkSync(tempPath);
-      } catch {
-        // Ignore cleanup errors
-      }
-    }
-    throw error;
-  }
-}
+export type {
+  TrustRule,
+  TrustedFoldersError,
+  TrustedFoldersFile,
+  TrustResult,
+  LoadedTrustedFolders,
+} from '@google/gemini-cli-core';
 
 /** Is folder trust feature enabled per the current applied settings */
 export function isFolderTrustEnabled(settings: Settings): boolean {
@@ -335,57 +34,24 @@ export function isFolderTrustEnabled(settings: Settings): boolean {
   return folderTrustSetting;
 }
 
-function getWorkspaceTrustFromLocalConfig(
-  workspaceDir: string,
-  trustConfig?: Record<string, TrustLevel>,
-  headlessOptions?: HeadlessModeOptions,
-): TrustResult {
-  const folders = loadTrustedFolders();
-  const configToUse = trustConfig ?? folders.user.config;
-
-  if (folders.errors.length > 0) {
-    const errorMessages = folders.errors.map(
-      (error) => `Error in ${error.path}: ${error.message}`,
-    );
-    throw new FatalConfigError(
-      `${errorMessages.join('\n')}\nPlease fix the configuration file and try again.`,
-    );
-  }
-
-  const isTrusted = folders.isPathTrusted(
-    workspaceDir,
-    configToUse,
-    headlessOptions,
-  );
-  return {
-    isTrusted,
-    source: isTrusted !== undefined ? 'file' : undefined,
-  };
+export function loadTrustedFolders(): LoadedTrustedFolders {
+  return loadCoreTrustedFolders();
 }
 
+/**
+ * Returns true or false if the workspace is considered "trusted".
+ */
 export function isWorkspaceTrusted(
   settings: Settings,
   workspaceDir: string = process.cwd(),
-  trustConfig?: Record<string, TrustLevel>,
   headlessOptions?: HeadlessModeOptions,
-): TrustResult {
-  if (isHeadlessMode(headlessOptions)) {
-    return { isTrusted: true, source: undefined };
-  }
-
-  if (!isFolderTrustEnabled(settings)) {
-    return { isTrusted: true, source: undefined };
-  }
-
-  const ideTrust = ideContextStore.get()?.workspaceState?.isTrusted;
-  if (ideTrust !== undefined) {
-    return { isTrusted: ideTrust, source: 'ide' };
-  }
-
-  // Fall back to the local user configuration
-  return getWorkspaceTrustFromLocalConfig(
-    workspaceDir,
-    trustConfig,
-    headlessOptions,
-  );
+): {
+  isTrusted: boolean | undefined;
+  source: 'ide' | 'file' | 'env' | undefined;
+} {
+  return checkPathTrust({
+    path: workspaceDir,
+    isFolderTrustEnabled: isFolderTrustEnabled(settings),
+    isHeadless: isHeadlessMode(headlessOptions),
+  });
 }

packages/cli/src/gemini.test.tsx

@@ -280,6 +280,7 @@ describe('gemini.tsx main function', () => {
     vi.stubEnv('GEMINI_SANDBOX', '');
     vi.stubEnv('SANDBOX', '');
     vi.stubEnv('SHPOOL_SESSION_NAME', '');
+    vi.stubEnv('GEMINI_CLI_TRUST_WORKSPACE', 'true');
 
     initialUnhandledRejectionListeners =
       process.listeners('unhandledRejection');
@@ -555,6 +556,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       rawOutput: undefined,
       acceptRawOutputRisk: undefined,
       isCommand: undefined,
+      skipTrust: undefined,
     });
 
     await act(async () => {
@@ -613,6 +615,7 @@ describe('gemini.tsx main function kitty protocol', () => {
       rawOutput: undefined,
       acceptRawOutputRisk: undefined,
       isCommand: undefined,
+      skipTrust: undefined,
     });
 
     await act(async () => {

packages/cli/src/gemini.tsx

@@ -532,7 +532,7 @@ export async function main() {
       const { setupInitialActivityLogger } = await import(
         './utils/devtoolsService.js'
       );
-      await setupInitialActivityLogger(config);
+      setupInitialActivityLogger(config);
     }
 
     // Register config for telemetry shutdown
@@ -661,6 +661,12 @@ export async function main() {
 
     cliStartupHandle?.end();
 
+    if (!config.isInteractive()) {
+      for (const warning of startupWarnings) {
+        writeToStderr(warning.message + '\n');
+      }
+    }
+
     // Render UI, passing necessary config values. Check that there is no command line question.
     if (config.isInteractive()) {
       // Earlier initialization phases (like TerminalCapabilityManager resolving

packages/cli/src/gemini_cleanup.test.tsx

@@ -181,6 +181,7 @@ describe('gemini.tsx main function cleanup', () => {
   beforeEach(() => {
     vi.clearAllMocks();
     process.env['GEMINI_CLI_NO_RELAUNCH'] = 'true';
+    vi.stubEnv('GEMINI_CLI_TRUST_WORKSPACE', 'true');
   });
 
   afterEach(() => {

packages/cli/src/nonInteractiveCli.ts

@@ -80,7 +80,7 @@ export async function runNonInteractive(
       const { setupInitialActivityLogger } = await import(
         './utils/devtoolsService.js'
       );
-      await setupInitialActivityLogger(config);
+      setupInitialActivityLogger(config);
     }
 
     const { stdout: workingStdout } = createWorkingStdio();

packages/cli/src/nonInteractiveCliAgentSession.ts

@@ -80,7 +80,7 @@ export async function runNonInteractive({
       const { setupInitialActivityLogger } = await import(
         './utils/devtoolsService.js'
       );
-      await setupInitialActivityLogger(config);
+      setupInitialActivityLogger(config);
     }
 
     const { stdout: workingStdout } = createWorkingStdio();

packages/cli/src/test-utils/mockConfig.ts

@@ -38,7 +38,7 @@ export const createMockConfig = (overrides: Partial<Config> = {}): Config =>
       fireSessionEndEvent: vi.fn().mockResolvedValue(undefined),
       fireSessionStartEvent: vi.fn().mockResolvedValue(undefined),
     })),
-    isMemoryManagerEnabled: vi.fn(() => false),
+    isMemoryV2Enabled: vi.fn(() => false),
     isAutoMemoryEnabled: vi.fn(() => false),
     getListExtensions: vi.fn(() => false),
     getExtensions: vi.fn(() => []),

packages/cli/src/ui/__snapshots__/ToolConfirmationFullFrame-Full-Terminal-Tool-Confirmation-Snapshot-renders-tool-confirmation-box-in-the-frame-of-the-entire-terminal.snap.svg

@@ -10,8 +10,7 @@
     <rect x="27" y="0" width="324" height="17" fill="#141414" />
     <text x="27" y="2" fill="#ffffff" textLength="324" lengthAdjust="spacingAndGlyphs">Can you edit InputPrompt.tsx for me?</text>
     <rect x="351" y="0" width="549" height="17" fill="#141414" />
-    <rect x="0" y="17" width="900" height="17" fill="#141414" />
-    <text x="0" y="19" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
+    <text x="0" y="19" fill="#141414" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
     <text x="0" y="53" fill="#333333" textLength="891" lengthAdjust="spacingAndGlyphs">╭─────────────────────────────────────────────────────────────────────────────────────────────────╮</text>
     <text x="0" y="70" fill="#333333" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="18" y="70" fill="#ffffaf" textLength="63" lengthAdjust="spacingAndGlyphs" font-weight="bold">? Edit </text>

packages/cli/src/ui/__snapshots__/ToolConfirmationFullFrame.test.tsx.snap

@@ -2,7 +2,7 @@
 
 exports[`Full Terminal Tool Confirmation Snapshot > renders tool confirmation box in the frame of the entire terminal 1`] = `
 " > Can you edit InputPrompt.tsx for me?                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 
 ╭─────────────────────────────────────────────────────────────────────────────────────────────────╮
 │ ? Edit packages/.../InputPrompt.tsx:   return kittyProtocolSupporte... =>   return kittyProto…  │

packages/cli/src/ui/commands/clearCommand.ts

@@ -16,7 +16,7 @@ import { MessageType } from '../types.js';
 import { randomUUID } from 'node:crypto';
 
 export const clearCommand: SlashCommand = {
-  name: 'clear (new)',
+  name: 'clear',
   altNames: ['new'],
   description: 'Clear the screen and start a new session',
   kind: CommandKind.BUILT_IN,

packages/cli/src/ui/components/InputPrompt.test.tsx

@@ -56,11 +56,8 @@ import * as clipboardUtils from '../utils/clipboardUtils.js';
 import { useKittyKeyboardProtocol } from '../hooks/useKittyKeyboardProtocol.js';
 import { createMockCommandContext } from '../../test-utils/mockCommandContext.js';
 import stripAnsi from 'strip-ansi';
-import chalk from 'chalk';
 import { StreamingState } from '../types.js';
 import { terminalCapabilityManager } from '../utils/terminalCapabilityManager.js';
-import type { UIState } from '../contexts/UIStateContext.js';
-import { isLowColorDepth } from '../utils/terminalUtils.js';
 import { cpLen } from '../utils/textUtils.js';
 import { defaultKeyMatchers, Command } from '../key/keyMatchers.js';
 import { useKeypress, type Key } from '../hooks/useKeypress.js';
@@ -78,9 +75,6 @@ vi.mock('../hooks/useReverseSearchCompletion.js');
 vi.mock('clipboardy');
 vi.mock('../utils/clipboardUtils.js');
 vi.mock('../hooks/useKittyKeyboardProtocol.js');
-vi.mock('../utils/terminalUtils.js', () => ({
-  isLowColorDepth: vi.fn(() => false),
-}));
 
 // Mock ink BEFORE importing components that use it to intercept terminalCursorPosition
 vi.mock('ink', async (importOriginal) => {
@@ -1914,172 +1908,6 @@ describe('InputPrompt', () => {
     unmount();
   });
 
-  describe('Background Color Styles', () => {
-    beforeEach(() => {
-      vi.mocked(isLowColorDepth).mockReturnValue(false);
-    });
-
-    afterEach(() => {
-      vi.restoreAllMocks();
-    });
-
-    it('should render with background color by default', async () => {
-      const { stdout, unmount } = await renderWithProviders(
-        <TestInputPrompt {...props} />,
-      );
-
-      await waitFor(() => {
-        const frame = stdout.lastFrameRaw();
-        expect(frame).toContain('▀');
-        expect(frame).toContain('▄');
-      });
-      unmount();
-    });
-
-    it.each([
-      { color: 'black', name: 'black' },
-      { color: '#000000', name: '#000000' },
-      { color: '#000', name: '#000' },
-      { color: 'white', name: 'white' },
-      { color: '#ffffff', name: '#ffffff' },
-      { color: '#fff', name: '#fff' },
-    ])(
-      'should render with safe grey background but NO side borders in 8-bit mode when background is $name',
-      async ({ color }) => {
-        vi.mocked(isLowColorDepth).mockReturnValue(true);
-
-        const { stdout, unmount } = await renderWithProviders(
-          <TestInputPrompt {...props} />,
-          {
-            uiState: {
-              terminalBackgroundColor: color,
-            } as Partial<UIState>,
-          },
-        );
-
-        const isWhite =
-          color === 'white' || color === '#ffffff' || color === '#fff';
-        const expectedBgColor = isWhite ? '#eeeeee' : '#1c1c1c';
-
-        await waitFor(() => {
-          const frame = stdout.lastFrameRaw();
-
-          // Use chalk to get the expected background color escape sequence
-          const bgCheck = chalk.bgHex(expectedBgColor)(' ');
-          const bgCode = bgCheck.substring(0, bgCheck.indexOf(' '));
-
-          // Background color code should be present
-          expect(frame).toContain(bgCode);
-          // Background characters should be rendered
-          expect(frame).toContain('▀');
-          expect(frame).toContain('▄');
-          // Side borders should STILL be removed
-          expect(frame).not.toContain('│');
-        });
-
-        unmount();
-      },
-    );
-
-    it('should NOT render with background color but SHOULD render horizontal lines when color depth is < 24 and background is NOT black', async () => {
-      vi.mocked(isLowColorDepth).mockReturnValue(true);
-
-      const { stdout, unmount } = await renderWithProviders(
-        <TestInputPrompt {...props} />,
-        {
-          uiState: {
-            terminalBackgroundColor: '#333333',
-          } as Partial<UIState>,
-        },
-      );
-
-      await waitFor(() => {
-        const frame = stdout.lastFrameRaw();
-        expect(frame).not.toContain('▀');
-        expect(frame).not.toContain('▄');
-        // It SHOULD have horizontal fallback lines
-        expect(frame).toContain('─');
-        // It SHOULD NOT have vertical side borders (standard Box borders have │)
-        expect(frame).not.toContain('│');
-      });
-      unmount();
-    });
-    it('should handle 4-bit color mode (16 colors) as low color depth', async () => {
-      vi.mocked(isLowColorDepth).mockReturnValue(true);
-
-      const { stdout, unmount } = await renderWithProviders(
-        <TestInputPrompt {...props} />,
-        {
-          uiState: {
-            terminalBackgroundColor: 'black',
-          } as Partial<UIState>,
-        },
-      );
-
-      await waitFor(() => {
-        const frame = stdout.lastFrameRaw();
-
-        expect(frame).toContain('▀');
-
-        expect(frame).not.toContain('│');
-      });
-
-      unmount();
-    });
-
-    it('should render horizontal lines (but NO background) in 8-bit mode when background is blue', async () => {
-      vi.mocked(isLowColorDepth).mockReturnValue(true);
-
-      const { stdout, unmount } = await renderWithProviders(
-        <TestInputPrompt {...props} />,
-
-        {
-          uiState: {
-            terminalBackgroundColor: 'blue',
-          } as Partial<UIState>,
-        },
-      );
-
-      await waitFor(() => {
-        const frame = stdout.lastFrameRaw();
-
-        // Should NOT have background characters
-
-        expect(frame).not.toContain('▀');
-
-        expect(frame).not.toContain('▄');
-
-        // Should HAVE horizontal lines from the fallback Box borders
-
-        // Box style "round" uses these for top/bottom
-
-        expect(frame).toContain('─');
-
-        // Should NOT have vertical side borders
-
-        expect(frame).not.toContain('│');
-      });
-
-      unmount();
-    });
-
-    it('should render with plain borders when useBackgroundColor is false', async () => {
-      props.config.getUseBackgroundColor = () => false;
-      const { stdout, unmount } = await renderWithProviders(
-        <TestInputPrompt {...props} />,
-      );
-
-      await waitFor(() => {
-        const frame = stdout.lastFrameRaw();
-        expect(frame).not.toContain('▀');
-        expect(frame).not.toContain('▄');
-        // Check for Box borders (round style uses unicode box chars)
-        expect(frame).toMatch(/[─│┐└┘┌]/);
-      });
-      unmount();
-    });
-  });
-
   describe('cursor-based completion trigger', () => {
     it.each([
       {
@@ -4007,9 +3835,9 @@ describe('InputPrompt', () => {
         expect(stdout.lastFrame()).toContain('hello world');
       });
 
-      // With plain borders: 1(border) + 1(padding) + 2(prompt) = 4 offset (x=4, col=5)
+      // With plain borders offset
       await act(async () => {
-        stdin.write(`\x1b[<0;5;2M`); // Click at col 5, row 2
+        stdin.write(`\x1b[<0;4;2M`); // Click at col 4, row 2
       });
 
       await waitFor(() => {

packages/cli/src/ui/components/InputPrompt.tsx

@@ -73,8 +73,6 @@ import {
 import { parseSlashCommand } from '../../utils/commands.js';
 import * as path from 'node:path';
 import { SCREEN_READER_USER_PREFIX } from '../textConstants.js';
-import { getSafeLowColorBackground } from '../themes/color-utils.js';
-import { isLowColorDepth } from '../utils/terminalUtils.js';
 import { useShellFocusState } from '../contexts/ShellFocusContext.js';
 import { useUIState } from '../contexts/UIStateContext.js';
 import { useInputState } from '../contexts/InputContext.js';
@@ -1645,21 +1643,6 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   );
 
   const useBackgroundColor = config.getUseBackgroundColor();
-  const isLowColor = isLowColorDepth();
-  const terminalBg = theme.background.primary || 'black';
-
-  // We should fallback to lines if the background color is disabled OR if it is
-  // enabled but we are in a low color depth terminal where we don't have a safe
-  // background color to use.
-  const useLineFallback = useMemo(() => {
-    if (!useBackgroundColor) {
-      return true;
-    }
-    if (isLowColor) {
-      return !getSafeLowColorBackground(terminalBg);
-    }
-    return false;
-  }, [useBackgroundColor, isLowColor, terminalBg]);
 
   const prevCursorRef = useRef(buffer.visualCursor);
   const prevTextRef = useRef(buffer.text);
@@ -1698,8 +1681,11 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
     }
   }, [buffer.visualCursor, buffer.text, focus]);
 
-  const listBackgroundColor =
-    useLineFallback || !useBackgroundColor ? undefined : theme.background.input;
+  const listBackgroundColor = !useBackgroundColor
+    ? undefined
+    : theme.background.input;
+
+  const useLineFallback = !!process.env['NO_COLOR'];
 
   useEffect(() => {
     if (onSuggestionsVisibilityChange) {
@@ -1762,7 +1748,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
   return (
     <>
       {suggestionsPosition === 'above' && suggestionsNode}
-      {useLineFallback ? (
+      {useLineFallback || !useBackgroundColor ? (
         <Box
           borderStyle="round"
           borderTop={true}
@@ -1781,17 +1767,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
         backgroundOpacity={1}
         useBackgroundColor={useBackgroundColor}
       >
-        <Box
-          flexGrow={1}
-          flexDirection="row"
-          paddingX={1}
-          borderColor={borderColor}
-          borderStyle={useLineFallback ? 'round' : undefined}
-          borderTop={false}
-          borderBottom={false}
-          borderLeft={!useBackgroundColor}
-          borderRight={!useBackgroundColor}
-        >
+        <Box flexGrow={1} flexDirection="row" paddingX={1}>
           <Text
             color={statusColor ?? theme.text.accent}
             aria-label={statusText || undefined}
@@ -1880,7 +1856,7 @@ export const InputPrompt: React.FC<InputPromptProps> = ({
           </Box>
         </Box>
       </HalfLinePaddedBox>
-      {useLineFallback ? (
+      {useLineFallback || !useBackgroundColor ? (
         <Box
           borderStyle="round"
           borderTop={false}

packages/cli/src/ui/components/__snapshots__/AlternateBufferQuittingDisplay.test.tsx.snap

@@ -139,9 +139,9 @@ Tips for getting started:
 2. /help for more information
 3. Ask coding questions, edit code or run commands
 4. Be specific for the best results
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Hello Gemini                                                                 
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > Hello Gemini                                                                 
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 ✦  Hello User!
 "
 `;

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-correctly-at-the-beginning-of-a-line-in-a-multiline-block.snap.svg

@@ -5,15 +5,11 @@
   <rect width="920" height="88" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="36" y="34" width="9" height="17" fill="#ffffff" />
-    <text x="36" y="36" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">s</text>
-    <text x="45" y="36" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">econd line</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
+    <rect x="27" y="34" width="9" height="17" fill="#ffffff" />
+    <text x="27" y="36" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">s</text>
+    <text x="36" y="36" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">econd line</text>
     <text x="0" y="53" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-correctly-at-the-end-of-a-line-in-a-multiline-block.snap.svg

@@ -5,14 +5,10 @@
   <rect width="920" height="88" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <rect x="126" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="36" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs">second line</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
+    <rect x="117" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="27" y="36" fill="#ffffff" textLength="99" lengthAdjust="spacingAndGlyphs">second line</text>
     <text x="0" y="53" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-correctly-in-the-middle-of-a-line-in-a-multiline-block.snap.svg

@@ -5,19 +5,13 @@
   <rect width="920" height="105" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="36" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">sec</text>
-    <rect x="63" y="34" width="9" height="17" fill="#ffffff" />
-    <text x="63" y="36" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">o</text>
-    <text x="72" y="36" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">nd line</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">third line</text>
-    <text x="891" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
+    <text x="27" y="36" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">sec</text>
+    <rect x="54" y="34" width="9" height="17" fill="#ffffff" />
+    <text x="54" y="36" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">o</text>
+    <text x="63" y="36" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">nd line</text>
+    <text x="27" y="53" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">third line</text>
     <text x="0" y="70" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-multi-line-scenarios-should-display-cursor-on-a-blank-line-in-a-multiline-block.snap.svg

@@ -5,16 +5,10 @@
   <rect width="920" height="105" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <rect x="36" y="34" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">third line</text>
-    <text x="891" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">first line</text>
+    <rect x="27" y="34" width="9" height="17" fill="#ffffff" />
+    <text x="27" y="53" fill="#ffffff" textLength="90" lengthAdjust="spacingAndGlyphs">third line</text>
     <text x="0" y="70" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-after-multi-byte-unicode-characters-.snap.svg

@@ -5,12 +5,10 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
-    <rect x="45" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="45" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">A</text>
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
+    <rect x="36" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="36" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">A</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-beginning-of-the-line-.snap.svg

@@ -5,12 +5,10 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <rect x="36" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="36" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">h</text>
-    <text x="45" y="19" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">ello</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <rect x="27" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="27" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">h</text>
+    <text x="36" y="19" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">ello</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-end-of-a-line-with-unicode-cha-.snap.svg

@@ -5,10 +5,8 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">hello 👍</text>
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">hello 👍</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-end-of-a-short-line-with-unico-.snap.svg

@@ -5,11 +5,9 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
-    <rect x="45" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
+    <rect x="36" y="17" width="9" height="17" fill="#ffffff" />
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-at-the-end-of-the-line-.snap.svg

@@ -5,11 +5,9 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
-    <rect x="81" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
+    <rect x="72" y="17" width="9" height="17" fill="#ffffff" />
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-for-multi-byte-unicode-characters-.snap.svg

@@ -5,13 +5,11 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">hello </text>
-    <rect x="90" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="90" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
-    <text x="99" y="19" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs"> world</text>
-    <text x="882" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs">hello </text>
+    <rect x="81" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="81" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">👍</text>
+    <text x="90" y="19" fill="#ffffff" textLength="54" lengthAdjust="spacingAndGlyphs"> world</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-mid-word-.snap.svg

@@ -5,13 +5,11 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">hel</text>
-    <rect x="63" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="63" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">l</text>
-    <text x="72" y="19" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">o world</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="27" lengthAdjust="spacingAndGlyphs">hel</text>
+    <rect x="54" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="54" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">l</text>
+    <text x="63" y="19" fill="#ffffff" textLength="63" lengthAdjust="spacingAndGlyphs">o world</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-on-a-highlighted-token-.snap.svg

@@ -5,14 +5,12 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">run </text>
-    <text x="72" y="19" fill="#d7afff" textLength="45" lengthAdjust="spacingAndGlyphs">@path</text>
-    <rect x="117" y="17" width="9" height="17" fill="#d7afff" />
-    <text x="117" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">/</text>
-    <text x="126" y="19" fill="#d7afff" textLength="63" lengthAdjust="spacingAndGlyphs">to/file</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="36" lengthAdjust="spacingAndGlyphs">run </text>
+    <text x="63" y="19" fill="#d7afff" textLength="45" lengthAdjust="spacingAndGlyphs">@path</text>
+    <rect x="108" y="17" width="9" height="17" fill="#d7afff" />
+    <text x="108" y="19" fill="#000000" textLength="9" lengthAdjust="spacingAndGlyphs">/</text>
+    <text x="117" y="19" fill="#d7afff" textLength="63" lengthAdjust="spacingAndGlyphs">to/file</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-on-a-space-between-words-.snap.svg

@@ -5,12 +5,10 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
-    <rect x="81" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="90" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">world</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
+    <rect x="72" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="81" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">world</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-Highlighting-and-Cursor-Display-single-line-scenarios-should-display-cursor-correctly-on-an-empty-line-.snap.svg

@@ -5,11 +5,9 @@
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <rect x="36" y="17" width="9" height="17" fill="#ffffff" />
-    <text x="45" y="19" fill="#afafaf" textLength="315" lengthAdjust="spacingAndGlyphs"> Type your message or @path/to/file</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <rect x="27" y="17" width="9" height="17" fill="#ffffff" />
+    <text x="36" y="19" fill="#afafaf" textLength="315" lengthAdjust="spacingAndGlyphs"> Type your message or @path/to/file</text>
     <text x="0" y="36" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-multiline-rendering-should-correctly-render-multiline-input-including-blank-lines.snap.svg

@@ -5,16 +5,10 @@
   <rect width="920" height="105" fill="#000000" />
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
-    <text x="0" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="18" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
-    <text x="36" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
-    <text x="891" y="19" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="891" y="36" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="0" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
-    <text x="36" y="53" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">world</text>
-    <rect x="81" y="51" width="9" height="17" fill="#ffffff" />
-    <text x="891" y="53" fill="#00cd00" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
+    <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
+    <text x="27" y="19" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">hello</text>
+    <text x="27" y="53" fill="#ffffff" textLength="45" lengthAdjust="spacingAndGlyphs">world</text>
+    <rect x="72" y="51" width="9" height="17" fill="#ffffff" />
     <text x="0" y="70" fill="#00cd00" textLength="900" lengthAdjust="spacingAndGlyphs">────────────────────────────────────────────────────────────────────────────────────────────────────</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt-InputPrompt-snapshots-should-not-show-inverted-cursor-when-shell-is-focused.snap.svg

@@ -4,15 +4,13 @@
   </style>
   <rect width="920" height="71" fill="#000000" />
   <g transform="translate(10, 10)">
-    <rect x="0" y="0" width="900" height="17" fill="#1f1f1f" />
-    <text x="0" y="2" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
+    <text x="0" y="2" fill="#1f1f1f" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
     <rect x="0" y="17" width="9" height="17" fill="#1f1f1f" />
     <rect x="9" y="17" width="18" height="17" fill="#1f1f1f" />
     <text x="9" y="19" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
     <rect x="27" y="17" width="324" height="17" fill="#1f1f1f" />
     <text x="27" y="19" fill="#afafaf" textLength="324" lengthAdjust="spacingAndGlyphs">  Type your message or @path/to/file</text>
     <rect x="351" y="17" width="549" height="17" fill="#1f1f1f" />
-    <rect x="0" y="34" width="900" height="17" fill="#1f1f1f" />
-    <text x="0" y="36" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
+    <text x="0" y="36" fill="#1f1f1f" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
   </g>
 </svg>

packages/cli/src/ui/components/__snapshots__/InputPrompt.test.tsx.snap

@@ -2,105 +2,105 @@
 
 exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor correctly 'at the beginning of a line' in a multiline block 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│   second line                                                                                    │
+ > first line
+   second line
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor correctly 'at the end of a line' in a multiline block 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│   second line                                                                                    │
+ > first line 
+   second line
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor correctly 'in the middle of a line' in a multiline block 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│   second line                                                                                    │
-│   third line                                                                                     │
+ > first line
+   second line
+   third line
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > multi-line scenarios > should display cursor on a blank line in a multiline block 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > first line                                                                                     │
-│                                                                                                  │
-│   third line                                                                                     │
+ > first line
+    
+   third line
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'after multi-byte unicode characters' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > 👍A                                                                                            │
+ > 👍A
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the beginning of the line' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello                                                                                          │
+ > hello
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of a line with unicode cha…' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello 👍                                                                                       │
+ > hello 👍
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of a short line with unico…' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > 👍                                                                                             │
+ > 👍 
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'at the end of the line' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello                                                                                          │
+ > hello 
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'for multi-byte unicode characters' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello 👍 world                                                                                 │
+ > hello 👍 world
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'mid-word' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello world                                                                                    │
+ > hello world
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'on a highlighted token' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > run @path/to/file                                                                              │
+ > run @path/to/file
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'on a space between words' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello world                                                                                    │
+ > hello world
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > Highlighting and Cursor Display > single-line scenarios > should display cursor correctly 'on an empty line' 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ >   Type your message or @path/to/file                                                           │
+ >   Type your message or @path/to/file
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > History Navigation and Completion Suppression > should not render suggestions during history navigation 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > second message                                                                                   
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > command search (Ctrl+R when not in shell) > expands and collapses long suggestion via Right/Left arrows > command-search-render-collapsed-match 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  (r:)    Type your message or @path/to/file                                                         
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll → 
  lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll   
  ...                                                                           
@@ -108,9 +108,9 @@ exports[`InputPrompt > command search (Ctrl+R when not in shell) > expands and c
 `;
 
 exports[`InputPrompt > command search (Ctrl+R when not in shell) > expands and collapses long suggestion via Right/Left arrows > command-search-render-expanded-match 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  (r:)    Type your message or @path/to/file                                                         
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll ← 
  lllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllllll   
  llllllllllllllllllllllllllllllllllllllllllllllllll                            
@@ -118,87 +118,87 @@ exports[`InputPrompt > command search (Ctrl+R when not in shell) > expands and c
 `;
 
 exports[`InputPrompt > command search (Ctrl+R when not in shell) > renders match window and expanded view (snapshots) > command-search-render-collapsed-match 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  (r:)  commit                                                                                       
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  git commit -m "feat: add search" in src/app                                   
 "
 `;
 
 exports[`InputPrompt > command search (Ctrl+R when not in shell) > renders match window and expanded view (snapshots) > command-search-render-expanded-match 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  (r:)  commit                                                                                       
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  git commit -m "feat: add search" in src/app                                   
 "
 `;
 
 exports[`InputPrompt > image path transformation snapshots > should snapshot collapsed image path 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > [Image ...reenshot2x.png]                                                                        
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > image path transformation snapshots > should snapshot expanded image path when cursor is on it 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > @/path/to/screenshots/screenshot2x.png                                                           
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > [Pasted Text: 10 lines]                                                                          
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 2`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > [Pasted Text: 10 lines]                                                                          
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > mouse interaction > should toggle paste expansion on double-click 3`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > [Pasted Text: 10 lines]                                                                          
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > multiline rendering > should correctly render multiline input including blank lines 1`] = `
 "────────────────────────────────────────────────────────────────────────────────────────────────────
-│ > hello                                                                                          │
-│                                                                                                  │
-│   world                                                                                          │
+ > hello
+
+   world 
 ────────────────────────────────────────────────────────────────────────────────────────────────────"
 `;
 
 exports[`InputPrompt > snapshots > should not show inverted cursor when shell is focused 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  >   Type your message or @path/to/file                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄"
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀"
 `;
 
 exports[`InputPrompt > snapshots > should render correctly in shell mode 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  !   Type your message or @path/to/file                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > snapshots > should render correctly in yolo mode 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  *   Type your message or @path/to/file                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`InputPrompt > snapshots > should render correctly when accepting edits 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  >   Type your message or @path/to/file                                                             
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;

packages/cli/src/ui/components/__snapshots__/MainContent-MainContent-renders-multiple-thinking-messages-sequentially-correctly.snap.svg

@@ -6,16 +6,14 @@
   <g transform="translate(10, 10)">
     <text x="0" y="2" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">ScrollableList                                                                                      </text>
     <text x="0" y="19" fill="#ffffff" textLength="900" lengthAdjust="spacingAndGlyphs">AppHeader(full)                                                                                     </text>
-    <rect x="0" y="34" width="900" height="17" fill="#141414" />
-    <text x="0" y="36" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
+    <text x="0" y="36" fill="#141414" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
     <rect x="0" y="51" width="9" height="17" fill="#141414" />
     <rect x="9" y="51" width="18" height="17" fill="#141414" />
     <text x="9" y="53" fill="#d7afff" textLength="18" lengthAdjust="spacingAndGlyphs">&gt; </text>
     <rect x="27" y="51" width="135" height="17" fill="#141414" />
     <text x="27" y="53" fill="#ffffff" textLength="135" lengthAdjust="spacingAndGlyphs">Plan a solution</text>
     <rect x="162" y="51" width="738" height="17" fill="#141414" />
-    <rect x="0" y="68" width="900" height="17" fill="#141414" />
-    <text x="0" y="70" fill="#000000" textLength="900" lengthAdjust="spacingAndGlyphs">▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄</text>
+    <text x="0" y="70" fill="#141414" textLength="900" lengthAdjust="spacingAndGlyphs">▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀</text>
     <text x="0" y="87" fill="#ffffff" textLength="117" lengthAdjust="spacingAndGlyphs" font-style="italic"> Thinking... </text>
     <text x="9" y="104" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>
     <text x="9" y="121" fill="#afafaf" textLength="9" lengthAdjust="spacingAndGlyphs">│</text>

packages/cli/src/ui/components/__snapshots__/MainContent.test.tsx.snap

@@ -94,9 +94,9 @@ exports[`MainContent > MainContent Tool Output Height Logic > 'Normal mode - Unc
 
 exports[`MainContent > renders a ToolConfirmationQueue without an extra line when preceded by hidden tools 1`] = `
 "AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Apply plan                                                                   
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > Apply plan                                                                   
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 
 ╭──────────────────────────────────────────────────────────────────────────────╮
 │ Ready to start implementation?                                               │
@@ -123,17 +123,17 @@ exports[`MainContent > renders a split tool group without a gap between static a
 
 exports[`MainContent > renders a spurious line when a tool group has only hidden tools and borderBottom true 1`] = `
 "AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Apply plan                                                                   
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > Apply plan                                                                   
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`MainContent > renders a subagent with a complete box including bottom border 1`] = `
 "AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Investigate                                                                  
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > Investigate                                                                  
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 
 ╭──────────────────────────────────────────────────────────────────────────╮
 │ ≡ Running Agent... (ctrl+o to collapse)                                  │
@@ -149,9 +149,9 @@ exports[`MainContent > renders a subagent with a complete box including bottom b
 exports[`MainContent > renders mixed history items (user + gemini) with single line padding between them 1`] = `
 "ScrollableList
 AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > User message                                                                                     
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > User message                                                                                     
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 ✦ Gemini response
   Gemini response
   Gemini response
@@ -195,9 +195,9 @@ AppHeader(full)
 exports[`MainContent > renders multiple thinking messages sequentially correctly 1`] = `
 "ScrollableList
 AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Plan a solution                                                                                  
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > Plan a solution                                                                                  
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  Thinking... 
  │
  │ Initial analysis
@@ -217,9 +217,9 @@ AppHeader(full)
 exports[`MainContent > renders multiple thinking messages sequentially correctly 2`] = `
 "ScrollableList
 AppHeader(full)
-▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
- > Plan a solution                                                                                  
 ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+ > Plan a solution                                                                                  
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
  Thinking... 
  │
  │ Initial analysis

packages/cli/src/ui/components/messages/__snapshots__/UserMessage.test.tsx.snap

@@ -1,30 +1,30 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
 exports[`UserMessage > renders multiline user message 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > Line 1                                                                       
    Line 2                                                                       
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`UserMessage > renders normal user message with correct prefix 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > Hello Gemini                                                                 
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`UserMessage > renders slash command message 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > /help                                                                        
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;
 
 exports[`UserMessage > transforms image paths in user message 1`] = `
-"▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
+"▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
  > Check out this image: [Image my-image.png]                                   
-▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
 "
 `;

packages/cli/src/ui/components/shared/HalfLinePaddedBox.test.tsx

@@ -3,12 +3,11 @@
  * Copyright 2025 Google LLC
  * SPDX-License-Identifier: Apache-2.0
  */
-
 import { renderWithProviders } from '../../../test-utils/render.js';
 import { HalfLinePaddedBox } from './HalfLinePaddedBox.js';
 import { Text, useIsScreenReaderEnabled } from 'ink';
 import { describe, it, expect, vi, afterEach } from 'vitest';
-import { isITerm2 } from '../../utils/terminalUtils.js';
+import { supportsTrueColor } from '@google/gemini-cli-core';
 
 vi.mock('ink', async () => {
   const actual = await vi.importActual('ink');
@@ -18,15 +17,24 @@ vi.mock('ink', async () => {
   };
 });
 
+vi.mock('@google/gemini-cli-core', async () => {
+  const actual = await vi.importActual('@google/gemini-cli-core');
+  return {
+    ...actual,
+    supportsTrueColor: vi.fn(() => true),
+  };
+});
+
 describe('<HalfLinePaddedBox />', () => {
   const mockUseIsScreenReaderEnabled = vi.mocked(useIsScreenReaderEnabled);
+  const mockSupportsTrueColor = vi.mocked(supportsTrueColor);
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  it('renders standard background and blocks when not iTerm2', async () => {
-    vi.mocked(isITerm2).mockReturnValue(false);
+  it('renders standard background and blocks when true color is supported', async () => {
+    mockSupportsTrueColor.mockReturnValue(true);
 
     const { lastFrame, unmount } = await renderWithProviders(
       <HalfLinePaddedBox backgroundBaseColor="blue" backgroundOpacity={0.5}>
@@ -40,8 +48,8 @@ describe('<HalfLinePaddedBox />', () => {
     unmount();
   });
 
-  it('renders iTerm2-specific blocks when iTerm2 is detected', async () => {
-    vi.mocked(isITerm2).mockReturnValue(true);
+  it('renders alternative blocks when true color is not supported', async () => {
+    mockSupportsTrueColor.mockReturnValue(false);
 
     const { lastFrame, unmount } = await renderWithProviders(
       <HalfLinePaddedBox backgroundBaseColor="blue" backgroundOpacity={0.5}>

packages/cli/src/ui/components/shared/HalfLinePaddedBox.tsx

@@ -9,12 +9,8 @@ import { useMemo } from 'react';
 import { Box, Text, useIsScreenReaderEnabled } from 'ink';
 import { useUIState } from '../../contexts/UIStateContext.js';
 import { theme } from '../../semantic-colors.js';
-import {
-  interpolateColor,
-  resolveColor,
-  getSafeLowColorBackground,
-} from '../../themes/color-utils.js';
-import { isLowColorDepth, isITerm2 } from '../../utils/terminalUtils.js';
+import { interpolateColor, resolveColor } from '../../themes/color-utils.js';
+import { supportsTrueColor } from '@google/gemini-cli-core';
 
 export interface HalfLinePaddedBoxProps {
   /**
@@ -56,14 +52,7 @@ const HalfLinePaddedBoxInternal: React.FC<HalfLinePaddedBoxProps> = ({
   const { terminalWidth } = useUIState();
   const terminalBg = theme.background.primary || 'black';
 
-  const isLowColor = isLowColorDepth();
-
   const backgroundColor = useMemo(() => {
-    // Interpolated background colors often look bad in 256-color terminals
-    if (isLowColor) {
-      return getSafeLowColorBackground(terminalBg);
-    }
-
     const resolvedBase =
       resolveColor(backgroundBaseColor) || backgroundBaseColor;
     const resolvedTerminalBg = resolveColor(terminalBg) || terminalBg;
@@ -73,37 +62,18 @@ const HalfLinePaddedBoxInternal: React.FC<HalfLinePaddedBoxProps> = ({
       resolvedBase,
       backgroundOpacity,
     );
-  }, [backgroundBaseColor, backgroundOpacity, terminalBg, isLowColor]);
+  }, [backgroundBaseColor, backgroundOpacity, terminalBg]);
 
   if (!backgroundColor) {
     return <>{children}</>;
   }
 
-  const isITerm = isITerm2();
+  const noTrueColor = !supportsTrueColor();
 
-  if (isITerm) {
+  if (noTrueColor) {
     return (
-      <Box
-        width={terminalWidth}
-        flexDirection="column"
-        alignItems="stretch"
-        minHeight={1}
-        flexShrink={0}
-      >
-        <Box width={terminalWidth} flexDirection="row">
-          <Text color={backgroundColor}>{'▄'.repeat(terminalWidth)}</Text>
-        </Box>
-        <Box
-          width={terminalWidth}
-          flexDirection="column"
-          alignItems="stretch"
-          backgroundColor={backgroundColor}
-        >
-          {children}
-        </Box>
-        <Box width={terminalWidth} flexDirection="row">
-          <Text color={backgroundColor}>{'▀'.repeat(terminalWidth)}</Text>
-        </Box>
+      <Box width={terminalWidth} backgroundColor={backgroundColor} paddingY={1}>
+        {children}
       </Box>
     );
   }
@@ -115,18 +85,20 @@ const HalfLinePaddedBoxInternal: React.FC<HalfLinePaddedBoxProps> = ({
       alignItems="stretch"
       minHeight={1}
       flexShrink={0}
-      backgroundColor={backgroundColor}
     >
       <Box width={terminalWidth} flexDirection="row">
-        <Text backgroundColor={backgroundColor} color={terminalBg}>
-          {'▀'.repeat(terminalWidth)}
-        </Text>
+        <Text color={backgroundColor}>{'▄'.repeat(terminalWidth)}</Text>
+      </Box>
+      <Box
+        width={terminalWidth}
+        flexDirection="column"
+        alignItems="stretch"
+        backgroundColor={backgroundColor}
+      >
+        {children}
       </Box>
-      {children}
       <Box width={terminalWidth} flexDirection="row">
-        <Text color={terminalBg} backgroundColor={backgroundColor}>
-          {'▄'.repeat(terminalWidth)}
-        </Text>
+        <Text color={backgroundColor}>{'▀'.repeat(terminalWidth)}</Text>
       </Box>
     </Box>
   );

packages/cli/src/ui/components/shared/__snapshots__/HalfLinePaddedBox.test.tsx.snap

@@ -1,9 +1,9 @@
 // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
 
-exports[`<HalfLinePaddedBox /> > renders iTerm2-specific blocks when iTerm2 is detected 1`] = `
-"▄▄▄▄▄▄▄▄▄▄
+exports[`<HalfLinePaddedBox /> > renders alternative blocks when true color is not supported 1`] = `
+"          
 Content   
-▀▀▀▀▀▀▀▀▀▀
+          
 "
 `;
 
@@ -17,9 +17,9 @@ exports[`<HalfLinePaddedBox /> > renders nothing when useBackgroundColor is fals
 "
 `;
 
-exports[`<HalfLinePaddedBox /> > renders standard background and blocks when not iTerm2 1`] = `
-"▀▀▀▀▀▀▀▀▀▀
+exports[`<HalfLinePaddedBox /> > renders standard background and blocks when true color is supported 1`] = `
+"▄▄▄▄▄▄▄▄▄▄
 Content   
-▄▄▄▄▄▄▄▄▄▄
+▀▀▀▀▀▀▀▀▀▀
 "
 `;

packages/cli/src/ui/hooks/useSlashCompletion.test.ts

@@ -513,6 +513,70 @@ describe('useSlashCompletion', () => {
       unmountResume();
     });
 
+    it('should NOT suggest the auto-list command when typing a non-matching partial after /chat', async () => {
+      const slashCommands = [
+        createTestCommand({
+          name: 'chat',
+          description: 'Manage chat history',
+          subCommands: [
+            createTestCommand({ name: 'list', description: 'List chats' }),
+          ],
+        }),
+      ];
+
+      const { result, unmount } = await renderHook(() =>
+        useTestHarnessForSlashCompletion(
+          true,
+          '/chat x', // 'x' does not match 'list'
+          slashCommands,
+          mockCommandContext,
+        ),
+      );
+
+      await resolveMatch();
+
+      await waitFor(() => {
+        // It should NOT have the 'auto' section 'list' suggestion
+        const autoSuggestion = result.current.suggestions.find(
+          (s) => s.sectionTitle === 'auto',
+        );
+        expect(autoSuggestion).toBeUndefined();
+      });
+      unmount();
+    });
+
+    it('should STILL suggest the auto-list command when typing a matching partial after /chat', async () => {
+      const slashCommands = [
+        createTestCommand({
+          name: 'chat',
+          description: 'Manage chat history',
+          subCommands: [
+            createTestCommand({ name: 'list', description: 'List chats' }),
+          ],
+        }),
+      ];
+
+      const { result, unmount } = await renderHook(() =>
+        useTestHarnessForSlashCompletion(
+          true,
+          '/chat l', // 'l' matches 'list'
+          slashCommands,
+          mockCommandContext,
+        ),
+      );
+
+      await resolveMatch();
+
+      await waitFor(() => {
+        const autoSuggestion = result.current.suggestions.find(
+          (s) => s.sectionTitle === 'auto',
+        );
+        expect(autoSuggestion).toBeDefined();
+        expect(autoSuggestion?.label).toBe('list');
+      });
+      unmount();
+    });
+
     it('should sort exact altName matches to the top', async () => {
       const slashCommands = [
         createTestCommand({

packages/cli/src/ui/hooks/useSlashCompletion.ts

@@ -338,17 +338,23 @@ function useCommandSuggestions(
 
           if (isTopLevelChatOrResumeContext) {
             const canonicalParentName = leafCommand.name;
-            const autoSectionSuggestion: Suggestion = {
-              label: 'list',
-              value: 'list',
-              insertValue: canonicalParentName,
-              description: 'Browse auto-saved chats',
-              commandKind: CommandKind.BUILT_IN,
-              sectionTitle: 'auto',
-              submitValue: `/${canonicalParentName}`,
-            };
-            setSuggestions([autoSectionSuggestion, ...finalSuggestions]);
-            return;
+            const autoLabel = 'list';
+            if (
+              partial === '' ||
+              autoLabel.toLowerCase().startsWith(partial.toLowerCase())
+            ) {
+              const autoSectionSuggestion: Suggestion = {
+                label: autoLabel,
+                value: autoLabel,
+                insertValue: canonicalParentName,
+                description: 'Browse auto-saved chats',
+                commandKind: CommandKind.BUILT_IN,
+                sectionTitle: 'auto',
+                submitValue: `/${canonicalParentName}`,
+              };
+              setSuggestions([autoSectionSuggestion, ...finalSuggestions]);
+              return;
+            }
           }
 
           setSuggestions(finalSuggestions);

packages/cli/src/utils/devtoolsService.test.ts

@@ -123,69 +123,22 @@ describe('devtoolsService', () => {
   });
 
   describe('setupInitialActivityLogger', () => {
-    it('stays in buffer mode when no existing server found', async () => {
+    it('stays in buffer mode (no probe attempted)', () => {
       const config = createMockConfig();
-      const promise = setupInitialActivityLogger(config);
-
-      // Probe fires immediately — no server running
-      await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
-      MockWebSocket.instances[0].simulateError();
-
-      await promise;
+      setupInitialActivityLogger(config);
 
       expect(mockInitActivityLogger).toHaveBeenCalledWith(config, {
         mode: 'buffer',
       });
       expect(mockAddNetworkTransport).not.toHaveBeenCalled();
+      // No WebSocket probe on startup
+      expect(MockWebSocket.instances.length).toBe(0);
     });
 
-    it('attaches transport when existing server found at startup', async () => {
-      const config = createMockConfig();
-      const promise = setupInitialActivityLogger(config);
-
-      await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
-      MockWebSocket.instances[0].simulateOpen();
-
-      await promise;
-
-      expect(mockInitActivityLogger).toHaveBeenCalledWith(config, {
-        mode: 'buffer',
-      });
-      expect(mockAddNetworkTransport).toHaveBeenCalledWith(
-        config,
-        '127.0.0.1',
-        25417,
-        expect.any(Function),
-      );
-      expect(
-        mockActivityLoggerInstance.enableNetworkLogging,
-      ).toHaveBeenCalled();
-    });
-
-    it('F12 short-circuits when startup already connected', async () => {
-      const config = createMockConfig();
-
-      // Startup: probe succeeds
-      const setupPromise = setupInitialActivityLogger(config);
-      await vi.waitFor(() => expect(MockWebSocket.instances.length).toBe(1));
-      MockWebSocket.instances[0].simulateOpen();
-      await setupPromise;
-
-      mockAddNetworkTransport.mockClear();
-      mockActivityLoggerInstance.enableNetworkLogging.mockClear();
-
-      // F12: should return URL immediately
-      const url = await startDevToolsServer(config);
-
-      expect(url).toBe('http://localhost:25417');
-      expect(mockAddNetworkTransport).not.toHaveBeenCalled();
-      expect(mockDevToolsInstance.start).not.toHaveBeenCalled();
-    });
-
-    it('initializes in file mode when target env var is set', async () => {
+    it('initializes in file mode when target env var is set', () => {
       process.env['GEMINI_CLI_ACTIVITY_LOG_TARGET'] = '/tmp/test.jsonl';
       const config = createMockConfig();
-      await setupInitialActivityLogger(config);
+      setupInitialActivityLogger(config);
 
       expect(mockInitActivityLogger).toHaveBeenCalledWith(config, {
         mode: 'file',
@@ -195,10 +148,10 @@ describe('devtoolsService', () => {
       expect(MockWebSocket.instances.length).toBe(0);
     });
 
-    it('does nothing in file mode when config.storage is missing', async () => {
+    it('does nothing in file mode when config.storage is missing', () => {
       process.env['GEMINI_CLI_ACTIVITY_LOG_TARGET'] = '/tmp/test.jsonl';
       const config = createMockConfig({ storage: undefined });
-      await setupInitialActivityLogger(config);
+      setupInitialActivityLogger(config);
 
       expect(mockInitActivityLogger).not.toHaveBeenCalled();
       expect(MockWebSocket.instances.length).toBe(0);

packages/cli/src/utils/devtoolsService.ts

@@ -116,39 +116,17 @@ async function handlePromotion(config: Config) {
 /**
  * Initializes the activity logger.
  * Interception starts immediately in buffering mode.
- * If an existing DevTools server is found, attaches transport eagerly.
+ * Transport is only attached when the user presses F12.
  */
-export async function setupInitialActivityLogger(config: Config) {
+export function setupInitialActivityLogger(config: Config) {
   const target = process.env['GEMINI_CLI_ACTIVITY_LOG_TARGET'];
 
   if (target) {
     if (!config.storage) return;
     initActivityLogger(config, { mode: 'file', filePath: target });
   } else {
-    // Start in buffering mode (no transport attached yet)
+    // Start in buffering mode — transport attached later on F12
     initActivityLogger(config, { mode: 'buffer' });
-
-    // Eagerly probe for an existing DevTools server
-    try {
-      const existing = await probeDevTools(
-        DEFAULT_DEVTOOLS_HOST,
-        DEFAULT_DEVTOOLS_PORT,
-      );
-      if (existing) {
-        const onReconnectFailed = () => handlePromotion(config);
-        addNetworkTransport(
-          config,
-          DEFAULT_DEVTOOLS_HOST,
-          DEFAULT_DEVTOOLS_PORT,
-          onReconnectFailed,
-        );
-        ActivityLogger.getInstance().enableNetworkLogging();
-        connectedUrl = `http://localhost:${DEFAULT_DEVTOOLS_PORT}`;
-        debugLogger.log(`DevTools (existing) at startup: ${connectedUrl}`);
-      }
-    } catch {
-      // Probe failed silently — stay in buffer mode
-    }
   }
 }
 

packages/cli/src/utils/userStartupWarnings.test.ts

@@ -34,6 +34,7 @@ vi.mock('@google/gemini-cli-core', async (importOriginal) => {
     ...actual,
     homedir: () => os.homedir(),
     getCompatibilityWarnings: vi.fn().mockReturnValue([]),
+    isHeadlessMode: vi.fn().mockReturnValue(false),
     WarningPriority: {
       Low: 'low',
       High: 'high',
@@ -143,6 +144,51 @@ describe('getUserStartupWarnings', () => {
     });
   });
 
+  describe('folder trust check', () => {
+    it('should throw FatalUntrustedWorkspaceError when untrusted in headless mode', async () => {
+      const { isHeadlessMode, FatalUntrustedWorkspaceError } = await import(
+        '@google/gemini-cli-core'
+      );
+      vi.mocked(isFolderTrustEnabled).mockReturnValue(true);
+      vi.mocked(isWorkspaceTrusted).mockImplementation(() => {
+        throw new FatalUntrustedWorkspaceError(
+          'Gemini CLI is not running in a trusted directory',
+        );
+      });
+      vi.mocked(isHeadlessMode).mockReturnValue(true);
+
+      await expect(
+        getUserStartupWarnings({}, testRootDir),
+      ).rejects.toThrowError(FatalUntrustedWorkspaceError);
+    });
+
+    it('should not return a warning when trusted in headless mode', async () => {
+      const { isHeadlessMode } = await import('@google/gemini-cli-core');
+      vi.mocked(isFolderTrustEnabled).mockReturnValue(true);
+      vi.mocked(isWorkspaceTrusted).mockReturnValue({
+        isTrusted: true,
+        source: 'file',
+      });
+      vi.mocked(isHeadlessMode).mockReturnValue(true);
+
+      const warnings = await getUserStartupWarnings({}, testRootDir);
+      expect(warnings.find((w) => w.id === 'folder-trust')).toBeUndefined();
+    });
+
+    it('should not return a warning when untrusted in interactive mode', async () => {
+      const { isHeadlessMode } = await import('@google/gemini-cli-core');
+      vi.mocked(isFolderTrustEnabled).mockReturnValue(true);
+      vi.mocked(isWorkspaceTrusted).mockReturnValue({
+        isTrusted: false,
+        source: undefined,
+      });
+      vi.mocked(isHeadlessMode).mockReturnValue(false);
+
+      const warnings = await getUserStartupWarnings({}, testRootDir);
+      expect(warnings.find((w) => w.id === 'folder-trust')).toBeUndefined();
+    });
+  });
+
   describe('compatibility warnings', () => {
     it('should include compatibility warnings by default', async () => {
       const compWarning = {

packages/cli/src/utils/userStartupWarnings.ts

@@ -12,6 +12,8 @@ import {
   getCompatibilityWarnings,
   WarningPriority,
   type StartupWarning,
+  isHeadlessMode,
+  FatalUntrustedWorkspaceError,
 } from '@google/gemini-cli-core';
 import type { Settings } from '../config/settingsSchema.js';
 import {
@@ -79,10 +81,34 @@ const rootDirectoryCheck: WarningCheck = {
   },
 };
 
+const folderTrustCheck: WarningCheck = {
+  id: 'folder-trust',
+  priority: WarningPriority.High,
+  check: async (workspaceRoot: string, settings: Settings) => {
+    if (!isFolderTrustEnabled(settings)) {
+      return null;
+    }
+
+    const { isTrusted } = isWorkspaceTrusted(settings, workspaceRoot);
+    if (isTrusted === true) {
+      return null;
+    }
+
+    if (isHeadlessMode()) {
+      throw new FatalUntrustedWorkspaceError(
+        'Gemini CLI is not running in a trusted directory. To proceed, either use `--skip-trust`, set the `GEMINI_CLI_TRUST_WORKSPACE=true` environment variable, or trust this directory in interactive mode.',
+      );
+    }
+
+    return null;
+  },
+};
+
 // All warning checks
 const WARNING_CHECKS: readonly WarningCheck[] = [
   homeDirectoryCheck,
   rootDirectoryCheck,
+  folderTrustCheck,
 ];
 
 export async function getUserStartupWarnings(

packages/cli/test-setup.ts

@@ -37,6 +37,14 @@ process.env.FORCE_GENERIC_KEYBINDING_HINTS = 'true';
 // Force generic terminal declaration to ensure stable snapshots across different host environments.
 process.env.TERM_PROGRAM = 'generic';
 
+// Force true color support for terminal capability checks to ensure stable snapshots across different terminals.
+process.env.COLORTERM = 'truecolor';
+
+// Mock stdout color depth to ensure true color capability is detected consistently across local and headless CI runners.
+if (process.stdout) {
+  process.stdout.getColorDepth = () => 24;
+}
+
 import './src/test-utils/customMatchers.js';
 
 let consoleErrorSpy: vi.SpyInstance;

packages/core/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@google/gemini-cli-core",
-  "version": "0.40.0-nightly.20260414.g5b1f7375a",
+  "version": "0.41.0-nightly.20260423.gaa05b4583",
   "description": "Gemini CLI Core",
   "license": "Apache-2.0",
   "repository": {
@@ -20,8 +20,7 @@
     "typecheck": "tsc --noEmit"
   },
   "files": [
-    "dist",
-    "vendor"
+    "dist"
   ],
   "dependencies": {
     "@a2a-js/sdk": "0.3.11",

packages/core/src/agents/memory-manager-agent.test.ts

@@ -1,160 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
-import { MemoryManagerAgent } from './memory-manager-agent.js';
-import {
-  ASK_USER_TOOL_NAME,
-  EDIT_TOOL_NAME,
-  GLOB_TOOL_NAME,
-  GREP_TOOL_NAME,
-  LS_TOOL_NAME,
-  READ_FILE_TOOL_NAME,
-  WRITE_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { Storage } from '../config/storage.js';
-import type { Config } from '../config/config.js';
-import type { HierarchicalMemory } from '../config/memory.js';
-
-function createMockConfig(memory: string | HierarchicalMemory = ''): Config {
-  return {
-    getUserMemory: vi.fn().mockReturnValue(memory),
-  } as unknown as Config;
-}
-
-describe('MemoryManagerAgent', () => {
-  beforeEach(() => {
-    vi.clearAllMocks();
-  });
-
-  afterEach(() => {
-    vi.restoreAllMocks();
-  });
-
-  it('should have the correct name "save_memory"', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    expect(agent.name).toBe('save_memory');
-  });
-
-  it('should be a local agent', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    expect(agent.kind).toBe('local');
-  });
-
-  it('should have a description', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    expect(agent.description).toBeTruthy();
-    expect(agent.description).toContain('memory');
-  });
-
-  it('should have a system prompt with memory management instructions', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    const prompt = agent.promptConfig.systemPrompt;
-    const globalGeminiDir = Storage.getGlobalGeminiDir();
-    expect(prompt).toContain(`Global (${globalGeminiDir}`);
-    expect(prompt).toContain('Project (./');
-    expect(prompt).toContain('Memory Hierarchy');
-    expect(prompt).toContain('De-duplicating');
-    expect(prompt).toContain('Adding');
-    expect(prompt).toContain('Removing stale entries');
-    expect(prompt).toContain('Organizing');
-    expect(prompt).toContain('Routing');
-  });
-
-  it('should have efficiency guidelines in the system prompt', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    const prompt = agent.promptConfig.systemPrompt;
-    expect(prompt).toContain('Efficiency & Performance');
-    expect(prompt).toContain('Use as few turns as possible');
-    expect(prompt).toContain('Do not perform any exploration');
-    expect(prompt).toContain('Be strategic with your thinking');
-    expect(prompt).toContain('Context Awareness');
-  });
-
-  it('should inject hierarchical memory into initial context', () => {
-    const config = createMockConfig({
-      global:
-        '--- Context from: ../../.gemini/GEMINI.md ---\nglobal context\n--- End of Context from: ../../.gemini/GEMINI.md ---',
-      project:
-        '--- Context from: .gemini/GEMINI.md ---\nproject context\n--- End of Context from: .gemini/GEMINI.md ---',
-    });
-
-    const agent = MemoryManagerAgent(config);
-    const query = agent.promptConfig.query;
-
-    expect(query).toContain('# Initial Context');
-    expect(query).toContain('global context');
-    expect(query).toContain('project context');
-  });
-
-  it('should inject flat string memory into initial context', () => {
-    const config = createMockConfig('flat memory content');
-
-    const agent = MemoryManagerAgent(config);
-    const query = agent.promptConfig.query;
-
-    expect(query).toContain('# Initial Context');
-    expect(query).toContain('flat memory content');
-  });
-
-  it('should exclude extension memory from initial context', () => {
-    const config = createMockConfig({
-      global: 'global context',
-      extension: 'extension context that should be excluded',
-      project: 'project context',
-    });
-
-    const agent = MemoryManagerAgent(config);
-    const query = agent.promptConfig.query;
-
-    expect(query).toContain('global context');
-    expect(query).toContain('project context');
-    expect(query).not.toContain('extension context');
-  });
-
-  it('should not include initial context when memory is empty', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    const query = agent.promptConfig.query;
-
-    expect(query).not.toContain('# Initial Context');
-  });
-
-  it('should have file-management and search tools', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    expect(agent.toolConfig).toBeDefined();
-    expect(agent.toolConfig!.tools).toEqual(
-      expect.arrayContaining([
-        READ_FILE_TOOL_NAME,
-        EDIT_TOOL_NAME,
-        WRITE_FILE_TOOL_NAME,
-        LS_TOOL_NAME,
-        GLOB_TOOL_NAME,
-        GREP_TOOL_NAME,
-        ASK_USER_TOOL_NAME,
-      ]),
-    );
-  });
-
-  it('should require a "request" input parameter', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    const schema = agent.inputConfig.inputSchema as Record<string, unknown>;
-    expect(schema).toBeDefined();
-    expect(schema['properties']).toHaveProperty('request');
-    expect(schema['required']).toContain('request');
-  });
-
-  it('should use a fast model', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    expect(agent.modelConfig.model).toBe('flash');
-  });
-
-  it('should declare workspaceDirectories containing the global .gemini directory', () => {
-    const agent = MemoryManagerAgent(createMockConfig());
-    const globalGeminiDir = Storage.getGlobalGeminiDir();
-    expect(agent.workspaceDirectories).toBeDefined();
-    expect(agent.workspaceDirectories).toContain(globalGeminiDir);
-  });
-});

packages/core/src/agents/memory-manager-agent.ts

@@ -1,157 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { z } from 'zod';
-import type { LocalAgentDefinition } from './types.js';
-import {
-  ASK_USER_TOOL_NAME,
-  EDIT_TOOL_NAME,
-  GLOB_TOOL_NAME,
-  GREP_TOOL_NAME,
-  LS_TOOL_NAME,
-  READ_FILE_TOOL_NAME,
-  WRITE_FILE_TOOL_NAME,
-} from '../tools/tool-names.js';
-import { Storage } from '../config/storage.js';
-import { flattenMemory } from '../config/memory.js';
-import { GEMINI_MODEL_ALIAS_FLASH } from '../config/models.js';
-import type { Config } from '../config/config.js';
-
-const MemoryManagerSchema = z.object({
-  response: z
-    .string()
-    .describe('A summary of the memory operations performed.'),
-});
-
-/**
- * A memory management agent that replaces the built-in save_memory tool.
- * It provides richer memory operations: adding, removing, de-duplicating,
- * and organizing memories in the global GEMINI.md file.
- *
- * Users can override this agent by placing a custom save_memory.md
- * in ~/.gemini/agents/ or .gemini/agents/.
- */
-export const MemoryManagerAgent = (
-  config: Config,
-): LocalAgentDefinition<typeof MemoryManagerSchema> => {
-  const globalGeminiDir = Storage.getGlobalGeminiDir();
-
-  const getInitialContext = (): string => {
-    const memory = config.getUserMemory();
-    // Only include global and project memory — extension memory is read-only
-    // and not relevant to the memory manager.
-    const content =
-      typeof memory === 'string'
-        ? memory
-        : flattenMemory({ global: memory.global, project: memory.project });
-    if (!content.trim()) return '';
-    return `\n# Initial Context\n\n${content}\n`;
-  };
-
-  const buildSystemPrompt = (): string =>
-    `
-You are a memory management agent maintaining user memories in GEMINI.md files.
-
-# Memory Hierarchy
-
-## Global (${globalGeminiDir})
-- \`${globalGeminiDir}/GEMINI.md\` — Cross-project user preferences, key personal info,
-  and habits that apply everywhere.
-
-## Project (./)
-- \`./GEMINI.md\` — **Table of Contents** for project-specific context:
-  architecture decisions, conventions, key contacts, and references to
-  subdirectory GEMINI.md files for detailed context.
-- Subdirectory GEMINI.md files (e.g. \`src/GEMINI.md\`, \`docs/GEMINI.md\`) —
-  detailed, domain-specific context for that part of the project. Reference
-  these from the root \`./GEMINI.md\`.
-
-## Routing
-
-When adding a memory, route it to the right store:
-- **Global**: User preferences, personal info, tool aliases, cross-project habits → **global**
-- **Project Root**: Project architecture, conventions, workflows, team info → **project root**
-- **Subdirectory**: Detailed context about a specific module or directory → **subdirectory
-  GEMINI.md**, with a reference added to the project root
-
-- **Ambiguity**: If a memory (like a coding preference or workflow) could be interpreted as either a global habit or a project-specific convention, you **MUST** use \`${ASK_USER_TOOL_NAME}\` to clarify the user's intent. Do NOT make a unilateral decision when ambiguity exists between Global and Project stores.
-
-# Operations
-
-1. **Adding** — Route to the correct store and file. Check for duplicates in your provided context first.
-2. **Removing stale entries** — Delete outdated or unwanted entries. Clean up
-   dangling references.
-3. **De-duplicating** — Semantically equivalent entries should be combined. Keep the most informative version.
-4. **Organizing** — Restructure for clarity. Update references between files.
-
-# Restrictions
-- Keep GEMINI.md files lean — they are loaded into context every session.
-- Keep entries concise.
-- Edit surgically — preserve existing structure and user-authored content.
-- NEVER write or read any files other than GEMINI.md files.
-
-# Efficiency & Performance
-- **Use as few turns as possible.** Execute independent reads and writes to different files in parallel by calling multiple tools in a single turn.
-- **Do not perform any exploration of the codebase.** Try to use the provided file context and only search additional GEMINI.md files as needed to accomplish your task.
-- **Be strategic with your thinking.** carefully decide where to route memories and how to de-duplicate memories, but be decisive with simple memory writes.
-- **Minimize file system operations.** You should typically only modify the GEMINI.md files that are already provided in your context. Only read or write to other files if explicitly directed or if you are following a specific reference from an existing memory file.
-- **Context Awareness.** If a file's content is already provided in the "Initial Context" section, you do not need to call \`read_file\` for it.
-
-# Insufficient context
-If you find that you have insufficient context to read or modify the memories as described,
-reply with what you need, and exit. Do not search the codebase for the missing context.
-`.trim();
-
-  return {
-    kind: 'local',
-    name: 'save_memory',
-    displayName: 'Memory Manager',
-    description: `Writes and reads memory, preferences or facts across ALL future sessions. Use this for recurring instructions like coding styles or tool aliases.`,
-    inputConfig: {
-      inputSchema: {
-        type: 'object',
-        properties: {
-          request: {
-            type: 'string',
-            description:
-              'The memory operation to perform. Examples: "Remember that I prefer tabs over spaces", "Clean up stale memories", "De-duplicate my memories", "Organize my memories".',
-          },
-        },
-        required: ['request'],
-      },
-    },
-    outputConfig: {
-      outputName: 'result',
-      description: 'A summary of the memory operations performed.',
-      schema: MemoryManagerSchema,
-    },
-    modelConfig: {
-      model: GEMINI_MODEL_ALIAS_FLASH,
-    },
-    workspaceDirectories: [globalGeminiDir],
-    toolConfig: {
-      tools: [
-        READ_FILE_TOOL_NAME,
-        EDIT_TOOL_NAME,
-        WRITE_FILE_TOOL_NAME,
-        LS_TOOL_NAME,
-        GLOB_TOOL_NAME,
-        GREP_TOOL_NAME,
-        ASK_USER_TOOL_NAME,
-      ],
-    },
-    get promptConfig() {
-      return {
-        systemPrompt: buildSystemPrompt(),
-        query: `${getInitialContext()}\${request}`,
-      };
-    },
-    runConfig: {
-      maxTimeMinutes: 5,
-      maxTurns: 10,
-    },
-  };
-};

packages/core/src/agents/registry.ts

@@ -15,7 +15,6 @@ import { CodebaseInvestigatorAgent } from './codebase-investigator.js';
 import { CliHelpAgent } from './cli-help-agent.js';
 import { GeneralistAgent } from './generalist-agent.js';
 import { BrowserAgentDefinition } from './browser/browserAgentDefinition.js';
-import { MemoryManagerAgent } from './memory-manager-agent.js';
 import { AgentTool } from './agent-tool.js';
 import { A2AAuthProviderFactory } from './auth-provider/factory.js';
 import type { AuthenticationHandler } from '@a2a-js/sdk/client';
@@ -293,14 +292,6 @@ export class AgentRegistry {
         this.registerLocalAgent(BrowserAgentDefinition(this.config));
       }
     }
-
-    // Register the memory manager agent as a replacement for the save_memory tool.
-    // The agent declares its own workspaceDirectories (e.g. ~/.gemini) which are
-    // scoped to its execution via runWithScopedWorkspaceContext in LocalAgentExecutor,
-    // keeping the main agent's workspace context clean.
-    if (this.config.isMemoryManagerEnabled()) {
-      this.registerLocalAgent(MemoryManagerAgent(this.config));
-    }
   }
 
   private async refreshAgents(

packages/core/src/config/config.test.ts

@@ -3500,8 +3500,8 @@ describe('Config JIT Initialization', () => {
     expect(config.getUserMemory()).toBe('Initial Memory');
   });
 
-  describe('isMemoryManagerEnabled', () => {
-    it('should default to false', () => {
+  describe('isMemoryV2Enabled', () => {
+    it('should default to true', () => {
       const params: ConfigParameters = {
         sessionId: 'test-session',
         targetDir: '/tmp/test',
@@ -3511,21 +3511,106 @@ describe('Config JIT Initialization', () => {
       };
 
       config = new Config(params);
-      expect(config.isMemoryManagerEnabled()).toBe(false);
+      expect(config.isMemoryV2Enabled()).toBe(true);
     });
 
-    it('should return true when experimentalMemoryManager is true', () => {
+    it('should return false when experimentalMemoryV2 is explicitly false', () => {
       const params: ConfigParameters = {
         sessionId: 'test-session',
         targetDir: '/tmp/test',
         debugMode: false,
         model: 'test-model',
         cwd: '/tmp/test',
-        experimentalMemoryManager: true,
+        experimentalMemoryV2: false,
       };
 
       config = new Config(params);
-      expect(config.isMemoryManagerEnabled()).toBe(true);
+      expect(config.isMemoryV2Enabled()).toBe(false);
+    });
+
+    it('should return true when experimentalMemoryV2 is true', () => {
+      const params: ConfigParameters = {
+        sessionId: 'test-session',
+        targetDir: '/tmp/test',
+        debugMode: false,
+        model: 'test-model',
+        cwd: '/tmp/test',
+        experimentalMemoryV2: true,
+      };
+
+      config = new Config(params);
+      expect(config.isMemoryV2Enabled()).toBe(true);
+    });
+
+    it('should NOT add the global ~/.gemini directory to the workspace when enabled', async () => {
+      // The prompt-driven memoryV2 mode does not broaden the workspace
+      // to include the global ~/.gemini/ directory. Cross-project personal
+      // preferences are routed to ~/.gemini/GEMINI.md via the surgical
+      // isPathAllowed allowlist instead — see the next two tests.
+      const params: ConfigParameters = {
+        sessionId: 'test-session',
+        targetDir: '/tmp/test',
+        debugMode: false,
+        model: 'test-model',
+        cwd: '/tmp/test',
+        experimentalMemoryV2: true,
+      };
+
+      config = new Config(params);
+      await config.initialize();
+
+      const directories = config.getWorkspaceContext().getDirectories();
+      expect(directories).not.toContain(Storage.getGlobalGeminiDir());
+    });
+
+    it('should allow isPathAllowed to write the global ~/.gemini/GEMINI.md file', async () => {
+      // Surgical allowlist: when memoryV2 is on, the prompt routes
+      // cross-project personal preferences to ~/.gemini/GEMINI.md, so the
+      // agent must be able to edit that exact file via edit/write_file.
+      const params: ConfigParameters = {
+        sessionId: 'test-session',
+        targetDir: '/tmp/test',
+        debugMode: false,
+        model: 'test-model',
+        cwd: '/tmp/test',
+        experimentalMemoryV2: true,
+      };
+
+      config = new Config(params);
+      await config.initialize();
+
+      const globalGeminiMdPath = path.join(
+        Storage.getGlobalGeminiDir(),
+        'GEMINI.md',
+      );
+      expect(config.isPathAllowed(globalGeminiMdPath)).toBe(true);
+    });
+
+    it('should NOT allow isPathAllowed to write other files under ~/.gemini/ (least privilege)', async () => {
+      // The allowlist is surgical: only ~/.gemini/GEMINI.md is reachable.
+      // settings.json, keybindings.json, credentials, etc. remain disallowed.
+      const params: ConfigParameters = {
+        sessionId: 'test-session',
+        targetDir: '/tmp/test',
+        debugMode: false,
+        model: 'test-model',
+        cwd: '/tmp/test',
+        experimentalMemoryV2: true,
+      };
+
+      config = new Config(params);
+      await config.initialize();
+
+      const globalDir = Storage.getGlobalGeminiDir();
+      expect(config.isPathAllowed(path.join(globalDir, 'settings.json'))).toBe(
+        false,
+      );
+      expect(
+        config.isPathAllowed(path.join(globalDir, 'keybindings.json')),
+      ).toBe(false);
+      expect(
+        config.isPathAllowed(path.join(globalDir, 'oauth_creds.json')),
+      ).toBe(false);
     });
   });
 
@@ -3557,18 +3642,18 @@ describe('Config JIT Initialization', () => {
       expect(config.isAutoMemoryEnabled()).toBe(true);
     });
 
-    it('should be independent of experimentalMemoryManager', () => {
+    it('should be independent of experimentalMemoryV2', () => {
       const params: ConfigParameters = {
         sessionId: 'test-session',
         targetDir: '/tmp/test',
         debugMode: false,
         model: 'test-model',
         cwd: '/tmp/test',
-        experimentalMemoryManager: true,
+        experimentalMemoryV2: true,
       };
 
       config = new Config(params);
-      expect(config.isMemoryManagerEnabled()).toBe(true);
+      expect(config.isMemoryV2Enabled()).toBe(true);
       expect(config.isAutoMemoryEnabled()).toBe(false);
     });
   });

packages/core/src/config/config.ts

@@ -41,7 +41,11 @@ import { EditTool } from '../tools/edit.js';
 import { ShellTool } from '../tools/shell.js';
 import { WriteFileTool } from '../tools/write-file.js';
 import { WebFetchTool } from '../tools/web-fetch.js';
-import { MemoryTool, setGeminiMdFilename } from '../tools/memoryTool.js';
+import {
+  MemoryTool,
+  setGeminiMdFilename,
+  getCurrentGeminiMdFilename,
+} from '../tools/memoryTool.js';
 import { WebSearchTool } from '../tools/web-search.js';
 import { AskUserTool } from '../tools/ask-user.js';
 import { UpdateTopicTool } from '../tools/topicTool.js';
@@ -705,7 +709,7 @@ export interface ConfigParameters {
   adminSkillsEnabled?: boolean;
   experimentalJitContext?: boolean;
   autoDistillation?: boolean;
-  experimentalMemoryManager?: boolean;
+  experimentalMemoryV2?: boolean;
   experimentalAutoMemory?: boolean;
   experimentalContextManagementConfig?: string;
   experimentalAgentHistoryTruncation?: boolean;
@@ -950,7 +954,7 @@ export class Config implements McpContext, AgentLoopContext {
   private disabledSkills: string[];
   private readonly adminSkillsEnabled: boolean;
   private readonly experimentalJitContext: boolean;
-  private readonly experimentalMemoryManager: boolean;
+  private readonly experimentalMemoryV2: boolean;
   private readonly experimentalAutoMemory: boolean;
   private readonly experimentalContextManagementConfig?: string;
   private readonly memoryBoundaryMarkers: readonly string[];
@@ -1167,8 +1171,8 @@ export class Config implements McpContext, AgentLoopContext {
       modelConfigServiceConfig ?? DEFAULT_MODEL_CONFIGS,
     );
 
-    this.experimentalJitContext = params.experimentalJitContext ?? false;
-    this.experimentalMemoryManager = params.experimentalMemoryManager ?? false;
+    this.experimentalJitContext = params.experimentalJitContext ?? true;
+    this.experimentalMemoryV2 = params.experimentalMemoryV2 ?? true;
     this.experimentalAutoMemory = params.experimentalAutoMemory ?? false;
     this.experimentalContextManagementConfig =
       params.experimentalContextManagementConfig;
@@ -2502,8 +2506,8 @@ export class Config implements McpContext, AgentLoopContext {
     return this.memoryBoundaryMarkers;
   }
 
-  isMemoryManagerEnabled(): boolean {
-    return this.experimentalMemoryManager;
+  isMemoryV2Enabled(): boolean {
+    return this.experimentalMemoryV2;
   }
 
   isAutoMemoryEnabled(): boolean {
@@ -3031,7 +3035,10 @@ export class Config implements McpContext, AgentLoopContext {
 
   /**
    * Checks if a given absolute path is allowed for file system operations.
-   * A path is allowed if it's within the workspace context or the project's temporary directory.
+   * A path is allowed if it's within the workspace context, the project's
+   * temporary directory, or is exactly the global personal `~/.gemini/GEMINI.md`
+   * file (the latter is the only file under `~/.gemini/` that is reachable —
+   * settings, credentials, keybindings, etc. remain disallowed).
    *
    * @param absolutePath The absolute path to check.
    * @returns true if the path is allowed, false otherwise.
@@ -3046,8 +3053,25 @@ export class Config implements McpContext, AgentLoopContext {
 
     const projectTempDir = this.storage.getProjectTempDir();
     const resolvedTempDir = resolveToRealPath(projectTempDir);
+    if (isSubpath(resolvedTempDir, resolvedPath)) {
+      return true;
+    }
 
-    return isSubpath(resolvedTempDir, resolvedPath);
+    // Surgical allowlist: the global personal GEMINI.md file (and ONLY that
+    // file) is reachable so the prompt-driven memory flow can persist
+    // cross-project personal preferences. This deliberately does NOT
+    // allowlist the rest of `~/.gemini/`.
+    const globalMemoryFilePath = path.join(
+      Storage.getGlobalGeminiDir(),
+      getCurrentGeminiMdFilename(),
+    );
+    const resolvedGlobalMemoryFilePath =
+      resolveToRealPath(globalMemoryFilePath);
+    if (resolvedPath === resolvedGlobalMemoryFilePath) {
+      return true;
+    }
+
+    return false;
   }
 
   /**
@@ -3681,7 +3705,7 @@ export class Config implements McpContext, AgentLoopContext {
         new ReadBackgroundOutputTool(this, this.messageBus),
       ),
     );
-    if (!this.isMemoryManagerEnabled()) {
+    if (!this.isMemoryV2Enabled()) {
       maybeRegister(MemoryTool, () =>
         registry.registerTool(new MemoryTool(this.messageBus, this.storage)),
       );

packages/core/src/config/memory.ts

@@ -24,7 +24,7 @@ export function flattenMemory(memory?: string | HierarchicalMemory): string {
   }
   if (memory.userProjectMemory?.trim()) {
     sections.push({
-      name: 'User Project Memory',
+      name: 'Private Project Memory',
       content: memory.userProjectMemory.trim(),
     });
   }

packages/core/src/config/path-validation.test.ts

@@ -45,19 +45,28 @@ describe('Config Path Validation', () => {
     });
   });
 
-  it('should allow access to ~/.gemini if it is added to the workspace', () => {
-    const geminiMdPath = path.join(globalGeminiDir, 'GEMINI.md');
+  it('should allow access to a file under ~/.gemini once that directory is added to the workspace', () => {
+    // Use settings.json rather than GEMINI.md as the example: the latter is
+    // now reachable via a surgical isPathAllowed allowlist regardless of
+    // workspace membership (covered by dedicated tests in config.test.ts), so
+    // it can no longer demonstrate the workspace-addition semantic on its
+    // own. settings.json is NOT on the allowlist, so it preserves the
+    // original "denied -> add to workspace -> allowed" flow this test was
+    // written to verify, and additionally double-asserts the least-privilege
+    // guarantee that the allowlist does not leak access to other files
+    // under ~/.gemini/.
+    const settingsPath = path.join(globalGeminiDir, 'settings.json');
 
     // Before adding, it should be denied
-    expect(config.isPathAllowed(geminiMdPath)).toBe(false);
+    expect(config.isPathAllowed(settingsPath)).toBe(false);
 
     // Add to workspace
     config.getWorkspaceContext().addDirectory(globalGeminiDir);
 
     // Now it should be allowed
-    expect(config.isPathAllowed(geminiMdPath)).toBe(true);
-    expect(config.validatePathAccess(geminiMdPath, 'read')).toBeNull();
-    expect(config.validatePathAccess(geminiMdPath, 'write')).toBeNull();
+    expect(config.isPathAllowed(settingsPath)).toBe(true);
+    expect(config.validatePathAccess(settingsPath, 'read')).toBeNull();
+    expect(config.validatePathAccess(settingsPath, 'write')).toBeNull();
   });
 
   it('should still allow project workspace paths', () => {

packages/core/src/config/storage.ts

@@ -20,6 +20,7 @@ import { ProjectRegistry } from './projectRegistry.js';
 import { StorageMigration } from './storageMigration.js';
 
 export const OAUTH_FILE = 'oauth_creds.json';
+export const TRUSTED_FOLDERS_FILENAME = 'trustedFolders.json';
 const TMP_DIR_NAME = 'tmp';
 const BIN_DIR_NAME = 'bin';
 const AGENTS_DIR_NAME = '.agents';
@@ -86,6 +87,13 @@ export class Storage {
     return path.join(Storage.getGlobalGeminiDir(), GOOGLE_ACCOUNTS_FILENAME);
   }
 
+  static getTrustedFoldersPath(): string {
+    if (process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH']) {
+      return process.env['GEMINI_CLI_TRUSTED_FOLDERS_PATH'];
+    }
+    return path.join(Storage.getGlobalGeminiDir(), TRUSTED_FOLDERS_FILENAME);
+  }
+
   static getUserCommandsDir(): string {
     return path.join(Storage.getGlobalGeminiDir(), 'commands');
   }

packages/core/src/core/client.test.ts

@@ -1244,9 +1244,6 @@ ${JSON.stringify(
         count: 2,
       });
 
-      const abortSpy = vi.spyOn(AbortController.prototype, 'abort');
-
-      // Act
       const stream = client.sendMessageStream(
         [{ text: 'Hi' }],
         new AbortController().signal,
@@ -1267,7 +1264,6 @@ ${JSON.stringify(
 
       // Assert
       expect(events).toContainEqual({ type: GeminiEventType.LoopDetected });
-      expect(abortSpy).toHaveBeenCalled();
       expect(finalResult).toBeInstanceOf(Turn);
     });
 

packages/core/src/core/client.ts

@@ -684,9 +684,6 @@ export class GeminiClient {
     // Re-initialize turn with fresh history
     turn = new Turn(this.getChat(), prompt_id);
 
-    const controller = new AbortController();
-    const linkedSignal = AbortSignal.any([signal, controller.signal]);
-
     const loopResult = await this.loopDetector.turnStarted(signal);
     if (loopResult.count > 1) {
       yield { type: GeminiEventType.LoopDetected };
@@ -747,7 +744,7 @@ export class GeminiClient {
     const resultStream = turn.run(
       modelConfigKey,
       request,
-      linkedSignal,
+      signal,
       displayContent,
     );
     let isError = false;
@@ -783,7 +780,6 @@ export class GeminiClient {
     }
 
     if (loopDetectedAbort) {
-      controller.abort();
       return turn;
     }
 
@@ -795,10 +791,8 @@ export class GeminiClient {
         boundedTurns,
         isInvalidStreamRetry,
         displayContent,
-        controller,
       );
     }
-
     if (isError) {
       return turn;
     }
@@ -1252,10 +1246,7 @@ export class GeminiClient {
     boundedTurns: number,
     isInvalidStreamRetry: boolean,
     displayContent?: PartListUnion,
-    controllerToAbort?: AbortController,
   ): AsyncGenerator<ServerGeminiStreamEvent, Turn> {
-    controllerToAbort?.abort();
-
     // Clear the detection flag so the recursive turn can proceed, but the count remains 1.
     this.loopDetector.clearDetection();
 

packages/core/src/core/prompts.test.ts

@@ -104,7 +104,7 @@ describe('Core System Prompt (prompts.ts)', () => {
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
       isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
-      isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
+      isMemoryV2Enabled: vi.fn().mockReturnValue(false),
       isAgentsEnabled: vi.fn().mockReturnValue(false),
       getPreviewFeatures: vi.fn().mockReturnValue(true),
       getModel: vi.fn().mockReturnValue(DEFAULT_GEMINI_MODEL_AUTO),
@@ -458,7 +458,7 @@ describe('Core System Prompt (prompts.ts)', () => {
         isInteractive: vi.fn().mockReturnValue(false),
         isInteractiveShellEnabled: vi.fn().mockReturnValue(false),
         isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
-        isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
+        isMemoryV2Enabled: vi.fn().mockReturnValue(false),
         isAgentsEnabled: vi.fn().mockReturnValue(false),
         getModel: vi.fn().mockReturnValue('auto'),
         getActiveModel: vi.fn().mockReturnValue(PREVIEW_GEMINI_MODEL),

packages/core/src/ide/ide-client.ts

@@ -31,6 +31,7 @@ import {
   createProxyAwareFetch,
   type StdioConfig,
 } from './ide-connection-utils.js';
+import { getVersion } from '../utils/version.js';
 
 const logger = {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -588,8 +589,7 @@ export class IdeClient {
       logger.debug(`Server URL: ${serverUrl}`);
       this.client = new Client({
         name: 'streamable-http-client',
-        // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: await getVersion(),
       });
       transport = new StreamableHTTPClientTransport(new URL(serverUrl), {
         fetch: await createProxyAwareFetch(ideServerHost),
@@ -623,8 +623,7 @@ export class IdeClient {
       logger.debug('Attempting to connect to IDE via stdio');
       this.client = new Client({
         name: 'stdio-client',
-        // TODO(#3487): use the CLI version here.
-        version: '1.0.0',
+        version: await getVersion(),
       });
 
       transport = new StdioClientTransport({

packages/core/src/index.ts

@@ -294,3 +294,6 @@ export type { Content, Part, FunctionCall } from '@google/genai';
 // Export context types and profiles
 export * from './context/types.js';
 export * from './context/profiles.js';
+
+// Export trust utility
+export * from './utils/trust.js';

packages/core/src/prompts/promptProvider.test.ts

@@ -73,7 +73,7 @@ describe('PromptProvider', () => {
       isInteractive: vi.fn().mockReturnValue(true),
       isInteractiveShellEnabled: vi.fn().mockReturnValue(true),
       isTopicUpdateNarrationEnabled: vi.fn().mockReturnValue(false),
-      isMemoryManagerEnabled: vi.fn().mockReturnValue(false),
+      isMemoryV2Enabled: vi.fn().mockReturnValue(false),
       getSkillManager: vi.fn().mockReturnValue({
         getSkills: vi.fn().mockReturnValue([]),
       }),

packages/core/src/prompts/promptProvider.ts

@@ -30,7 +30,11 @@ import {
 } from '../tools/tool-names.js';
 import { resolveModel, supportsModernFeatures } from '../config/models.js';
 import { DiscoveredMCPTool } from '../tools/mcp-tool.js';
-import { getAllGeminiMdFilenames } from '../tools/memoryTool.js';
+import {
+  getAllGeminiMdFilenames,
+  getGlobalMemoryFilePath,
+  getProjectMemoryIndexFilePath,
+} from '../tools/memoryTool.js';
 import type { AgentLoopContext } from '../config/agent-loop-context.js';
 
 /**
@@ -223,7 +227,13 @@ export class PromptProvider {
               context.config.getEnableShellOutputEfficiency(),
             interactiveShellEnabled: context.config.isInteractiveShellEnabled(),
             topicUpdateNarration: isTopicUpdateNarrationEnabled,
-            memoryManagerEnabled: context.config.isMemoryManagerEnabled(),
+            memoryV2Enabled: context.config.isMemoryV2Enabled(),
+            userProjectMemoryPath: context.config.isMemoryV2Enabled()
+              ? getProjectMemoryIndexFilePath(context.config.storage)
+              : undefined,
+            globalMemoryPath: context.config.isMemoryV2Enabled()
+              ? getGlobalMemoryFilePath()
+              : undefined,
           }),
         ),
         sandbox: this.withSection('sandbox', () => ({

packages/core/src/prompts/snippets-memory-manager.test.ts

@@ -1,34 +0,0 @@
-/**
- * @license
- * Copyright 2026 Google LLC
- * SPDX-License-Identifier: Apache-2.0
- */
-
-import { describe, it, expect } from 'vitest';
-import { renderOperationalGuidelines } from './snippets.js';
-
-describe('renderOperationalGuidelines - memoryManagerEnabled', () => {
-  const baseOptions = {
-    interactive: true,
-    interactiveShellEnabled: false,
-    topicUpdateNarration: false,
-    memoryManagerEnabled: false,
-  };
-
-  it('should include standard memory tool guidance when memoryManagerEnabled is false', () => {
-    const result = renderOperationalGuidelines(baseOptions);
-    expect(result).toContain('save_memory');
-    expect(result).toContain('persist facts across sessions');
-    expect(result).not.toContain('subagent');
-  });
-
-  it('should include subagent memory guidance when memoryManagerEnabled is true', () => {
-    const result = renderOperationalGuidelines({
-      ...baseOptions,
-      memoryManagerEnabled: true,
-    });
-    expect(result).toContain('save_memory');
-    expect(result).toContain('subagent');
-    expect(result).not.toContain('persistent user-related information');
-  });
-});

packages/core/src/prompts/snippets-memory-v2.test.ts

@@ -0,0 +1,106 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect } from 'vitest';
+import { renderOperationalGuidelines } from './snippets.js';
+
+describe('renderOperationalGuidelines - memoryV2Enabled', () => {
+  const baseOptions = {
+    interactive: true,
+    interactiveShellEnabled: false,
+    topicUpdateNarration: false,
+    memoryV2Enabled: false,
+  };
+
+  it('should include standard memory tool guidance when memoryV2Enabled is false', () => {
+    const result = renderOperationalGuidelines(baseOptions);
+    expect(result).toContain('save_memory');
+    expect(result).toContain('persist facts across sessions');
+    expect(result).not.toContain('Instruction and Memory Files');
+  });
+
+  it('should distinguish shared GEMINI.md instructions from private MEMORY.md when memoryV2Enabled is true', () => {
+    const result = renderOperationalGuidelines({
+      ...baseOptions,
+      memoryV2Enabled: true,
+    });
+    expect(result).toContain('Instruction and Memory Files');
+    expect(result).toContain('GEMINI.md');
+    expect(result).toContain('./GEMINI.md');
+    expect(result).toContain('MEMORY.md');
+    expect(result).toContain('sibling `*.md` file');
+    expect(result).toContain('There is no `save_memory` tool');
+    expect(result).not.toContain('subagent');
+
+    // The Global Personal Memory tier is now opt-in via globalMemoryPath.
+    // When it is NOT provided (this case), the bullet and the cross-project
+    // routing rule must not be rendered.
+    expect(result).not.toContain('**Global Personal Memory**');
+    expect(result).not.toContain('across all my projects');
+
+    // Per-tier routing block must be present so the model has one trigger
+    // per home rather than a single broad "remember -> private folder"
+    // default that causes duplicate writes across tiers.
+    expect(result).toContain('Routing rules — pick exactly one tier per fact');
+    expect(result).toContain('team-shared convention');
+    expect(result).toContain('personal-to-them local setup');
+
+    // Explicit mutual-exclusion rule: each fact lives in exactly one tier.
+    expect(result).toContain('Never duplicate or mirror the same fact');
+
+    // MEMORY.md must be scoped to its sibling notes only and must never
+    // point at GEMINI.md topics.
+    expect(result).toContain('index for its sibling `*.md` notes');
+    expect(result).toContain('never use it to point at');
+  });
+
+  it('should NOT include the Private Project Memory bullet when userProjectMemoryPath is undefined', () => {
+    const result = renderOperationalGuidelines({
+      ...baseOptions,
+      memoryV2Enabled: true,
+    });
+    expect(result).not.toContain('**Private Project Memory**');
+  });
+
+  it('should include the Private Project Memory bullet with the absolute path when provided', () => {
+    const userProjectMemoryPath =
+      '/Users/test/.gemini/tmp/abc123/memory/MEMORY.md';
+    const result = renderOperationalGuidelines({
+      ...baseOptions,
+      memoryV2Enabled: true,
+      userProjectMemoryPath,
+    });
+    expect(result).toContain('**Private Project Memory**');
+    expect(result).toContain(userProjectMemoryPath);
+    expect(result).toContain('NOT** be committed to the repo');
+  });
+
+  it('should NOT include the Global Personal Memory bullet or cross-project routing rule when globalMemoryPath is undefined', () => {
+    const result = renderOperationalGuidelines({
+      ...baseOptions,
+      memoryV2Enabled: true,
+    });
+    expect(result).not.toContain('**Global Personal Memory**');
+    expect(result).not.toContain('across all my projects');
+    expect(result).not.toContain('cross-project personal preference');
+  });
+
+  it('should include the Global Personal Memory bullet, cross-project routing rule, and four-tier mutual-exclusion when globalMemoryPath is provided', () => {
+    const globalMemoryPath = '/Users/test/.gemini/GEMINI.md';
+    const result = renderOperationalGuidelines({
+      ...baseOptions,
+      memoryV2Enabled: true,
+      globalMemoryPath,
+    });
+    expect(result).toContain('**Global Personal Memory**');
+    expect(result).toContain(globalMemoryPath);
+    expect(result).toContain('cross-project personal preference');
+    expect(result).toContain('across all my projects');
+    // Mutual-exclusion rule must explicitly cover all four tiers when the
+    // global tier is surfaced.
+    expect(result).toContain('across all four tiers');
+  });
+});

packages/core/src/prompts/snippets.legacy.ts

@@ -74,7 +74,12 @@ export interface OperationalGuidelinesOptions {
   enableShellEfficiency: boolean;
   interactiveShellEnabled: boolean;
   topicUpdateNarration?: boolean;
-  memoryManagerEnabled: boolean;
+  memoryV2Enabled: boolean;
+  /**
+   * Absolute path to the user's per-project private memory index. See
+   * snippets.ts for full semantics.
+   */
+  userProjectMemoryPath?: string;
 }
 
 export type SandboxMode = 'macos-seatbelt' | 'generic' | 'outside';
@@ -409,7 +414,7 @@ ${trimmed}
   }
   if (memory.userProjectMemory?.trim()) {
     sections.push(
-      `<user_project_memory>\n--- User's Project Memory (private, not committed to repo) ---\n${memory.userProjectMemory.trim()}\n--- End User's Project Memory ---\n</user_project_memory>`,
+      `<user_project_memory>\n--- Private Project Memory Index (private, not committed to repo) ---\n${memory.userProjectMemory.trim()}\n--- End Private Project Memory Index ---\n</user_project_memory>`,
     );
   }
   if (memory.extension?.trim()) {
@@ -697,9 +702,16 @@ function toolUsageInteractive(
 function toolUsageRememberingFacts(
   options: OperationalGuidelinesOptions,
 ): string {
-  if (options.memoryManagerEnabled) {
+  if (options.memoryV2Enabled) {
+    const userProjectBullet = options.userProjectMemoryPath
+      ? `
+  - **Private Project Memory** (\`${options.userProjectMemoryPath}\`): Personal-to-the-user, project-specific notes that must **NOT** be committed to the repo. Keep this file concise: it is the private index for this workspace. Store richer detail in sibling \`*.md\` files in the same folder and use \`MEMORY.md\` to point to them.`
+      : '';
     return `
-- **Memory Tool:** You MUST use the '${AGENT_TOOL_NAME}' tool with the 'save_memory' agent to proactively record facts, preferences, and workflows that apply across all sessions. Whenever the user explicitly tells you to "remember" something, or when they state a preference or workflow (like "always lint after editing"), you MUST immediately call the save_memory subagent. Never save transient session state. Do not use memory to store summaries of code changes, bug fixes, or findings discovered during a task; this tool is strictly for persistent general knowledge.`;
+- **Instruction and Memory Files:** You persist long-lived project context by editing markdown files directly with '${EDIT_TOOL_NAME}' or '${WRITE_FILE_TOOL_NAME}'. There is no \`save_memory\` tool. The current contents of all loaded \`GEMINI.md\` files and the private project \`MEMORY.md\` index are already in your context — do not re-read them before editing.
+  - **Project Instructions** (\`./GEMINI.md\`): Team-shared architecture, conventions, workflows, and other repo guidance. **Committed to the repo and shared with the team.**
+  - **Subdirectory Instructions** (e.g. \`./src/GEMINI.md\`): Scoped instructions for one part of the project. Reference them from \`./GEMINI.md\` so they remain discoverable.${userProjectBullet}
+  Whenever the user tells you to "remember" something or states a durable personal workflow for this codebase, save it in the private project memory folder immediately. Put concise index entries in \`MEMORY.md\`; if more detail is useful, create or update a sibling \`*.md\` note in the same folder and keep \`MEMORY.md\` as the pointer. Only update \`GEMINI.md\` files when the memory is a shared project instruction or convention that belongs in the repo. If it could be either tier, ask the user. Never save transient session state, summaries of code changes, bug fixes, or task-specific findings — these files are loaded into every session and must stay lean.`;
   }
   const base = `
 - **Remembering Facts:** Use the '${MEMORY_TOOL_NAME}' tool to remember specific, *user-related* facts or preferences when the user explicitly asks, or when they state a clear, concise piece of information that would help personalize or streamline *your future interactions with them* (e.g., preferred coding style, common project paths they use, personal tool aliases, or a workflow like "always lint after editing"). This tool is for user-specific information that should persist across sessions. Do *not* use it for general project context or information.`;

packages/core/src/prompts/snippets.ts

@@ -83,7 +83,25 @@ export interface OperationalGuidelinesOptions {
   interactive: boolean;
   interactiveShellEnabled: boolean;
   topicUpdateNarration: boolean;
-  memoryManagerEnabled: boolean;
+  memoryV2Enabled: boolean;
+  /**
+   * Absolute path to the user's per-project private memory index
+   * (e.g. ~/.gemini/tmp/<project-hash>/memory/MEMORY.md). Surfaced to the
+   * model when memoryV2Enabled is true so the prompt-driven memory flow
+   * can route project-specific personal notes there instead of the committed
+   * project GEMINI.md.
+   */
+  userProjectMemoryPath?: string;
+  /**
+   * Absolute path to the user's global personal memory file
+   * (e.g. ~/.gemini/GEMINI.md). Surfaced to the model when memoryV2Enabled
+   * is true so the prompt-driven memory flow can route cross-project personal
+   * preferences (preferences that follow the user across all workspaces) there
+   * instead of the project-scoped tiers. Config.isPathAllowed surgically
+   * allowlists this exact file (only this file, not the rest of `~/.gemini/`)
+   * so the agent can edit it directly.
+   */
+  globalMemoryPath?: string;
 }
 
 export type SandboxMode = 'macos-seatbelt' | 'generic' | 'outside';
@@ -525,7 +543,7 @@ ${trimmed}
   }
   if (memory.userProjectMemory?.trim()) {
     sections.push(
-      `<user_project_memory>\n--- User's Project Memory (private, not committed to repo) ---\n${memory.userProjectMemory.trim()}\n--- End User's Project Memory ---\n</user_project_memory>`,
+      `<user_project_memory>\n--- Private Project Memory Index (private, not committed to repo) ---\n${memory.userProjectMemory.trim()}\n--- End Private Project Memory Index ---\n</user_project_memory>`,
     );
   }
   if (memory.extension?.trim()) {
@@ -810,9 +828,30 @@ function toolUsageInteractive(
 function toolUsageRememberingFacts(
   options: OperationalGuidelinesOptions,
 ): string {
-  if (options.memoryManagerEnabled) {
+  if (options.memoryV2Enabled) {
+    const userProjectBullet = options.userProjectMemoryPath
+      ? `
+  - **Private Project Memory** (\`${options.userProjectMemoryPath}\`): Personal-to-the-user, project-specific notes that must **NOT** be committed to the repo. Keep this file concise: it is the private index for this workspace. Store richer detail in sibling \`*.md\` files in the same folder and use \`MEMORY.md\` to point to them.`
+      : '';
+    const globalMemoryBullet = options.globalMemoryPath
+      ? `
+  - **Global Personal Memory** (\`${options.globalMemoryPath}\`): Cross-project personal preferences and facts about the user that should follow them into every workspace (e.g. preferred testing framework across all projects, language preferences, coding-style defaults). Loaded automatically in every session. Keep entries concise and durable — never workspace-specific.`
+      : '';
+    const globalRoutingRule = options.globalMemoryPath
+      ? `
+  - When the user states a **cross-project personal preference** that should follow them into every workspace ("I always prefer X", "across all my projects", "my personal coding style is Y", "in general I like Z"), update the global personal memory file. Do **not** also write it into a \`GEMINI.md\` file or the private memory folder.`
+      : '';
     return `
-- **Memory Tool:** You MUST use the '${AGENT_TOOL_NAME}' tool with the 'save_memory' agent to proactively record facts, preferences, and workflows that apply across all sessions. Whenever the user explicitly tells you to "remember" something, or when they state a preference or workflow (like "always lint after editing"), you MUST immediately call the save_memory subagent. Never save transient session state. Do not use memory to store summaries of code changes, bug fixes, or findings discovered during a task; this tool is strictly for persistent general knowledge.`;
+- **Instruction and Memory Files:** You persist long-lived project context by editing markdown files directly with ${formatToolName(EDIT_TOOL_NAME)} or ${formatToolName(WRITE_FILE_TOOL_NAME)}. There is no \`save_memory\` tool. The current contents of all loaded \`GEMINI.md\` files and the private project \`MEMORY.md\` index are already in your context — do not re-read them before editing.
+  - **Project Instructions** (\`./GEMINI.md\`): Team-shared architecture, conventions, workflows, and other repo guidance. **Committed to the repo and shared with the team.**
+  - **Subdirectory Instructions** (e.g. \`./src/GEMINI.md\`): Scoped instructions for one part of the project. Reference them from \`./GEMINI.md\` so they remain discoverable.${userProjectBullet}${globalMemoryBullet}
+  **Routing rules — pick exactly one tier per fact:**
+  - When the user states a **team-shared convention, architecture rule, or repo-wide workflow** ("our project uses X", "the team always Y", "for this repo, always Z"), update the relevant \`GEMINI.md\` file. Do **not** also write it into the private memory folder or the global personal memory file.
+  - When the user states a **personal-to-them local setup, machine-specific note, or private workflow** for this codebase ("on my machine", "my local setup", "do not commit this"), save it under the private project memory folder. Do **not** also write it into a \`GEMINI.md\` file or the global personal memory file.${globalRoutingRule}
+  - If a fact could plausibly belong to more than one tier, **ask the user** which tier they want before writing.
+  **Never duplicate or mirror the same fact across tiers** — each fact lives in exactly one file across all four tiers (project \`GEMINI.md\`, subdirectory \`GEMINI.md\`, private project memory, global personal memory). Do not add cross-references between any of them.
+  **Inside the private memory folder:** \`MEMORY.md\` is the index for its sibling \`*.md\` notes **in that same folder only** — never use it to point at, summarize, or duplicate content from any \`GEMINI.md\` file. For brief facts, write the entry directly into \`MEMORY.md\`. When a note has substantial detail (multiple sections, procedures, or fields), put the detail in a sibling \`*.md\` file in the same folder and add a one-line pointer entry in \`MEMORY.md\`.
+  Never save transient session state, summaries of code changes, bug fixes, or task-specific findings — these files are loaded into every session and must stay lean.`;
   }
   const base = `
 - **Memory Tool:** Use ${formatToolName(MEMORY_TOOL_NAME)} to persist facts across sessions. It supports two scopes via the \`scope\` parameter:

packages/core/src/services/chatRecordingService.ts

@@ -109,6 +109,7 @@ export async function loadConversationRecord(
 ): Promise<
   | (ConversationRecord & {
       messageCount?: number;
+      userMessageCount?: number;
       firstUserMessage?: string;
       hasUserOrAssistantMessage?: boolean;
     })
@@ -128,8 +129,11 @@ export async function loadConversationRecord(
     let metadata: Partial<ConversationRecord> = {};
     const messagesMap = new Map<string, MessageRecord>();
     const messageIds: string[] = [];
+    const messageKinds = new Map<
+      string,
+      { isUser: boolean; isUserOrAssistant: boolean }
+    >();
     let firstUserMessageStr: string | undefined;
-    let hasUserOrAssistant = false;
 
     for await (const line of rl) {
       if (!line.trim()) continue;
@@ -140,13 +144,14 @@ export async function loadConversationRecord(
           if (options?.metadataOnly) {
             const idx = messageIds.indexOf(rewindId);
             if (idx !== -1) {
-              messageIds.splice(idx);
+              const removedIds = messageIds.splice(idx);
+              for (const removedId of removedIds) {
+                messageKinds.delete(removedId);
+              }
             } else {
               messageIds.length = 0;
+              messageKinds.clear();
             }
-            // For metadataOnly we can't perfectly un-track hasUserOrAssistant if it was rewinded,
-            // but we can assume false if messageIds is empty.
-            if (messageIds.length === 0) hasUserOrAssistant = false;
           } else {
             let found = false;
             const idsToDelete: string[] = [];
@@ -164,20 +169,18 @@ export async function loadConversationRecord(
           }
         } else if (isMessageRecord(record)) {
           const id = record.id;
-          if (
+          const isUser = hasProperty(record, 'type') && record.type === 'user';
+          const isUserOrAssistant =
             hasProperty(record, 'type') &&
-            (record.type === 'user' || record.type === 'gemini')
-          ) {
-            hasUserOrAssistant = true;
-          }
+            (record.type === 'user' || record.type === 'gemini');
           // Track message count and first user message
           if (options?.metadataOnly) {
             messageIds.push(id);
+            messageKinds.set(id, { isUser, isUserOrAssistant });
           }
           if (
             !firstUserMessageStr &&
-            hasProperty(record, 'type') &&
-            record['type'] === 'user' &&
+            isUser &&
             hasProperty(record, 'content') &&
             record['content']
           ) {
@@ -221,6 +224,33 @@ export async function loadConversationRecord(
       return await parseLegacyRecordFallback(filePath, options);
     }
 
+    const metadataMessages = Array.isArray(metadata.messages)
+      ? metadata.messages
+      : [];
+    const loadedMessages =
+      metadataMessages.length > 0
+        ? metadataMessages
+        : Array.from(messagesMap.values());
+    const metadataFirstUserMessage =
+      metadataMessages.find((message) => message.type === 'user') ?? null;
+    let fallbackFirstUserMessage = firstUserMessageStr;
+    if (!fallbackFirstUserMessage && metadataFirstUserMessage) {
+      const rawContent = metadataFirstUserMessage.content;
+      if (Array.isArray(rawContent)) {
+        fallbackFirstUserMessage = rawContent
+          .map((part: unknown) => (isTextPart(part) ? part['text'] : ''))
+          .join('');
+      } else if (typeof rawContent === 'string') {
+        fallbackFirstUserMessage = rawContent;
+      }
+    }
+    const userMessageCount = options?.metadataOnly
+      ? Array.from(messageKinds.values()).filter((m) => m.isUser).length
+      : loadedMessages.filter((m) => m.type === 'user').length;
+    const hasUserOrAssistant = options?.metadataOnly
+      ? Array.from(messageKinds.values()).some((m) => m.isUserOrAssistant)
+      : loadedMessages.some((m) => m.type === 'user' || m.type === 'gemini');
+
     return {
       sessionId: metadata.sessionId,
       projectHash: metadata.projectHash,
@@ -229,16 +259,21 @@ export async function loadConversationRecord(
       summary: metadata.summary,
       directories: metadata.directories,
       kind: metadata.kind,
-      messages: Array.from(messagesMap.values()),
+      messages: options?.metadataOnly ? [] : loadedMessages,
       messageCount: options?.metadataOnly
-        ? messageIds.length
-        : messagesMap.size,
-      firstUserMessage: firstUserMessageStr,
-      hasUserOrAssistantMessage: options?.metadataOnly
-        ? hasUserOrAssistant
-        : Array.from(messagesMap.values()).some(
-            (m) => m.type === 'user' || m.type === 'gemini',
-          ),
+        ? metadataMessages.length || messageIds.length
+        : loadedMessages.length,
+      userMessageCount:
+        options?.metadataOnly && metadataMessages.length > 0
+          ? metadataMessages.filter((m) => m.type === 'user').length
+          : userMessageCount,
+      firstUserMessage: fallbackFirstUserMessage,
+      hasUserOrAssistantMessage:
+        options?.metadataOnly && metadataMessages.length > 0
+          ? metadataMessages.some(
+              (m) => m.type === 'user' || m.type === 'gemini',
+            )
+          : hasUserOrAssistant,
     };
   } catch (error) {
     debugLogger.error('Error loading conversation record from JSONL:', error);
@@ -816,6 +851,7 @@ async function parseLegacyRecordFallback(
 ): Promise<
   | (ConversationRecord & {
       messageCount?: number;
+      userMessageCount?: number;
       firstUserMessage?: string;
       hasUserOrAssistantMessage?: boolean;
     })
@@ -849,6 +885,8 @@ async function parseLegacyRecordFallback(
           ...legacyRecord,
           messages: [],
           messageCount: legacyRecord.messages?.length || 0,
+          userMessageCount:
+            legacyRecord.messages?.filter((m) => m.type === 'user').length || 0,
           firstUserMessage: fallbackFirstUserMessageStr,
           hasUserOrAssistantMessage:
             legacyRecord.messages?.some(
@@ -858,6 +896,8 @@ async function parseLegacyRecordFallback(
       }
       return {
         ...legacyRecord,
+        userMessageCount:
+          legacyRecord.messages?.filter((m) => m.type === 'user').length || 0,
         hasUserOrAssistantMessage:
           legacyRecord.messages?.some(
             (m) => m.type === 'user' || m.type === 'gemini',

packages/core/src/services/memoryService.test.ts

@@ -117,6 +117,35 @@ function createConversation(
   };
 }
 
+async function writeConversationJsonl(
+  filePath: string,
+  conversation: ConversationRecord,
+): Promise<void> {
+  const metadata = {
+    sessionId: conversation.sessionId,
+    projectHash: conversation.projectHash,
+    startTime: conversation.startTime,
+    lastUpdated: conversation.lastUpdated,
+    summary: conversation.summary,
+    directories: conversation.directories,
+    kind: conversation.kind,
+  };
+
+  const records = [metadata, ...conversation.messages];
+  await fs.writeFile(
+    filePath,
+    records.map((record) => JSON.stringify(record)).join('\n') + '\n',
+  );
+}
+
+async function setSessionMtime(
+  filePath: string,
+  timestamp: string,
+): Promise<void> {
+  const date = new Date(timestamp);
+  await fs.utimes(filePath, date, date);
+}
+
 describe('memoryService', () => {
   let tmpDir: string;
 
@@ -535,6 +564,150 @@ describe('memoryService', () => {
         expect.stringContaining('/memory inbox'),
       );
     });
+
+    it('records only sessions whose read_file calls succeed as processed', async () => {
+      const { startMemoryService, readExtractionState } = await import(
+        './memoryService.js'
+      );
+      const { LocalAgentExecutor } = await import(
+        '../agents/local-executor.js'
+      );
+
+      vi.mocked(LocalAgentExecutor.create).mockReset();
+
+      const memoryDir = path.join(tmpDir, 'memory-read-tracking');
+      const skillsDir = path.join(tmpDir, 'skills-read-tracking');
+      const projectTempDir = path.join(tmpDir, 'temp-read-tracking');
+      const chatsDir = path.join(projectTempDir, 'chats');
+      await fs.mkdir(memoryDir, { recursive: true });
+      await fs.mkdir(skillsDir, { recursive: true });
+      await fs.mkdir(chatsDir, { recursive: true });
+
+      const openedConversation = createConversation({
+        sessionId: 'opened-session',
+        summary: 'Read this one',
+        messageCount: 20,
+        lastUpdated: '2025-01-02T01:00:00Z',
+      });
+      const skippedConversation = createConversation({
+        sessionId: 'skipped-session',
+        summary: 'Do not read this one',
+        messageCount: 20,
+        lastUpdated: '2025-01-01T01:00:00Z',
+      });
+
+      const openedPath = path.join(
+        chatsDir,
+        `${SESSION_FILE_PREFIX}2025-01-02T00-00-opened.jsonl`,
+      );
+      const skippedPath = path.join(
+        chatsDir,
+        `${SESSION_FILE_PREFIX}2025-01-01T00-00-skipped.jsonl`,
+      );
+      await writeConversationJsonl(openedPath, openedConversation);
+      await writeConversationJsonl(skippedPath, skippedConversation);
+
+      vi.mocked(LocalAgentExecutor.create).mockImplementationOnce(
+        async (_definition, _context, onActivity) =>
+          ({
+            run: vi.fn().mockImplementation(async () => {
+              onActivity?.({
+                isSubagentActivityEvent: true,
+                agentName: 'Skill Extractor',
+                type: 'TOOL_CALL_START',
+                data: {
+                  name: 'read_file',
+                  args: { file_path: openedPath },
+                  callId: 'call-opened',
+                },
+              });
+              onActivity?.({
+                isSubagentActivityEvent: true,
+                agentName: 'Skill Extractor',
+                type: 'TOOL_CALL_START',
+                data: {
+                  name: 'read_file',
+                  args: { file_path: skippedPath },
+                  callId: 'call-skipped',
+                },
+              });
+              onActivity?.({
+                isSubagentActivityEvent: true,
+                agentName: 'Skill Extractor',
+                type: 'ERROR',
+                data: {
+                  name: 'read_file',
+                  callId: 'call-skipped',
+                  error: 'access denied',
+                },
+              });
+              onActivity?.({
+                isSubagentActivityEvent: true,
+                agentName: 'Skill Extractor',
+                type: 'TOOL_CALL_END',
+                data: {
+                  name: 'read_file',
+                  id: 'call-opened',
+                  data: { content: 'Read this one' },
+                },
+              });
+              onActivity?.({
+                isSubagentActivityEvent: true,
+                agentName: 'Skill Extractor',
+                type: 'TOOL_CALL_START',
+                data: {
+                  name: 'read_file',
+                  args: { file_path: path.join(chatsDir, 'unrelated.jsonl') },
+                  callId: 'call-unrelated',
+                },
+              });
+              return undefined;
+            }),
+          }) as never,
+      );
+
+      const mockConfig = {
+        storage: {
+          getProjectMemoryDir: vi.fn().mockReturnValue(memoryDir),
+          getProjectMemoryTempDir: vi.fn().mockReturnValue(memoryDir),
+          getProjectSkillsMemoryDir: vi.fn().mockReturnValue(skillsDir),
+          getProjectTempDir: vi.fn().mockReturnValue(projectTempDir),
+        },
+        getToolRegistry: vi.fn(),
+        getMessageBus: vi.fn(),
+        getGeminiClient: vi.fn(),
+        getSkillManager: vi.fn().mockReturnValue({ getSkills: () => [] }),
+        modelConfigService: {
+          registerRuntimeModelConfig: vi.fn(),
+        },
+        getTargetDir: vi.fn().mockReturnValue(tmpDir),
+        sandboxManager: undefined,
+      } as unknown as Parameters<typeof startMemoryService>[0];
+
+      await startMemoryService(mockConfig);
+
+      const state = await readExtractionState(
+        path.join(memoryDir, '.extraction-state.json'),
+      );
+      expect(state.runs).toHaveLength(1);
+      expect(state.runs[0].candidateSessions).toEqual([
+        {
+          sessionId: 'opened-session',
+          lastUpdated: '2025-01-02T01:00:00Z',
+        },
+        {
+          sessionId: 'skipped-session',
+          lastUpdated: '2025-01-01T01:00:00Z',
+        },
+      ]);
+      expect(state.runs[0].processedSessions).toEqual([
+        {
+          sessionId: 'opened-session',
+          lastUpdated: '2025-01-02T01:00:00Z',
+        },
+      ]);
+      expect(state.runs[0].sessionIds).toEqual(['opened-session']);
+    });
   });
 
   describe('getProcessedSessionIds', () => {
@@ -663,7 +836,7 @@ describe('memoryService', () => {
       const state: ExtractionState = {
         runs: [
           {
-            runAt: '2025-01-01T00:00:00Z',
+            runAt: '2025-01-01T02:00:00Z',
             sessionIds: ['old-session'],
             skillsCreated: [],
           },
@@ -676,6 +849,39 @@ describe('memoryService', () => {
       expect(result.sessionIndex).not.toContain('[NEW]');
     });
 
+    it('treats resumed legacy sessions as [NEW] when lastUpdated moved past the old run', async () => {
+      const { buildSessionIndex } = await import('./memoryService.js');
+
+      const conversation = createConversation({
+        sessionId: 'resumed-session',
+        summary: 'Resumed after extraction',
+        messageCount: 20,
+        lastUpdated: '2025-01-01T03:00:00Z',
+      });
+      await fs.writeFile(
+        path.join(
+          chatsDir,
+          `${SESSION_FILE_PREFIX}2025-01-01T00-00-resumed01.json`,
+        ),
+        JSON.stringify(conversation),
+      );
+
+      const state: ExtractionState = {
+        runs: [
+          {
+            runAt: '2025-01-01T02:00:00Z',
+            sessionIds: ['resumed-session'],
+            skillsCreated: [],
+          },
+        ],
+      };
+
+      const result = await buildSessionIndex(chatsDir, state);
+
+      expect(result.sessionIndex).toContain('[NEW]');
+      expect(result.newSessionIds).toEqual(['resumed-session']);
+    });
+
     it('includes file path and summary in each line', async () => {
       const { buildSessionIndex } = await import('./memoryService.js');
 
@@ -800,7 +1006,7 @@ describe('memoryService', () => {
       const state: ExtractionState = {
         runs: [
           {
-            runAt: '2025-01-01T00:00:00Z',
+            runAt: '2025-01-01T02:00:00Z',
             sessionIds: ['processed-one'],
             skillsCreated: [],
           },
@@ -815,6 +1021,136 @@ describe('memoryService', () => {
       expect(result.sessionIndex).toContain('[NEW]');
       expect(result.sessionIndex).toContain('[old]');
     });
+
+    it('reads JSONL sessions and sorts by actual lastUpdated instead of filename', async () => {
+      const { buildSessionIndex } = await import('./memoryService.js');
+
+      const olderByName = createConversation({
+        sessionId: 'older-by-name',
+        summary: 'Filename looks newer',
+        messageCount: 20,
+        lastUpdated: '2025-01-01T01:00:00Z',
+      });
+      const newerByActivity = createConversation({
+        sessionId: 'newer-by-activity',
+        summary: 'Actually most recent',
+        messageCount: 20,
+        lastUpdated: '2025-02-01T01:00:00Z',
+      });
+
+      await writeConversationJsonl(
+        path.join(
+          chatsDir,
+          `${SESSION_FILE_PREFIX}2025-02-01T00-00-oldername.jsonl`,
+        ),
+        olderByName,
+      );
+      await writeConversationJsonl(
+        path.join(
+          chatsDir,
+          `${SESSION_FILE_PREFIX}2025-01-01T00-00-neweractv.jsonl`,
+        ),
+        newerByActivity,
+      );
+
+      const result = await buildSessionIndex(chatsDir, { runs: [] });
+      const firstLine = result.sessionIndex.split('\n')[0];
+
+      expect(firstLine).toContain('Actually most recent');
+      expect(firstLine).not.toContain('Filename looks newer');
+    });
+
+    it('rotates in older unprocessed sessions instead of starving them behind retried recent ones', async () => {
+      const { buildSessionIndex } = await import('./memoryService.js');
+
+      for (let i = 0; i < 11; i++) {
+        const day = String(11 - i).padStart(2, '0');
+        const conversation = createConversation({
+          sessionId: `backlog-${i}`,
+          summary: `Backlog ${i}`,
+          messageCount: 20,
+          lastUpdated: `2025-01-${day}T01:00:00Z`,
+        });
+        await fs.writeFile(
+          path.join(
+            chatsDir,
+            `${SESSION_FILE_PREFIX}2025-01-${day}T00-00-backlog${i}.json`,
+          ),
+          JSON.stringify(conversation),
+        );
+      }
+
+      const state: ExtractionState = {
+        runs: [
+          {
+            runAt: '2025-02-01T00:00:00Z',
+            sessionIds: [],
+            candidateSessions: Array.from({ length: 10 }, (_, i) => ({
+              sessionId: `backlog-${i}`,
+              lastUpdated: `2025-01-${String(11 - i).padStart(2, '0')}T01:00:00Z`,
+            })),
+            skillsCreated: [],
+          },
+        ],
+      };
+
+      const result = await buildSessionIndex(chatsDir, state);
+
+      expect(result.newSessionIds).toContain('backlog-10');
+      expect(result.newSessionIds).not.toContain('backlog-9');
+    });
+
+    it('surfaces older unprocessed sessions even when the newest 100 files were already processed', async () => {
+      const { buildSessionIndex } = await import('./memoryService.js');
+
+      const processedSessions: ExtractionRun['processedSessions'] = [];
+
+      for (let i = 0; i < 105; i++) {
+        const timestamp = new Date(
+          Date.UTC(2025, 0, 1, 0, 0, 105 - i),
+        ).toISOString();
+        const conversation = createConversation({
+          sessionId: `backlog-${i}`,
+          summary: `Backlog ${i}`,
+          messageCount: 20,
+          lastUpdated: timestamp,
+        });
+        const filePath = path.join(
+          chatsDir,
+          `${SESSION_FILE_PREFIX}2025-01-01T00-00-backlog${String(i).padStart(3, '0')}.json`,
+        );
+        await fs.writeFile(filePath, JSON.stringify(conversation));
+        await setSessionMtime(filePath, timestamp);
+
+        if (i < 100) {
+          processedSessions.push({
+            sessionId: conversation.sessionId,
+            lastUpdated: conversation.lastUpdated,
+          });
+        }
+      }
+
+      const result = await buildSessionIndex(chatsDir, {
+        runs: [
+          {
+            runAt: '2025-02-01T00:00:00Z',
+            sessionIds: processedSessions.map((session) => session.sessionId),
+            processedSessions,
+            skillsCreated: [],
+          },
+        ],
+      });
+
+      expect(result.newSessionIds).toEqual([
+        'backlog-100',
+        'backlog-101',
+        'backlog-102',
+        'backlog-103',
+        'backlog-104',
+      ]);
+      expect(result.sessionIndex).toContain('Backlog 100');
+      expect(result.sessionIndex).toContain('Backlog 104');
+    });
   });
 
   describe('ExtractionState runs tracking', () => {
@@ -827,6 +1163,18 @@ describe('memoryService', () => {
           {
             runAt: '2025-06-01T00:00:00Z',
             sessionIds: ['s1'],
+            candidateSessions: [
+              {
+                sessionId: 's1',
+                lastUpdated: '2025-05-31T12:00:00Z',
+              },
+            ],
+            processedSessions: [
+              {
+                sessionId: 's1',
+                lastUpdated: '2025-05-31T12:00:00Z',
+              },
+            ],
             skillsCreated: ['debug-helper', 'test-gen'],
           },
         ],
@@ -840,6 +1188,18 @@ describe('memoryService', () => {
         'debug-helper',
         'test-gen',
       ]);
+      expect(result.runs[0].candidateSessions).toEqual([
+        {
+          sessionId: 's1',
+          lastUpdated: '2025-05-31T12:00:00Z',
+        },
+      ]);
+      expect(result.runs[0].processedSessions).toEqual([
+        {
+          sessionId: 's1',
+          lastUpdated: '2025-05-31T12:00:00Z',
+        },
+      ]);
       expect(result.runs[0].sessionIds).toEqual(['s1']);
       expect(result.runs[0].runAt).toBe('2025-06-01T00:00:00Z');
     });
@@ -854,6 +1214,26 @@ describe('memoryService', () => {
         {
           runAt: '2025-01-01T00:00:00Z',
           sessionIds: ['a', 'b'],
+          candidateSessions: [
+            {
+              sessionId: 'a',
+              lastUpdated: '2024-12-31T23:00:00Z',
+            },
+            {
+              sessionId: 'b',
+              lastUpdated: '2024-12-31T22:00:00Z',
+            },
+          ],
+          processedSessions: [
+            {
+              sessionId: 'a',
+              lastUpdated: '2024-12-31T23:00:00Z',
+            },
+            {
+              sessionId: 'b',
+              lastUpdated: '2024-12-31T22:00:00Z',
+            },
+          ],
           skillsCreated: ['skill-x'],
         },
         {

packages/core/src/services/memoryService.ts

@@ -12,6 +12,7 @@ import * as Diff from 'diff';
 import type { Config } from '../config/config.js';
 import {
   SESSION_FILE_PREFIX,
+  loadConversationRecord,
   type ConversationRecord,
 } from './chatRecordingService.js';
 import { debugLogger } from '../utils/debugLogger.js';
@@ -21,6 +22,7 @@ import { FRONTMATTER_REGEX, parseFrontmatter } from '../skills/skillLoader.js';
 import { LocalAgentExecutor } from '../agents/local-executor.js';
 import { SkillExtractionAgent } from '../agents/skill-extraction-agent.js';
 import { getModelConfigAlias } from '../agents/registry.js';
+import type { SubagentActivityEvent } from '../agents/types.js';
 import { ExecutionLifecycleService } from './executionLifecycleService.js';
 import { PromptRegistry } from '../prompts/prompt-registry.js';
 import { ResourceRegistry } from '../resources/resource-registry.js';
@@ -29,6 +31,7 @@ import { PolicyDecision } from '../policy/types.js';
 import { MessageBus } from '../confirmation-bus/message-bus.js';
 import { Storage } from '../config/storage.js';
 import type { AgentLoopContext } from '../config/agent-loop-context.js';
+import { READ_FILE_TOOL_NAME } from '../tools/tool-names.js';
 import {
   applyParsedSkillPatches,
   hasParsedPatchHunks,
@@ -40,6 +43,7 @@ const LOCK_STALE_MS = 35 * 60 * 1000; // 35 minutes (exceeds agent's 30-min time
 const MIN_USER_MESSAGES = 10;
 const MIN_IDLE_MS = 3 * 60 * 60 * 1000; // 3 hours
 const MAX_SESSION_INDEX_SIZE = 50;
+const MAX_NEW_SESSION_BATCH_SIZE = 10;
 
 /**
  * Lock file content for coordinating across CLI instances.
@@ -49,12 +53,39 @@ interface LockInfo {
   startedAt: string;
 }
 
+function hasProperty<T extends string>(
+  obj: unknown,
+  prop: T,
+): obj is { [key in T]: unknown } {
+  return obj !== null && typeof obj === 'object' && prop in obj;
+}
+
+function isStringProperty<T extends string>(
+  obj: unknown,
+  prop: T,
+): obj is { [key in T]: string } {
+  return hasProperty(obj, prop) && typeof obj[prop] === 'string';
+}
+
+interface SessionVersion {
+  sessionId: string;
+  lastUpdated: string;
+}
+
+interface IndexedSession extends SessionVersion {
+  filePath: string;
+  summary?: string;
+  userMessageCount: number;
+}
+
 /**
  * Metadata for a single extraction run.
  */
 export interface ExtractionRun {
   runAt: string;
   sessionIds: string[];
+  candidateSessions?: SessionVersion[];
+  processedSessions?: SessionVersion[];
   skillsCreated: string[];
 }
 
@@ -71,7 +102,10 @@ export interface ExtractionState {
 export function getProcessedSessionIds(state: ExtractionState): Set<string> {
   const ids = new Set<string>();
   for (const run of state.runs) {
-    for (const id of run.sessionIds) {
+    const processedSessionIds =
+      run.processedSessions?.map((session) => session.sessionId) ??
+      run.sessionIds;
+    for (const id of processedSessionIds) {
       ids.add(id);
     }
   }
@@ -89,30 +123,49 @@ function isLockInfo(value: unknown): value is LockInfo {
   );
 }
 
-function isConversationRecord(value: unknown): value is ConversationRecord {
+function isSessionVersion(value: unknown): value is SessionVersion {
   return (
     typeof value === 'object' &&
     value !== null &&
     'sessionId' in value &&
     typeof value.sessionId === 'string' &&
-    'messages' in value &&
-    Array.isArray(value.messages) &&
-    'projectHash' in value &&
-    'startTime' in value &&
-    'lastUpdated' in value
+    'lastUpdated' in value &&
+    typeof value.lastUpdated === 'string'
   );
 }
 
-function isExtractionRun(value: unknown): value is ExtractionRun {
+function normalizeSessionVersions(value: unknown): SessionVersion[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value.filter(isSessionVersion).map((session) => ({
+    sessionId: session.sessionId,
+    lastUpdated: session.lastUpdated,
+  }));
+}
+
+function normalizeStringArray(value: unknown): string[] {
+  if (!Array.isArray(value)) {
+    return [];
+  }
+
+  return value.filter((item): item is string => typeof item === 'string');
+}
+
+function isExtractionRunLike(value: unknown): value is {
+  runAt: string;
+  sessionIds?: unknown;
+  candidateSessions?: unknown;
+  processedSessions?: unknown;
+  skillsCreated: unknown;
+} {
   return (
     typeof value === 'object' &&
     value !== null &&
     'runAt' in value &&
     typeof value.runAt === 'string' &&
-    'sessionIds' in value &&
-    Array.isArray(value.sessionIds) &&
-    'skillsCreated' in value &&
-    Array.isArray(value.skillsCreated)
+    'skillsCreated' in value
   );
 }
 
@@ -125,6 +178,208 @@ function isExtractionState(value: unknown): value is { runs: unknown[] } {
   );
 }
 
+function buildExtractionRun(value: unknown): ExtractionRun | null {
+  if (!isExtractionRunLike(value)) {
+    return null;
+  }
+
+  const candidateSessions = normalizeSessionVersions(value.candidateSessions);
+  const processedSessions = normalizeSessionVersions(value.processedSessions);
+  const sessionIds = normalizeStringArray(value.sessionIds);
+
+  return {
+    runAt: value.runAt,
+    sessionIds:
+      sessionIds.length > 0
+        ? sessionIds
+        : processedSessions.map((session) => session.sessionId),
+    candidateSessions:
+      candidateSessions.length > 0 ? candidateSessions : undefined,
+    processedSessions:
+      processedSessions.length > 0 ? processedSessions : undefined,
+    skillsCreated: normalizeStringArray(value.skillsCreated),
+  };
+}
+
+function getTimestampMs(timestamp: string): number {
+  const parsed = Date.parse(timestamp);
+  return Number.isNaN(parsed) ? 0 : parsed;
+}
+
+function getSessionVersionKey(session: SessionVersion): string {
+  return `${session.sessionId}\u0000${session.lastUpdated}`;
+}
+
+function hasLegacyRunProcessedSession(
+  run: ExtractionRun,
+  session: SessionVersion,
+): boolean {
+  return (
+    run.sessionIds.includes(session.sessionId) &&
+    getTimestampMs(run.runAt) >= getTimestampMs(session.lastUpdated)
+  );
+}
+
+function isSessionVersionProcessed(
+  state: ExtractionState,
+  session: SessionVersion,
+): boolean {
+  const sessionKey = getSessionVersionKey(session);
+
+  for (const run of state.runs) {
+    if (
+      run.processedSessions?.some(
+        (processed) => getSessionVersionKey(processed) === sessionKey,
+      )
+    ) {
+      return true;
+    }
+
+    if (!run.processedSessions && hasLegacyRunProcessedSession(run, session)) {
+      return true;
+    }
+  }
+
+  return false;
+}
+
+function getSessionAttemptCount(
+  state: ExtractionState,
+  session: SessionVersion,
+): number {
+  const sessionKey = getSessionVersionKey(session);
+  let attempts = 0;
+
+  for (const run of state.runs) {
+    if (run.candidateSessions) {
+      if (
+        run.candidateSessions.some(
+          (candidate) => getSessionVersionKey(candidate) === sessionKey,
+        )
+      ) {
+        attempts++;
+      }
+      continue;
+    }
+
+    if (hasLegacyRunProcessedSession(run, session)) {
+      attempts++;
+    }
+  }
+
+  return attempts;
+}
+
+function compareIndexedSessions(a: IndexedSession, b: IndexedSession): number {
+  const timestampDelta =
+    getTimestampMs(b.lastUpdated) - getTimestampMs(a.lastUpdated);
+  if (timestampDelta !== 0) {
+    return timestampDelta;
+  }
+
+  if (a.filePath.endsWith('.jsonl') !== b.filePath.endsWith('.jsonl')) {
+    return a.filePath.endsWith('.jsonl') ? -1 : 1;
+  }
+
+  return b.filePath.localeCompare(a.filePath);
+}
+
+function shouldReplaceIndexedSession(
+  existing: IndexedSession,
+  candidate: IndexedSession,
+): boolean {
+  return compareIndexedSessions(candidate, existing) < 0;
+}
+
+function isReadFileStartActivity(
+  activity: SubagentActivityEvent,
+): activity is SubagentActivityEvent & {
+  data: { name: string; args?: { file_path?: unknown }; callId?: unknown };
+} {
+  return (
+    activity.type === 'TOOL_CALL_START' &&
+    activity.data['name'] === READ_FILE_TOOL_NAME
+  );
+}
+
+function getResolvedReadFilePath(
+  config: Config,
+  activity: SubagentActivityEvent,
+): string | null {
+  if (!isReadFileStartActivity(activity)) {
+    return null;
+  }
+
+  const args = activity.data.args;
+  if (
+    typeof args !== 'object' ||
+    args === null ||
+    !('file_path' in args) ||
+    typeof args.file_path !== 'string'
+  ) {
+    return null;
+  }
+
+  return path.resolve(config.getTargetDir(), args.file_path);
+}
+
+function getReadFileStartCallId(
+  activity: SubagentActivityEvent,
+): string | null {
+  if (
+    !isReadFileStartActivity(activity) ||
+    !isStringProperty(activity.data, 'callId')
+  ) {
+    return null;
+  }
+
+  return activity.data.callId;
+}
+
+function getCompletedReadFileCallId(
+  activity: SubagentActivityEvent,
+): string | null {
+  if (
+    activity.type !== 'TOOL_CALL_END' ||
+    activity.data['name'] !== READ_FILE_TOOL_NAME ||
+    !isStringProperty(activity.data, 'id')
+  ) {
+    return null;
+  }
+
+  return activity.data['id'];
+}
+
+function getFailedReadFileCallId(
+  activity: SubagentActivityEvent,
+): string | null {
+  if (
+    activity.type !== 'ERROR' ||
+    activity.data['name'] !== READ_FILE_TOOL_NAME ||
+    !isStringProperty(activity.data, 'callId')
+  ) {
+    return null;
+  }
+
+  return activity.data['callId'];
+}
+
+function getUserMessageCount(
+  conversation: ConversationRecord & { userMessageCount?: number },
+): number {
+  return (
+    conversation.userMessageCount ??
+    conversation.messages.filter((message) => message.type === 'user').length
+  );
+}
+
+function isSupportedSessionFile(fileName: string): boolean {
+  return (
+    fileName.startsWith(SESSION_FILE_PREFIX) &&
+    (fileName.endsWith('.json') || fileName.endsWith('.jsonl'))
+  );
+}
+
 /**
  * Attempts to acquire an exclusive lock file using O_CREAT | O_EXCL.
  * Returns true if the lock was acquired, false if another instance owns it.
@@ -231,16 +486,9 @@ export async function readExtractionState(
 
     const runs: ExtractionRun[] = [];
     for (const run of parsed.runs) {
-      if (!isExtractionRun(run)) continue;
-      runs.push({
-        runAt: run.runAt,
-        sessionIds: run.sessionIds.filter(
-          (sid): sid is string => typeof sid === 'string',
-        ),
-        skillsCreated: run.skillsCreated.filter(
-          (sk): sk is string => typeof sk === 'string',
-        ),
-      });
+      const normalizedRun = buildExtractionRun(run);
+      if (!normalizedRun) continue;
+      runs.push(normalizedRun);
     }
 
     return { runs };
@@ -270,30 +518,32 @@ export async function writeExtractionState(
  * Filters out subagent sessions, sessions that haven't been idle long enough,
  * and sessions with too few user messages.
  */
-function shouldProcessConversation(parsed: ConversationRecord): boolean {
+function shouldProcessConversation(
+  parsed: ConversationRecord & { userMessageCount?: number },
+): boolean {
   // Skip subagent sessions
   if (parsed.kind === 'subagent') return false;
 
   // Skip sessions that are still active (not idle for 3+ hours)
-  const lastUpdated = new Date(parsed.lastUpdated).getTime();
+  const lastUpdated = getTimestampMs(parsed.lastUpdated);
   if (Date.now() - lastUpdated < MIN_IDLE_MS) return false;
 
   // Skip sessions with too few user messages
-  const userMessageCount = parsed.messages.filter(
-    (m) => m.type === 'user',
-  ).length;
-  if (userMessageCount < MIN_USER_MESSAGES) return false;
+  if (getUserMessageCount(parsed) < MIN_USER_MESSAGES) return false;
 
   return true;
 }
 
 /**
- * Scans the chats directory for eligible session files (sorted most-recent-first,
- * capped at MAX_SESSION_INDEX_SIZE). Shared by buildSessionIndex.
+ * Scans the chats directory for eligible session files, loading metadata from
+ * both JSONL and legacy JSON sessions, deduplicating migrated sessions by
+ * session ID, and sorting by actual lastUpdated. We scan the full directory
+ * here so already-processed recent sessions cannot permanently block older
+ * backlog sessions from surfacing as new candidates.
  */
 async function scanEligibleSessions(
   chatsDir: string,
-): Promise<Array<{ conversation: ConversationRecord; filePath: string }>> {
+): Promise<IndexedSession[]> {
   let allFiles: string[];
   try {
     allFiles = await fs.readdir(chatsDir);
@@ -301,33 +551,48 @@ async function scanEligibleSessions(
     return [];
   }
 
-  const sessionFiles = allFiles.filter(
-    (f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith('.json'),
-  );
-
-  // Sort by filename descending (most recent first)
-  sessionFiles.sort((a, b) => b.localeCompare(a));
-
-  const results: Array<{ conversation: ConversationRecord; filePath: string }> =
-    [];
-
-  for (const file of sessionFiles) {
-    if (results.length >= MAX_SESSION_INDEX_SIZE) break;
-
+  const candidates: Array<{ filePath: string; mtimeMs: number }> = [];
+  for (const file of allFiles) {
+    if (!isSupportedSessionFile(file)) continue;
     const filePath = path.join(chatsDir, file);
     try {
-      const content = await fs.readFile(filePath, 'utf-8');
-      const parsed: unknown = JSON.parse(content);
-      if (!isConversationRecord(parsed)) continue;
-      if (!shouldProcessConversation(parsed)) continue;
+      const stat = await fs.stat(filePath);
+      if (!stat.isFile()) continue;
+      candidates.push({ filePath, mtimeMs: stat.mtimeMs });
+    } catch {
+      // Skip files that disappeared between readdir and stat.
+    }
+  }
 
-      results.push({ conversation: parsed, filePath });
+  candidates.sort((a, b) => b.mtimeMs - a.mtimeMs);
+
+  const latestBySessionId = new Map<string, IndexedSession>();
+
+  for (const { filePath } of candidates) {
+    try {
+      const conversation = await loadConversationRecord(filePath, {
+        metadataOnly: true,
+      });
+      if (!conversation || !shouldProcessConversation(conversation)) continue;
+
+      const indexedSession: IndexedSession = {
+        sessionId: conversation.sessionId,
+        lastUpdated: conversation.lastUpdated,
+        filePath,
+        summary: conversation.summary,
+        userMessageCount: getUserMessageCount(conversation),
+      };
+
+      const existing = latestBySessionId.get(indexedSession.sessionId);
+      if (!existing || shouldReplaceIndexedSession(existing, indexedSession)) {
+        latestBySessionId.set(indexedSession.sessionId, indexedSession);
+      }
     } catch {
       // Skip unreadable files
     }
   }
 
-  return results;
+  return Array.from(latestBySessionId.values()).sort(compareIndexedSessions);
 }
 
 /**
@@ -335,39 +600,67 @@ async function scanEligibleSessions(
  * eligible sessions with their summary, file path, and new/previously-processed status.
  * The agent can use read_file on paths to inspect sessions that look promising.
  *
- * Returns the index text and the list of new (unprocessed) session IDs.
+ * Returns the index text, the list of selected new (unprocessed) session IDs,
+ * and the surfaced candidate sessions for this run.
  */
 export async function buildSessionIndex(
   chatsDir: string,
   state: ExtractionState,
-): Promise<{ sessionIndex: string; newSessionIds: string[] }> {
-  const processedSet = getProcessedSessionIds(state);
+): Promise<{
+  sessionIndex: string;
+  newSessionIds: string[];
+  candidateSessions: IndexedSession[];
+}> {
   const eligible = await scanEligibleSessions(chatsDir);
 
   if (eligible.length === 0) {
-    return { sessionIndex: '', newSessionIds: [] };
+    return { sessionIndex: '', newSessionIds: [], candidateSessions: [] };
   }
 
-  const lines: string[] = [];
-  const newSessionIds: string[] = [];
-
-  for (const { conversation, filePath } of eligible) {
-    const userMessageCount = conversation.messages.filter(
-      (m) => m.type === 'user',
-    ).length;
-    const isNew = !processedSet.has(conversation.sessionId);
-    if (isNew) {
-      newSessionIds.push(conversation.sessionId);
+  const newSessions: IndexedSession[] = [];
+  const oldSessions: IndexedSession[] = [];
+  for (const session of eligible) {
+    if (isSessionVersionProcessed(state, session)) {
+      oldSessions.push(session);
+    } else {
+      newSessions.push(session);
     }
-
-    const status = isNew ? '[NEW]' : '[old]';
-    const summary = conversation.summary ?? '(no summary)';
-    lines.push(
-      `${status} ${summary} (${userMessageCount} user msgs) — ${filePath}`,
-    );
   }
 
-  return { sessionIndex: lines.join('\n'), newSessionIds };
+  newSessions.sort((a, b) => {
+    const attemptDelta =
+      getSessionAttemptCount(state, a) - getSessionAttemptCount(state, b);
+    if (attemptDelta !== 0) {
+      return attemptDelta;
+    }
+    return compareIndexedSessions(a, b);
+  });
+
+  const candidateSessions = newSessions.slice(0, MAX_NEW_SESSION_BATCH_SIZE);
+  const remainingSlots = Math.max(
+    0,
+    MAX_SESSION_INDEX_SIZE - candidateSessions.length,
+  );
+  const displayedOldSessions = oldSessions.slice(0, remainingSlots);
+  const candidateSessionIds = new Set(
+    candidateSessions.map((session) => getSessionVersionKey(session)),
+  );
+
+  const lines = [...candidateSessions, ...displayedOldSessions].map(
+    (session) => {
+      const status = candidateSessionIds.has(getSessionVersionKey(session))
+        ? '[NEW]'
+        : '[old]';
+      const summary = session.summary ?? '(no summary)';
+      return `${status} ${summary} (${session.userMessageCount} user msgs) — ${session.filePath}`;
+    },
+  );
+
+  return {
+    sessionIndex: lines.join('\n'),
+    newSessionIds: candidateSessions.map((session) => session.sessionId),
+    candidateSessions,
+  };
 }
 
 /**
@@ -632,14 +925,12 @@ export async function startMemoryService(config: Config): Promise<void> {
 
     // Build session index: all eligible sessions with summaries + file paths.
     // The agent decides which to read in full via read_file.
-    const { sessionIndex, newSessionIds } = await buildSessionIndex(
-      chatsDir,
-      state,
-    );
+    const { sessionIndex, newSessionIds, candidateSessions } =
+      await buildSessionIndex(chatsDir, state);
 
     const totalInIndex = sessionIndex ? sessionIndex.split('\n').length : 0;
     debugLogger.log(
-      `[MemoryService] Session scan: ${totalInIndex} eligible session(s) found, ${newSessionIds.length} new`,
+      `[MemoryService] Session scan: ${totalInIndex} indexed session(s), ${candidateSessions.length} surfaced as new candidates`,
     );
 
     if (newSessionIds.length === 0) {
@@ -702,8 +993,59 @@ export async function startMemoryService(config: Config): Promise<void> {
       `[MemoryService] Starting extraction agent (model: ${agentDefinition.modelConfig.model}, maxTurns: 30, maxTime: 30min)`,
     );
 
+    const candidateSessionsByPath = new Map(
+      candidateSessions.map((session) => [
+        path.resolve(session.filePath),
+        session,
+      ]),
+    );
+    const processedSessionKeys = new Set<string>();
+    const pendingReadFileSessions = new Map<string, string>();
+
     // Create and run the extraction agent
-    const executor = await LocalAgentExecutor.create(agentDefinition, context);
+    const executor = await LocalAgentExecutor.create(
+      agentDefinition,
+      context,
+      (activity) => {
+        const readFileCallId = getReadFileStartCallId(activity);
+        if (readFileCallId) {
+          const resolvedPath = getResolvedReadFilePath(config, activity);
+          if (!resolvedPath) {
+            return;
+          }
+
+          const session = candidateSessionsByPath.get(resolvedPath);
+          if (!session) {
+            return;
+          }
+
+          pendingReadFileSessions.set(
+            readFileCallId,
+            getSessionVersionKey(session),
+          );
+          return;
+        }
+
+        const completedReadFileCallId = getCompletedReadFileCallId(activity);
+        if (completedReadFileCallId) {
+          const sessionKey = pendingReadFileSessions.get(
+            completedReadFileCallId,
+          );
+          if (!sessionKey) {
+            return;
+          }
+
+          processedSessionKeys.add(sessionKey);
+          pendingReadFileSessions.delete(completedReadFileCallId);
+          return;
+        }
+
+        const failedReadFileCallId = getFailedReadFileCallId(activity);
+        if (failedReadFileCallId) {
+          pendingReadFileSessions.delete(failedReadFileCallId);
+        }
+      },
+    );
 
     await executor.run(
       { request: 'Extract skills from the provided sessions.' },
@@ -746,10 +1088,24 @@ export async function startMemoryService(config: Config): Promise<void> {
       );
     }
 
+    const processedSessions = candidateSessions
+      .filter((session) =>
+        processedSessionKeys.has(getSessionVersionKey(session)),
+      )
+      .map((session) => ({
+        sessionId: session.sessionId,
+        lastUpdated: session.lastUpdated,
+      }));
+
     // Record the run with full metadata
     const run: ExtractionRun = {
       runAt: new Date().toISOString(),
-      sessionIds: newSessionIds,
+      sessionIds: processedSessions.map((session) => session.sessionId),
+      candidateSessions: candidateSessions.map((session) => ({
+        sessionId: session.sessionId,
+        lastUpdated: session.lastUpdated,
+      })),
+      processedSessions,
       skillsCreated,
     };
     const updatedState: ExtractionState = {
@@ -770,7 +1126,7 @@ export async function startMemoryService(config: Config): Promise<void> {
         );
       }
       debugLogger.log(
-        `[MemoryService] Completed in ${elapsed}s. ${completionParts.join('; ')} (processed ${newSessionIds.length} session(s))`,
+        `[MemoryService] Completed in ${elapsed}s. ${completionParts.join('; ')} (read ${processedSessions.length}/${candidateSessions.length} surfaced session(s))`,
       );
       const feedbackParts: string[] = [];
       if (skillsCreated.length > 0) {
@@ -789,7 +1145,7 @@ export async function startMemoryService(config: Config): Promise<void> {
       );
     } else {
       debugLogger.log(
-        `[MemoryService] Completed in ${elapsed}s. No new skills or patches created (processed ${newSessionIds.length} session(s))`,
+        `[MemoryService] Completed in ${elapsed}s. No new skills or patches created (read ${processedSessions.length}/${candidateSessions.length} surfaced session(s))`,
       );
     }
   } catch (error) {

packages/core/src/services/sessionSummaryUtils.test.ts

@@ -8,12 +8,10 @@ import { describe, it, expect, vi, beforeEach, afterEach } from 'vitest';
 import { generateSummary, getPreviousSession } from './sessionSummaryUtils.js';
 import type { Config } from '../config/config.js';
 import type { ContentGenerator } from '../core/contentGenerator.js';
+import * as chatRecordingService from './chatRecordingService.js';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
-
-// Mock fs/promises
-vi.mock('node:fs/promises');
-const mockReaddir = fs.readdir as unknown as ReturnType<typeof vi.fn>;
+import * as os from 'node:os';
 
 // Mock the SessionSummaryService module
 vi.mock('./sessionSummaryService.js', () => ({
@@ -27,23 +25,84 @@ vi.mock('../core/baseLlmClient.js', () => ({
   BaseLlmClient: vi.fn(),
 }));
 
-// Helper to create a session with N user messages
-function createSessionWithUserMessages(
-  count: number,
-  options: { summary?: string; sessionId?: string } = {},
-) {
+vi.mock('./chatRecordingService.js', async () => {
+  const actual = await vi.importActual<
+    typeof import('./chatRecordingService.js')
+  >('./chatRecordingService.js');
+  return {
+    ...actual,
+    loadConversationRecord: vi.fn(actual.loadConversationRecord),
+  };
+});
+
+interface SessionFixture {
+  summary?: string;
+  sessionId?: string;
+  startTime?: string;
+  lastUpdated?: string;
+  userMessageCount: number;
+}
+
+function buildLegacySessionJson(fixture: SessionFixture): string {
   return JSON.stringify({
-    sessionId: options.sessionId ?? 'session-id',
-    summary: options.summary,
-    messages: Array.from({ length: count }, (_, i) => ({
+    sessionId: fixture.sessionId ?? 'session-id',
+    projectHash: 'abc123',
+    startTime: fixture.startTime ?? '2024-01-01T00:00:00Z',
+    lastUpdated: fixture.lastUpdated ?? '2024-01-01T00:00:00Z',
+    summary: fixture.summary,
+    messages: Array.from({ length: fixture.userMessageCount }, (_, i) => ({
       id: String(i + 1),
+      timestamp: '2024-01-01T00:00:00Z',
       type: 'user',
       content: [{ text: `Message ${i + 1}` }],
     })),
   });
 }
 
+function buildJsonlSession(fixture: SessionFixture): string {
+  const metadata = {
+    sessionId: fixture.sessionId ?? 'session-id',
+    projectHash: 'abc123',
+    startTime: fixture.startTime ?? '2024-01-01T00:00:00Z',
+    lastUpdated: fixture.lastUpdated ?? '2024-01-01T00:00:00Z',
+    ...(fixture.summary !== undefined ? { summary: fixture.summary } : {}),
+  };
+  const lines: string[] = [JSON.stringify(metadata)];
+  for (let i = 0; i < fixture.userMessageCount; i++) {
+    lines.push(
+      JSON.stringify({
+        id: String(i + 1),
+        timestamp: '2024-01-01T00:00:00Z',
+        type: 'user',
+        content: [{ text: `Message ${i + 1}` }],
+      }),
+    );
+  }
+  return lines.join('\n') + '\n';
+}
+
+async function writeSession(
+  chatsDir: string,
+  fileName: string,
+  contents: string,
+): Promise<string> {
+  const filePath = path.join(chatsDir, fileName);
+  await fs.writeFile(filePath, contents);
+  return filePath;
+}
+
+async function setSessionMtime(
+  filePath: string,
+  timestamp: string,
+): Promise<void> {
+  const date = new Date(timestamp);
+  await fs.utimes(filePath, date, date);
+}
+
 describe('sessionSummaryUtils', () => {
+  let tmpDir: string;
+  let projectTempDir: string;
+  let chatsDir: string;
   let mockConfig: Config;
   let mockContentGenerator: ContentGenerator;
   let mockGenerateSummary: ReturnType<typeof vi.fn>;
@@ -51,21 +110,23 @@ describe('sessionSummaryUtils', () => {
   beforeEach(async () => {
     vi.clearAllMocks();
 
-    // Setup mock content generator
+    tmpDir = await fs.mkdtemp(path.join(os.tmpdir(), 'session-summary-utils-'));
+    projectTempDir = path.join(tmpDir, 'project');
+    chatsDir = path.join(projectTempDir, 'chats');
+    await fs.mkdir(chatsDir, { recursive: true });
+
     mockContentGenerator = {} as ContentGenerator;
 
-    // Setup mock config
     mockConfig = {
       getContentGenerator: vi.fn().mockReturnValue(mockContentGenerator),
+      getSessionId: vi.fn().mockReturnValue('current-session'),
       storage: {
-        getProjectTempDir: vi.fn().mockReturnValue('/tmp/project'),
+        getProjectTempDir: vi.fn().mockReturnValue(projectTempDir),
       },
     } as unknown as Config;
 
-    // Setup mock generateSummary function
     mockGenerateSummary = vi.fn().mockResolvedValue('Add dark mode to the app');
 
-    // Import the mocked module to access the constructor
     const { SessionSummaryService } = await import(
       './sessionSummaryService.js'
     );
@@ -76,13 +137,14 @@ describe('sessionSummaryUtils', () => {
     }));
   });
 
-  afterEach(() => {
+  afterEach(async () => {
     vi.restoreAllMocks();
+    await fs.rm(tmpDir, { recursive: true, force: true });
   });
 
   describe('getPreviousSession', () => {
     it('should return null if chats directory does not exist', async () => {
-      vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
+      await fs.rm(chatsDir, { recursive: true, force: true });
 
       const result = await getPreviousSession(mockConfig);
 
@@ -90,19 +152,19 @@ describe('sessionSummaryUtils', () => {
     });
 
     it('should return null if no session files exist', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue([]);
-
       const result = await getPreviousSession(mockConfig);
 
       expect(result).toBeNull();
     });
 
     it('should return null if most recent session already has summary', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(5, { summary: 'Existing summary' }),
+      await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-abc12345.json',
+        buildLegacySessionJson({
+          userMessageCount: 5,
+          summary: 'Existing summary',
+        }),
       );
 
       const result = await getPreviousSession(mockConfig);
@@ -111,10 +173,10 @@ describe('sessionSummaryUtils', () => {
     });
 
     it('should return null if most recent session has 1 or fewer user messages', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(1),
+      await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-abc12345.json',
+        buildLegacySessionJson({ userMessageCount: 1 }),
       );
 
       const result = await getPreviousSession(mockConfig);
@@ -123,95 +185,282 @@ describe('sessionSummaryUtils', () => {
     });
 
     it('should return path if most recent session has more than 1 user message and no summary', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
+      const filePath = await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-abc12345.json',
+        buildLegacySessionJson({ userMessageCount: 2 }),
       );
 
       const result = await getPreviousSession(mockConfig);
 
-      expect(result).toBe(
-        path.join(
-          '/tmp/project',
-          'chats',
-          'session-2024-01-01T10-00-abc12345.json',
-        ),
-      );
+      expect(result).toBe(filePath);
     });
 
-    it('should select most recently created session by filename', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue([
+    it('should select most recently updated session', async () => {
+      await writeSession(
+        chatsDir,
         'session-2024-01-01T10-00-older000.json',
+        buildLegacySessionJson({
+          userMessageCount: 2,
+          lastUpdated: '2024-01-01T10:00:00Z',
+        }),
+      );
+      const newerPath = await writeSession(
+        chatsDir,
         'session-2024-01-02T10-00-newer000.json',
-      ]);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
+        buildLegacySessionJson({
+          userMessageCount: 2,
+          lastUpdated: '2024-01-02T10:00:00Z',
+        }),
       );
 
       const result = await getPreviousSession(mockConfig);
 
-      expect(result).toBe(
-        path.join(
-          '/tmp/project',
-          'chats',
-          'session-2024-01-02T10-00-newer000.json',
-        ),
-      );
+      expect(result).toBe(newerPath);
     });
 
-    it('should return null if most recent session file is corrupted', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue('invalid json');
+    it('should ignore corrupted session files', async () => {
+      await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-abc12345.json',
+        'invalid json',
+      );
 
       const result = await getPreviousSession(mockConfig);
 
       expect(result).toBeNull();
     });
+
+    it('should support JSONL sessions and sort by lastUpdated instead of filename', async () => {
+      await writeSession(
+        chatsDir,
+        'session-2024-01-02T10-00-older000.jsonl',
+        buildJsonlSession({
+          userMessageCount: 2,
+          lastUpdated: '2024-01-01T10:00:00Z',
+          sessionId: 'older-session',
+        }),
+      );
+      const newerPath = await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-newer000.jsonl',
+        buildJsonlSession({
+          userMessageCount: 2,
+          lastUpdated: '2024-01-03T10:00:00Z',
+          sessionId: 'newer-session',
+        }),
+      );
+
+      const result = await getPreviousSession(mockConfig);
+
+      expect(result).toBe(newerPath);
+    });
+
+    it('should stop scanning once older mtimes cannot beat the best lastUpdated', async () => {
+      const loadConversationRecord = vi.mocked(
+        chatRecordingService.loadConversationRecord,
+      );
+
+      const currentPath = await writeSession(
+        chatsDir,
+        'session-2024-01-03T10-00-cur00001.jsonl',
+        buildJsonlSession({
+          sessionId: 'current-session',
+          userMessageCount: 2,
+          lastUpdated: '2024-01-03T10:00:00Z',
+        }),
+      );
+      await setSessionMtime(currentPath, '2024-01-03T10:00:00Z');
+
+      const bestPath = await writeSession(
+        chatsDir,
+        'session-2024-01-02T10-00-best0001.jsonl',
+        buildJsonlSession({
+          sessionId: 'best-session',
+          userMessageCount: 2,
+          lastUpdated: '2024-01-02T10:00:00Z',
+        }),
+      );
+      await setSessionMtime(bestPath, '2024-01-02T10:00:00Z');
+
+      const olderPath = await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-older001.jsonl',
+        buildJsonlSession({
+          sessionId: 'older-session',
+          userMessageCount: 2,
+          lastUpdated: '2024-01-01T10:00:00Z',
+        }),
+      );
+      await setSessionMtime(olderPath, '2024-01-01T10:00:00Z');
+
+      const result = await getPreviousSession(mockConfig);
+
+      expect(result).toBe(bestPath);
+      expect(loadConversationRecord).toHaveBeenCalledTimes(2);
+      expect(loadConversationRecord).not.toHaveBeenCalledWith(olderPath, {
+        metadataOnly: true,
+      });
+    });
   });
 
   describe('generateSummary', () => {
     it('should not throw if getPreviousSession returns null', async () => {
-      vi.mocked(fs.access).mockRejectedValue(new Error('ENOENT'));
+      await fs.rm(chatsDir, { recursive: true, force: true });
 
       await expect(generateSummary(mockConfig)).resolves.not.toThrow();
     });
 
-    it('should generate and save summary for session needing one', async () => {
-      const sessionPath = path.join(
-        '/tmp/project',
-        'chats',
+    it('should generate and save summary for legacy JSON sessions', async () => {
+      const lastUpdated = '2024-01-01T10:00:00Z';
+      const filePath = await writeSession(
+        chatsDir,
         'session-2024-01-01T10-00-abc12345.json',
+        buildLegacySessionJson({ userMessageCount: 2, lastUpdated }),
       );
 
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
-      );
-      vi.mocked(fs.writeFile).mockResolvedValue(undefined);
-
       await generateSummary(mockConfig);
 
       expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
-      expect(fs.writeFile).toHaveBeenCalledTimes(1);
-      expect(fs.writeFile).toHaveBeenCalledWith(
-        sessionPath,
-        expect.stringContaining('Add dark mode to the app'),
-      );
+      const written = JSON.parse(await fs.readFile(filePath, 'utf-8'));
+      expect(written.summary).toBe('Add dark mode to the app');
+      expect(written.lastUpdated).toBe(lastUpdated);
     });
 
     it('should handle errors gracefully without throwing', async () => {
-      vi.mocked(fs.access).mockResolvedValue(undefined);
-      mockReaddir.mockResolvedValue(['session-2024-01-01T10-00-abc12345.json']);
-      vi.mocked(fs.readFile).mockResolvedValue(
-        createSessionWithUserMessages(2),
+      await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-abc12345.json',
+        buildLegacySessionJson({ userMessageCount: 2 }),
       );
       mockGenerateSummary.mockRejectedValue(new Error('API Error'));
 
       await expect(generateSummary(mockConfig)).resolves.not.toThrow();
     });
+
+    it('should append a metadata update when saving a summary to JSONL', async () => {
+      const lastUpdated = '2024-01-01T10:00:00Z';
+      const filePath = await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-abc12345.jsonl',
+        buildJsonlSession({ userMessageCount: 2, lastUpdated }),
+      );
+
+      await generateSummary(mockConfig);
+
+      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
+      const lines = (await fs.readFile(filePath, 'utf-8'))
+        .split('\n')
+        .filter(Boolean);
+      const lastRecord = JSON.parse(lines[lines.length - 1]);
+      expect(lastRecord).toEqual({
+        $set: {
+          summary: 'Add dark mode to the app',
+        },
+      });
+    });
+
+    it('should preserve a newer JSONL lastUpdated written concurrently', async () => {
+      const initialLastUpdated = '2024-01-01T10:00:00Z';
+      const newerLastUpdated = '2024-01-02T12:34:56Z';
+      const filePath = await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-race.jsonl',
+        buildJsonlSession({
+          userMessageCount: 2,
+          lastUpdated: initialLastUpdated,
+        }),
+      );
+
+      const actualChatRecordingService = await vi.importActual<
+        typeof import('./chatRecordingService.js')
+      >('./chatRecordingService.js');
+      let injectedConcurrentUpdate = false;
+      let sessionReadCount = 0;
+      vi.mocked(chatRecordingService.loadConversationRecord).mockImplementation(
+        async (targetPath, options) => {
+          const conversation =
+            await actualChatRecordingService.loadConversationRecord(
+              targetPath,
+              options,
+            );
+
+          if (targetPath === filePath) {
+            sessionReadCount += 1;
+          }
+
+          if (
+            !injectedConcurrentUpdate &&
+            targetPath === filePath &&
+            sessionReadCount === 2
+          ) {
+            injectedConcurrentUpdate = true;
+            await fs.appendFile(
+              filePath,
+              `${JSON.stringify({ $set: { lastUpdated: newerLastUpdated } })}\n`,
+            );
+          }
+
+          return conversation;
+        },
+      );
+
+      await generateSummary(mockConfig);
+
+      expect(injectedConcurrentUpdate).toBe(true);
+      const savedConversation =
+        await chatRecordingService.loadConversationRecord(filePath);
+      expect(savedConversation?.summary).toBe('Add dark mode to the app');
+      expect(savedConversation?.lastUpdated).toBe(newerLastUpdated);
+
+      const lines = (await fs.readFile(filePath, 'utf-8'))
+        .split('\n')
+        .filter(Boolean);
+      const lastRecord = JSON.parse(lines[lines.length - 1]);
+      expect(lastRecord).toEqual({
+        $set: {
+          summary: 'Add dark mode to the app',
+        },
+      });
+    });
+
+    it('should skip the active startup session and summarize the previous session', async () => {
+      const previousPath = await writeSession(
+        chatsDir,
+        'session-2024-01-01T10-00-prev0001.jsonl',
+        buildJsonlSession({
+          sessionId: 'previous-session',
+          userMessageCount: 2,
+          lastUpdated: '2024-01-01T10:00:00Z',
+        }),
+      );
+      const currentPath = await writeSession(
+        chatsDir,
+        'session-2024-01-02T10-00-cur00001.jsonl',
+        buildJsonlSession({
+          sessionId: 'current-session',
+          userMessageCount: 1,
+          lastUpdated: '2024-01-02T10:00:00Z',
+        }),
+      );
+
+      await generateSummary(mockConfig);
+
+      expect(mockGenerateSummary).toHaveBeenCalledTimes(1);
+
+      const previousLines = (await fs.readFile(previousPath, 'utf-8'))
+        .split('\n')
+        .filter(Boolean);
+      expect(JSON.parse(previousLines[previousLines.length - 1])).toEqual({
+        $set: {
+          summary: 'Add dark mode to the app',
+        },
+      });
+
+      const currentLines = (await fs.readFile(currentPath, 'utf-8'))
+        .split('\n')
+        .filter(Boolean);
+      expect(currentLines).toHaveLength(2);
+    });
   });
 });

packages/core/src/services/sessionSummaryUtils.ts

@@ -10,6 +10,7 @@ import { BaseLlmClient } from '../core/baseLlmClient.js';
 import { debugLogger } from '../utils/debugLogger.js';
 import {
   SESSION_FILE_PREFIX,
+  loadConversationRecord,
   type ConversationRecord,
 } from './chatRecordingService.js';
 import fs from 'node:fs/promises';
@@ -17,6 +18,60 @@ import path from 'node:path';
 
 const MIN_MESSAGES_FOR_SUMMARY = 1;
 
+type LoadedSession = ConversationRecord & {
+  messageCount?: number;
+  userMessageCount?: number;
+};
+
+interface SessionFileCandidate {
+  filePath: string;
+  mtimeMs: number;
+}
+
+function isSupportedSessionFile(fileName: string): boolean {
+  return (
+    fileName.startsWith(SESSION_FILE_PREFIX) &&
+    (fileName.endsWith('.json') || fileName.endsWith('.jsonl'))
+  );
+}
+
+async function listSessionFileCandidates(
+  chatsDir: string,
+): Promise<SessionFileCandidate[]> {
+  const allFiles = await fs.readdir(chatsDir);
+  const candidates: SessionFileCandidate[] = [];
+
+  for (const fileName of allFiles) {
+    if (!isSupportedSessionFile(fileName)) continue;
+
+    const filePath = path.join(chatsDir, fileName);
+    try {
+      const stat = await fs.stat(filePath);
+      if (!stat.isFile()) continue;
+      candidates.push({ filePath, mtimeMs: stat.mtimeMs });
+    } catch {
+      // Skip files that disappeared between readdir and stat.
+    }
+  }
+
+  candidates.sort((a, b) => {
+    const mtimeDelta = b.mtimeMs - a.mtimeMs;
+    if (mtimeDelta !== 0) {
+      return mtimeDelta;
+    }
+
+    return path.basename(b.filePath).localeCompare(path.basename(a.filePath));
+  });
+
+  return candidates;
+}
+
+function getSessionTimestampMs(session: LoadedSession): number {
+  if (!session.lastUpdated) return 0;
+  const parsed = Date.parse(session.lastUpdated);
+  return Number.isNaN(parsed) ? 0 : parsed;
+}
+
 /**
  * Generates and saves a summary for a session file.
  */
@@ -24,10 +79,11 @@ async function generateAndSaveSummary(
   config: Config,
   sessionPath: string,
 ): Promise<void> {
-  // Read session file
-  const content = await fs.readFile(sessionPath, 'utf-8');
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const conversation: ConversationRecord = JSON.parse(content);
+  const conversation = await loadConversationRecord(sessionPath);
+  if (!conversation) {
+    debugLogger.debug(`[SessionSummary] Could not read session ${sessionPath}`);
+    return;
+  }
 
   // Skip if summary already exists
   if (conversation.summary) {
@@ -68,10 +124,17 @@ async function generateAndSaveSummary(
     return;
   }
 
-  // Re-read the file before writing to handle race conditions
-  const freshContent = await fs.readFile(sessionPath, 'utf-8');
-  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-  const freshConversation: ConversationRecord = JSON.parse(freshContent);
+  // Re-read the file before writing to handle race conditions. For JSONL we
+  // only need the metadata; for legacy JSON we need the full record so we can
+  // round-trip the messages back to disk.
+  const isJsonl = sessionPath.endsWith('.jsonl');
+  const freshConversation = await loadConversationRecord(sessionPath, {
+    metadataOnly: isJsonl,
+  });
+  if (!freshConversation) {
+    debugLogger.debug(`[SessionSummary] Could not re-read ${sessionPath}`);
+    return;
+  }
 
   // Check if summary was added by another process
   if (freshConversation.summary) {
@@ -81,17 +144,33 @@ async function generateAndSaveSummary(
     return;
   }
 
-  // Add summary and write back
-  freshConversation.summary = summary;
-  freshConversation.lastUpdated = new Date().toISOString();
-  await fs.writeFile(sessionPath, JSON.stringify(freshConversation, null, 2));
+  if (isJsonl) {
+    await fs.appendFile(
+      sessionPath,
+      `${JSON.stringify({ $set: { summary } })}\n`,
+    );
+  } else {
+    const lastUpdated = freshConversation.lastUpdated;
+    await fs.writeFile(
+      sessionPath,
+      JSON.stringify(
+        {
+          ...freshConversation,
+          summary,
+          lastUpdated,
+        },
+        null,
+        2,
+      ),
+    );
+  }
   debugLogger.debug(
     `[SessionSummary] Saved summary for ${sessionPath}: "${summary}"`,
   );
 }
 
 /**
- * Finds the most recently created session that needs a summary.
+ * Finds the most recently updated previous session that still needs a summary.
  * Returns the path if it needs a summary, null otherwise.
  */
 export async function getPreviousSession(
@@ -108,53 +187,74 @@ export async function getPreviousSession(
       return null;
     }
 
-    // List session files
-    const allFiles = await fs.readdir(chatsDir);
-    const sessionFiles = allFiles.filter(
-      (f) => f.startsWith(SESSION_FILE_PREFIX) && f.endsWith('.json'),
-    );
-
+    const sessionFiles = await listSessionFileCandidates(chatsDir);
     if (sessionFiles.length === 0) {
       debugLogger.debug('[SessionSummary] No session files found');
       return null;
     }
 
-    // Sort by filename descending (most recently created first)
-    // Filename format: session-YYYY-MM-DDTHH-MM-XXXXXXXX.json
-    sessionFiles.sort((a, b) => b.localeCompare(a));
+    let bestPreviousSession: {
+      filePath: string;
+      conversation: LoadedSession;
+    } | null = null;
 
-    // Check the most recently created session
-    const mostRecentFile = sessionFiles[0];
-    const filePath = path.join(chatsDir, mostRecentFile);
-
-    try {
-      const content = await fs.readFile(filePath, 'utf-8');
-      // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-      const conversation: ConversationRecord = JSON.parse(content);
-
-      if (conversation.summary) {
-        debugLogger.debug(
-          '[SessionSummary] Most recent session already has summary',
-        );
-        return null;
+    for (const { filePath, mtimeMs } of sessionFiles) {
+      const bestTimestamp = bestPreviousSession
+        ? getSessionTimestampMs(bestPreviousSession.conversation)
+        : null;
+      if (
+        bestPreviousSession &&
+        bestTimestamp !== null &&
+        bestTimestamp > 0 &&
+        mtimeMs < bestTimestamp
+      ) {
+        break;
       }
 
-      // Only generate summaries for sessions with more than 1 user message
-      const userMessageCount = conversation.messages.filter(
-        (m) => m.type === 'user',
-      ).length;
-      if (userMessageCount <= MIN_MESSAGES_FOR_SUMMARY) {
-        debugLogger.debug(
-          `[SessionSummary] Most recent session has ${userMessageCount} user message(s), skipping (need more than ${MIN_MESSAGES_FOR_SUMMARY})`,
-        );
-        return null;
-      }
+      try {
+        const conversation = await loadConversationRecord(filePath, {
+          metadataOnly: true,
+        });
+        if (!conversation) continue;
+        if (conversation.sessionId === config.getSessionId()) continue;
+        if (conversation.summary) continue;
 
-      return filePath;
-    } catch {
-      debugLogger.debug('[SessionSummary] Could not read most recent session');
+        // Only generate summaries for sessions with more than 1 user message.
+        // `loadConversationRecord` populates `userMessageCount` in metadataOnly
+        // mode; fall back to scanning messages for the legacy fallback path.
+        const userMessageCount =
+          conversation.userMessageCount ??
+          conversation.messages.filter((message) => message.type === 'user')
+            .length;
+        if (userMessageCount <= MIN_MESSAGES_FOR_SUMMARY) {
+          continue;
+        }
+
+        if (
+          !bestPreviousSession ||
+          getSessionTimestampMs(conversation) >
+            getSessionTimestampMs(bestPreviousSession.conversation) ||
+          (getSessionTimestampMs(conversation) ===
+            getSessionTimestampMs(bestPreviousSession.conversation) &&
+            path
+              .basename(filePath)
+              .localeCompare(path.basename(bestPreviousSession.filePath)) > 0)
+        ) {
+          bestPreviousSession = { filePath, conversation };
+        }
+      } catch {
+        // Ignore unreadable session files
+      }
+    }
+
+    if (!bestPreviousSession) {
+      debugLogger.debug(
+        '[SessionSummary] No previous session needs summary generation',
+      );
       return null;
     }
+
+    return bestPreviousSession.filePath;
   } catch (error) {
     debugLogger.debug(
       `[SessionSummary] Error finding previous session: ${error instanceof Error ? error.message : String(error)}`,

packages/core/src/telemetry/metrics.test.ts

@@ -121,8 +121,10 @@ describe('Telemetry Metrics', () => {
       return actualApi;
     });
 
-    const { getCommonAttributes } = await import('./telemetryAttributes.js');
-    (getCommonAttributes as Mock).mockReturnValue({
+    const { getCommonMetricAttributes } = await import(
+      './telemetryAttributes.js'
+    );
+    (getCommonMetricAttributes as Mock).mockReturnValue({
       'session.id': 'test-session-id',
       'installation.id': 'test-installation-id',
       'user.email': 'test@example.com',

packages/core/src/telemetry/metrics.ts

@@ -24,7 +24,7 @@ import type {
   TokenStorageInitializationEvent,
 } from './types.js';
 import { AuthType } from '../core/contentGenerator.js';
-import { getCommonAttributes } from './telemetryAttributes.js';
+import { getCommonMetricAttributes } from './telemetryAttributes.js';
 import { sanitizeHookName } from './sanitize.js';
 
 const EVENT_CHAT_COMPRESSION = 'gemini_cli.chat_compression';
@@ -104,7 +104,7 @@ const EXIT_FAIL_COUNT = 'gemini_cli.exit.fail.count';
 const PLAN_EXECUTION_COUNT = 'gemini_cli.plan.execution.count';
 
 const baseMetricDefinition = {
-  getCommonAttributes,
+  getCommonAttributes: getCommonMetricAttributes,
 };
 
 const COUNTER_DEFINITIONS = {

packages/core/src/telemetry/telemetryAttributes.test.ts

@@ -0,0 +1,115 @@
+/**
+ * @license
+ * Copyright 2026 Google LLC
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { describe, it, expect, vi, beforeEach, type Mock } from 'vitest';
+import {
+  getCommonAttributes,
+  getCommonMetricAttributes,
+} from './telemetryAttributes.js';
+import type { Config } from '../config/config.js';
+import { UserAccountManager } from '../utils/userAccountManager.js';
+import { InstallationManager } from '../utils/installationManager.js';
+
+vi.mock('../utils/userAccountManager.js');
+vi.mock('../utils/installationManager.js');
+
+describe('telemetryAttributes', () => {
+  let mockConfig: Partial<Config>;
+
+  beforeEach(() => {
+    vi.resetAllMocks();
+
+    mockConfig = {
+      getSessionId: vi.fn().mockReturnValue('mock-session-id'),
+      isInteractive: vi.fn().mockReturnValue(true),
+      getExperiments: vi.fn().mockReturnValue(undefined),
+      getContentGeneratorConfig: vi.fn().mockReturnValue(undefined),
+    };
+
+    (
+      UserAccountManager.prototype.getCachedGoogleAccount as Mock
+    ).mockReturnValue(undefined);
+    (InstallationManager.prototype.getInstallationId as Mock).mockReturnValue(
+      'mock-install-id',
+    );
+  });
+
+  describe('getCommonMetricAttributes', () => {
+    it('should return interactive and auth_type when defined', () => {
+      mockConfig.getContentGeneratorConfig = vi
+        .fn()
+        .mockReturnValue({ authType: 'oauth-personal' });
+
+      const attributes = getCommonMetricAttributes(mockConfig as Config);
+
+      expect(attributes).toEqual({
+        interactive: true,
+        auth_type: 'oauth-personal',
+      });
+    });
+
+    it('should return only interactive when auth_type is not defined', () => {
+      const attributes = getCommonMetricAttributes(mockConfig as Config);
+
+      expect(attributes).toEqual({
+        interactive: true,
+      });
+    });
+  });
+
+  describe('getCommonAttributes', () => {
+    it('should include all common attributes', () => {
+      (
+        UserAccountManager.prototype.getCachedGoogleAccount as Mock
+      ).mockReturnValue('test@google.com');
+      mockConfig.getExperiments = vi
+        .fn()
+        .mockReturnValue({ experimentIds: [123, 456] });
+      mockConfig.getContentGeneratorConfig = vi
+        .fn()
+        .mockReturnValue({ authType: 'adc' });
+
+      const attributes = getCommonAttributes(mockConfig as Config);
+
+      expect(attributes).toEqual({
+        'session.id': 'mock-session-id',
+        'installation.id': 'mock-install-id',
+        interactive: true,
+        'user.email': 'test@google.com',
+        auth_type: 'adc',
+        'experiments.ids': '123,456',
+      });
+    });
+
+    it('should safely truncate experiments string to not exceed 1000 characters and not cut mid-ID', () => {
+      // Generate a list of experiment IDs that will produce a string > 1000 chars
+      const expIds = [];
+      for (let i = 0; i < 200; i++) {
+        // e.g., 100000000 -> 9 chars + 1 comma = 10 chars per ID
+        expIds.push(100000000 + i);
+      }
+      mockConfig.getExperiments = vi
+        .fn()
+        .mockReturnValue({ experimentIds: expIds });
+
+      const attributes = getCommonAttributes(mockConfig as Config);
+      const expString = attributes['experiments.ids'] as string;
+
+      expect(expString.length).toBeLessThanOrEqual(1000);
+
+      // Verify the last ID is complete (not cut off) by checking if it's one of our expected IDs
+      const ids = expString.split(',');
+      const lastIdStr = ids[ids.length - 1];
+      const lastIdNumber = parseInt(lastIdStr, 10);
+
+      expect(lastIdNumber).toBeGreaterThanOrEqual(100000000);
+      expect(lastIdNumber).toBeLessThan(100000200);
+
+      // Also ensure no trailing comma
+      expect(expString.endsWith(',')).toBe(false);
+    });
+  });
+});

packages/core/src/telemetry/telemetryAttributes.ts

@@ -12,19 +12,36 @@ import { UserAccountManager } from '../utils/userAccountManager.js';
 const userAccountManager = new UserAccountManager();
 const installationManager = new InstallationManager();
 
+export function getCommonMetricAttributes(config: Config): Attributes {
+  const authType = config.getContentGeneratorConfig()?.authType;
+
+  return {
+    interactive: config.isInteractive(),
+    ...(authType && { auth_type: authType }),
+  };
+}
+
 export function getCommonAttributes(config: Config): Attributes {
   const email = userAccountManager.getCachedGoogleAccount();
   const experiments = config.getExperiments();
-  const authType = config.getContentGeneratorConfig()?.authType;
+
+  let experimentsIdsStr = '';
+  if (experiments && experiments.experimentIds.length > 0) {
+    experimentsIdsStr = experiments.experimentIds.join(',');
+    if (experimentsIdsStr.length > 1000) {
+      experimentsIdsStr = experimentsIdsStr.substring(0, 1000);
+      const lastCommaIndex = experimentsIdsStr.lastIndexOf(',');
+      if (lastCommaIndex > 0) {
+        experimentsIdsStr = experimentsIdsStr.substring(0, lastCommaIndex);
+      }
+    }
+  }
+
   return {
+    ...getCommonMetricAttributes(config),
     'session.id': config.getSessionId(),
     'installation.id': installationManager.getInstallationId(),
-    interactive: config.isInteractive(),
     ...(email && { 'user.email': email }),
-    ...(authType && { auth_type: authType }),
-    ...(experiments &&
-      experiments.experimentIds.length > 0 && {
-        'experiments.ids': experiments.experimentIds,
-      }),
+    ...(experimentsIdsStr && { 'experiments.ids': experimentsIdsStr }),
   };
 }

packages/core/src/telemetry/trace.test.ts

@@ -52,26 +52,95 @@ describe('truncateForTelemetry', () => {
   });
 
   it('should correctly truncate strings with multi-byte unicode characters (emojis)', () => {
-    // 5 emojis, each is multiple bytes in UTF-16
+    // 5 emojis, each is a surrogate pair (2 code units)
     const emojis = '👋🌍🚀🔥🎉';
 
-    // Truncating to length 5 (which is 2.5 emojis in UTF-16 length terms)
-    // truncateString will stop after the full grapheme clusters that fit within 5
-    const result = truncateForTelemetry(emojis, 5);
+    // Truncating to 2 code units
+    const result = truncateForTelemetry(emojis, 2);
 
-    expect(result).toBe('👋🌍...[TRUNCATED: original length 10]');
+    expect(result).toBe('👋...[TRUNCATED: original length 10]');
   });
 
-  it('should stringify and truncate objects if exceeding maxLength', () => {
+  it('should stringify and structurally truncate objects if exceeding limits', () => {
     const obj = { message: 'hello world', nested: { a: 1 } };
-    const stringified = JSON.stringify(obj);
     const result = truncateForTelemetry(obj, 10);
     expect(result).toBe(
-      stringified.substring(0, 10) +
-        `...[TRUNCATED: original length ${stringified.length}]`,
+      JSON.stringify({
+        message: 'hello worl...[TRUNCATED: original length 11]',
+        nested: { a: 1 },
+      }),
     );
   });
 
+  it('should structurally truncate arrays and depth', () => {
+    const obj = {
+      arr: [1, 2, 3],
+      deep: { level1: { level2: { level3: { a: 1 } } } },
+    };
+    const result = truncateForTelemetry(obj, 100, 2, 3);
+    expect(result).toBe(
+      JSON.stringify({
+        arr: [1, 2, '[TRUNCATED: Array of length 3]'],
+        deep: { level1: { level2: '[TRUNCATED: Max Depth Reached]' } },
+      }),
+    );
+  });
+
+  it('should handle objects with a toJSON method', () => {
+    const date = new Date('2026-04-13T00:00:00.000Z');
+    const result = truncateForTelemetry(date);
+    expect(result).toBe('2026-04-13T00:00:00.000Z');
+  });
+
+  it('should handle getters via direct property access', () => {
+    const obj = {
+      get myGetter() {
+        return 'getter value';
+      },
+      get errorGetter() {
+        throw new Error('getter error');
+      },
+    };
+    const result = truncateForTelemetry(obj);
+    expect(result).toBe(
+      JSON.stringify({
+        myGetter: 'getter value',
+        errorGetter: '[ERROR: Failed to read property]',
+      }),
+    );
+  });
+
+  it('should truncate extremely long keys', () => {
+    const longKey = 'a'.repeat(150);
+    const obj = {
+      [longKey]: 'value',
+    };
+    const result = truncateForTelemetry(obj);
+    const expectedKey = 'a'.repeat(100) + '...[TRUNCATED_KEY]';
+    expect(result).toBe(
+      JSON.stringify({
+        [expectedKey]: 'value',
+      }),
+    );
+  });
+
+  it('should enforce a global payload string limit without breaking JSON', () => {
+    const obj = {
+      a: 'x'.repeat(100),
+      b: 'y'.repeat(100),
+    };
+    // Capping global string length to 50
+    const result = truncateForTelemetry(obj, 100, 100, 4, 100, 50) as string;
+
+    // It should replace the entire object with a valid JSON string indicating truncation
+    expect(result).toBe(
+      '"[TRUNCATED: Payload exceeded global limit of 50 characters. Original length: 215]"',
+    );
+
+    // Prove it remains perfectly parseable JSON
+    expect(() => JSON.parse(result)).not.toThrow();
+  });
+
   it('should stringify objects unchanged if within maxLength', () => {
     const obj = { a: 1 };
     expect(truncateForTelemetry(obj, 100)).toBe(JSON.stringify(obj));

packages/core/src/telemetry/trace.ts

@@ -14,7 +14,6 @@ import {
 
 import { debugLogger } from '../utils/debugLogger.js';
 import { safeJsonStringify } from '../utils/safeJsonStringify.js';
-import { truncateString } from '../utils/textUtils.js';
 import {
   GEN_AI_AGENT_DESCRIPTION,
   GEN_AI_AGENT_NAME,
@@ -45,6 +44,17 @@ export const spanRegistry = new FinalizationRegistry((endSpan: () => void) => {
   }
 });
 
+function isRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null;
+}
+
+function hasToJSON(value: unknown): value is { toJSON: () => unknown } {
+  if (!isRecord(value)) return false;
+  if (!('toJSON' in value)) return false;
+  const toJSONFn = value['toJSON'];
+  return typeof toJSONFn === 'function';
+}
+
 /**
  * Truncates a value for inclusion in telemetry attributes.
  *
@@ -54,27 +64,98 @@ export const spanRegistry = new FinalizationRegistry((endSpan: () => void) => {
  */
 export function truncateForTelemetry(
   value: unknown,
-  maxLength = 10000,
+  maxStringLength = 10000,
+  maxArrayLength = 100,
+  maxDepth = 4,
+  maxObjectKeys = 100,
+  maxGlobalStringLength = 50000,
 ): AttributeValue | undefined {
-  if (typeof value === 'string') {
-    return truncateString(
-      value,
-      maxLength,
-      `...[TRUNCATED: original length ${value.length}]`,
-    ) as AttributeValue;
+  const truncateObj = (v: unknown, depth: number): unknown => {
+    if (typeof v === 'string') {
+      if (v.length > maxStringLength) {
+        let truncatedStr = v.slice(0, maxStringLength);
+        if (truncatedStr.length > 0 && /[\uD800-\uDBFF]$/.test(truncatedStr)) {
+          truncatedStr = truncatedStr.slice(0, -1);
+        }
+        return truncatedStr + `...[TRUNCATED: original length ${v.length}]`;
+      }
+      return v;
+    }
+    if (
+      typeof v === 'number' ||
+      typeof v === 'boolean' ||
+      v === null ||
+      v === undefined
+    ) {
+      return v;
+    }
+    if (hasToJSON(v)) {
+      try {
+        return truncateObj(v.toJSON(), depth);
+      } catch {
+        // Ignore and fall back to manual structural iteration
+      }
+    }
+    if (typeof v === 'object') {
+      if (depth >= maxDepth) {
+        return `[TRUNCATED: Max Depth Reached]`;
+      }
+      if (Array.isArray(v)) {
+        if (v.length > maxArrayLength) {
+          const truncatedArray = v
+            .slice(0, maxArrayLength)
+            .map((item) => truncateObj(item, depth + 1));
+          truncatedArray.push(`[TRUNCATED: Array of length ${v.length}]`);
+          return truncatedArray;
+        }
+        return v.map((item) => truncateObj(item, depth + 1));
+      }
+
+      const newObj: Record<string, unknown> = {};
+      let numKeys = 0;
+      const recordV = isRecord(v) ? v : {};
+      for (const key in recordV) {
+        if (!Object.prototype.hasOwnProperty.call(recordV, key)) continue;
+        if (numKeys >= maxObjectKeys) {
+          newObj['__truncated'] =
+            `[TRUNCATED: Object with >${maxObjectKeys} keys]`;
+          break;
+        }
+        const truncatedKey =
+          key.length > 100 ? key.slice(0, 100) + '...[TRUNCATED_KEY]' : key;
+        try {
+          const val = recordV[key];
+          newObj[truncatedKey] = truncateObj(val, depth + 1);
+        } catch {
+          newObj[truncatedKey] = '[ERROR: Failed to read property]';
+        }
+        numKeys++;
+      }
+      return newObj;
+    }
+    return undefined;
+  };
+
+  const truncated = truncateObj(value, 0);
+
+  if (
+    typeof truncated === 'string' ||
+    typeof truncated === 'number' ||
+    typeof truncated === 'boolean'
+  ) {
+    return truncated as AttributeValue;
   }
-  if (typeof value === 'object' && value !== null) {
-    const stringified = safeJsonStringify(value);
-    return truncateString(
-      stringified,
-      maxLength,
-      `...[TRUNCATED: original length ${stringified.length}]`,
-    ) as AttributeValue;
+  if (truncated === null || truncated === undefined) {
+    return undefined;
   }
-  if (typeof value === 'number' || typeof value === 'boolean') {
-    return value as AttributeValue;
+
+  const stringified = safeJsonStringify(truncated);
+
+  if (stringified.length > maxGlobalStringLength) {
+    return `"[TRUNCATED: Payload exceeded global limit of ${maxGlobalStringLength} characters. Original length: ${stringified.length}]"`;
   }
-  return undefined;
+
+  return stringified as AttributeValue;
 }
 
 function isAsyncIterable<T>(value: T): value is T & AsyncIterable<unknown> {