nterminal 1.3.3 → 1.3.5

package/scripts/nterminal-hook.cjs

@@ -0,0 +1,171 @@
+'use strict';
+
+// Standalone installer payload: copy to <stateDir>/hooks/forward.cjs. No app imports.
+const fs = require('node:fs');
+const fsp = require('node:fs/promises');
+const http = require('node:http');
+const path = require('node:path');
+const { randomUUID } = require('node:crypto');
+
+const MAX_INPUT = 4 * 1024 * 1024;
+const ID = /^[A-Za-z0-9][A-Za-z0-9_.:-]{0,255}$/;
+const ERRORS = new Set(['authentication_error', 'rate_limit_error', 'api_error', 'overloaded_error',
+  'server_error', 'timeout', 'permission_denied', 'cancelled', 'provider_error', 'rate_limit', 'overloaded',
+  'authentication_failed', 'oauth_org_not_allowed', 'account_on_hold', 'billing_error', 'invalid_request',
+  'model_not_found', 'max_output_tokens', 'cloud_credential_error', 'unknown']);
+let request;
+let finished = false;
+const deadline = setTimeout(finish, 700);
+
+function finish() {
+  if (finished) return;
+  finished = true;
+  clearTimeout(deadline);
+  request?.destroy();
+  // A hook must never request continuation, grant permission, or fail the provider.
+  try { fs.writeSync(1, '{}\n'); } catch {}
+  process.exit(0);
+}
+process.on('uncaughtException', finish);
+process.on('unhandledRejection', finish);
+process.stdin.on('error', finish);
+process.stdout.on('error', finish);
+
+function options() {
+  const args = process.argv.slice(2);
+  const result = { notify: false };
+  while (args.length) {
+    const key = args.shift();
+    if (key === '--provider' && result.provider === undefined) result.provider = args.shift();
+    else if (key === '--endpoint' && result.endpoint === undefined) result.endpoint = args.shift();
+    else if (key === '--notify' && !result.notify) result.notify = true;
+    else if (result.notify && args.length === 0 && result.raw === undefined) result.raw = key;
+    else throw new Error('arguments');
+  }
+  if (!['codex', 'claude'].includes(result.provider) || !result.endpoint || !path.isAbsolute(result.endpoint)
+    || (result.notify && (result.provider !== 'codex' || result.raw === undefined))) throw new Error('arguments');
+  return result;
+}
+
+async function readPrivate(file, limit) {
+  const handle = await fsp.open(file, fs.constants.O_RDONLY | fs.constants.O_NOFOLLOW | fs.constants.O_NONBLOCK);
+  try {
+    const info = await handle.stat();
+    if (!info.isFile() || info.uid !== process.getuid() || (info.mode & 0o777) !== 0o600 || info.size > limit) throw new Error('file');
+    const buffer = Buffer.alloc(limit + 1);
+    const { bytesRead } = await handle.read(buffer, 0, buffer.length, 0);
+    if (bytesRead > limit) throw new Error('size');
+    return buffer.subarray(0, bytesRead).toString('utf8');
+  } finally { await handle.close(); }
+}
+
+async function endpoint(file) {
+  if (path.basename(file) !== 'endpoint.json') throw new Error('endpoint');
+  const directory = path.dirname(file);
+  const info = await fsp.lstat(directory);
+  if (!info.isDirectory() || info.uid !== process.getuid() || (info.mode & 0o777) !== 0o700
+    || await fsp.realpath(directory) !== directory) throw new Error('directory');
+  const value = JSON.parse(await readPrivate(file, 4096));
+  if (value.version !== 1 || !/^[0-9a-f]{32}$/.test(value.generation) || !/^[0-9a-f]{64}$/.test(value.token)
+    || value.socketPath !== path.join(directory, `r-${value.generation}.sock`)
+    || Buffer.byteLength(value.socketPath) > 103) throw new Error('endpoint');
+  const socket = await fsp.lstat(value.socketPath);
+  if (!socket.isSocket() || socket.uid !== process.getuid() || (socket.mode & 0o777) !== 0o600) throw new Error('socket');
+  return value;
+}
+
+async function ancestry() {
+  const chain = [];
+  const seen = new Set();
+  let pid = process.pid;
+  while (pid > 0 && chain.length < 64 && !seen.has(pid)) {
+    seen.add(pid);
+    const raw = await fsp.readFile(`/proc/${pid}/stat`, 'utf8');
+    if (raw.length > 4096 || !raw.startsWith(`${pid} (`)) throw new Error('stat');
+    const fields = raw.slice(raw.lastIndexOf(')') + 2).trim().split(/\s+/);
+    if (!/^\d{1,20}$/.test(fields[19] || '') || !/^\d+$/.test(fields[1] || '')
+      || fields[0] === 'Z' || fields[0] === 'X') throw new Error('stat');
+    chain.push({ pid, startTicks: fields[19] });
+    pid = Number(fields[1]);
+  }
+  if (pid !== 0 || chain.length < 2) throw new Error('chain');
+  return chain;
+}
+
+function metadata(raw, provider, notify) {
+  if (!raw || typeof raw !== 'object' || Array.isArray(raw)) throw new Error('input');
+  const event = notify ? raw.type : raw.hook_event_name;
+  const sessionId = notify ? raw['thread-id'] : raw.session_id;
+  if (typeof event !== 'string' || !/^[A-Za-z][A-Za-z0-9_-]{0,63}$/.test(event)
+    || (notify && event !== 'agent-turn-complete') || typeof sessionId !== 'string' || !ID.test(sessionId)) throw new Error('identity');
+  // Stamp the provider's spawn time, not the post-startup time: async (non-blocking)
+  // tool hooks may finish after a later synchronous Stop, and the receiver orders
+  // events by this timestamp. performance.timeOrigin is this process's start time.
+  const started = Math.min(Date.now(), Math.floor(performance.timeOrigin));
+  const result = { provider, event, sessionId, pid: process.pid, occurredAt: new Date(started).toISOString(), eventId: randomUUID() };
+  for (const [key, value] of Object.entries({ transcriptPath: raw.transcript_path, cwd: raw.cwd,
+    turnId: notify ? raw['turn-id'] : raw.turn_id, promptId: raw.prompt_id, agentId: raw.agent_id })) {
+    if (value === undefined || (provider === 'codex' && key === 'transcriptPath' && value === null)) continue;
+    if (typeof value !== 'string') throw new Error('metadata');
+    if (key === 'cwd' || key === 'transcriptPath') {
+      if (value.length > 4096 || !path.isAbsolute(value) || /[\x00-\x1f\x7f]/.test(value)) throw new Error('path');
+    } else if (!ID.test(value)) throw new Error('id');
+    result[key] = value;
+  }
+  for (const [key, value] of Object.entries({ background: raw.background, stopHookActive: raw.stop_hook_active, hasBackgroundTasks: raw.has_background_tasks })) {
+    if (value === undefined) continue;
+    if (typeof value !== 'boolean') throw new Error('flag');
+    result[key] = value;
+  }
+  if (provider === 'claude' && (event === 'Stop' || event === 'SubagentStop')) {
+    const tasks = raw.background_tasks;
+    const crons = raw.session_crons;
+    for (const value of [tasks, crons]) {
+      if (value !== undefined && !Array.isArray(value)) throw new Error('tasks');
+    }
+    // Only presence matters. Missing registry data is unknown; never copy task or prompt bodies.
+    if (tasks?.length || crons?.length) result.hasBackgroundTasks = true;
+    else if (tasks !== undefined && crons !== undefined && result.hasBackgroundTasks === undefined) result.hasBackgroundTasks = false;
+  }
+  if (raw.error !== undefined) result.error = typeof raw.error === 'string' && ERRORS.has(raw.error) ? raw.error : 'provider_error';
+  if (raw.notification_type !== undefined) {
+    if (typeof raw.notification_type !== 'string' || !/^[a-z][a-z0-9_]{0,63}$/.test(raw.notification_type)) throw new Error('notification');
+    result.notificationType = raw.notification_type;
+  }
+  return result;
+}
+
+async function stdin() {
+  let bytes = 0;
+  let chunks = [];
+  for await (const chunk of process.stdin) {
+    bytes += chunk.length;
+    if (bytes <= MAX_INPUT) chunks.push(chunk);
+    else chunks = []; // Drain overflow without keeping prompt/tool content in memory.
+  }
+  if (bytes > MAX_INPUT) throw new Error('size');
+  return Buffer.concat(chunks, bytes).toString('utf8');
+}
+
+async function main() {
+  const opts = options();
+  const input = opts.notify ? opts.raw : await stdin();
+  if (Buffer.byteLength(input) > MAX_INPUT) return;
+  const event = metadata(JSON.parse(input), opts.provider, opts.notify);
+  const destination = await endpoint(opts.endpoint);
+  event.ancestors = await ancestry();
+  const body = JSON.stringify(event);
+  if (Buffer.byteLength(body) > 64 * 1024 || finished) return;
+  await new Promise(resolve => {
+    request = http.request({ socketPath: destination.socketPath, method: 'POST', path: '/hook', agent: false,
+      headers: { authorization: `Bearer ${destination.token}`, 'content-type': 'application/json', 'content-length': Buffer.byteLength(body), connection: 'close' } }, response => {
+      response.resume();
+      response.once('end', resolve);
+      response.once('error', resolve);
+    });
+    request.once('error', resolve);
+    request.end(body);
+  });
+}
+
+main().then(finish, finish);

