termdock 1.4.223 → 1.4.225

package/dist/server/routes/filesystem.js

@@ -1,3 +1,4 @@
+import { readRecentCommitHistory } from '../utils/recentCommitHistory.js';
 import { AUTH_COOKIE, isSessionValid } from '../utils/authProtection.js';
 import { Router } from 'express';
 import crypto from 'crypto';
@@ -4619,26 +4620,9 @@ router.get('/git-recent-commits', async (req, res) => {
             return;
         }
         repoRootForLog = repoRoot;
-        const fetchCount = limit + 1;
-        const logArgs = ['log', '--oneline', `--skip=${skip}`, `-${fetchCount}`];
-        if (query) {
-            logArgs.push('--regexp-ignore-case', '--all-match', `--grep=${query}`);
-        }
-        let output = await withTimeout(execGit(logArgs, repoRoot, controller.signal).catch(emptyOnNonAbortGitError), GIT_ROUTE_TIMEOUT_MS, 'Recent commits took too long. The repository may be busy, on slow storage, or locked by another Git process.', 'GIT_RECENT_COMMITS_TIMEOUT', () => controller.abort(new OperationTimeoutError('Recent commits took too long. The repository may be busy, on slow storage, or locked by another Git process.', 'GIT_RECENT_COMMITS_TIMEOUT')));
-        let commits = output.split('\n').map((line) => line.trim()).filter(Boolean);
-        if (query && commits.length === 0 && /^[0-9a-f]{4,40}$/i.test(query)) {
-            const hashSearchLimit = Math.max(fetchCount + skip, 200);
-            output = await withTimeout(execGit(['log', '--oneline', '--abbrev=40', `-${hashSearchLimit}`], repoRoot, controller.signal).catch(emptyOnNonAbortGitError), GIT_ROUTE_TIMEOUT_MS, 'Recent commits took too long. The repository may be busy, on slow storage, or locked by another Git process.', 'GIT_RECENT_COMMITS_TIMEOUT', () => controller.abort(new OperationTimeoutError('Recent commits took too long. The repository may be busy, on slow storage, or locked by another Git process.', 'GIT_RECENT_COMMITS_TIMEOUT')));
-            commits = output
-                .split('\n')
-                .map((line) => line.trim())
-                .filter((line) => line.toLowerCase().startsWith(query.toLowerCase()))
-                .slice(skip, skip + fetchCount);
-        }
-        const hasMore = commits.length > limit;
-        const page = commits.slice(0, limit);
+        const { commits: page, hasMore, commitSyncStatus, upstream } = await withTimeout(readRecentCommitHistory((args) => execGit(args, repoRoot, controller.signal), { skip, limit, query }), GIT_ROUTE_TIMEOUT_MS, 'Recent commits took too long.', 'GIT_RECENT_COMMITS_TIMEOUT', () => controller.abort(new OperationTimeoutError('Recent commits took too long.', 'GIT_RECENT_COMMITS_TIMEOUT')));
         logFsIo({ id: requestId, action, op: 'git.recent-commits', startedAt, status: 'ok', cwd: resolvedCwd, repoRoot, count: page.length, extra: { requestSlotId, query, skip, limit, hasMore } });
-        res.json({ available: true, cwd: resolvedCwd, root: repoRoot, commits: page, hasMore, skip, limit, query });
+        res.json({ available: true, cwd: resolvedCwd, root: repoRoot, commits: page, hasMore, skip, limit, query, commitSyncStatus, upstream });
     }
     catch (error) {
         const payload = getErrorPayload(error);

package/dist/server/routes/terminal.js

@@ -1,3 +1,4 @@
+import { progressRoutes } from '../notifications/progressRoutes.js';
 import { ensureNodePty } from '../utils/ensureNodePty.js';
 import { PtySpawnBackoff, PtySpawnDeferredError } from '../utils/ptySpawnBackoff.js';
 import { collaborationGroupRoutes } from '../agent/collaborationGroupRoutes.js';
@@ -5585,6 +5586,24 @@ router.post('/operations/collaboration-groups/:groupId/messages', (req, res) =>
         res.status(400).json({ error: getErrorMessage(error) });
     }
 });
