orquesta-agent 0.2.238 → 0.2.240

package/dist/fs-browse.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Read-only file browsing for the dashboard's Code Browser.
+ *
+ * A project bought as "Solo Orquesta" has no GitHub repository and no SSH
+ * credentials — the two sources the browser knew about — so the panel was
+ * permanently blocked even though the agent is connected and the files are
+ * right there on the machine. This answers `fs:list` / `fs:read` from the
+ * agent's own working directory. QA-68.
+ *
+ * Read-only on purpose, and confined to the working directory: it resolves
+ * every requested path and refuses anything that lands outside, symlinks
+ * included, so a crafted path cannot be used to read the rest of the disk.
+ */
+export interface BrowseItem {
+    name: string;
+    path: string;
+    type: 'file' | 'dir';
+    size: number;
+}
+export declare function listDirectory(root: string, requestedPath?: string): {
+    path: string;
+    items: BrowseItem[];
+    truncated: boolean;
+} | {
+    error: string;
+};
+export declare function readFileForBrowser(root: string, requestedPath?: string): {
+    path: string;
+    name: string;
+    content: string;
+    size: number;
+} | {
+    error: string;
+};
+//# sourceMappingURL=fs-browse.d.ts.map

package/dist/fs-browse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fs-browse.d.ts","sourceRoot":"","sources":["../src/fs-browse.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;GAYG;AAEH,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,GAAG,KAAK,CAAA;IACpB,IAAI,EAAE,MAAM,CAAA;CACb;AAsCD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG;IACnE,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,UAAU,EAAE,CAAA;IACnB,SAAS,EAAE,OAAO,CAAA;CACnB,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CAyCpB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG;IACxE,IAAI,EAAE,MAAM,CAAA;IACZ,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;CACb,GAAG;IAAE,KAAK,EAAE,MAAM,CAAA;CAAE,CA2BpB"}

package/dist/fs-browse.js

