termdock 1.4.356 → 1.4.357

package/dist/client/sw.js

@@ -1 +1 @@
-if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,a)=>{const o=e||("document"in self?document.currentScript.src:"")||location.href;if(s[o])return;let r={};const c=e=>n(e,o),d={module:{uri:o},exports:r,require:c};s[o]=Promise.all(i.map(e=>d[e]||c(e))).then(e=>(a(...e),r))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"c28a34f6faa77ba4f2eb081e18d5259f"},{url:"assets/app-DuUnqxq-.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-BCFAPC0L.js",revision:null},{url:"assets/terminal-Dea8wJF3.js",revision:null},{url:"assets/index-nIgxJ6I3.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});
+if(!self.define){let e,s={};const n=(n,i)=>(n=new URL(n+".js",i).href,s[n]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=n,e.onload=s,document.head.appendChild(e)}else e=n,importScripts(n),s()}).then(()=>{let e=s[n];if(!e)throw new Error(`Module ${n} didn’t register its module`);return e}));self.define=(i,o)=>{const a=e||("document"in self?document.currentScript.src:"")||location.href;if(s[a])return;let r={};const c=e=>n(e,a),d={module:{uri:a},exports:r,require:c};s[a]=Promise.all(i.map(e=>d[e]||c(e))).then(e=>(o(...e),r))}}define(["./workbox-9845bf53"],function(e){"use strict";importScripts("sw-encrypted-background.js","sw-notifications.js","sw-secure-api.js","sw-downloads.js"),self.addEventListener("message",e=>{e.data&&"SKIP_WAITING"===e.data.type&&self.skipWaiting()}),e.clientsClaim(),e.precacheAndRoute([{url:"index.html",revision:"285237b81d8d0f5b17794822bbd5b73f"},{url:"assets/app-CovJYQoW.js",revision:null},{url:"assets/react-XDCjal2T.js",revision:null},{url:"assets/dnd-BCFAPC0L.js",revision:null},{url:"assets/terminal-DaiFCKy_.js",revision:null},{url:"assets/index-DEAMSl55.css",revision:null},{url:"icons/agents/opencode.svg",revision:"851c2931d95821ba2b39b68587b48976"},{url:"icons/agents/kimi.svg",revision:"5366c710f4f763022fe159a69cf17409"},{url:"icons/agents/grok.svg",revision:"cd745b0b964545bc7a6b4f36021c3298"},{url:"icons/agents/goose.svg",revision:"c79b927278983c19098d77b4b0c11ab3"},{url:"icons/agents/gemini.svg",revision:"7a64f6d6f80a908255e9c0256903882e"},{url:"icons/agents/droid.svg",revision:"f28723b8c5c115e0908ba3c72613e256"},{url:"icons/agents/cursor.svg",revision:"a1528f3d3cda497f75a5db28defb19de"},{url:"icons/agents/copilot.svg",revision:"dd52e96c1eac0b6ec4bedcd0ddd3b52d"},{url:"icons/agents/codex.svg",revision:"608e55babb0b217e1f2da287342b46d3"},{url:"icons/agents/claude.svg",revision:"08af0225b7acdd8e8f573f3247e5e1c3"},{url:"icons/agents/amp.svg",revision:"af12f8b33faa81e4d46ea7b93c7e43f3"},{url:"apple-touch-icon-180x180.png",revision:"628c2e2f28a9b545aa57be1352025643"},{url:"boot-logo.png",revision:"2e3a25efd9b0b8ca1eab53b5f2284556"},{url:"favicon.ico",revision:"2994debfa6f59a0898e24eb0c54d64b5"},{url:"ipad-status-bar.js",revision:"3a8080edb8a5cc658a7908f6ad69537f"},{url:"maskable-icon-512x512.png",revision:"4d489331fd81f0713c400b26426442b9"},{url:"pwa-192x192.png",revision:"4d6f899888cfb8ccd7a1fd3c9e583ad2"},{url:"pwa-512x512.png",revision:"0885dd7ec8932e7f878b013d51a380a4"},{url:"robots.txt",revision:"d9339907142917dee4aac78494ac9cfe"},{url:"sw-downloads.js",revision:"48dab2e78bd93b4eee27fca487eccfde"},{url:"sw-notifications.js",revision:"fde578590ea8b0540d488ef448b48f45"},{url:"sw-secure-api.js",revision:"cf2bdbd03d41d66d60344c0b5a1075de"},{url:"manifest.webmanifest",revision:"83f9a43b74c236012adafb077fb6d774"}],{}),e.cleanupOutdatedCaches(),e.registerRoute(new e.NavigationRoute(e.createHandlerBoundToURL("index.html"),{denylist:[/^\/api\//,/^\/__termdock-download\//,/^\/health$/]})),e.registerRoute(/\/assets\/.*\.(?:js|css)$/,new e.CacheFirst({cacheName:"termdock-lazy-assets-v1",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:96,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/terminal\/[^/]+-[a-f0-9]{12}\.woff2$/,new e.CacheFirst({cacheName:"termdock-fonts-v2",plugins:[new e.CacheableResponsePlugin({statuses:[0,200]}),new e.ExpirationPlugin({maxEntries:384,maxAgeSeconds:2592e3})]}),"GET"),e.registerRoute(/\/fonts\/.*\.(?:woff2|ttf)$/,new e.StaleWhileRevalidate({cacheName:"termdock-fonts-v1",plugins:[new e.ExpirationPlugin({maxEntries:24,maxAgeSeconds:2592e3})]}),"GET")});

package/dist/server/agent/collaborationPeerTransport.js

@@ -1,13 +1,13 @@
-import { RELAY_CLIENT_CONNECT_TIMEOUT_MS } from '../federation/streamLimits.js';
 import { encryptedRequestSubject } from '../federation/requestContext.js';
 import { randomUUID } from 'node:crypto';
 import { readFileSync, writeFileSync, renameSync, mkdirSync } from 'node:fs';
 import { dirname } from 'node:path';
-import WebSocket from 'ws';
-import { AsyncQueue, toBase64, fromBase64, PacketChannel } from '../federation/packets.js';
+import { PacketChannel } from '../federation/packets.js';
 import { secureConnection } from '../federation/secureProtocol.js';
 import { socketDuplex } from '../federation/socketDuplex.js';
-import { readPinnedCertificateAuthority } from '../federation/trustedCa.js';
+import { RelayTransport } from '../federation/relayTransport.js';
+import { createServiceSocket, waitForServiceSocket } from '../federation/serviceTransport.js';
+import { serviceEndpoint } from '../federation/connectionModel.js';
 import { COLLAB_LIMITS, STATUS_RANK } from './collaborationProtocol.js';
 import { terminalMessage } from './collaborationStore.js';
 /** The outer API gate already authenticated local CLI tokens. Browser callers
@@ -123,23 +123,19 @@ export class CollaborationRpc {
         this.pending.clear();
     }
 }
-export async function connectCollaborationRpc(identity, peer, endpoint, receive, configuredCa) {
+export async function connectCollaborationRpc(identity, peer, endpoint, receive, configuredCa, certificateFingerprint256, signal) {
     validateCollaborationNode(peer);
-    const ca = peer.caFingerprint256 ? await readPinnedCertificateAuthority(peer.origin, peer.caFingerprint256) : configuredCa;
-    const url = endpoint ?? `${peer.origin.replace(/^https:/, 'wss:')}/api/federation/secure`;
-    const socket = new WebSocket(url, { ca, rejectUnauthorized: true, followRedirects: false, handshakeTimeout: 3000, maxPayload: 1024 * 1024 });
-    const relay = endpoint ? relayDuplex(socket, peer.serviceId) : undefined;
-    const duplex = relay?.duplex ?? socketDuplex(socket);
+    const url = endpoint ?? serviceEndpoint(peer.origin).href;
+    const socket = await createServiceSocket(url, { ca: configuredCa, caFingerprint256: peer.caFingerprint256, certificateFingerprint256 }, { signal, handshakeTimeout: 3000 });
+    const relay = endpoint ? new RelayTransport(url, peer.serviceId, () => socket, { entryUrl: peer.origin }) : undefined;
+    const wire = relay || socket;
+    const duplex = socketDuplex(wire);
     try {
-        await new Promise((resolve, reject) => {
-            socket.once('open', resolve);
-            socket.once('error', reject);
-            socket.once('close', () => reject(new Error('PEER_DISCONNECTED')));
-        });
-        if (relay)
-            await relay.ready;
-        const secured = await secureConnection({ identity, duplex, initiator: true, targetPinnedPeerId: peer.serviceId, signal: AbortSignal.timeout(5000) });
+        await waitForServiceSocket(wire, signal);
+        const secured = await secureConnection({ identity, duplex, initiator: true, targetPinnedPeerId: peer.serviceId, signal: signal ? AbortSignal.any([signal, AbortSignal.timeout(5000)]) : AbortSignal.timeout(5000) });
         const rpc = new CollaborationRpc(new PacketChannel(secured.duplex), receive);
+        if (relay)
+            relay.addEventListener('close', () => rpc.close(relay.transportFailure), { once: true });
         if (receive) {
             try {
                 await rpc.request({ type: 'collaboration-connect' });
@@ -160,57 +156,6 @@ export async function connectCollaborationRpc(identity, peer, endpoint, receive,
         throw error;
     }
 }
-function relayDuplex(socket, target) {
-    const queue = new AsyncQueue(64), streamId = randomUUID();
-    let readyResolve, readyReject;
-    const ready = new Promise((resolve, reject) => { readyResolve = resolve; readyReject = reject; });
-    void ready.catch(() => { });
-    const timer = setTimeout(() => fail(new Error('ROUTE_TIMEOUT')), RELAY_CLIENT_CONNECT_TIMEOUT_MS);
-    const fail = (error) => { clearTimeout(timer); readyReject(error); queue.end(error); socket.close(); };
-    const send = (frame) => {
-        if (socket.readyState !== 1 || socket.bufferedAmount > 1024 * 1024)
-            throw new Error('ROUTE_CONGESTED');
-        socket.send(JSON.stringify(frame));
-    };
-    socket.on('error', fail);
-    socket.on('close', () => fail(new Error('ROUTE_CLOSED')));
-    socket.on('message', (raw, binary) => {
-        try {
-            if (binary || raw.toString().length > 256 * 1024)
-                throw new Error('INVALID_RELAY_FRAME');
-            const frame = JSON.parse(raw.toString());
-            if (frame.type === 'ready') {
-                send({ type: 'open', streamId, serviceId: target });
-                return;
-            }
-            if (frame.streamId !== streamId)
-                return;
-            if (frame.type === 'opened') {
-                clearTimeout(timer);
-                readyResolve();
-                return;
-            }
-            if (frame.type !== 'data' || frame.encoding !== 'base64' || typeof frame.payload !== 'string')
-                throw new Error('ROUTE_CLOSED');
-            queue.push(fromBase64(frame.payload));
-        }
-        catch (error) {
-            fail(error instanceof Error ? error : new Error('INVALID_RELAY_FRAME'));
-        }
-    });
-    return { ready, duplex: { source: queue, close: () => socket.close(), async sink(source) {
-                await ready;
-                for await (const bytes of source)
-                    for (let offset = 0; offset < bytes.length; offset += 65536) {
-                        while (socket.bufferedAmount > 256 * 1024) {
-                            if (socket.readyState !== 1)
-                                throw new Error('ROUTE_CLOSED');
-                            await new Promise(resolve => setTimeout(resolve, 10));
-                        }
-                        send({ type: 'data', streamId, encoding: 'base64', payload: toBase64(bytes.subarray(offset, offset + 65536)) });
-                    }
-            } } };
-}
 /** Group-scoped, durable server-to-server delivery. A binding is installed only
  * by an already authorized group administrator, never by the remote peer itself. */
 export class CollaborationPeerTransport {

package/dist/server/agent/collaborationStore.js

@@ -620,6 +620,11 @@ export class CollaborationStore {
         this.persist(true);
         return reply;
     }
+    /** References only: callers can select a bounded page before projecting bodies. */
+    listGroupMessages(groupId) {
+        this.expire();
+        return this.document.messages.filter(message => message.groupId === groupId);
+    }
     listMessages(groupId, limit = 200) {
         return this.document.messages.filter((message) => message.groupId === groupId).slice(-Math.max(1, Math.min(limit, 500)));
     }

package/dist/server/agent/installers.js

@@ -54,7 +54,7 @@ const OWNED_FILE_STEM_JS = 'termdock.js';
 function targetPath(agent) {
     switch (agent) {
         case 'claude': return claudeSettingsPath();
-        case 'codex': return path.join(homeDir(), '.codex', 'hooks.json');
+        case 'codex': return path.join(process.env.CODEX_HOME?.trim() || path.join(homeDir(), '.codex'), 'hooks.json');
         case 'copilot': return path.join(homeDir(), '.copilot', 'hooks', OWNED_FILE_STEM_JSON);
         case 'opencode': return path.join(xdgConfigDir(), 'opencode', 'plugins', OWNED_FILE_STEM_JS);
         case 'pi': return path.join(homeDir(), '.pi', 'agent', 'extensions', 'termdock', 'index.ts');
@@ -92,7 +92,7 @@ function hookCommand(agent, event) {
 /** Substring identifying a hook entry / owned file as termdock's. Every
  *  generated command and file embeds `agent-hook <slug>` verbatim. */
 function marker(agent) {
-    return `agent-hook ${agent}`;
+    return `agent-hook ${agent} `;
 }
 /** Best-effort atomic write: tmp file + rename. */
 function writeAtomic(file, content) {
@@ -116,6 +116,8 @@ function writeAtomic(file, content) {
 const CLAUDE_HOOK_EVENTS = [
     ['SessionStart', 'session-start'],
     ['UserPromptSubmit', 'prompt-submit'],
+    ['PermissionRequest', 'permission-request'],
+    ['PreToolUse', 'tool-start'],
     ['Notification', 'notification'],
     ['PostToolUse', 'tool-complete'],
     ['Stop', 'stop'],
@@ -126,8 +128,10 @@ const CODEX_HOOK_EVENTS = [
     ['SessionStart', 'session-start'],
     ['UserPromptSubmit', 'prompt-submit'],
     ['PermissionRequest', 'permission-request'],
+    ['PreToolUse', 'tool-start'],
     ['PostToolUse', 'tool-complete'],
     ['Stop', 'stop'],
+    ['Interrupt', 'stop'],
     ['SessionEnd', 'session-end'],
 ];
 /** Shared budget for Termdock status emitters, in seconds. */
@@ -205,6 +209,22 @@ function markerCommand(entry, mark) {
     }
     return null;
 }
+/** Remove only our handlers, including when a user grouped their own
+ * command alongside ours. Preserve matcher metadata and unrelated agents. */
+function removeOwnedHookHandlers(list, mark) {
+    return list.flatMap((entry) => {
+        if (!entry || typeof entry !== 'object' || !Array.isArray(entry.hooks))
+            return [entry];
+        const group = entry;
+        const handlers = group.hooks;
+        const kept = handlers.filter(handler => !handler || typeof handler !== 'object'
+            || typeof handler.command !== 'string'
+            || !handler.command.includes(mark));
+        if (kept.length === handlers.length)
+            return [entry];
+        return kept.length ? [{ ...group, hooks: kept }] : [];
+    });
+}
 function hookMapState(file, agent, events) {
     const root = readJsonObject(file);
     if (!root)
@@ -272,7 +292,7 @@ function hookMapInstall(file, agent, events) {
         if (!Array.isArray(list))
             continue; // malformed user config; leave it alone
         // Drop any previous termdock entry (stale exe path), then append ours.
-        const kept = list.filter((entry) => markerCommand(entry, mark) === null);
+        const kept = removeOwnedHookHandlers(list, mark);
         const handler = { type: 'command', command };
         handler.timeout = hookTimeout(sentinel);
         kept.push({ hooks: [handler] });
@@ -295,8 +315,8 @@ function hookMapUninstall(file, agent) {
             const list = hooks[eventName];
             if (!Array.isArray(list))
                 continue;
-            const kept = list.filter((entry) => markerCommand(entry, mark) === null);
-            removed += list.length - kept.length;
+            const kept = removeOwnedHookHandlers(list, mark);
+            removed += list.filter(entry => markerCommand(entry, mark) !== null).length;
             if (kept.length === 0) {
                 delete hooks[eventName];
             }
@@ -681,13 +701,33 @@ export function hooksState(agent) {
     return ownedFileState(file, expected, marker(agent));
 }
 let codexRuntimeStateCache = null;
+export function codexHookRegistryState(hooks) {
+    let approvalNeeded = false;
+    for (const [event, sentinel] of CODEX_HOOK_EVENTS) {
+        const eventName = event[0].toLowerCase() + event.slice(1);
+        const matching = hooks.filter(hook => hook.eventName === eventName && hook.command === hookCommand('codex', sentinel));
+        if (!matching.length)
+            return 'outdated';
+        if (!matching.some(hook => hook.enabled === true && ['trusted', 'managed'].includes(hook.trustStatus ?? '')))
+            approvalNeeded = true;
+    }
+    return approvalNeeded ? 'needs-approval' : 'installed';
+}
 /** Query Codex's own hook registry: a structurally present hook can still be
  * quarantined until the user approves its current hash in `/hooks`. */
 async function codexRuntimeHooksState() {
     const structural = hooksState('codex');
     if (structural !== 'installed')
         return structural;
-    if (codexRuntimeStateCache && Date.now() - codexRuntimeStateCache.at < 30_000) {
+    let stat;
+    try {
+        stat = fs.statSync(targetPath('codex'));
+    }
+    catch {
+        return 'unverified';
+    }
+    const key = `${targetPath('codex')}:${stat.mtimeMs}:${stat.size}:${process.cwd()}`;
+    if (codexRuntimeStateCache?.key === key && Date.now() - codexRuntimeStateCache.at < 30_000) {
         return codexRuntimeStateCache.state;
     }
     const state = await new Promise((resolve) => {
@@ -705,11 +745,17 @@ async function codexRuntimeHooksState() {
             child.kill();
             resolve(value);
         };
-        const timer = setTimeout(() => finish(structural), 5_000);
+        const timer = setTimeout(() => finish('unverified'), 5_000);
         timer.unref?.();
-        child.on('error', () => finish(structural));
+        child.on('error', () => finish('unverified'));
+        child.on('close', () => finish('unverified'));
+        child.stdin.on('error', () => finish('unverified'));
         child.stdout.on('data', (chunk) => {
             buffer += chunk.toString();
+            if (buffer.length > 1024 * 1024) {
+                finish('unverified');
+                return;
+            }
             for (;;) {
                 const newline = buffer.indexOf('\n');
                 if (newline < 0)
@@ -725,28 +771,31 @@ async function codexRuntimeHooksState() {
                 catch {
                     continue;
                 }
+                if (message.error && (message.id === 1 || message.id === 2)) {
+                    finish('unverified');
+                    return;
+                }
                 if (message.id === 1) {
                     child.stdin.write(`${JSON.stringify({ method: 'initialized', params: {} })}\n`);
                     child.stdin.write(`${JSON.stringify({ id: 2, method: 'hooks/list', params: { cwds: [process.cwd()] } })}\n`);
                 }
                 else if (message.id === 2) {
-                    const ours = (message.result?.data ?? [])
-                        .flatMap((entry) => entry.hooks ?? [])
-                        .filter((hook) => typeof hook.command === 'string' && hook.command.includes(marker('codex')));
-                    if (ours.length < CODEX_HOOK_EVENTS.length)
-                        finish('outdated');
-                    else if (ours.some((hook) => hook.enabled === false || !['trusted', 'managed'].includes(hook.trustStatus ?? '')))
-                        finish('needs-approval');
-                    else
-                        finish('installed');
+                    if (!Array.isArray(message.result?.data)) {
+                        finish('unverified');
+                        return;
+                    }
+                    finish(codexHookRegistryState(message.result.data.flatMap(entry => entry.hooks ?? [])));
                 }
             }
         });
         child.stdin.write(`${JSON.stringify({ id: 1, method: 'initialize', params: { clientInfo: { name: 'termdock', version: '1' } } })}\n`);
     });
-    codexRuntimeStateCache = { at: Date.now(), state };
+    codexRuntimeStateCache = { at: Date.now(), key, state };
     return state;
 }
+export async function runtimeHooksStateForSlug(slug) {
+    return slug === 'codex' ? codexRuntimeHooksState() : hooksStateForSlug(slug);
+}
 export function listHookAgents() {
     return HOOK_AGENTS.map((slug) => ({
         slug,
@@ -908,18 +957,17 @@ export function pluginHooksState(slug, file, events) {
         const list = hooks && typeof hooks === 'object'
             ? hooks[hookEvent]
             : null;
-        const ours = Array.isArray(list)
-            ? list.find((entry) => markerCommand(entry, mark) !== null)
-            : undefined;
-        if (ours !== undefined) {
+        const ours = Array.isArray(list) ? list.filter((entry) => markerCommand(entry, mark) !== null) : [];
+        if (ours.length) {
             any = true;
-            const group = ours && typeof ours === 'object' ? ours : {};
-            const handler = Array.isArray(group.hooks) && group.hooks[0] && typeof group.hooks[0] === 'object'
-                ? group.hooks[0]
-                : {};
-            if (handler.command !== hookCommandForPlugin(slug, sentinel, status)
-                || (matcher ?? undefined) !== group.matcher
-                || (timeout ?? hookTimeout(sentinel)) !== handler.timeout)
+            const covered = ours.some((entry) => {
+                const group = entry;
+                return (matcher ?? undefined) === group.matcher && Array.isArray(group.hooks)
+                    && group.hooks.some(handler => handler && typeof handler === 'object'
+                        && handler.command === hookCommandForPlugin(slug, sentinel, status)
+                        && handler.timeout === (timeout ?? hookTimeout(sentinel)));
+            });
+            if (!covered)
                 complete = false;
         }
         else {
@@ -954,6 +1002,12 @@ export function installPluginHooks(slug, file, events) {
     }
     const hooks = root.hooks;
     const mark = marker(slug);
+    // Clear the previous owned set once, then add every mapping. Clearing on
+    // each mapping loses all but the last matcher sharing a native hook event.
+    for (const [eventName, list] of Object.entries(hooks)) {
+        if (Array.isArray(list))
+            hooks[eventName] = removeOwnedHookHandlers(list, mark);
+    }
     for (const [hookEvent, sentinel, matcher, timeout, status] of events) {
         const command = hookCommandForPlugin(slug, sentinel, status);
         let list = hooks[hookEvent];
@@ -963,7 +1017,7 @@ export function installPluginHooks(slug, file, events) {
         }
         if (!Array.isArray(list))
             continue;
-        const kept = list.filter((entry) => markerCommand(entry, mark) === null);
+        const kept = [...list];
         const handler = { type: 'command', command };
         handler.timeout = timeout ?? hookTimeout(sentinel);
         const entry = { hooks: [handler] };
@@ -988,8 +1042,8 @@ function uninstallPluginHooks(slug, file) {
             const list = hooks[eventName];
             if (!Array.isArray(list))
                 continue;
-            const kept = list.filter((entry) => markerCommand(entry, mark) === null);
-            removed += list.length - kept.length;
+            const kept = removeOwnedHookHandlers(list, mark);
+            removed += list.filter(entry => markerCommand(entry, mark) !== null).length;
             if (kept.length === 0) {
                 delete hooks[eventName];
             }
@@ -1014,7 +1068,9 @@ export function refreshStaleHooksAtLaunch() {
         if (hooksState(agent) !== 'outdated')
             continue;
         try {
-            void installHooks(agent);
+            void installHooks(agent).catch((error) => {
+                console.warn(`[agent-hooks] could not refresh stale ${agent} hooks:`, error.message);
+            });
             refreshed++;
             console.log(`[agent-hooks] refreshed stale ${agent} hooks at ${abbreviateHome(targetPath(agent))}`);
         }

package/dist/server/agent/integrationServer.js

@@ -9,7 +9,16 @@ import { terminalMessage } from './collaborationStore.js';
 import { IntegrationStore, INTEGRATION_PROTOCOL, INTEGRATION_OPERATIONS, atomicJson, integrationError } from './integrationStore.js';
 import { IntegrationSessions, publicIntegrationSession } from './integrationSessions.js';
 import { getTermdockVersion } from '../utils/version.js';
-export function integrationSocketPath(port) { return path.join(homedir(), '.termdock', `integration-${port}.sock`); }
+export function integrationSocketPath(port, home = homedir()) {
+    const preferred = path.join(home, '.termdock', `integration-${port}.sock`);
+    // Darwin's sockaddr_un is shorter than Linux's. Node can truncate a long
+    // pathname while binding, leaving chmod and clients looking at another name.
+    if (Buffer.byteLength(preferred) < 100)
+        return preferred;
+    const owner = process.getuid?.() ?? 'user';
+    const key = createHash('sha256').update(home).digest('hex').slice(0, 16);
+    return path.join('/tmp', `td-integration-${owner}-${key}`, `${port}.sock`);
+}
 function scopedId(input, ids, type) {
     if (typeof input !== 'string')
         integrationError(`INVALID_${type}_ID`, 'A message or member id is required');
@@ -618,6 +627,14 @@ export class IntegrationRuntime {
     }
     async listen() {
         fs.mkdirSync(path.dirname(this.options.socketPath), { recursive: true, mode: 0o700 });
+        const directory = path.dirname(this.options.socketPath);
+        if (directory.startsWith('/tmp/td-integration-')) {
+            const stat = fs.lstatSync(directory);
+            if (!stat.isDirectory() || (process.getuid && stat.uid !== process.getuid())) {
+                integrationError('INTEGRATION_SOCKET_DIRECTORY_INVALID', 'Socket directory must be private and owned by this user');
+            }
+            fs.chmodSync(directory, 0o700);
+        }
         // A stale socket may be removed only after proving no listener exists.
         if (fs.existsSync(this.options.socketPath)) {
             const { createConnection } = await import('node:net');
@@ -635,7 +652,19 @@ export class IntegrationRuntime {
                 integrationError('INTEGRATION_SOCKET_INVALID', 'Refusing to replace a non-socket file');
             fs.unlinkSync(this.options.socketPath);
         }
-        await new Promise((resolve, reject) => { this.server.once('error', reject); this.server.listen(this.options.socketPath, () => { this.server.removeListener('error', reject); fs.chmodSync(this.options.socketPath, 0o600); resolve(); }); });
+        await new Promise((resolve, reject) => {
+            this.server.once('error', reject);
+            this.server.listen(this.options.socketPath, () => {
+                this.server.removeListener('error', reject);
+                try {
+                    fs.chmodSync(this.options.socketPath, 0o600);
+                    resolve();
+                }
+                catch (error) {
+                    reject(error);
+                }
+            });
+        });
         this.sync();
         await this.sessions.refreshAll();
         void this.pumpReleaseBatches();

package/dist/server/agent/pluginPackages.js

@@ -11,36 +11,63 @@ const MAX_PACKAGE_BYTES = 16 * 1024 * 1024;
 const MAX_SINGLE_FILE_BYTES = 8 * 1024 * 1024;
 const GIT_TIMEOUT_MS = 45_000;
 const IGNORED_NAMES = new Set(['.git', '.github', 'node_modules', SOURCE_METADATA_FILE]);
-const DEFAULT_GIT_HOSTS = new Set(['github.com', 'gitlab.com', 'codeberg.org', 'bitbucket.org']);
 function hardenedGitEnv() {
-    return {
+    const env = {
         ...process.env,
         GIT_TERMINAL_PROMPT: '0',
-        GIT_CONFIG_COUNT: '0',
-        GIT_CONFIG_GLOBAL: '/dev/null',
-        GIT_CONFIG_SYSTEM: '/dev/null',
+        GIT_LFS_SKIP_SMUDGE: '1',
     };
+    // Keep the service user's credential helpers, SSH agent/config, CA and
+    // proxy settings. Only repository-local context inherited from a caller
+    // must not redirect these operations into another working tree.
+    for (const key of ['GIT_DIR', 'GIT_WORK_TREE', 'GIT_INDEX_FILE', 'GIT_COMMON_DIR',
+        'GIT_OBJECT_DIRECTORY', 'GIT_ALTERNATE_OBJECT_DIRECTORIES'])
+        delete env[key];
+    if (!env.GIT_SSH_COMMAND && !env.GIT_SSH)
+        env.GIT_SSH_COMMAND = 'ssh -o BatchMode=yes';
+    return env;
 }
-function allowedGitHosts() {
+const GIT_OPTIONS = [
+    '-c', `core.hooksPath=${os.devNull}`,
+    '-c', 'protocol.allow=never',
+    '-c', 'protocol.http.allow=always',
+    '-c', 'protocol.https.allow=always',
+    '-c', 'protocol.ssh.allow=always',
+    '-c', 'filter.lfs.smudge=',
+    '-c', 'filter.lfs.process=',
+    '-c', 'filter.lfs.required=false',
+];
+function gitHostAllowed(host) {
     const configured = (process.env.TERMDOCK_PLUGIN_GIT_HOSTS ?? '')
         .split(',')
         .map((host) => host.trim().toLowerCase())
         .filter(Boolean);
-    return new Set([...DEFAULT_GIT_HOSTS, ...configured]);
+    // An explicit administrative allowlist is optional. Self-hosted and
+    // private-network hosts work without having to edit service environment.
+    return configured.length === 0 || configured.includes(host.toLowerCase());
 }
 export function normalizeGitPluginSource(input) {
+    const source = input.trim();
+    if (!source || source.startsWith('-') || /[\x00-\x20\x7f]/.test(source) || /^[A-Za-z]:[\\/]/.test(source))
+        return null;
+    if (!source.includes('://')) {
+        const scp = /^(?:[A-Za-z0-9_.-]+@)?(\[[0-9a-fA-F:]+\]|[A-Za-z0-9][A-Za-z0-9._-]*):([^?#\\]+)$/.exec(source);
+        if (!scp || scp[2].startsWith('-') || !gitHostAllowed(scp[1]))
+            return null;
+        return source;
+    }
     let url;
     try {
-        url = new URL(input.trim());
+        url = new URL(source);
     }
     catch {
         return null;
     }
-    if (url.protocol !== 'https:' || url.username || url.password || url.search || url.hash)
+    if (!['https:', 'http:', 'ssh:'].includes(url.protocol) || url.password || url.search || url.hash)
         return null;
-    if (!allowedGitHosts().has(url.hostname.toLowerCase()))
+    if (!url.hostname || url.hostname.startsWith('-') || !gitHostAllowed(url.hostname))
         return null;
-    if (!/^\/[A-Za-z0-9_.-]+\/[A-Za-z0-9_.-]+(?:\.git)?\/?$/.test(url.pathname))
+    if (url.pathname === '/' || /%0[0-9a-f]|%1[0-9a-f]|%7f/i.test(url.pathname))
         return null;
     url.pathname = url.pathname.replace(/\/$/, '');
     return url.toString();
@@ -157,10 +184,7 @@ export async function preparePluginPackage(sourceInput, expectedSlug) {
         if (remote) {
             packageDir = path.join(temporaryRoot, 'repo');
             await execFileAsync('git', [
-                '-c', 'credential.helper=',
-                '-c', 'core.hooksPath=/dev/null',
-                '-c', 'filter.lfs.smudge=',
-                '-c', 'filter.lfs.required=false',
+                ...GIT_OPTIONS,
                 'clone', '--depth', '1', '--single-branch', '--no-recurse-submodules', '--', remote, packageDir,
             ], {
                 timeout: GIT_TIMEOUT_MS,
@@ -170,16 +194,20 @@ export async function preparePluginPackage(sourceInput, expectedSlug) {
             const result = await execFileAsync('git', ['-C', packageDir, 'rev-parse', 'HEAD'], {
                 timeout: 5000,
                 maxBuffer: 128 * 1024,
+                env: hardenedGitEnv(),
             });
             revision = result.stdout.trim();
             type = 'git';
             normalizedSource = remote;
         }
         else {
-            const resolved = path.resolve(source);
+            if (source.includes('://') || /^(?:[^/]+@[^/]+:|[^/]+::)/.test(source)) {
+                throw new Error('Unsupported Git source: use an HTTPS, HTTP or SSH repository URL, an scp-style Git address, or a local package directory');
+            }
+            const resolved = path.resolve(source === '~' ? os.homedir() : source.startsWith('~/') ? path.join(os.homedir(), source.slice(2)) : source);
             const stat = await fs.promises.stat(resolved).catch(() => null);
             if (!stat)
-                throw new Error('Plugin source must be an existing local path or an allowed HTTPS Git repository');
+                throw new Error('Plugin source must be an existing local path or an accessible HTTPS, HTTP or SSH Git repository');
             packageDir = stat.isDirectory() ? resolved : path.dirname(resolved);
             if (!stat.isDirectory() && path.basename(resolved) !== MANIFEST_FILE) {
                 throw new Error('A local plugin file must be named manifest.json');
@@ -224,8 +252,10 @@ export async function preparePluginPackage(sourceInput, expectedSlug) {
 export async function commitPreparedPlugin(prepared, replace = false) {
     await fs.promises.mkdir(PLUGINS_DIR, { recursive: true });
     const target = path.join(PLUGINS_DIR, prepared.manifest.slug);
-    if (!replace && fs.existsSync(target))
+    if (!replace && fs.existsSync(target)) {
+        await prepared.cleanup();
         throw new Error(`Plugin "${prepared.manifest.slug}" already exists`);
+    }
     const stage = path.join(PLUGINS_DIR, `.stage-${prepared.manifest.slug}-${randomUUID()}`);
     const backup = path.join(PLUGINS_DIR, `.backup-${prepared.manifest.slug}-${randomUUID()}`);
     try {
@@ -260,11 +290,10 @@ export async function checkPluginPackageUpdate(plugin) {
     if (metadata.type === 'git') {
         const remote = normalizeGitPluginSource(metadata.source);
         if (!remote)
-            throw new Error('The stored Git source is no longer allowed');
+            throw new Error('The stored Git source is invalid or excluded by TERMDOCK_PLUGIN_GIT_HOSTS');
         const { stdout } = await execFileAsync('git', [
-            '-c', 'credential.helper=',
-            '-c', 'core.hooksPath=/dev/null',
-            'ls-remote', remote, 'HEAD',
+            ...GIT_OPTIONS,
+            'ls-remote', '--', remote, 'HEAD',
         ], {
             timeout: 15_000,
             maxBuffer: 128 * 1024,