Merge commit 'de2b3352c' into fix/reconcile-rows-b-2026-09-10

Author: elkaix

apps/pythinker-code/src/cli/sub/web/remote-control.ts

@@ -58,7 +58,7 @@ export function formatRemoteControlOutput(options: RemoteControlOutputOptions):
   );
   return [
     '',
-    `  ${title('Pythinker Remote Control ready')}  ${muted(`${getVersion()} (experimental)`)}`,
+    `  ${title('Pythinker Remote Control ready')}  ${muted(getVersion())}`,
     `  ${muted('Use Pythinker Code on this machine from your phone or another computer.')}`,
     '',
     `  ${label('1.')} Scan the QR code, or open ${link(options.url)}`,
@@ -72,7 +72,7 @@ export function formatRemoteControlOutput(options: RemoteControlOutputOptions):
     `  ${label('QR code PNG: ')}${options.pngPath} ${muted('(open this if the QR above does not scan)')}`,
     `  ${label('Local UI: ')}${accent(localBase)}${dim(localFrag)} ${muted('(LAN: --host)')}`,
     '',
-    `  ${muted('Experimental —')} ${docs} ${muted('·')} ${feedback}`,
+    `  ${muted('Docs:')} ${docs} ${muted('·')} ${feedback}`,
     `  ${label('Logs: ')}${muted('off (--log-level info)')} ${muted('·')} ${label('Stop: ')}${muted('Ctrl+C')}`,
     '',
   ].join('\n');

apps/pythinker-code/test/cli/options.test.ts

@@ -5,7 +5,7 @@
  * Run: pnpm -C apps/pythinker-code exec vitest run test/cli/options.test.ts
  */
 
-import { describe, expect, it, vi } from 'vitest';
+import { describe, expect, it } from 'vitest';
 
 import { createProgram } from '#/cli/commands';
 import type { CLIOptions } from '#/cli/options';

apps/pythinker-code/test/cli/web/web.test.ts

@@ -546,6 +546,7 @@ describe('`pythinker web` opens the browser', () => {
     const remoteControlOption = makeProgram()
       .commands.find((command) => command.name() === 'web')!
       .options.find((option) => option.long === '--remote-control');
+    expect(remoteControlOption).toBeDefined();
     expect(remoteControlOption?.hidden).toBeFalsy();
   });
 });

docs/reference/slash-commands.md