@@ -0,0 +1,106 @@
+import fs from 'fs';
+import path from 'path';
+import * as logger from './logger.js';
+/** A listing is a directory pane — long enough to be useful, short enough to send. */
+const MAX_ENTRIES = 1000;
+/** Above this a file stops being something you read in a browser pane. */
+const MAX_FILE_BYTES = 1024 * 1024;
+/**
+ * Resolve `rel` beneath `root`, or null when it escapes.
+ *
+ * Both the lexical path and its realpath are checked: `..` is caught by the
+ * first, a symlink pointing out of the tree only by the second.
+ */
+function resolveInside(root, rel) {
+    const base = path.resolve(root);
+    const cleaned = (rel || '').replace(/^[/\\]+/, '');
+    const target = path.resolve(base, cleaned === '.' ? '' : cleaned);
+    const contains = (p) => p === base || p.startsWith(base + path.sep);
+    if (!contains(target))
+        return null;
+    try {
+        const real = fs.realpathSync(target);
+        const realBase = fs.realpathSync(base);
+        if (real !== realBase && !real.startsWith(realBase + path.sep))
+            return null;
+    }
+    catch {
+        // Does not exist yet / cannot be resolved — the caller's stat will report it.
+    }
+    return target;
+}
+/** Path as the dashboard addresses it: relative to the root, forward slashes. */
+function toRelative(root, absolute) {
+    const rel = path.relative(path.resolve(root), absolute);
+    return rel.split(path.sep).join('/');
+}
+export function listDirectory(root, requestedPath) {
+    const target = resolveInside(root, requestedPath);
+    if (!target)
+        return { error: 'Path is outside the working directory' };
+    let entries;
+    try {
+        const stat = fs.statSync(target);
+        if (!stat.isDirectory())
+            return { error: 'Not a directory' };
+        entries = fs.readdirSync(target, { withFileTypes: true });
+    }
+    catch (err) {
+        return { error: err instanceof Error ? err.message : 'Could not read directory' };
+    }
+    // `.git` is megabytes of objects nobody browses, and the GitHub source does
+    // not show it either — keeping it out keeps the two sources looking alike.
+    const visible = entries.filter(e => e.name !== '.git');
+    const truncated = visible.length > MAX_ENTRIES;
+    const items = [];
+    for (const entry of visible.slice(0, MAX_ENTRIES)) {
+        const absolute = path.join(target, entry.name);
+        let size = 0;
+        let isDir = entry.isDirectory();
+        try {
+            const stat = fs.statSync(absolute); // follows symlinks, so a linked dir reads as a dir
+            size = stat.isFile() ? stat.size : 0;
+            isDir = stat.isDirectory();
+        }
+        catch {
+            // Broken symlink or a race with a delete — list it as an empty file.
+        }
+        items.push({
+            name: entry.name,
+            path: toRelative(root, absolute),
+            type: isDir ? 'dir' : 'file',
+            size,
+        });
+    }
+    items.sort((a, b) => (a.type !== b.type ? (a.type === 'dir' ? -1 : 1) : a.name.localeCompare(b.name)));
+    return { path: toRelative(root, target), items, truncated };
+}
+export function readFileForBrowser(root, requestedPath) {
+    const target = resolveInside(root, requestedPath);
+    if (!target)
+        return { error: 'Path is outside the working directory' };
+    try {
+        const stat = fs.statSync(target);
+        if (!stat.isFile())
+            return { error: 'Not a file' };
+        if (stat.size > MAX_FILE_BYTES) {
+            return { error: `File is too large to open here (${Math.round(stat.size / 1024)} KB)` };
+        }
+        const buffer = fs.readFileSync(target);
+        // A NUL byte early on is the usual, cheap "this is not text" signal.
+        if (buffer.subarray(0, 8000).includes(0)) {
+            return { error: 'Binary file' };
+        }
+        return {
+            path: toRelative(root, target),
+            name: path.basename(target),
+            content: buffer.toString('utf-8'),
+            size: stat.size,
+        };
+    }
+    catch (err) {
+        logger.debug(`[fs-browse] read failed: ${err instanceof Error ? err.message : err}`);
+        return { error: err instanceof Error ? err.message : 'Could not read file' };
+    }
+}
+//# sourceMappingURL=fs-browse.js.map

