merge: upstream/main v0.20.2 — file download, auto perm mode, PWA update, drag-drop

Merge tiann/hapi upstream (33 commits, v0.20.2) into the liuxin fork.
Notable adoptions:

- file viewer download button (tiann#926) — the download UI the user asked
  about; decodes existing base64 content to a Blob, no new endpoint
- Claude Code 'auto' permission mode (tiann#879)
- in-app PWA update prompt when a new service worker is ready (tiann#946) —
  PwaUpdateBannerWithStatusOffset, adopted WITHOUT enabling voice
- drag-and-drop files onto chat to attach (tiann#936) + Web Share Target (tiann#933)
- Codex fast mode / service-tier toggle (tiann#904), session service_tier
  column + merge-preserve
- four hub-restart-cascade cleanup bugs (tiann#923), stale-PID detection
  after abnormal runner shutdown (tiann#931), OutgoingMessageQueue flush
  before next turn (tiann#909), inactive-session send error surface (tiann#922)
- OLED black theme + per-appearance custom colors (tiann#937), session-list
  attention tooltips (tiann#941), active-only filter + paginated Show-N-more
  (tiann#903), file-explorer state persistence (tiann#911)

Conflict resolutions (22 files) — fork features preserved:
- store/index.ts: both forks bumped schema to V10 with different
  migrateFromV9ToV10; combined into one migration doing BOTH our
  content_uuid dedup index (messages) AND upstream service_tier (sessions)
- socket/server.ts: collapsed duplicate maxHttpBufferSize key into
  Math.max(SOCKET_MAX_HTTP_BUFFER_SIZE, 100MB) — keeps our 100MB upload
  floor while honoring upstream's image-buffer constant
- spawnSession plumbing (apiMachine/rpcGateway/syncEngine): unioned our
  sandbox+continueLatest with upstream's serviceTier across signature,
  RPC payload, and the resume call site
- App.tsx: kept signOut + voice-disabled; adopted PWA update banner
  (PwaUpdateProvider auto-merged into App() wrapper)
- SessionChat: nested both wrappers — HappyChatProvider > ShareSeedConsumer
  + DragDropZone > thread
- sessionModel.test: split the two same-named merge tests (our codex
  dedup + upstream service-tier) back into separate it() blocks
- useSendMessage: kept fork queue-stop AND upstream onError surface;
  keyed onError by non-null sid
- startHappyServer: kept fork's manual-rename skip in change_title
- schemas/locales/StatusBar/HappyComposer: unioned both sides

Post-merge type fixes: pinned-session test mock gained pendingRequests +
nextScheduledAt (new required SessionSummary fields); legacy-CLI model
backfill in applySessionConfig now extracts modelId from upstream's Pi
{provider,modelId} union.

Validation: typecheck green (cli/web/hub); full suite 2260 tests pass
incl. the runner stress test.

via [HAPI](https://hapi.run)

Co-Authored-By: HAPI <noreply@hapi.run>

Author: yoyoworms

.gitignore

@@ -47,3 +47,6 @@ cli/npm/main/
 test-results/
 playwright-report/
 e2e-output/
+.xyz-harness
+.agents/
+.pi/

AGENTS.md

@@ -145,7 +145,7 @@ Before commit/push/PR: use the **`pre-push-review`** skill (`~/.cursor/skills/pr
 - **RPC**: CLI registers handlers (`rpc-register`), hub routes requests via `rpcGateway.ts`
 - **Versioned updates**: CLI sends `update-metadata`/`update-state` with version; hub rejects stale
 - **Session modes**: `local` (terminal) vs `remote` (web-controlled); switchable mid-session
-- **Permission modes**: `default`, `acceptEdits`, `bypassPermissions`, `plan`
+- **Permission modes**: `default`, `acceptEdits`, `auto`, `bypassPermissions`, `plan`
 - **Namespaces**: Multi-user isolation via `CLI_API_TOKEN:<namespace>` suffix
 
 ## Adding new web features — consider an FUE

bun.lock

@@ -1,6 +1,6 @@
 {
   "name": "@twsxtd/hapi",
-  "version": "0.20.1",
+  "version": "0.20.2",
   "description": "App for agentic coding - access coding agent anywhere",
   "author": "Kirill Dubovitskiy & weishu",
   "license": "AGPL-3.0-only",
@@ -26,11 +26,11 @@
     }
   },
   "optionalDependencies": {
-    "@twsxtd/hapi-darwin-arm64": "0.20.1",
-    "@twsxtd/hapi-darwin-x64": "0.20.1",
-    "@twsxtd/hapi-linux-arm64": "0.20.1",
-    "@twsxtd/hapi-linux-x64": "0.20.1",
-    "@twsxtd/hapi-win32-x64": "0.20.1"
+    "@twsxtd/hapi-darwin-arm64": "0.20.2",
+    "@twsxtd/hapi-darwin-x64": "0.20.2",
+    "@twsxtd/hapi-linux-arm64": "0.20.2",
+    "@twsxtd/hapi-linux-x64": "0.20.2",
+    "@twsxtd/hapi-win32-x64": "0.20.2"
   },
   "scripts": {
     "postinstall": "node -e \"try{require('fs').chmodSync(require('path').join(__dirname,'bin','hapi.cjs'),0o755)}catch(e){}\"",
@@ -83,4 +83,4 @@
     "@types/parse-path": "7.0.3"
   },
   "packageManager": "bun@1.3.14"
-}
+}

cli/package.json

@@ -5,15 +5,25 @@ const guard = vi.hoisted(() => ({
     unregister: vi.fn()
 }));
 
+const spawnState = vi.hoisted(() => ({
+    exitHandlers: [] as Array<(code: number | null, signal: NodeJS.Signals | null) => void>,
+    stdinWrite: vi.fn<(chunk: string) => boolean>(() => true),
+    exitCode: null as number | null
+}));
+
 vi.mock('./agentCliGuard', () => ({
     registerActiveAcpTransport: guard.register,
     unregisterActiveAcpTransport: guard.unregister
 }));
 
 vi.mock('node:child_process', () => ({
     spawn: vi.fn(() => {
+        spawnState.exitHandlers = [];
         const handlers = new Map<string, Array<(...args: unknown[]) => void>>();
         const proc = {
+            get exitCode() {
+                return spawnState.exitCode;
+            },
             stdout: {
                 setEncoding: vi.fn(),
                 on: vi.fn((event: string, handler: (...args: unknown[]) => void) => {
@@ -26,12 +36,15 @@ vi.mock('node:child_process', () => ({
                     handlers.set(`stderr:${event}`, [...(handlers.get(`stderr:${event}`) ?? []), handler]);
                 })
             },
-            stdin: { end: vi.fn(), write: vi.fn() },
+            stdin: {
+                end: vi.fn(),
+                write: (chunk: string) => spawnState.stdinWrite(chunk)
+            },
             on: vi.fn((event: string, handler: (...args: unknown[]) => void) => {
-                handlers.set(`proc:${event}`, [...(handlers.get(`proc:${event}`) ?? []), handler]);
                 if (event === 'exit') {
-                    queueMicrotask(() => handler(0, null));
+                    spawnState.exitHandlers.push(handler as (code: number | null, signal: NodeJS.Signals | null) => void);
                 }
+                handlers.set(`proc:${event}`, [...(handlers.get(`proc:${event}`) ?? []), handler]);
             }),
             kill: vi.fn()
         };
@@ -45,6 +58,10 @@ describe('AcpStdioTransport agent CLI guard', () => {
     afterEach(() => {
         guard.register.mockClear();
         guard.unregister.mockClear();
+        spawnState.stdinWrite.mockReset();
+        spawnState.stdinWrite.mockReturnValue(true);
+        spawnState.exitCode = null;
+        spawnState.exitHandlers = [];
     });
 
     test('registers cross-process guard only for Cursor agent command', async () => {
@@ -64,3 +81,39 @@ describe('AcpStdioTransport agent CLI guard', () => {
         }
     });
 });
+
+describe('AcpStdioTransport closed stdin writes', () => {
+    afterEach(() => {
+        spawnState.stdinWrite.mockReset();
+        spawnState.stdinWrite.mockReturnValue(true);
+        spawnState.exitCode = null;
+        spawnState.exitHandlers = [];
+    });
+
+    test('rejects new requests after the ACP process exits instead of throwing from stdin.write', async () => {
+        const transport = new AcpStdioTransport({ command: 'gemini' });
+        spawnState.exitCode = 1;
+        spawnState.stdinWrite.mockImplementation(() => {
+            throw new Error('WritableIterable is closed');
+        });
+
+        for (const handler of spawnState.exitHandlers) {
+            handler(1, null);
+        }
+
+        await expect(transport.sendRequest('session/new')).rejects.toThrow(
+            'ACP process exited (code=1, signal=null)'
+        );
+        expect(() => transport.sendNotification('session/cancel', {})).not.toThrow();
+    });
+
+    test('rejects pending requests when stdin.write throws', async () => {
+        spawnState.stdinWrite.mockImplementation(() => {
+            throw new Error('WritableIterable is closed');
+        });
+
+        const transport = new AcpStdioTransport({ command: 'gemini' });
+        await expect(transport.sendRequest('initialize')).rejects.toThrow('WritableIterable is closed');
+        await expect(transport.sendRequest('session/new')).rejects.toThrow('WritableIterable is closed');
+    });
+});

cli/src/agent/backends/acp/AcpStdioTransport.test.ts

@@ -63,6 +63,8 @@ export class AcpStdioTransport {
     private nextId = 1;
     private protocolError: Error | null = null;
     private guardReleased = false;
+    private closed = false;
+    private closeError: Error | null = null;
 
     constructor(options: {
         command: string;
@@ -94,14 +96,14 @@ export class AcpStdioTransport {
             this.releaseAgentCliGuard();
             const message = `ACP process exited (code=${code ?? 'null'}, signal=${signal ?? 'null'})`;
             logger.debug(message);
-            this.rejectAllPending(new Error(message));
+            this.markClosed(new Error(message));
         });
 
         this.process.on('error', (error) => {
             this.releaseAgentCliGuard();
             logger.debug('[ACP] Process error', error);
             const message = error instanceof Error ? error.message : String(error);
-            this.rejectAllPending(new Error(
+            this.markClosed(new Error(
                 `Failed to spawn ${options.command}: ${message}. Is it installed and on PATH?`,
                 { cause: error }
             ));
@@ -124,6 +126,10 @@ export class AcpStdioTransport {
     static readonly DEFAULT_TIMEOUT_MS = 120_000;
 
     async sendRequest(method: string, params?: unknown, options?: { timeoutMs?: number }): Promise<unknown> {
+        if (this.closed) {
+            return Promise.reject(this.closeError ?? new Error('ACP transport is closed'));
+        }
+
         const id = this.nextId++;
         const payload: JsonRpcRequest = {
             jsonrpc: '2.0',
@@ -167,6 +173,10 @@ export class AcpStdioTransport {
     }
 
     sendNotification(method: string, params?: unknown): void {
+        if (this.closed) {
+            return;
+        }
+
         const payload: JsonRpcNotification = {
             jsonrpc: '2.0',
             method,
@@ -179,7 +189,7 @@ export class AcpStdioTransport {
         this.process.stdin.end();
         await killProcessByChildProcess(this.process);
         this.releaseAgentCliGuard();
-        this.rejectAllPending(new Error('ACP transport closed'));
+        this.markClosed(new Error('ACP transport closed'));
     }
 
     private releaseAgentCliGuard(): void {
@@ -302,8 +312,27 @@ export class AcpStdioTransport {
     }
 
     private writePayload(payload: JsonRpcRequest | JsonRpcNotification | JsonRpcResponse): void {
-        const serialized = JSON.stringify(payload);
-        this.process.stdin.write(`${serialized}\n`);
+        if (this.closed) {
+            return;
+        }
+
+        try {
+            const serialized = JSON.stringify(payload);
+            this.process.stdin.write(`${serialized}\n`);
+        } catch (error) {
+            const writeError = error instanceof Error ? error : new Error(String(error));
+            this.markClosed(writeError);
+        }
+    }
+
+    private markClosed(error: Error): void {
+        if (this.closed) {
+            return;
+        }
+
+        this.closed = true;
+        this.closeError = error;
+        this.rejectAllPending(error);
     }
 
     private rejectAllPending(error: Error): void {

cli/src/agent/backends/acp/AcpStdioTransport.ts

@@ -12,6 +12,7 @@ describe('registerLocalHandoffHandler', () => {
         const lifecycle = {
             setArchiveReason: vi.fn(),
             setSessionEndReason: vi.fn(),
+            hasExplicitSessionEndReason: vi.fn(() => false),
             cleanupAndExit: vi.fn(async () => {})
         }
 

cli/src/agent/localHandoff.test.ts

@@ -50,6 +50,18 @@ describe('convertAgentMessage', () => {
         });
     });
 
+    it('converts agent errors into error wire payloads', () => {
+        const converted = convertAgentMessage({
+            type: 'error',
+            message: 'Cursor Agent failed: authentication required'
+        });
+
+        expect(converted).toEqual({
+            type: 'error',
+            message: 'Cursor Agent failed: authentication required'
+        });
+    });
+
     it('converts usage messages into token_count payloads', () => {
         const converted = convertAgentMessage({
             type: 'usage',