@@ -16,7 +16,7 @@ Some commands are only available in the idle state. Executing these commands whi
 | `/logout` | — | Clear credentials for the currently selected account | No |
 | `/provider` | — | Open the interactive provider manager to view, add, and remove configured providers. See [Platforms & Models — `/provider` and provider management](../configuration/providers.md#provider-—-interactive-provider-management) | Yes |
 | `/model` | — | Switch the LLM model used in the current session | Yes |
-| `/secondary-model` | `/subagent-model` | Pick the default model for subagents (writes `[secondary_model] default_model`; see the [subagent model pool](../configuration/config-files.md#subagent-model-pool)). Yes |
+| `/secondary-model` | `/subagent-model` | Pick the default model for subagents (writes `[secondary_model] default_model`; see the [subagent model pool](../configuration/config-files.md#subagent-model-pool)) | Yes |
 | `/settings` | `/config` | Open the settings panel inside the TUI | Yes |
 | `/experiments` | `/experimental` | Open the experimental feature panel | Yes |
 | `/permission` | — | Select a permission mode | Yes |

packages/agent-core-v2/src/persistence/backends/minidb/miniDbQueryStore.ts

@@ -137,6 +137,9 @@ export class MiniDbQueryStore extends Disposable implements IQueryStore {
       const result = await op(db);
       if (kind === 'write') this.transientWriteFailures = 0;
       else this.transientReadFailures = 0;
+      if (expectedStoreEpoch !== undefined && expectedStoreEpoch !== this.storeEpochCounter) {
+        throw new QueryStoreRebuiltError();
+      }
       return result;
     } catch (error) {
       if (classifyStorageError(error) !== 'rebuild') {

packages/agent-gateway/src/search/indexCore.ts

@@ -1,5 +1,5 @@
 import { createHash } from 'node:crypto';
-import { open, readFile, readdir, stat } from 'node:fs/promises';
+import { open, readFile, readdir, stat, type FileHandle } from 'node:fs/promises';
 import { join, relative } from 'node:path';
 
 import {
@@ -60,6 +60,7 @@ function legacyFileMetaKey(filePath: string): string {
 
 const WIRE_READ_CHUNK_BYTES = 1 << 20;
 const WIRE_BATCH_OPS = 1_000;
+const MAX_WIRE_PENDING_BYTES = 4 * 1024 * 1024;
 const SYNC_ROUND_BYTE_BUDGET = 64 << 20;
 const SYNC_ROUND_TIME_BUDGET_MS = 30_000;
 const SYNC_FAILURE_ESCALATION_LIMIT = 5;
@@ -535,6 +536,7 @@ export class SearchIndexCore {
       if (result.failed) {
         const count = (this.sessionSyncFailures.get(summary.id) ?? 0) + 1;
         this.sessionSyncFailures.set(summary.id, count);
+        failures += 1;
         if (count >= SESSION_SYNC_FAILURE_SKIP_LIMIT) {
           this.sessionSyncFailures.delete(summary.id);
           this.sessionSyncSkips.set(summary.id, { at: Date.now(), updatedAt: summary.updatedAt });
@@ -543,7 +545,6 @@ export class SearchIndexCore {
             { sessionId: summary.id, error: result.error },
           );
         } else {
-          failures += 1;
           this.log.warn('global search: failed to index session', {
             sessionId: summary.id,
             error: result.error,
@@ -665,11 +666,21 @@ export class SearchIndexCore {
     file: WireFileRef,
     budget: SyncRoundBudget,
   ): Promise<SessionSyncResult> {
+    let handle: FileHandle;
+    try {
+      handle = await open(file.path, 'r');
+    } catch (error) {
+      if (error instanceof Error && 'code' in error && error.code === 'ENOENT') {
+        return { truncated: false, failed: false };
+      }
+      return { truncated: false, failed: true, error: errorMessage(error) };
+    }
     let st: { size: number; mtimeMs: number; ino: number };
     try {
-      st = await stat(file.path);
-    } catch {
-      return { truncated: false, failed: false };
+      st = await handle.stat();
+    } catch (error) {
+      await handle.close();
+      return { truncated: false, failed: true, error: errorMessage(error) };
     }
     const size = st.size;
     const metaKey = fileMetaKey(summary.id, file.path);
@@ -730,19 +741,15 @@ export class SearchIndexCore {
         if (legacyKey !== null) ops.push({ op: 'del', key: legacyKey });
         await db.batch(ops);
       }
+      await handle.close();
       return { truncated: false, failed: false };
     }
 
-    let handle: Awaited<ReturnType<typeof open>>;
-    try {
-      handle = await open(file.path, 'r');
-    } catch (error) {
-      return { truncated: false, failed: true, error: errorMessage(error) };
-    }
     const ops: BatchInputOp<SearchDoc>[] = [];
     let byteCursor = offset;
     let position = offset;
     let wireError: unknown;
+    let pendingOverflow = false;
     try {
       let pending: Buffer = EMPTY_BUFFER;
       let finishing = false;
@@ -796,6 +803,10 @@ export class SearchIndexCore {
           pending.length > 0
             ? Buffer.concat([pending, slice.subarray(start)])
             : Buffer.from(slice.subarray(start));
+        if (pending.length > MAX_WIRE_PENDING_BYTES) {
+          pendingOverflow = true;
+          break;
+        }
         if (finishing && completedRecord) break;
         if (ops.length >= WIRE_BATCH_OPS) {
           ops.push({ op: 'set', key: metaKey, value: fileMeta(byteCursor, turnState, stepState) });
@@ -811,7 +822,7 @@ export class SearchIndexCore {
       await handle.close();
     }
 
-    const truncated = position < size && syncBudgetExhausted(budget);
+    const truncated = pendingOverflow || (position < size && syncBudgetExhausted(budget));
     if (byteCursor !== offset || legacyKey !== null) {
       ops.push({ op: 'set', key: metaKey, value: fileMeta(byteCursor, turnState, stepState) });
       if (legacyKey !== null) ops.push({ op: 'del', key: legacyKey });

packages/agent-gateway/test/search/searchService.test.ts

@@ -423,6 +423,17 @@ describe('GlobalSearchService', () => {
     expect(page.items.length).toBe(2);
     expect(page.items.some((h) => h.snippet.includes('appended'))).toBe(true);
   });
+  it('keeps the index incomplete while a wire record exceeds the pending cap', async () => {
+    const s1 = summary('s1', 'overflow', T1);
+    const file = await writeWire(home!, 's1', 'main', [userLine('\u82F9\u679C head', T1)]);
+    await appendFile(file, `{"kind":"step","pad":"${'x'.repeat(5 * 1024 * 1024)}"`, 'utf8');
+    const service = track(makeService(home!, staticIndex([s1])));
+
+    await service.reindex();
+    const page = await service.search({ query: '\u82F9\u679C' });
+    expect(page.items.length).toBe(1);
+    expect(page.indexState.state).not.toBe('ready');
+  });
 
   it('reports indexState building before the first full sync and ready after', async () => {
     const s1 = summary('s1', 'state', T1);

packages/remote-control/src/remote-control.ts

@@ -53,6 +53,7 @@ export function resolveRelayKey(
 
 const MAX_HTTP_HEADER_BYTES = 64 * 1024;
 const MAX_HTTP_REQUEST_BYTES = 10 * 1024 * 1024;
+const MAX_HTTP_RESPONSE_BYTES = 64 * 1024 * 1024;
 const HTTP_REQUEST_TIMEOUT_MS = 30_000;
 const REGISTER_TIMEOUT_MS = 10_000;
 const MAX_RECONNECT_DELAY_MS = 30_000;
@@ -153,7 +154,7 @@ export function buildRemoteControlUrl(
   relayOrigin = REMOTE_CONTROL_RELAY_ORIGIN,
 ): string {
   const url = new URL(relayOrigin);
-  const relayPath = url.pathname.replace(/\/+$/, '');
+  const relayPath = stripTrailingSlashes(url.pathname);
   const devicePath = `${relayPath}/devices/${encodeURIComponent(deviceId)}`;
   url.pathname =
     sessionId === undefined
@@ -231,23 +232,34 @@ export function filterForwardRequestHeaders(
   return result;
 }
 
+function stripTrailingSlashes(value: string): string {
+  let end = value.length;
+  while (end > 0 && value.codePointAt(end - 1) === 47) end -= 1;
+  return end === value.length ? value : value.slice(0, end);
+}
+
+function findHeadTagEnd(text: string): number {
+  const start = /<head(?=[\s>])/i.exec(text);
+  if (start === null) return -1;
+  const close = text.indexOf('>', start.index + 5);
+  return close === -1 ? -1 : close + 1;
+}
+
 export function rewriteRemoteControlResponse(
   contentType: string,
   body: Buffer,
   publicPrefix: string,
 ): Buffer {
-  const normalizedPrefix = publicPrefix.replace(/\/+$/, '');
+  const normalizedPrefix = stripTrailingSlashes(publicPrefix);
   if (contentType.toLowerCase().includes('text/html')) {
     const prefixLiteral = scriptStringLiteral(normalizedPrefix);
     const injected = `<script>(function(){var p=${prefixLiteral};try{sessionStorage.setItem('pythinker-desktop-server-origin',location.origin+p)}catch(e){}var w=function(f){return function(s,t,u){if(typeof u==='string'&&u.charAt(0)==='/'&&u.indexOf(p)!==0)u=p+u;return f.apply(this,[s,t,u])}};history.pushState=w(history.pushState);history.replaceState=w(history.replaceState)})();</script>`;
     let text = body.toString('utf8');
-    const headMatch = /<head(?:\s[^>]*)?>/i.exec(text);
+    const headEnd = findHeadTagEnd(text);
     text =
-      headMatch === null
+      headEnd === -1
         ? injected + text
-        : text.slice(0, headMatch.index + headMatch[0].length) +
-          injected +
-          text.slice(headMatch.index + headMatch[0].length);
+        : text.slice(0, headEnd) + injected + text.slice(headEnd);
     text = text.replaceAll(/\bsrc="\//g, `src="${normalizedPrefix}/`);
     text = text.replaceAll(/\bhref="\//g, `href="${normalizedPrefix}/`);
     return Buffer.from(text);
@@ -318,7 +330,7 @@ export async function startRemoteControl(
   const deviceName = hostname();
   const url = buildRemoteControlUrl(deviceId, undefined, relayOrigin);
   const lock = await acquireRemoteControlLock(options.homeDir, {
-    localOrigin: options.localOrigin.replace(/\/+$/, ''),
+    localOrigin: stripTrailingSlashes(options.localOrigin),
     deviceId,
     url,
   });
@@ -387,7 +399,7 @@ class RemoteControlClient {
       readonly localServerToken: () => string;
     },
   ) {
-    this.localOrigin = options.localOrigin.replace(/\/+$/, '');
+    this.localOrigin = stripTrailingSlashes(options.localOrigin);
     this.localServerToken = options.localServerToken;
     this.clientVersion = options.clientVersion;
     this.relayOrigin = options.relayOrigin;
@@ -758,7 +770,7 @@ class RemoteControlClient {
   }
 
   private publicPrefix(): string {
-    const relayPath = new URL(this.relayOrigin).pathname.replace(/\/+$/, '');
+    const relayPath = stripTrailingSlashes(new URL(this.relayOrigin).pathname);
     return `${relayPath}/devices/${encodeURIComponent(this.deviceId)}`;
   }
 
@@ -911,7 +923,17 @@ function requestLocalHttp(
       },
       (response) => {
         const chunks: Buffer[] = [];
-        response.on('data', (chunk: Buffer | string) => chunks.push(Buffer.from(chunk)));
+        let receivedBytes = 0;
+        response.on('data', (chunk: Buffer | string) => {
+          receivedBytes += chunk.length;
+          if (receivedBytes > MAX_HTTP_RESPONSE_BYTES) {
+            response.destroy(
+              new Error(`Remote Control response exceeds ${MAX_HTTP_RESPONSE_BYTES} bytes`),
+            );
+            return;
+          }
+          chunks.push(Buffer.from(chunk));
+        });
         response.once('error', reject);
         response.once('end', () => {
           void (async (): Promise<Buffer> => {
@@ -1007,7 +1029,7 @@ function bridgeSockets(
   left: WebSocket,
   right: WebSocket,
   onClose: () => void,
-  earlyLeftFrames?: [RawData, boolean][],
+  earlyLeftFrames: [RawData, boolean][],
 ): void {
   let closed = false;
   const closeBoth = (code = 1000, reason = Buffer.alloc(0)): void => {
@@ -1018,11 +1040,9 @@ function bridgeSockets(
     if (left.readyState === WebSocket.OPEN) left.close(safeCode, reason);
     if (right.readyState === WebSocket.OPEN) right.close(safeCode, reason);
   };
-  if (earlyLeftFrames !== undefined) {
-    left.removeAllListeners('message');
-    for (const [data, isBinary] of earlyLeftFrames) {
-      if (right.readyState === WebSocket.OPEN) right.send(data, { binary: isBinary });
-    }
+  left.removeAllListeners('message');
+  for (const [data, isBinary] of earlyLeftFrames) {
+    if (right.readyState === WebSocket.OPEN) right.send(data, { binary: isBinary });
   }
   left.on('message', (data, isBinary) => {
     if (right.readyState === WebSocket.OPEN) right.send(data, { binary: isBinary });
@@ -1050,7 +1070,7 @@ function isValidCloseCode(code: number): boolean {
 function relayWebSocketUrl(origin: string, path: string): string {
   const url = new URL(origin);
   url.protocol = url.protocol === 'https:' ? 'wss:' : 'ws:';
-  const relayPath = url.pathname.replace(/\/+$/, '');
+  const relayPath = stripTrailingSlashes(url.pathname);
   const [pathname, query] = path.split('?', 2);
   url.pathname = `${relayPath}${pathname}`;
   url.search = query === undefined ? '' : query;