@cordfuse/crosstalk 7.0.0-alpha.3 → 7.0.0-alpha.4

package/commands/chat.js

@@ -28,10 +28,59 @@ import { api, ConnectError } from '../lib/api-client.js';
 import { flag, has } from '../lib/argv.js';
 
 const KNOWN_AGENTS = ['claude', 'codex', 'gemini', 'qwen', 'opencode', 'agy'];
-// Conservative URL regex: matches the leading https://...token boundary,
-// stops at whitespace/quote/angle. False positives are bounded to --login
-// mode where the first URL printed is almost certainly the auth URL.
-const URL_RE = /https?:\/\/[^\s<>"']+/;
+
+// URL extraction that survives agent TUI rendering. Naive regex against
+// raw stdout fails because agent CLIs (Claude in particular) draw a box
+// around the URL with line wraps every ~N chars; the captured URL is
+// truncated at the first wrap, with ANSI control chars leaking in at
+// the cut point. Real example from alpha.3 macOS test: extracted URL
+// ended with `%18%6b…` (CAN char + box-drawing artifact) instead of
+// the `redirect_uri=…` param, breaking OAuth.
+//
+// Approach:
+//   1. ANSI-strip everything (CSI / OSC / SS3 escapes).
+//   2. Strip control chars (0x00-0x1F except LF, plus DEL).
+//   3. Join line wraps that occur INSIDE a URL-safe character run —
+//      `<url-char>\n<url-char>` → `<url-char><url-char>`. Preserves real
+//      `<url-char>\n<non-url-char>` boundaries.
+//   4. Match `https?://<url-chars>+` against the joined buffer.
+//   5. Only fire when the character AFTER the matched URL is a true
+//      terminator (whitespace, end-of-buffer) — guards against acting
+//      on a partial URL still being written.
+
+const URL_SAFE_CLASS = "a-zA-Z0-9%/?#&=+\\-._~:@!$()*,;";
+const URL_RE = new RegExp(`https?://[${URL_SAFE_CLASS}]+`);
+
+function extractCompleteUrl(rawBuffer) {
+  // Strip ANSI CSI escapes (\x1B[ ... terminator).
+  let clean = rawBuffer.replace(/\x1B\[[0-9;?]*[a-zA-Z]/g, '');
+  // Strip ANSI OSC escapes (\x1B] ... BEL or ST).
+  clean = clean.replace(/\x1B\][^\x07\x1B]*(?:\x07|\x1B\\)/g, '');
+  // Strip SS3 escapes (\x1BO + one char).
+  clean = clean.replace(/\x1BO./g, '');
+  // Strip remaining single-char escapes that slipped through.
+  clean = clean.replace(/\x1B[^a-zA-Z0-9]/g, '');
+  // Strip control chars except LF (0x0A); we use LF for line-wrap rejoin.
+  clean = clean.replace(/[\x00-\x09\x0B-\x1F\x7F]/g, '');
+  // Rejoin URL-character wrap points: `<url-char>\n<url-char>` becomes
+  // `<url-char><url-char>`. Doesn't merge `<url-char>\n<space>` etc.
+  const safeRe = new RegExp(`[${URL_SAFE_CLASS}]\\n[${URL_SAFE_CLASS}]`, 'g');
+  let prev;
+  do {
+    prev = clean;
+    clean = clean.replace(safeRe, (m) => m[0] + m[2]);
+  } while (clean !== prev);
+
+  const match = clean.match(URL_RE);
+  if (!match) return null;
+  // Require a terminator after the URL — without it, the URL may still
+  // be growing in subsequent stdout chunks. Terminator = whitespace,
+  // quote/angle, or end-of-buffer-with-trailing-newline.
+  const after = clean.slice(match.index + match[0].length);
+  if (after.length === 0) return null;       // EOF-as-grow case, wait
+  if (!/^[\s<>"']/.test(after)) return null; // URL still continuing
+  return match[0];
+}
 
 function openInBrowser(url) {
   const cmd =
@@ -107,27 +156,29 @@ function runLogin(container, agent) {
   //
   // No agent-specific "login" subcommand — we just run the agent's
   // default interactive entry point. First-run auth flow happens
-  // automatically for every agent we support. Operator can pass
-  // --agent <name> to target a specific one.
+  // automatically for every agent we support.
+  //
+  // No COLUMNS=1000 env: making the agent render the URL "unwrapped" via
+  // a wide terminal claim doesn't reliably propagate to the in-container
+  // PTY, and even when it does Claude's TUI hard-wraps anyway. The
+  // extractCompleteUrl() function joins wrapped URL fragments on the
+  // host side, so the agent's rendering width is irrelevant. As bonus,
+  // dropping COLUMNS=1000 fixes daily-chat soft-wrap weirdness in
+  // long-form prose (agents see the real host terminal width).
   return new Promise((resolve) => {
     const child = spawn(
       'docker',
-      [
-        'exec', '-it',
-        '--env', 'COLUMNS=1000', // fallback for browser-open failure
-        '--env', 'LINES=40',
-        container,
-        agent,
-      ],
+      ['exec', '-it', container, agent],
       { stdio: ['inherit', 'pipe', 'inherit'] },
     );
     let opened = false;
+    let buffer = '';
     child.stdout.on('data', (chunk) => {
       process.stdout.write(chunk);
       if (opened) return;
-      const match = chunk.toString().match(URL_RE);
-      if (!match) return;
-      const url = match[0];
+      buffer += chunk.toString();
+      const url = extractCompleteUrl(buffer);
+      if (!url) return;
       opened = true;
       const ok = openInBrowser(url);
       process.stdout.write(

package/commands/init.js

@@ -21,7 +21,7 @@ import { spawnSync } from 'child_process';
 import { has, positionals } from '../lib/argv.js';
 
 const DEFAULT_IMAGE = process.env.CROSSTALK_IMAGE
-  ?? 'ghcr.io/cordfuse/crosstalk-server:7.0.0-alpha.3';
+  ?? 'ghcr.io/cordfuse/crosstalk-server:7.0.0-alpha.4';
 
 function usage(exit = 0) {
   const w = exit === 0 ? process.stdout : process.stderr;
@@ -34,9 +34,9 @@ function usage(exit = 0) {
 
   The image must be pullable (or already present locally). For local dev
   before the GHCR publish pipeline ships, build the image first:
-    docker build -t crosstalk-server:7.0.0-alpha.3 -f server/Dockerfile .
+    docker build -t crosstalk-server:7.0.0-alpha.4 -f server/Dockerfile .
   Then run:
-    CROSSTALK_IMAGE=crosstalk-server:7.0.0-alpha.3 crosstalk init mytransport
+    CROSSTALK_IMAGE=crosstalk-server:7.0.0-alpha.4 crosstalk init mytransport
 `,
   );
   process.exit(exit);

package/commands/status.js

@@ -18,7 +18,22 @@ export async function run(_argv) {
 
   process.stdout.write(`Claimed models: ${s.claimed_models.length}\n`);
   if (s.claimed_models.length === 0) {
-    process.stdout.write('  (no model CLIs found inside the container — install one or edit data/models.yaml)\n');
+    // Two failure shapes look the same in claimed_models=0: (a) no CLIs
+    // installed at all, (b) CLIs installed but data/models.yaml has no
+    // entries referencing them. Ask /agents/installed to distinguish so
+    // the operator gets a directly-actionable hint.
+    let installed = null;
+    try {
+      const r = await api.get('/agents/installed');
+      installed = r.installed;
+    } catch { /* ignore — fall back to generic message */ }
+    if (installed && installed.length > 0) {
+      process.stdout.write(
+        `  (${installed.join(', ')} installed in the container but no data/models.yaml entry references them — add one to claim)\n`,
+      );
+    } else {
+      process.stdout.write('  (no model CLIs found inside the container — install one via `crosstalk chat --shell` and add an entry to data/models.yaml)\n');
+    }
   } else {
     for (const m of s.claimed_models) process.stdout.write(`  - ${m}\n`);
   }

package/commands/up.js

@@ -16,7 +16,7 @@ import { requireTransportRoot, transportName, composeFile } from '../lib/transpo
 import { has } from '../lib/argv.js';
 
 const DEFAULT_IMAGE = process.env.CROSSTALK_IMAGE
-  ?? 'ghcr.io/cordfuse/crosstalk-server:7.0.0-alpha.3';
+  ?? 'ghcr.io/cordfuse/crosstalk-server:7.0.0-alpha.4';
 const DEFAULT_API_PORT = Number(process.env.CROSSTALK_API_PORT) || 7000;
 
 function usage(exit = 0) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cordfuse/crosstalk",
-  "version": "7.0.0-alpha.3",
+  "version": "7.0.0-alpha.4",
   "description": "Crosstalk client — host-side CLI that talks to the crosstalkd daemon running inside the crosstalk-server container.",
   "type": "module",
   "license": "MIT",