wtt-connect 0.2.39 → 0.2.41

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "wtt-connect",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "private": false,
   "description": "WTT-native connector daemon for Codex, Claude Code, Cursor, Gemini, ACP, and other coding agent surfaces.",
   "type": "module",

package/src/events.js

@@ -20,6 +20,9 @@ export function normalizeAgentEvent(adapterName, event) {
     }
   }
 
+  const generic = normalizeGenericCliEvent(event, now);
+  if (generic) return generic;
+
   if (type === 'item.started') {
     const kind = item.type || 'item';
     if (kind === 'command_execution') return { kind: 'command', status: 'started', text: item.command || 'command', time: now, raw: event };
@@ -35,6 +38,103 @@ export function normalizeAgentEvent(adapterName, event) {
   return null;
 }
 
+function normalizeGenericCliEvent(event, now) {
+  if (!event || typeof event !== 'object') return null;
+  const type = String(event.type || event.event || event.kind || '').trim();
+  const status = statusFromEvent(event, type);
+  const item = event.item || event.delta || event.message || event.data || {};
+  const typeText = `${type} ${String(item.type || item.kind || '').trim()}`.toLowerCase();
+
+  const error = event.error?.message || event.error || event.message?.error || '';
+  if (error && (typeText.includes('error') || String(error).trim())) {
+    return { kind: 'error', status: 'failed', text: String(error), time: now, raw: event };
+  }
+
+  const command = firstString(
+    event.command,
+    event.cmd,
+    event.args && Array.isArray(event.args) ? event.args.join(' ') : '',
+    item.command,
+    item.cmd,
+    item.input?.command,
+    item.arguments?.command,
+  );
+  if (command || includesAny(typeText, ['command', 'exec', 'shell', 'terminal'])) {
+    return { kind: 'command', status, text: command || labelFromEvent(event, item) || 'command', time: now, raw: event };
+  }
+
+  const toolName = firstString(
+    event.tool,
+    event.tool_name,
+    event.name,
+    event.call?.name,
+    item.tool,
+    item.tool_name,
+    item.name,
+    item.call?.name,
+    item.function?.name,
+  );
+  if (toolName || includesAny(typeText, ['tool', 'function_call', 'mcp'])) {
+    const summary = summarizeToolInput(event.input || item.input || item.arguments || event.arguments);
+    return { kind: 'tool', status, text: summary ? `${toolName || 'tool'} ${summary}` : (toolName || labelFromEvent(event, item) || 'tool'), time: now, raw: event };
+  }
+
+  const query = firstString(event.query, item.query, event.search_query, item.search_query);
+  if (query || includesAny(typeText, ['web_search', 'search'])) {
+    return { kind: 'web_search', status, text: query || labelFromEvent(event, item) || 'web search', time: now, raw: event };
+  }
+
+  if (includesAny(typeText, ['reason', 'thinking', 'analysis'])) {
+    return { kind: 'reasoning', status, text: labelFromEvent(event, item) || 'thinking', time: now, raw: event };
+  }
+
+  if (includesAny(typeText, ['message', 'assistant', 'response', 'output', 'answer'])) {
+    const text = firstString(event.text, event.content, event.delta, item.text, item.content);
+    return { kind: 'response', status, text: text ? String(text).slice(0, 120) : 'writing response', time: now, raw: event };
+  }
+
+  if (includesAny(typeText, ['session', 'thread', 'turn'])) {
+    return { kind: 'session', status, text: labelFromEvent(event, item) || 'session', time: now, raw: event };
+  }
+
+  return null;
+}
+
+function statusFromEvent(event, type) {
+  const raw = `${String(event.status || event.state || '')} ${type}`.toLowerCase();
+  if (includesAny(raw, ['fail', 'error'])) return 'failed';
+  if (includesAny(raw, ['complete', 'completed', 'done', 'finish', 'finished', 'end', 'ended', 'stop', 'stopped'])) return 'completed';
+  return 'started';
+}
+
+function labelFromEvent(event, item) {
+  return firstString(
+    event.title,
+    event.label,
+    event.message,
+    event.summary,
+    item.title,
+    item.label,
+    item.message,
+    item.summary,
+    item.type,
+    event.type,
+  );
+}
+
+function firstString(...values) {
+  for (const value of values) {
+    if (value == null) continue;
+    if (typeof value === 'string' && value.trim()) return value.trim();
+    if (typeof value === 'number' || typeof value === 'boolean') return String(value);
+  }
+  return '';
+}
+
+function includesAny(value, needles) {
+  return needles.some((needle) => value.includes(needle));
+}
+
 export function renderStatusLine(evt) {
   if (!evt) return '';
   return `[TASK_STATUS] time=${evt.time} status=${evt.status} action=${evt.kind}:${String(evt.text || '').slice(0, 180)}`;
@@ -49,6 +149,7 @@ export function renderActivityText(evt, adapterName = 'agent') {
   if (evt.kind === 'command') return `${adapter} 正在执行命令：${text || 'command'}`;
   if (evt.kind === 'tool') return `${adapter} 正在调用工具：${text || 'tool'}`;
   if (evt.kind === 'web_search') return `${adapter} 正在搜索：${text || 'web search'}`;
+  if (evt.kind === 'reasoning') return `${adapter} 正在推理：${text || 'thinking'}`;
   if (evt.kind === 'response') return `${adapter} 正在组织回复`;
   if (evt.kind === 'session') return `${adapter} 会话已启动`;
   return `${adapter} 正在执行：${text || labelKind(evt.kind)}`;

package/src/main.js

@@ -36,6 +36,7 @@ export async function main(args) {
   if (cmd === 'upload-file' || cmd === 'send-file') return uploadFile(loadConfig(argv), argv);
   if (cmd === 'upload-artifact' || cmd === 'opendesign-upload') return uploadArtifact(loadConfig(argv), argv);
   if (cmd === 'preview-port' || cmd === 'sandbox-preview') return previewPort(loadConfig(argv), argv);
+  if (cmd === 'cleanup-previews' || cmd === 'preview-cleanup') return cleanupPreviewsCommand(loadConfig(argv), argv);
   if (cmd === 'start') {
     const config = loadConfig(argv);
     if (!config.agentId) throw new Error('WTT_AGENT_ID is required');
@@ -95,6 +96,7 @@ function parseArgs(args) {
     else if (a === '--port') out.port = Number(args[++i]);
     else if (a === '--preview-name') out.previewName = args[++i];
     else if (a === '--preview-token') out.previewToken = args[++i];
+    else if (a === '--keep-last') out.keepLast = Number(args[++i]);
     else if (a === '--timeout') out.timeout = Number(args[++i]) * 1000;
     else if (a === '--sender-agent-id') out.senderAgentId = args[++i];
     else if (a === '--sender-token') out.senderToken = args[++i];
@@ -134,6 +136,7 @@ Commands:
                                   Alias for upload-artifact
   preview-port --port <port> [--topic-id <id>]
                                   Create a Cloud Sandbox port preview URL through sandbox outbox
+  cleanup-previews                Stop preview servers previously registered by this agent
   help                           Show this help
 `);
 }
@@ -143,6 +146,10 @@ async function previewPort(config, argv) {
   if (!Number.isInteger(port) || port < 1024 || port > 65535 || port === 3000) {
     throw new Error('preview-port requires --port <1024-65535>, excluding 3000');
   }
+  const cleanup = cleanupOldPreviews(config, {
+    currentPort: port,
+    keepLast: Number.isFinite(Number(argv.keepLast)) ? Number(argv.keepLast) : 0,
+  });
   const preview = await createSandboxPreviewFromOutbox(config, port, {
     name: String(argv.previewName || argv.title || '').trim(),
     token: String(argv.previewToken || '').trim(),
@@ -162,12 +169,89 @@ async function previewPort(config, argv) {
         type: 'cloud_sandbox_preview',
         port,
         preview_url: url,
+        preview_cleanup: cleanup,
       });
     } finally {
       await wtt.close();
     }
   }
-  console.log(JSON.stringify({ ok: true, port, url, preview_url: url, markdown, published }, null, 2));
+  recordPreview(config, { port, url, name: preview.name || title });
+  console.log(JSON.stringify({ ok: true, port, url, preview_url: url, markdown, cleanup, published }, null, 2));
+}
+
+async function cleanupPreviewsCommand(config, argv) {
+  const keepLast = Number.isFinite(Number(argv.keepLast)) ? Number(argv.keepLast) : 0;
+  const cleanup = cleanupOldPreviews(config, { currentPort: 0, keepLast });
+  console.log(JSON.stringify({ ok: true, cleanup }, null, 2));
+}
+
+function cleanupOldPreviews(config, { currentPort = 0, keepLast = 0 } = {}) {
+  const registry = readPreviewRegistry(config);
+  const entries = registry
+    .filter((entry) => Number(entry.port) !== Number(currentPort))
+    .sort((a, b) => Number(b.created_at_ms || 0) - Number(a.created_at_ms || 0));
+  const keep = Math.max(0, Number(keepLast) || 0);
+  const toKeep = entries.slice(0, keep);
+  const toStop = entries.slice(keep);
+  const stopped = [];
+  for (const entry of toStop) {
+    const result = stopPreviewPort(Number(entry.port));
+    stopped.push({ port: Number(entry.port), url: entry.url || '', ...result });
+  }
+  writePreviewRegistry(config, currentPort ? toKeep : toKeep);
+  return { stopped, kept: toKeep.map((entry) => ({ port: Number(entry.port), url: entry.url || '' })) };
+}
+
+function recordPreview(config, entry) {
+  const registry = readPreviewRegistry(config).filter((item) => Number(item.port) !== Number(entry.port));
+  registry.unshift({
+    port: Number(entry.port),
+    url: String(entry.url || ''),
+    name: String(entry.name || ''),
+    created_at: new Date().toISOString(),
+    created_at_ms: Date.now(),
+  });
+  writePreviewRegistry(config, registry.slice(0, 10));
+}
+
+function previewRegistryFile(config) {
+  return path.join(config.stateDir || path.join(config.workDir || process.cwd(), '.wtt-connect'), 'previews.json');
+}
+
+function readPreviewRegistry(config) {
+  try {
+    const file = previewRegistryFile(config);
+    if (!fs.existsSync(file)) return [];
+    const parsed = JSON.parse(fs.readFileSync(file, 'utf8'));
+    return Array.isArray(parsed) ? parsed : [];
+  } catch {
+    return [];
+  }
+}
+
+function writePreviewRegistry(config, registry) {
+  const file = previewRegistryFile(config);
+  fs.mkdirSync(path.dirname(file), { recursive: true });
+  fs.writeFileSync(file, `${JSON.stringify(registry, null, 2)}\n`);
+}
+
+function stopPreviewPort(port) {
+  if (!Number.isInteger(port) || port < 1024 || port > 65535) return { killed: [], reason: 'invalid_port' };
+  const script = [
+    `pids=$(ss -ltnp 2>/dev/null | awk '/:${port} / {print $NF}' | sed -n 's/.*pid=\\([0-9][0-9]*\\).*/\\1/p' | sort -u)`,
+    'killed=""',
+    'for pid in $pids; do',
+    '  if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then kill "$pid" 2>/dev/null || true; killed="$killed $pid"; fi',
+    'done',
+    'sleep 0.2',
+    'for pid in $pids; do',
+    '  if [ -n "$pid" ] && kill -0 "$pid" 2>/dev/null; then kill -9 "$pid" 2>/dev/null || true; fi',
+    'done',
+    'printf "%s" "$killed"',
+  ].join('; ');
+  const result = spawnSync('bash', ['-lc', script], { encoding: 'utf8', timeout: 5000 });
+  const killed = String(result.stdout || '').trim().split(/\s+/).filter(Boolean);
+  return { killed, ok: result.status === 0 };
 }
 
 async function createSandboxPreviewFromOutbox(config, port, { name = '', token = '', timeoutMs = 15000 } = {}) {

package/src/runner.js

@@ -939,6 +939,11 @@ function renderCloudSandboxStorageInstruction(config, topicId = '') {
     '- If a generated user-facing file is stored in R2/persistent output storage and should appear in WTT chat, still publish it with `wtt-connect upload-file` or a WTT artifact marker.',
     '- If the user asks for a visual page, HTML artifact, chart, dashboard, animation, or browser preview, build it in the workspace, start a local web server, create a Cloudflare Sandbox preview URL, and return that preview URL to WTT.',
     '- The Cloud Sandbox preview URL feature is only for WTT Cloud Sandbox agents. Do not use WTT backend artifact/media preview flows for live sandbox web servers.',
+    '- Before starting a new preview server, run `wtt-connect cleanup-previews` to stop older preview servers for this agent and free sandbox resources.',
+    '- Preview servers must keep running after your command finishes. Start them in the background with `nohup ... >/tmp/<name>.log 2>&1 &` or an equivalent long-lived process, and bind to `0.0.0.0`.',
+    '- Before publishing a preview URL, verify the server is actually listening and serving content with `curl -fsS http://127.0.0.1:<port>/ >/dev/null`.',
+    '- If local curl fails, fix or restart the web server first. Never publish a preview URL for a dead port.',
+    '- `wtt-connect preview-port` automatically stops older preview servers registered by this agent before publishing the new preview, so prefer one active preview per agent unless the user asks otherwise.',
     '- If you start a web server in the sandbox and the user should preview it, call the Cloudflare Sandbox outbound Worker directly with curl and include the returned `preview_url` in your reply as `[preview_url:Short Title](<preview_url>)`.',
     '- Preview ports must be 1024-65535 and cannot be 3000. For Vite/Next-style dev servers prefer 5173, 4173, or 8080.',
     `- Preview curl rule: curl -sS -X POST "\${WTT_SANDBOX_OUTBOX_URL:-http://wtt.preview}/preview-port" -H 'content-type: application/json' -d '{"agent_id":"'\${WTT_AGENT_ID:-cloud-agent}'","port":<port>}'`,