package/dist/fs-browse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fs-browse.js","sourceRoot":"","sources":["../src/fs-browse.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAA;AACnB,OAAO,IAAI,MAAM,MAAM,CAAA;AACvB,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AAuBrC,sFAAsF;AACtF,MAAM,WAAW,GAAG,IAAI,CAAA;AACxB,0EAA0E;AAC1E,MAAM,cAAc,GAAG,IAAI,GAAG,IAAI,CAAA;AAElC;;;;;GAKG;AACH,SAAS,aAAa,CAAC,IAAY,EAAE,GAAuB;IAC1D,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;IAC/B,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAA;IAClD,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;IAEjE,MAAM,QAAQ,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAA;IAC3E,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;QAAE,OAAO,IAAI,CAAA;IAElC,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QACpC,MAAM,QAAQ,GAAG,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,CAAA;QACtC,IAAI,IAAI,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC,GAAG,CAAC;YAAE,OAAO,IAAI,CAAA;IAC7E,CAAC;IAAC,MAAM,CAAC;QACP,8EAA8E;IAChF,CAAC;IAED,OAAO,MAAM,CAAA;AACf,CAAC;AAED,iFAAiF;AACjF,SAAS,UAAU,CAAC,IAAY,EAAE,QAAgB;IAChD,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,QAAQ,CAAC,CAAA;IACvD,OAAO,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACtC,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,IAAY,EAAE,aAAsB;IAKhE,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IACjD,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,KAAK,EAAE,uCAAuC,EAAE,CAAA;IAEtE,IAAI,OAAoB,CAAA;IACxB,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE;YAAE,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAA;QAC5D,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,MAAM,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAA;IAC3D,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,0BAA0B,EAAE,CAAA;IACnF,CAAC;IAED,4EAA4E;IAC5E,2EAA2E;IAC3E,MAAM,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAA;IACtD,MAAM,SAAS,GAAG,OAAO,CAAC,MAAM,GAAG,WAAW,CAAA;IAE9C,MAAM,KAAK,GAAiB,EAAE,CAAA;IAC9B,KAAK,MAAM,KAAK,IAAI,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,WAAW,CAAC,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAA;QAC9C,IAAI,IAAI,GAAG,CAAC,CAAA;QACZ,IAAI,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAA;QAC/B,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAA,CAAC,mDAAmD;YACtF,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAA;YACpC,KAAK,GAAG,IAAI,CAAC,WAAW,EAAE,CAAA;QAC5B,CAAC;QAAC,MAAM,CAAC;YACP,qEAAqE;QACvE,CAAC;QACD,KAAK,CAAC,IAAI,CAAC;YACT,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,QAAQ,CAAC;YAChC,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM;YAC5B,IAAI;SACL,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;IAEtG,OAAO,EAAE,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,CAAA;AAC7D,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAY,EAAE,aAAsB;IAMrE,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;IACjD,IAAI,CAAC,MAAM;QAAE,OAAO,EAAE,KAAK,EAAE,uCAAuC,EAAE,CAAA;IAEtE,IAAI,CAAC;QACH,MAAM,IAAI,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAA;QAChC,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAAE,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,CAAA;QAClD,IAAI,IAAI,CAAC,IAAI,GAAG,cAAc,EAAE,CAAC;YAC/B,OAAO,EAAE,KAAK,EAAE,mCAAmC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACzF,CAAC;QAED,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,MAAM,CAAC,CAAA;QACtC,qEAAqE;QACrE,IAAI,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YACzC,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,CAAA;QACjC,CAAC;QAED,OAAO;YACL,IAAI,EAAE,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC;YAC9B,IAAI,EAAE,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC;YAC3B,OAAO,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC;YACjC,IAAI,EAAE,IAAI,CAAC,IAAI;SAChB,CAAA;IACH,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,CAAC,KAAK,CAAC,4BAA4B,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAA;QACpF,OAAO,EAAE,KAAK,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,qBAAqB,EAAE,CAAA;IAC9E,CAAC;AACH,CAAC"}

package/dist/index.js

@@ -29,12 +29,13 @@ import * as path from 'path';
 import * as os from 'os';
 import { fileURLToPath } from 'url';
 import * as logger from './logger.js';
+import { listDirectory, readFileForBrowser } from './fs-browse.js';
 import { startDaemon, isDaemonChild, acquireSingleInstanceLock } from './daemon.js';
 import { getCliTokenHash } from './cli-config.js';
 import { validateToken, markDisconnected, subscribeToChannel, setAgentToken, reportAgentError, reportAgentProblem, persistAgentSettings, startHeartbeat, stopHeartbeat, setPermissionModeUpdater, setCliPreferenceUpdater, setCliEndpointUpdater, setBrowserEnabledUpdater, setSandboxUpdater, setSandboxAccessUpdater, setCurrentProjectId, getCurrentProjectId, fetchCredentials, fetchSkills, syncSkillsToDirectory, uploadClaudeMd, setClaudeAuthChecker, setOrquestaCliChecker, setKimiCliChecker, setCursorCliChecker, setActiveCliResolver, setEffectiveConfigResolver, setAgentVersion, setAgentName, } from './supabase.js';
 import { createSocketIOConnection, createExecutionChannel, setupSocketIOListeners, } from './socketio-transport.js';
 import { execSync, spawn } from 'child_process';