package/scripts/nterminalctl

@@ -790,6 +790,26 @@ clean_state_paths() {
   rm -rf "$state_dir/transcript-cache"
 }
 
+# Best effort and never fatal: remove only NTerminal-owned provider hook entries
+# (the installer verifies ownership from its manifests). Must run before .env is
+# removed because CODEX_HOME/CLAUDE_CONFIG_DIR may be defined there.
+remove_provider_hooks() {
+  local entry="$APP_DIR/dist/scripts/hooks.js"
+  local provider
+  if [[ ! -f "$entry" ]] || ! command -v "$NODE_BIN" >/dev/null 2>&1; then
+    info "warning: provider hooks were not checked (hooks CLI unavailable); run 'nterminal hooks remove --provider codex|claude' before uninstalling the package"
+    return 0
+  fi
+  for provider in codex claude; do
+    if "$NODE_BIN" "$entry" remove --provider "$provider" >/dev/null 2>&1; then
+      info "provider hooks removed provider=$provider"
+    else
+      info "warning: provider hooks may remain provider=$provider; check with: nterminal hooks status --provider $provider"
+    fi
+  done
+  return 0
+}
+
 cmd_clean() {
   local force=0
   local remove_env=0
@@ -816,6 +836,7 @@ cmd_clean() {
 
   local state_dir
   state_dir="$(dirname "$STATE_PATH")"
+  remove_provider_hooks || true
   clean_state_paths "$STATE_PATH" "$PID_PATH" "$LOG_PATH" "$MONITOR_PID_PATH"
   if (( remove_env == 1 )); then
     rm -f "$ENV_FILE"
@@ -846,6 +867,7 @@ cmd_uninstall() {
   if (( kill_tmux == 1 )) && command -v tmux >/dev/null 2>&1; then
     tmux -L nterminal kill-server >/dev/null 2>&1 || true
   fi
+  remove_provider_hooks || true
   clean_state_paths "$STATE_PATH" "$PID_PATH" "$LOG_PATH" "$MONITOR_PID_PATH"
   rm -f "$ENV_FILE"
   remove_owned_launchd_plist
@@ -939,10 +961,12 @@ Commands:
                  Stop the supervisor and start again after an npm package update.
   build          No-op for package installs; verifies the bundled runtime exists.
   deploy         Restart the installed package using the bundled runtime.
-  clean --force  Stop server, kill NTerminal tmux sessions, and remove local state/log/pid files.
+  clean --force  Stop server, kill NTerminal tmux sessions, remove NTerminal's provider hooks,
+                 and remove local state/log/pid files.
                  Add --env to also remove .env. Add --keep-tmux to preserve live panes.
   uninstall --force
-                 Stop server, unload NTerminal launchd agent, remove local runtime files and .env.
+                 Stop server, unload NTerminal launchd agent, remove NTerminal's provider hooks,
+                 local runtime files and .env.
                  Add --keep-tmux to preserve live panes.
   logs [N]       Show the last N log lines. Default: 100.
   logs -f [N]    Follow logs.

package/dist/client/assets/MarkdownPreview-CWK2qIZp.js

@@ -1 +0,0 @@
-import{j as a}from"./index-CcAQThtj.js";import{M as e,r as o}from"./index-DDCpqDNb.js";function s({content:r}){return a.jsx(e,{remarkPlugins:[o],children:r})}export{s as default};

package/dist/client/assets/TranscriptMarkdownBody-Ddi-rw6X.js

@@ -1,3 +0,0 @@
-import{j as o,R as a}from"./index-CcAQThtj.js";import{M as u,r as f}from"./index-DDCpqDNb.js";function k({text:r,searchQuery:t}){return o.jsx(u,{components:p(t),remarkPlugins:[f],children:j(r)})}function p(r){return{a({node:t,children:n,...e}){return o.jsx("a",{...e,target:"_blank",rel:"noreferrer",children:d(n,r)})},blockquote({node:t,children:n,...e}){return o.jsx("blockquote",{...e,children:d(n,r)})},code({node:t,children:n,...e}){return o.jsx("code",{...e,children:d(n,r)})},em({node:t,children:n,...e}){return o.jsx("em",{...e,children:d(n,r)})},h1({node:t,children:n,...e}){return o.jsx("h1",{...e,children:d(n,r)})},h2({node:t,children:n,...e}){return o.jsx("h2",{...e,children:d(n,r)})},h3({node:t,children:n,...e}){return o.jsx("h3",{...e,children:d(n,r)})},h4({node:t,children:n,...e}){return o.jsx("h4",{...e,children:d(n,r)})},h5({node:t,children:n,...e}){return o.jsx("h5",{...e,children:d(n,r)})},h6({node:t,children:n,...e}){return o.jsx("h6",{...e,children:d(n,r)})},li({node:t,children:n,...e}){return o.jsx("li",{...e,children:d(n,r)})},p({node:t,children:n,...e}){return o.jsx("p",{...e,children:d(n,r)})},pre({node:t,children:n,...e}){return o.jsx("pre",{...e,className:"transcript-markdown-code",children:n})},strong({node:t,children:n,...e}){return o.jsx("strong",{...e,children:d(n,r)})},td({node:t,children:n,...e}){return o.jsx("td",{...e,children:d(n,r)})},th({node:t,children:n,...e}){return o.jsx("th",{...e,children:d(n,r)})}}}function d(r,t){return a.Children.map(r,n=>typeof n=="string"?m(n,t):n)}function m(r,t){const n=t.trim();if(!n)return r||" ";const e=r.toLowerCase(),s=n.toLowerCase(),c=[];let l=0,i=e.indexOf(s);for(;i!==-1;){i>l&&c.push(r.slice(l,i));const h=i+n.length;c.push(o.jsx("mark",{className:"transcript-search-hit",children:r.slice(i,h)},`${i}-${h}`)),l=h,i=e.indexOf(s,l)}return l<r.length&&c.push(r.slice(l)),c.length>0?c:r||" "}function j(r){const t=r.split(`
-`);let n=!1,e=null;return t.map((s,c)=>{const l=n,i=/^ {0,3}(```+|~~~+)/.exec(s);if(i){const h=i[1]?.startsWith("`")?"`":"~";n?e===h&&(n=!1,e=null):(n=!0,e=h)}return c===t.length-1||l||i||s.trim()===""||s.endsWith("  ")?s:`${s.replace(/[ \t]+$/,"")}  `}).join(`
-`)}export{k as default};