ftown 0.19.52 → 0.19.54

package/muse-plugin/lib/ftown-hook.sh

@@ -40,7 +40,7 @@ add_candidate() {
 ENV_PORT="${FTOWN_HOOK_PORT:-}"
 ENV_TOKEN="${FTOWN_HOOK_TOKEN:-}"
 add_candidate "$ENV_PORT" "$ENV_TOKEN"
-BRIDGE_JSON="${HOME:-}/.ftown/bridge.json"
+BRIDGE_JSON="${FTOWN_BRIDGE_POINTER:-${HOME:-}/.ftown/bridge.json}"
 if [ -n "${HOME:-}" ] && [ -f "$BRIDGE_JSON" ]; then
   BPORT=$(jq -r '.port // empty' "$BRIDGE_JSON" 2>/dev/null)
   BTOKEN=$(jq -r '.token // empty' "$BRIDGE_JSON" 2>/dev/null)
@@ -89,27 +89,11 @@ post_hook "$PAYLOAD"
 if [ "$HOOK_EVENT" = "Stop" ]; then
   SID_ENC=$(jq -n -r --arg s "$FTOWN_SESSION_ID" '$s | @uri' 2>/dev/null)
   [ -n "$SID_ENC" ] || exit 0
-  _tmp=$(mktemp /tmp/ftown-muse-inbox.XXXXXX 2>/dev/null) || exit 0
-  INBOX=""
-  while IFS=' ' read -r _port _token _rest; do
-    [ -n "${_port:-}" ] || continue
-    if [ -n "${_token:-}" ]; then
-      _code=$(curl -s -o "$_tmp" -w '%{http_code}' \
-        "http://127.0.0.1:${_port}/api/sessions/${SID_ENC}/inbox?wait=0" \
-        -H "Authorization: Bearer ${_token}" \
-        --connect-timeout 1 --max-time 2 2>/dev/null)
-    else
-      _code=$(curl -s -o "$_tmp" -w '%{http_code}' \
-        "http://127.0.0.1:${_port}/api/sessions/${SID_ENC}/inbox?wait=0" \
-        --connect-timeout 1 --max-time 2 2>/dev/null)
-    fi
-    case "${_code:-}" in
-      2*) INBOX=$(cat "$_tmp" 2>/dev/null); break ;;
-    esac
-  done <<CANDIDATES_EOF
-$CANDIDATES
-CANDIDATES_EOF
-  rm -f "$_tmp"
+  FTOWN_SECURE_CLI=$(command -v ftown 2>/dev/null || true)
+  [ -n "$FTOWN_SECURE_CLI" ] || FTOWN_SECURE_CLI="${HOME:-}/.ftown/bin/ftown"
+  [ -x "$FTOWN_SECURE_CLI" ] || exit 0
+  REQUEST=$(jq -n -c --arg path "/api/sessions/${SID_ENC}/inbox?wait=0" '{method:"GET",path:$path,timeoutMs:2000}') || exit 0
+  INBOX=$(printf '%s' "$REQUEST" | "$FTOWN_SECURE_CLI" security proxy 2>/dev/null | jq -c 'select(.status >= 200 and .status < 300) | .body' 2>/dev/null)
   [ -n "$INBOX" ] || exit 0
   COUNT=$(printf '%s' "$INBOX" | jq -r '(.messages // []) | length' 2>/dev/null)
   if [ -n "$COUNT" ] && [ "$COUNT" -gt 0 ] 2>/dev/null; then

package/opencode-plugin/ftown.js

@@ -1,21 +1,45 @@
 import { readFile } from 'node:fs/promises';
+import { spawn } from 'node:child_process';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 async function defaultReadBridgePointer() {
   try {
-    const raw = await readFile(join(homedir(), '.ftown', 'bridge.json'), 'utf8');
+    const raw = await readFile(process.env.FTOWN_BRIDGE_POINTER || (process.env.FTOWN_DATA_DIR ? join(process.env.FTOWN_DATA_DIR, 'bridge.json') : join(homedir(), '.ftown', 'bridge.json')), 'utf8');
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed.port !== 'number') return null;
-    return {
-      port: parsed.port,
-      token: typeof parsed.token === 'string' ? parsed.token : undefined,
-    };
+    return parsed;
   } catch {
     return null;
   }
 }
 
