conductor-remote 1.105.0 → 1.105.1

package/dist/index.html

@@ -25,7 +25,7 @@
 		<title>Conductor Remote</title>
 		<!-- Runs before the module bundle so it can catch a stale shell that fails to boot. -->
 		<script src="/self-heal.js"></script>
-		<script type="module" crossorigin src="/assets/index-FEV7llKj.js"></script>
+		<script type="module" crossorigin src="/assets/index-DxkIsRk2.js"></script>
 		<link rel="stylesheet" crossorigin href="/assets/index-BH4EAaJZ.css">
 	<link rel="manifest" href="/manifest.webmanifest"></head>
 	<body>

package/dist/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const l=e||("document"in self?document.currentScript.src:"")||location.href;if(s[l])return;let o={};const a=e=>i(e,l),t={module:{uri:l},exports:o,require:a};s[l]=Promise.all(n.map(e=>t[e]||a(e))).then(e=>(r(...e),o))}}define(["./workbox-dcde9eb3"],function(e){"use strict";importScripts("/push-sw.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"push-sw.js",revision:"e7ef44deca46c0539e6ff7bba5eb815e"},{url:"index.html",revision:"09ee7881d7dfcc320a5551594fc1bda5"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/pierre-shiki-wasm-C8ETeZem.js",revision:null},{url:"assets/pierre-light-480U9XYS.js",revision:null},{url:"assets/pierre-dark-CyvmCCZW.js",revision:null},{url:"assets/index-FEV7llKj.js",revision:null},{url:"assets/index-BH4EAaJZ.css",revision:null},{url:"assets/PierrePatch-Dc241Szr.js",revision:null},{url:"apple-touch-icon.png",revision:"1127bb396b4648add53dce3f22c92aee"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a9b0d962686287452216492cd2247499"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]})),e.registerRoute(({url:e})=>e.pathname.startsWith("/assets/diff-syntax/"),new e.CacheFirst({cacheName:"diff-syntax",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:31536e3})]}),"GET")});
+if(!self.define){let e,s={};const i=(i,n)=>(i=new URL(i+".js",n).href,s[i]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=i,e.onload=s,document.head.appendChild(e)}else e=i,importScripts(i),s()}).then(()=>{let e=s[i];if(!e)throw new Error(`Module ${i} didn’t register its module`);return e}));self.define=(n,r)=>{const l=e||("document"in self?document.currentScript.src:"")||location.href;if(s[l])return;let o={};const a=e=>i(e,l),t={module:{uri:l},exports:o,require:a};s[l]=Promise.all(n.map(e=>t[e]||a(e))).then(e=>(r(...e),o))}}define(["./workbox-dcde9eb3"],function(e){"use strict";importScripts("/push-sw.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"self-heal.js",revision:"49bd63adb25a09341f8d2610e8bd3c76"},{url:"push-sw.js",revision:"e7ef44deca46c0539e6ff7bba5eb815e"},{url:"index.html",revision:"2e84a97e338a96c9e4f0aad252d9146d"},{url:"assets/workbox-window.prod.es5-BBnX5xw4.js",revision:null},{url:"assets/pierre-shiki-wasm-C8ETeZem.js",revision:null},{url:"assets/pierre-light-480U9XYS.js",revision:null},{url:"assets/pierre-dark-CyvmCCZW.js",revision:null},{url:"assets/index-DxkIsRk2.js",revision:null},{url:"assets/index-BH4EAaJZ.css",revision:null},{url:"assets/PierrePatch-D6dtPD_v.js",revision:null},{url:"apple-touch-icon.png",revision:"1127bb396b4648add53dce3f22c92aee"},{url:"icon-192.png",revision:"c5e01ac58768627e18ee7b8b6a9239ef"},{url:"icon-512.png",revision:"a40638c55e310312457a621c9a0002c8"},{url:"icon-maskable-512.png",revision:"a9b0d962686287452216492cd2247499"},{url:"icon.svg",revision:"c1aee186821798733dd477e69a0ef243"},{url:"manifest.webmanifest",revision:"cf88fbc5755108a7fe0616fa160a8a15"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("/index.html"),{denylist:[/^\/api\//]})),e.registerRoute(({url:e})=>e.pathname.startsWith("/assets/diff-syntax/"),new e.CacheFirst({cacheName:"diff-syntax",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:31536e3})]}),"GET")});

package/dist-node/src/git.js

@@ -1,4 +1,5 @@
 import { execFile } from 'node:child_process';
+import path from 'node:path';
 import { promisify } from 'node:util';
 import { isPreviewableSource } from "./shared.js";
 const exec = promisify(execFile);
@@ -12,6 +13,20 @@ async function git(cwd, args) {
     });
     return stdout;
 }
+/** `git diff --no-index` reports an ordinary difference with exit code 1. */
+async function noIndexDiff(cwd, file) {
+    try {
+        const { stdout } = await exec('git', ['-C', cwd, 'diff', '--no-index', '--no-color', '--', '/dev/null', file], {
+            encoding: 'utf8',
+            maxBuffer: 8 * 1024 * 1024,
+            timeout: 10000
+        });
+        return stdout;
+    }
+    catch (err) {
+        return err.stdout ?? '';
+    }
+}
 /**
  * Patch for untracked files. `git diff` ignores them, but a reviewer wants to
  * see new files — so we synthesize a "new file" diff via `--no-index` against
@@ -30,22 +45,12 @@ async function untrackedDiff(cwd) {
     const files = [];
     const patches = [];
     for (const p of paths) {
-        try {
-            // --no-index exits 1 when files differ, so read stdout from the error.
-            await exec('git', ['-C', cwd, 'diff', '--no-index', '--no-color', '--', '/dev/null', p], {
-                encoding: 'utf8',
-                maxBuffer: 4 * 1024 * 1024,
-                timeout: 10000
-            });
-        }
-        catch (err) {
-            const out = err.stdout ?? '';
-            if (!out)
-                continue;
-            const added = out.split('\n').filter(l => l.startsWith('+') && !l.startsWith('+++')).length;
-            files.push({ path: p, added, removed: 0 });
-            patches.push(out);
-        }
+        const out = await noIndexDiff(cwd, p);
+        if (!out)
+            continue;
+        const added = out.split('\n').filter(l => l.startsWith('+') && !l.startsWith('+++')).length;
+        files.push({ path: p, added, removed: 0 });
+        patches.push(out);
     }
     return { files, patch: patches.join('') };
 }
@@ -159,6 +164,38 @@ export async function workspaceDiff(worktree, base) {
     const { dirty, unpushed } = await localState(worktree);
     return { base: ref, mergeBase, files, patch, truncated, dirty, unpushed };
 }
+/**
+ * The complete patch for one selected changed file. The phone asks for this separately
+ * so a file remains reviewable even when its section follows the aggregate 400 KB cap.
+ */
+export async function workspaceFileDiff(worktree, base, requestedPath) {
+    if (!requestedPath || requestedPath.includes('\0') || path.isAbsolute(requestedPath))
+        return null;
+    const root = path.resolve(worktree);
+    const relative = path.relative(root, path.resolve(root, requestedPath));
+    if (!relative || relative === '..' || relative.startsWith(`..${path.sep}`) || path.isAbsolute(relative))
+        return null;
+    const { against } = await diffBasis(worktree, base);
+    // A literal pathspec prevents a filename beginning with `:` from becoming Git pathspec syntax.
+    const literalPathspec = `:(literal)${relative}`;
+    const tracked = await git(worktree, ['diff', '--no-color', against, '--', literalPathspec]).catch(() => '');
+    if (tracked)
+        return { path: relative, patch: tracked };
+    // `git diff <base>` omits untracked files. Only synthesize a patch when Git says this
+    // exact path is untracked and not ignored; never let the request name an arbitrary file.
+    const untracked = await git(worktree, [
+        'ls-files',
+        '--others',
+        '--exclude-standard',
+        '-z',
+        '--',
+        literalPathspec
+    ]).catch(() => '');
+    if (!untracked.split('\0').includes(relative))
+        return null;
+    const patch = await noIndexDiff(worktree, relative);
+    return patch ? { path: relative, patch } : null;
+}
 /**
  * Local publish state of the worktree: does it have uncommitted changes, and are
  * there commits not yet on its remote-tracking branch? Together these drive the

package/dist-node/src/routes.js

@@ -108,6 +108,8 @@ export const routes = {
     sessions: param('GET', '/api/workspaces/:workspaceId/sessions'),
     newChat: param('POST', '/api/workspaces/:workspaceId/sessions'),
     diff: param('GET', '/api/workspaces/:workspaceId/diff'),
+    /** One complete changed-file patch, addressed by the `path` query parameter. */
+    fileDiff: param('GET', '/api/workspaces/:workspaceId/diff/file'),
     /** Previewable worktree files for chat links and the diff window's All-files rail. */
     workspaceFiles: param('GET', '/api/workspaces/:workspaceId/files'),
     merge: param('POST', '/api/workspaces/:workspaceId/merge'),

package/dist-node/src/server.js

@@ -17,7 +17,7 @@ import { isAllowedPreviewPath, parseFileReference, parseImageReference } from ".
 import { FirstPromptQueue } from "./firstprompt.js";
 import { captureForkWorkspace, materializeForkWorkspace, releaseForkWorkspace } from "./fork-workspace.js";
 import { startFunnelWatchdog } from "./funnel-watchdog.js";
-import { listSourceFiles, workspaceDiff } from "./git.js";
+import { listSourceFiles, workspaceDiff, workspaceFileDiff } from "./git.js";
 import { installLogCapture, isManaged, LOG_FILE_NAMES, logFiles, processStartedAt, recentLogs, redactSecrets, tailLogFile } from "./logbuf.js";
 import { createTools, handleRpc, READ_TIMEOUT_MS } from "./mcp-tools.js";
 import { mergePr } from "./merge.js";
@@ -2103,6 +2103,24 @@ const server = http.createServer(async (req, res) => {
                 const diff = await workspaceDiff(ws.worktree, ws.baseBranch);
                 return json(req, res, 200, diff);
             }
+            // GET /api/workspaces/:id/diff/file?path=… — the complete patch for the file
+            // currently on screen. The aggregate endpoint stays bounded for phone-sized
+            // responses, while a late file no longer disappears behind that bound.
+            const fileDiffOf = routeParam(routes.fileDiff, req.method, pathname);
+            if (fileDiffOf) {
+                const ws = reads.getWorkspace(fileDiffOf);
+                if (!ws)
+                    return json(req, res, 404, { error: 'workspace not found' });
+                if (!ws.worktree)
+                    return json(req, res, 409, { error: 'worktree path unresolved' });
+                const file = url.searchParams.get('path');
+                if (!file)
+                    return json(req, res, 400, { error: 'file path is required' });
+                const diff = await workspaceFileDiff(ws.worktree, ws.baseBranch, file);
+                if (!diff)
+                    return json(req, res, 404, { error: 'changed file not found' });
+                return json(req, res, 200, diff);
+            }
             // GET /api/workspaces/:id/files — previewable worktree files for the diff window's
             // All-files rail and for linking `tests/foo.ts` in a message only when it really exists.
             // A workspace with no worktree has no list for either caller.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "conductor-remote",
-	"version": "1.105.0",
+	"version": "1.105.1",
 	"type": "module",
 	"packageManager": "yarn@4.15.0",
 	"description": "Phone control panel for local Conductor agents. Reads ride SQLite + git; prompts ride Conductor's own dispatch path.",