-import { execute, evaluate, cancel, cancelAll, hasRunningProcesses, checkClaudeAuth, configureAuth, gitClone, gitPull, setPermissionMode, setSandboxConfig, setSandboxAccess, setAgentInstructions, setProjectSettings, handleSupervisionResponse, setInjectedCredentials, generatePlanItems, isOrquestaCliAvailable, isClaudeCliAvailable, setCliPreference, setCliEndpoint, setBrowserEnabled, selectCli, isKimiCliAvailable, isCursorCliAvailable, checkCursorAuth, 
+import { execute, evaluate, cancel, cancelAll, hasRunningProcesses, checkClaudeAuth, configureAuth, gitClone, gitPull, gitCommitAndPush, gitNumstatSince, getCurrentGitBranch, setPermissionMode, setSandboxConfig, setSandboxAccess, setAgentInstructions, setProjectSettings, handleSupervisionResponse, setInjectedCredentials, generatePlanItems, isOrquestaCliAvailable, isClaudeCliAvailable, setCliPreference, setCliEndpoint, setBrowserEnabled, selectCli, isKimiCliAvailable, isCursorCliAvailable, checkCursorAuth, 
 // Interactive session functions
 startSession, sendSessionInput, endSession, terminateSession, hasActiveSession, hasActiveSessionFor, getEffectiveRuntimeConfig, getSessionStatus, resizeSession, setOnSessionEnded, listResumableSessions, } from './executor.js';
 import { startBrowserSession, endBrowserSession, tunnelInbound, openBrowserTunnel, browserRpc, runBrowserGoal, pauseBrowserGoal, resumeBrowserGoal, cancelBrowserGoal, shutdownAllBrowserSessions, } from './browser.js';
@@ -690,6 +691,48 @@ async function connect(options) {
             return promptQueue.some(q => q.promptId === promptId) ||
                 [...runningExecutions.values()].some(e => e.promptId === promptId);
         }
+        /**
+         * Commit the assisted item's work and hand the server the raw facts.
+         *
+         * Facts only: the commit sha, the branch, and `git diff --numstat` text.
+         * The server evaluates the gate. That split is the point — a gate computed
+         * on the machine being gated protects nobody, and this machine belongs to
+         * the customer.
+         *
+         * Best-effort throughout: a failure here must not fail the prompt, which
+         * has already produced real work. The reviewer sees the item stuck
+         * in_progress and can nudge the run instead.
+         */
+        async function reportAssistedResult(payload, execDir, baseBranch) {
+            const assisted = payload.assisted;
+            try {
+                const commit = await gitCommitAndPush(execDir, `assisted: ${payload.content.split('\n')[0].slice(0, 120)}`);
+                // Diff against the branch we started from when we know it; otherwise
+                // the last commit only, which is what the item just produced anyway.
+                const base = baseBranch && baseBranch !== assisted.branch ? baseBranch : 'HEAD~1';
+                const numstat = commit.sha ? gitNumstatSince(execDir, base) : '';
+                const apiUrl = process.env.ORQUESTA_API_URL || 'https://getorquesta.com';
+                const res = await fetch(`${apiUrl}/api/agent/assisted-report`, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        token,
+                        promptId: payload.promptId,
+                        commitSha: commit.sha,
+                        branch: assisted.branch,
+                        numstat,
+                    }),
+                });
+                if (!res.ok) {
+                    logger.warn(`[assisted] report rejected (${res.status}) for item ${assisted.itemId}`);
+                    return;
+                }
+                logger.success(`[assisted] reported ${commit.sha ? commit.sha.slice(0, 8) : 'no commit'} on ${assisted.branch}`);
+            }
+            catch (err) {
+                logger.warn(`[assisted] report failed: ${err}`);
+            }
+        }
         async function executePrompt(payload) {
             const execId = payload.id;
             runningExecutions.set(execId, { promptId: payload.promptId, commandId: execId, subAgentId: payload.subAgentId });
@@ -717,6 +760,14 @@ async function connect(options) {
                 catch {
                     // Non-fatal: continue with existing credentials
                 }
+                // The branch we came FROM, captured before any checkout below moves
+                // HEAD. Auto-merge used to read it afterwards, from `workingDirectory`
+                // — which for the common case (execDir === workingDirectory) is the
+                // sub-agent branch itself, so `subCfg.branch !== mainBranch` was false
+                // and the merge silently never ran. Capture first, merge into this.
+                const baseBranch = fs.existsSync(path.join(execDir, '.git'))
+                    ? getCurrentGitBranch(execDir)
+                    : null;
                 // Branch checkout if sub-agent has a configured branch
                 if (subCfg?.branch && fs.existsSync(path.join(execDir, '.git'))) {
                     try {
@@ -742,15 +793,28 @@ async function connect(options) {
                     channel: channel,
                     permissionMode: currentPermissionMode,
                     attachments: payload.attachments,
+                    assisted: payload.assisted,
                 });
+                // Assisted run: commit what the CLI produced and report the FACTS to
+                // the server, which computes the gate. The agent deliberately makes no
+                // judgement about the diff — it does not decide whether the change is
+                // too big, and it never merges or deploys. autoMerge is false on these
+                // payloads for the same reason.
+                if (payload.assisted && fs.existsSync(path.join(execDir, '.git'))) {
+                    await reportAssistedResult(payload, execDir, baseBranch);
+                }
                 // Auto-merge if configured
                 if (subCfg?.autoMerge && subCfg.branch && fs.existsSync(path.join(execDir, '.git'))) {
                     try {
-                        const mainBranch = execSync('git rev-parse --abbrev-ref HEAD', { cwd: workingDirectory, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'pipe'] }).trim();
-                        if (subCfg.branch !== mainBranch) {
-                            execSync(`git checkout ${mainBranch} && git merge ${subCfg.branch} --no-edit`, { cwd: execDir, stdio: 'pipe' });
+                        const mainBranch = baseBranch;
+                        if (mainBranch && subCfg.branch !== mainBranch) {
+                            execSync(`git checkout ${mainBranch}`, { cwd: execDir, stdio: 'pipe' });
+                            execSync(`git merge ${subCfg.branch} --no-edit`, { cwd: execDir, stdio: 'pipe' });
                             logger.success(`${label} Auto-merged ${subCfg.branch} into ${mainBranch}`);
                         }
+                        else if (!mainBranch) {
+                            logger.warn(`${label} Auto-merge skipped: could not determine the base branch`);
+                        }
                     }
                     catch (err) {
                         logger.warn(`${label} Auto-merge failed (resolve manually): ${err}`);
@@ -820,12 +884,24 @@ async function connect(options) {
             }
             else {
                 logger.info(`[Heartbeat] Dispatching missed execute for prompt ${cmd.promptId}`);
+                // Carry the branch envelope through the fallback too. Without it an
+                // assisted item delivered by heartbeat runs on whatever branch is
+                // currently checked out, which is exactly the isolation the run
+                // depends on.
+                const queued = {
+                    id: cmd.commandId,
+                    promptId: cmd.promptId,
+                    content: cmd.content,
+                    workingDirectory,
+                    subAgentConfig: cmd.subAgentConfig,
+                    assisted: cmd.assisted,
+                };
                 if (isDefaultSlotBusy()) {
                     logger.warn(`[Heartbeat] Default slot busy - queuing missed prompt: ${cmd.promptId}`);
-                    promptQueue.push({ id: cmd.commandId, promptId: cmd.promptId, content: cmd.content, workingDirectory });
+                    promptQueue.push(queued);
                 }
                 else {
-                    executePrompt({ id: cmd.commandId, promptId: cmd.promptId, content: cmd.content, workingDirectory });
+                    executePrompt(queued);
                 }
             }
         });
@@ -1288,7 +1364,14 @@ async function connect(options) {
         }, 
         // Resumable past conversations for the dashboard Resume menu. Defaults to
         // the project working dir when the request omits one.
-        (payload) => listResumableSessions(payload?.workingDirectory || workingDirectory));
+        (payload) => listResumableSessions(payload?.workingDirectory || workingDirectory), 
+        // Read-only file browsing, rooted at the working directory. This is the
+        // only file source a project with no GitHub repo and no SSH host has, and
+        // the browser panel is blocked without it. QA-68.
+        {
+            onFsList: (payload) => listDirectory(workingDirectory, payload?.path),
+            onFsRead: (payload) => readFileForBrowser(workingDirectory, payload?.path),
+        });
     }
     catch (err) {
         const message = err instanceof Error ? err.message : 'Unknown error';