termdock 1.4.196 → 1.4.198

package/dist/server/agent/collaborationStore.js

@@ -1,7 +1,7 @@
 import fs from 'node:fs';
 import path from 'node:path';
 import crypto from 'node:crypto';
-import { COLLAB_LIMITS, CollaborationError, STATUS_RANK, resolveIdPrefix, validateExtras } from './collaborationProtocol.js';
+import { COLLAB_LIMITS, CollaborationError, STATUS_RANK, canonicalShortId, drawCollaborationId, newCollaborationId, resolveIdPrefix, validateExtras } from './collaborationProtocol.js';
 /** Characters that would corrupt a role line injected into the delivery shell
  * (`你的定位:...`) or smuggle terminal output. Unlike names, roles are plain
  * prose — 「」 and · are harmless there — so only control sequences are barred. */
@@ -25,10 +25,15 @@ const MAX_MESSAGES = 2_000;
 const MESSAGE_KINDS = new Set(['message', 'ask', 'reply', 'task', 'handoff', 'done']);
 export class CollaborationStore {
     filePath;
+    drawId;
     document = { version: 2, groups: [], messages: [] };
     persistedDocument = JSON.stringify(this.document);
-    constructor(filePath) {
+    /** `drawId` is the random source behind newCollaborationId. It is a
+     *  constructor seam so tests can force a collision and prove the guard
+     *  below actually skips it; production always uses the CSPRNG default. */
+    constructor(filePath, drawId = drawCollaborationId) {
         this.filePath = filePath;
+        this.drawId = drawId;
         try {
             const parsed = JSON.parse(fs.readFileSync(filePath, 'utf8'));
             if (Array.isArray(parsed.groups)) {
@@ -57,13 +62,36 @@ export class CollaborationStore {
     getGroup(id) {
         return this.document.groups.find((group) => group.id === id) ?? null;
     }
-    /** Typed lookups accept the 8-character id a terminal shows as well as the
-     *  full one: exact match first, then a unique prefix. Ambiguity is reported,
+    /** Typed lookups accept the short id a terminal shows as well as the full
+     *  one: exact match first, then a unique prefix. Ambiguity is reported,
      *  never guessed at, and resolution happens before any send so the
      *  idempotency payload hash still sees the full id. */
     resolveGroupId(id) {
         return resolveIdPrefix(this.document.groups.map((group) => group.id), id);
     }
+    /** Everything a freshly minted id must not collide with. It holds two forms
+     *  of each stored id: the id itself, and the truncated form it displays as.
+     *  The second form is what keeps a new id from landing on the visible form
+     *  of an older UUID — resolveIdPrefix prefers an exact match, so that
+     *  collision would silently answer lookups with the wrong message. Ids
+     *  arrive from federation as given and cannot be rewritten, so this only
+     *  guarantees uniqueness within what this store has seen. */
+    takenIds() {
+        const taken = new Set();
+        const add = (id) => {
+            if (!id)
+                return;
+            taken.add(id);
+            taken.add(canonicalShortId(id));
+        };
+        for (const group of this.document.groups)
+            add(group.id);
+        for (const message of this.document.messages) {
+            add(message.id);
+            add(message.threadId);
+        }
+        return taken;
+    }
     save(input) {
         const now = Date.now();
         const existing = input.id ? this.document.groups.find((group) => group.id === input.id) : null;
@@ -71,7 +99,7 @@ export class CollaborationStore {
         const group = pruneRoles({
             ...existing,
             ...(existing?.remoteSessions ? { remoteSessions: existing.remoteSessions.filter((session) => sessionIds.includes(session.sessionId)) } : {}),
-            id: existing?.id ?? crypto.randomUUID(),
+            id: existing?.id ?? newCollaborationId(this.takenIds(), this.drawId),
             name: input.name.trim(),
             sessionIds,
             createdAt: existing?.createdAt ?? now,
@@ -204,11 +232,12 @@ export class CollaborationStore {
                 throw new CollaborationError('IDEMPOTENCY_RECORD_GONE', 'Original message removed; this key cannot be reused yet', 409);
             return originals;
         }
-        const threadId = input.threadId?.trim() || crypto.randomUUID();
+        const taken = this.takenIds();
+        const threadId = input.threadId?.trim() || newCollaborationId(taken, this.drawId);
         const messages = recipients.map((toSessionId) => ({
             idempotencyKey: input.idempotencyKey, responseKind: extras.responseKind, metadata: extras.metadata, task: extras.task, expiresAt: extras.expiresAt,
             sequence: this.nextSequence(),
-            id: crypto.randomUUID(), groupId: group.id, fromSessionId: input.fromSessionId,
+            id: newCollaborationId(taken, this.drawId), groupId: group.id, fromSessionId: input.fromSessionId,
             toSessionId, kind: input.kind, content, threadId,
             fanOutIds: recipients.length > 1 ? recipients.filter((id) => id !== toSessionId) : undefined,
             replyTo: input.replyTo?.trim() || null, status: 'pending', createdAt: now,

package/dist/server/routes/filesystem.js

@@ -49,7 +49,12 @@ const MAX_BRANCH_DIFF_NAME_BYTES = 256 * 1024;
 const MAX_BRANCH_DIFF_LOG_BYTES = 256 * 1024;
 const MAX_UNTRACKED_DIFF_FILE_BYTES = 1024 * 1024; // 1MB
 const MAX_NESTED_GIT_REPOS = 32;
-const NESTED_GIT_DISCOVERY_TIMEOUT_MS = 1_000;
+// Walking a large non-repo tree (datasets/, models/) costs ~1s per 50k entries,
+// and the walk order is depth-first: a budget that expires mid-walk drops every
+// repo sitting after the slow directory. 1s cut real workspaces down to a
+// handful of repos with no signal. Budget generously instead — the result is
+// cached, so this only bounds a cold scan.
+const NESTED_GIT_DISCOVERY_TIMEOUT_MS = 10_000;
 const NESTED_GIT_DISCOVERY_CACHE_TTL_MS = 60_000;
 const FS_ROUTE_TIMEOUT_MS = 6_000;
 const HEIC_PREVIEW_TIMEOUT_MS = 30_000;
@@ -2536,8 +2541,18 @@ async function getCachedNestedGitRoots(workspaceRoot, options = {}) {
     }
     const promise = discoverNestedGitRoots(workspaceRoot, options.signal)
         .then((result) => {
+        // A truncated walk has no expiry of its own: the cache now holds a repo
+        // list that is missing entries, and every rescan that truncates again
+        // returns that same short list — so manual refresh could never recover.
+        // Keep the longer of the two lists and let it expire, so the next scan
+        // gets a chance to finish.
         if (result.truncated && cached?.result.repositories.length) {
-            return { ...cached.result, truncated: true };
+            const merged = cached.result.repositories.length >= result.repositories.length ? cached.result : result;
+            nestedGitRootsCache.set(workspaceRoot, {
+                result: { ...merged, truncated: true },
+                expiresAt: now + NESTED_GIT_DISCOVERY_CACHE_TTL_MS,
+            });
+            return { ...merged, truncated: true };
         }
         nestedGitRootsCache.set(workspaceRoot, {
             result,

package/dist/server/routes/terminal.js

@@ -5520,7 +5520,7 @@ router.post('/operations/collaboration-federation', (req, res) => {
 });
 router.use('/operations', collaborationGroupRoutes({ store: collaborationStore,
     sessions: () => globalSessionState.sessions.map(orchestrationSessionSnapshot) }));
-/** Group id from a URL param: the 8-character id a terminal shows resolves to
+/** Group id from a URL param: the short id a terminal shows resolves to
  *  its full id, an ambiguous prefix is refused with 409, and anything else is
  *  simply "no such group" — the same 404 each route already answers. */
 function resolveGroupParam(id) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "termdock",
-  "version": "1.4.196",
+  "version": "1.4.198",
   "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.196",
+  "version": "1.4.198",
   "runtimeProtocolVersion": 1,
   "minimumDesktopVersion": "1.4.46",
   "nodeMajor": 22,
   "dependencyHash": "sha256-K4KyYJuVoQDpZsBM8ZX1Rw3MddOxAzVdp/cPm0iGZz0=",
-  "serverBundleHash": "sha256-T/KLnvRkLhdOmsag6ksQv7ZoSL8RTw328UNIFTUC3/4=",
-  "clientBundleHash": "sha256-EQPT/w33vRGcZlyZoRHKmtgmEPWiRSGjRGHBx2SAwOw=",
+  "serverBundleHash": "sha256-twQsOYoqr9YzoP1c9026oaRTwEqiTvtqMd6H5/oxMFY=",
+  "clientBundleHash": "sha256-GKvLn08PjXFK40TGm1OlgtPAA9Tcvy+GYnD2hU+pys0=",
   "entrypoint": "dist/server/cli.js",
   "clientEntrypoint": "dist/client/index.html"
 }

package/dist/client/assets/channel-DXepE6hM.js

@@ -1 +0,0 @@
-import{c as a,C as n}from"./mermaid.core-DPcnsfOi.js";const t=(r,o)=>a.lang.round(n.parse(r)[o]);export{t as c};

package/dist/client/assets/classDiagram-ZZMXUADV-IgYlwyDS.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-TICWLB2K-DeFRSdCH.js";import{d as i}from"./mermaid.core-DPcnsfOi.js";import"./chunk-5VM5RSS4-C1uXRBQl.js";import"./chunk-XXDRQBXY-DxUnOflr.js";import"./chunk-POPQ4Y6H-1XZwzFea.js";import"./chunk-F27PBJKO-BBroEsMn.js";import"./purify.es-4eNOHKSq.js";import"./app-D3EW-RfP.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/classDiagram-v2-VYDZK3BY-IgYlwyDS.js

@@ -1 +0,0 @@
-import{s as a,a as s,c as t,C as e}from"./chunk-TICWLB2K-DeFRSdCH.js";import{d as i}from"./mermaid.core-DPcnsfOi.js";import"./chunk-5VM5RSS4-C1uXRBQl.js";import"./chunk-XXDRQBXY-DxUnOflr.js";import"./chunk-POPQ4Y6H-1XZwzFea.js";import"./chunk-F27PBJKO-BBroEsMn.js";import"./purify.es-4eNOHKSq.js";import"./app-D3EW-RfP.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:t,get db(){return new e},renderer:s,styles:a,init:i(r=>{r.class||(r.class={}),r.class.arrowMarkerAbsolute=r.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/stateDiagram-v2-MP3YSRHH-UzQ4VZ52.js

@@ -1 +0,0 @@
-import{b as r,a as e,s as a,S as i}from"./chunk-IMKFNOWR-DulvBTQW.js";import{d as s}from"./mermaid.core-DPcnsfOi.js";import"./chunk-XXDRQBXY-DxUnOflr.js";import"./chunk-POPQ4Y6H-1XZwzFea.js";import"./chunk-F27PBJKO-BBroEsMn.js";import"./purify.es-4eNOHKSq.js";import"./app-D3EW-RfP.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var g={parser:a,get db(){return new i(2)},renderer:e,styles:r,init:s(t=>{t.state||(t.state={}),t.state.arrowMarkerAbsolute=t.arrowMarkerAbsolute},"init")};export{g as diagram};

package/dist/client/assets/swimlanesDiagram-VR7AAH4N-wnRqK4Za.js

@@ -1,8 +0,0 @@
-import{c as r,s as e}from"./flowDiagram-HODETNUW-BZyUxfJS.js";import{d as o}from"./mermaid.core-DPcnsfOi.js";import"./chunk-5VM5RSS4-C1uXRBQl.js";import"./chunk-XXDRQBXY-DxUnOflr.js";import"./chunk-POPQ4Y6H-1XZwzFea.js";import"./chunk-F27PBJKO-BBroEsMn.js";import"./purify.es-4eNOHKSq.js";import"./channel-DXepE6hM.js";import"./app-D3EW-RfP.js";import"./react-XDCjal2T.js";import"./dnd-BCFAPC0L.js";import"./terminal-C7X98Amf.js";var a=o(t=>`${e(t)}
-  .swimlane.cluster rect {
-    stroke: ${t.clusterBorder} !important;
-  }
-  [data-look="neo"].cluster rect {
-    filter: none;
-  }
-`,"getStyles"),m=a,v=r({defaultLayout:"swimlane",styles:m});export{v as diagram};