+
+async function secureProxy(env, pointer, path, init = {}) {
+  const cli = pointer?.harnessCli || join(homedir(), '.ftown', 'cli', 'dist', 'ftown-cli.js');
+  const args = [cli, 'security'];
+  const directory = env.FTOWN_DATA_DIR || pointer?.dataDir;
+  if (directory) args.push('--data-dir', directory);
+  args.push('proxy');
+  const request = { method: init.method || 'GET', path, timeoutMs: 60000 };
+  if (init.body !== undefined) request.body = typeof init.body === 'string' ? JSON.parse(init.body) : init.body;
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, args, { stdio: ['pipe', 'pipe', 'ignore'], signal: init.signal, env });
+    const chunks = []; let bytes = 0;
+    const timeout = setTimeout(() => child.kill(), 65000); timeout.unref?.();
+    child.on('error', () => { clearTimeout(timeout); reject(new Error('Encrypted bridge request failed')); });
+    child.stdout.on('data', data => { bytes += data.length; if (bytes > 1048576) child.kill(); else chunks.push(data); });
+    child.on('close', code => {
+      clearTimeout(timeout);
+      if (code !== 0 || bytes > 1048576) return reject(new Error('Encrypted bridge request failed'));
+      try { const response = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+        resolve(new Response(JSON.stringify(response.body), { status: response.status })); }
+      catch { reject(new Error('Encrypted bridge response failed')); }
+    });
+    child.stdin.on('error', () => {}); child.stdin.end(JSON.stringify(request));
+  });
+}
+
 function endpoints(env, pointer) {
   const candidates = [];
   const envPort = Number.parseInt(env.FTOWN_HOOK_PORT ?? '', 10);
@@ -82,6 +106,10 @@ export function registerFtownOpencodePlugin(client, options = {}) {
 
   async function request(path, init = {}) {
     const pointer = await readBridgePointer();
+    if (path.startsWith('/api/')) {
+      try { return await (options.proxy ?? ((p, i) => secureProxy(env, pointer, p, i)))(path, init); }
+      catch { return null; } // Delivery may be unknown: never retry a mutation through another endpoint.
+    }
     if (closed) return null;
     let lastResponse = null;
     for (const endpoint of endpoints(env, pointer)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ftown",
-  "version": "0.19.52",
+  "version": "0.19.54",
   "description": "CLI bridge for ftown — generic PTY-over-Centrifugo relay",
   "type": "module",
   "main": "dist/index.js",
@@ -49,6 +49,8 @@
     "directory": "bridge"
   },
   "dependencies": {
+    "@hpke/common": "1.10.1",
+    "@hpke/core": "1.9.0",
     "@modelcontextprotocol/sdk": "^1.32.1",
     "@xterm/addon-serialize": "^0.14.0",
     "@xterm/headless": "^6.0.0",
@@ -74,5 +76,5 @@
     "tsx": "^4.19.0",
     "typescript": "^5.7.0"
   },
-  "gitHead": "0e3e8c7e8150ec46770a297c414e3d2d6c11927b"
+  "gitHead": "d2701bcfae7ff9ccc9ee7c910d6dec2d33d262c1"
 }

package/pi-extension/ftown.js

@@ -1,21 +1,45 @@
 import { readFile } from 'node:fs/promises';
+import { spawn } from 'node:child_process';
 import { homedir } from 'node:os';
 import { join } from 'node:path';
 
 async function defaultReadBridgePointer() {
   try {
-    const raw = await readFile(join(homedir(), '.ftown', 'bridge.json'), 'utf8');
+    const raw = await readFile(process.env.FTOWN_BRIDGE_POINTER || (process.env.FTOWN_DATA_DIR ? join(process.env.FTOWN_DATA_DIR, 'bridge.json') : join(homedir(), '.ftown', 'bridge.json')), 'utf8');
     const parsed = JSON.parse(raw);
     if (!parsed || typeof parsed.port !== 'number') return null;
-    return {
-      port: parsed.port,
-      token: typeof parsed.token === 'string' ? parsed.token : undefined,
-    };
+    return parsed;
   } catch {
     return null;
   }
 }
 
+
+async function secureProxy(env, pointer, path, init = {}) {
+  const cli = pointer?.harnessCli || join(homedir(), '.ftown', 'cli', 'dist', 'ftown-cli.js');
+  const args = [cli, 'security'];
+  const directory = env.FTOWN_DATA_DIR || pointer?.dataDir;
+  if (directory) args.push('--data-dir', directory);
+  args.push('proxy');
+  const request = { method: init.method || 'GET', path, timeoutMs: 60000 };
+  if (init.body !== undefined) request.body = typeof init.body === 'string' ? JSON.parse(init.body) : init.body;
+  return new Promise((resolve, reject) => {
+    const child = spawn(process.execPath, args, { stdio: ['pipe', 'pipe', 'ignore'], signal: init.signal, env });
+    const chunks = []; let bytes = 0;
+    const timeout = setTimeout(() => child.kill(), 65000); timeout.unref?.();
+    child.on('error', () => { clearTimeout(timeout); reject(new Error('Encrypted bridge request failed')); });
+    child.stdout.on('data', data => { bytes += data.length; if (bytes > 1048576) child.kill(); else chunks.push(data); });
+    child.on('close', code => {
+      clearTimeout(timeout);
+      if (code !== 0 || bytes > 1048576) return reject(new Error('Encrypted bridge request failed'));
+      try { const response = JSON.parse(Buffer.concat(chunks).toString('utf8'));
+        resolve(new Response(JSON.stringify(response.body), { status: response.status })); }
+      catch { reject(new Error('Encrypted bridge response failed')); }
+    });
+    child.stdin.on('error', () => {}); child.stdin.end(JSON.stringify(request));
+  });
+}
+
 function endpoints(env, pointer) {
   const candidates = [];
   const envPort = Number.parseInt(env.FTOWN_HOOK_PORT ?? '', 10);
@@ -156,6 +180,10 @@ export function registerFtownPiExtension(pi, options = {}) {
 
   async function request(path, init = {}) {
     const pointer = await readBridgePointer();
+    if (path.startsWith('/api/')) {
+      try { return await (options.proxy ?? ((p, i) => secureProxy(env, pointer, p, i)))(path, init); }
+      catch { return null; } // Delivery may be unknown: never retry a mutation through another endpoint.
+    }
     let lastResponse = null;
     for (const endpoint of endpoints(env, pointer)) {
       try {