+router.use('/operations/notify', progressRoutes({
+    resolveSession: resolveFrontendSessionId,
+    sessionName: (id) => globalSessionState.sessions.find((session) => session.sessionId === id)?.name,
+    send: (event) => {
+        const payload = JSON.stringify(event);
+        let connections = 0;
+        for (const ws of controlClients.values()) {
+            if (ws.readyState !== ws.OPEN)
+                continue;
+            try {
+                ws.send(payload);
+                connections++;
+            }
+            catch { /* Disconnected client. */ }
+        }
+        return connections;
+    },
+}));
 router.get('/operations/orchestration/peers', async (req, res) => {
     const sourceSessionId = resolveFrontendSessionId(req.query);
     const source = globalSessionState.sessions.find((candidate) => candidate.sessionId === sourceSessionId);

package/dist/server/utils/recentCommitHistory.js

@@ -0,0 +1,45 @@
+// Resolve both tips once so a concurrent fetch cannot change classification mid-page.
+export async function readRecentCommitHistory(run, { skip, limit, query }) {
+    const head = (await run(['rev-parse', '--verify', '--quiet', 'HEAD']).catch((error) => {
+        if (error?.code === 1)
+            return '';
+        throw error;
+    })).trim();
+    if (!head)
+        return { commits: [], hasMore: false, commitSyncStatus: {}, upstream: null };
+    const branch = (await run(['symbolic-ref', '-q', 'HEAD']).catch((error) => {
+        if (error?.code === 1)
+            return '';
+        throw error;
+    })).trim();
+    const upstream = branch
+        ? (await run(['for-each-ref', '--format=%(upstream)', '--count=1', branch])).trim() || null
+        : null;
+    const remote = upstream ? (await run(['rev-parse', '--verify', upstream])).trim() : null;
+    const unique = new Map();
+    if (remote) {
+        const sides = await run(['rev-list', '--left-right', `${head}...${remote}`]);
+        for (const line of sides.trim().split('\n')) {
+            if (line)
+                unique.set(line.slice(1), line[0] === '<' ? 'ahead' : 'behind');
+        }
+    }
+    const refs = remote ? [head, remote] : [head];
+    const args = ['log', '--date-order', '--format=%H %s', `--skip=${skip}`, `-${limit + 1}`];
+    if (query)
+        args.push('--regexp-ignore-case', '--fixed-strings', `--grep=${query}`);
+    let lines = (await run([...args, ...refs, '--'])).trim().split('\n').filter(Boolean);
+    if (query && lines.length === 0 && /^[0-9a-f]{4,64}$/i.test(query)) {
+        lines = (await run(['log', '--date-order', '--format=%H %s', `-${Math.max(skip + limit + 1, 200)}`, ...refs, '--']))
+            .trim().split('\n').filter((line) => line.toLowerCase().startsWith(query.toLowerCase())).slice(skip, skip + limit + 1);
+    }
+    const commitSyncStatus = {};
+    const commits = lines.slice(0, limit).map((line) => {
+        const hash = line.split(' ')[0];
+        const short = hash.slice(0, 12);
+        if (remote)
+            commitSyncStatus[short] = unique.get(hash) ?? 'synced';
+        return short + line.slice(hash.length);
+    });
+    return { commits, hasMore: lines.length > limit, commitSyncStatus, upstream };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.223",
+  "version": "1.4.225",
   "description": "A complete web-based terminal application with modern UI",
   "type": "module",
   "main": ".desktop-dist/main.js",

package/runtime-manifest.json

@@ -1,13 +1,13 @@
 {
   "schemaVersion": 1,
   "packageName": "termdock",
-  "version": "1.4.223",
+  "version": "1.4.225",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-K4KyYJuVoQDpZsBM8ZX1Rw3MddOxAzVdp/cPm0iGZz0=",
-  "serverBundleHash": "sha256-by+kifQMpHXVzMq4dmVBieqyKasXA1awpsJTTGjgX7g=",
-  "clientBundleHash": "sha256-WSVFdDgv4C7Q3vOYtnRYTa5pClEoELQl8VmeG7eiseI=",
+  "serverBundleHash": "sha256-84TLgY1HkFA+dmjLiwsKCXizuO8A7o/a1fY2KFE6pCE=",
+  "clientBundleHash": "sha256-jYL3kO2kdcQl+I/zky6r2ql+bD1BXaULSsiiUujYMYk=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }