Skip to content

Node-based terminal manager for AI coding agents — tmux-backed terminals and parallel agent sessions as draggable nodes on an infinite pan/zoom canvas. macOS, Linux, and a browser Server Edition.

Merge remote-tracking branch 'origin/main' into fix/triage-826-20260923

reviewfbc1bf4f053d
diff --cc src/core/agents/hook-server.ts
index ce1e5f406,3542f5a98..dac3d2d93
--- a/src/core/agents/hook-server.ts
+++ b/src/core/agents/hook-server.ts
@@@ -1,7 -1,7 +1,8 @@@
+ import { sessionContextWindow } from '../model-window'
import { createServer, type IncomingMessage, type Server, type ServerResponse } from 'http'
import { randomUUID, timingSafeEqual } from 'crypto'
-import { writeFileSync, mkdirSync, chmodSync, unlinkSync } from 'fs'
+import { readFileSync, mkdirSync, chmodSync, unlinkSync } from 'fs'
+import { assertHookEndpointAvailable, clearStaleHookSocket, HookSocketOwnedError } from './hook-socket-owner'
import { homedir } from 'os'
import path from 'path'
import { platform } from '../platform'
diff --cc src/core/agents/hooks/managed-script.ts
index 59dbaa35a,43b4bfa9e..f7b2adc33
--- a/src/core/agents/hooks/managed-script.ts
+++ b/src/core/agents/hooks/managed-script.ts
@@@ -278,17 -287,19 +287,19 @@@ export function buildManagedScript
' -H "Content-Type: application/x-www-form-urlencoded" \\',
' --data-urlencode "nodeId=${NODETERM_NODE_ID}" \\',
' --data-urlencode "version=${NODETERM_HOOK_VERSION}" \\',
+ ' --data-urlencode "nodeterm_context_window=${nt_context_window}" \\',
' --data-urlencode "nodeterm_pending_id=${nt_pending}" \\',
- ' --data-urlencode "payload@${nt_payload_arg}" >/dev/null 2>&1',
+ ' --data-urlencode "payload@${nt_payload_arg}" 2>/dev/null) || return 1',
' elif [ -n "$NODETERM_HOOK_PORT" ]; then',
- ' nt_hook_headers |',
- ` curl -sS -X POST "http://127.0.0.1:\${NODETERM_HOOK_PORT}/hook/${agentId}" \\`,
+ ' nt_code=$(nt_hook_headers |',
+ ` curl -sS -o /dev/null -w '%{http_code}' -X POST "http://127.0.0.1:\${NODETERM_HOOK_PORT}/hook/${agentId}" \\`,
' --connect-timeout 0.5 --max-time 1.5 --config - \\',
' -H "Content-Type: application/x-www-form-urlencoded" \\',
' --data-urlencode "nodeId=${NODETERM_NODE_ID}" \\',
' --data-urlencode "version=${NODETERM_HOOK_VERSION}" \\',
+ ' --data-urlencode "nodeterm_context_window=${nt_context_window}" \\',
' --data-urlencode "nodeterm_pending_id=${nt_pending}" \\',
- ' --data-urlencode "payload@${nt_payload_arg}" >/dev/null 2>&1',
+ ' --data-urlencode "payload@${nt_payload_arg}" 2>/dev/null) || return 1',
' else',
' return 1',
' fi',
diff --cc src/main/remote-ssh/remote-hooks.test.ts
index b2892d426,3865be347..27e3358ea
--- a/src/main/remote-ssh/remote-hooks.test.ts
+++ b/src/main/remote-ssh/remote-hooks.test.ts
@@@ -272,10 -253,10 +274,10 @@@ describe('RemoteHooks.setup — a hosti
expect(joined.some((j) => j.includes(`mkdir -p '/Users/Enes K/.nodeterm'`))).toBe(true)
expect(
joined.some(
- (j) => j.includes('cat > ') && j.includes("/Users/Enes K/.nodeterm/hook-endpoint-p1.env'")
+ (j) => j.includes('cat > ') && j.includes(`/Users/Enes K/.nodeterm/hook-endpoint-p1-${owner}.env'`)
)
).toBe(true)
- expect(joined.some((j) => j.includes(`cat > '/Users/Enes K/.claude/settings.json'`))).toBe(true)
+ expect(joined.some((j) => j.includes(`mv -f -- "$nt_stage/publish" '/Users/Enes K/.claude/settings.json'`))).toBe(true)
// No path derived from $HOME survives UNQUOTED in any remote SHELL LINE (the last argv element
// of an ssh child is the command the remote shell parses; the `-R` forward spec is an ssh
// OPTION, not a shell word, so it is excluded by construction).
@@@ -906,9 -887,9 +908,9 @@@ describe('RemoteHooks.setup — the hos
it('installs hooks for a host whose $HOME is not spelled in ASCII', async () => {
const { rh, calls } = harness({ responses: { 'printf %s "$HOME"': '/home/gökhan' } })
const res = await rh.setup('p1', conn, '/s.sock', { port: 51234, token: 'tok', version: '1' })
- expect(res?.endpointPath).toBe('/home/gökhan/.nodeterm/hook-endpoint-p1.env')
+ expect(res?.endpointPath).toBe(`/home/gökhan/.nodeterm/hook-endpoint-p1-${owner}.env`)
const joined = calls.map((c) => c.args.join(' '))
- expect(joined.some((j) => j.includes(`cat > '/home/gökhan/.claude/settings.json'`))).toBe(true)
+ expect(joined.some((j) => j.includes(`mv -f -- "$nt_stage/publish" '/home/gökhan/.claude/settings.json'`))).toBe(true)
})
})