wtt-connect 0.2.9 → 0.2.11

package/README.md

@@ -26,7 +26,7 @@ Implemented production-oriented surfaces:
   - `none`
   - `macos-say` using the macOS `say` command, emitted as WAV when upload is enabled
 - HTTP task status update path
-- Permission broker for Codex modes, including explicit opt-in for dangerous `yolo`
+- Permission broker for agent modes; `full-auto` is the default no-approval mode for Codex and Claude Code
 - Optional WTT media artifact upload path (`/media/sign` → direct upload → `/media/commit`)
 - Agent-generated file artifacts for WTT feed chat (`.docx`, `.pptx`, `.xlsx`, `.pdf`, `.csv`, `.zip`) using explicit final-response markers that are converted into WTT file cards
 - Attachment staging for WTT message media/files; image attachments are passed to Codex with `--image` (including Claude Code image fallback when the Claude provider cannot view images directly)
@@ -90,6 +90,7 @@ Important settings:
 - `WTT_CONNECT_ADAPTERS=codex,claude-code,cursor,gemini,qoder,opencode,iflow,kimi,pi,acp,devin`
 - `WTT_CONNECT_WORKDIR`
 - `WTT_CONNECT_MODE=full-auto|auto-edit|yolo|suggest`
+- `full-auto` is the default no-approval mode: Codex runs with `--dangerously-bypass-approvals-and-sandbox`; Claude Code runs with `--dangerously-skip-permissions --permission-mode bypassPermissions`
 - `WTT_CONNECT_AGENT_ALIASES=alias1,alias2` for extra @mention names in discussion/collaborative topics; `WTT_AGENT_ID` always works
 - `WTT_CONNECT_ALLOW_YOLO=1` only when intentionally using `yolo`
 - `WTT_CONNECT_STATE_DIR` / `WTT_CONNECT_STORE_FILE` for durable sessions
@@ -101,6 +102,13 @@ Important settings:
 - `WTT_CONNECT_SHELL_MODE=unsafe|readonly|off`; default `unsafe` runs one-shot shell commands without command filtering. The interactive Terminal always opens a real PTY shell on the agent host.
 - `WTT_CONNECT_SHELL_TIMEOUT_SECONDS` and `WTT_CONNECT_SHELL_MAX_OUTPUT_CHARS` only bound legacy one-shot command execution and returned output
 
+Session continuity:
+
+- `wtt-connect` uses the WTT topic/task id as the local session key, for example `wtt:topic:<topic_id>`.
+- Codex stores `codexThreadId` and resumes with `codex exec resume`.
+- Claude Code stores `claudeSessionId` and resumes the same topic with `claude --resume <session_id> -p ...`.
+- Keep `WTT_CONNECT_STATE_DIR`, `WTT_CONNECT_STORE_FILE`, and `WTT_CONNECT_WORKDIR` stable per claimed agent. If they are changed or deleted, the adapter cannot resume previous local sessions.
+
 A JSON config may also be supplied:
 
 ```bash
@@ -260,7 +268,7 @@ wtt-connect up codex agent-codex '***'
 wtt-connect up claude-code agent-claude '***'
 ```
 
-Use named options when you need a custom service name, permission mode, or boot-before-login behavior:
+Use named options when you need a custom service name, a stricter permission mode, or boot-before-login behavior:
 
 ```bash
 ./scripts/install-systemd-user.sh \
@@ -268,8 +276,7 @@ Use named options when you need a custom service name, permission mode, or boot-
   --agent-id agent-codex \
   --token '***' \
   --adapter codex \
-  --mode yolo \
-  --allow-yolo \
+  --mode full-auto \
   --publish-progress \
   --enable-linger
 
@@ -278,8 +285,7 @@ Use named options when you need a custom service name, permission mode, or boot-
   --agent-id agent-claude \
   --token '***' \
   --adapter claude-code \
-  --mode yolo \
-  --allow-yolo \
+  --mode full-auto \
   --publish-progress \
   --enable-linger
 ```

package/package.json

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

package/src/adapters/claude-code.js

@@ -3,31 +3,72 @@ import readline from 'node:readline';
 import { log } from '../logger.js';
 
 export class ClaudeCodeAdapter {
-  constructor(config) {
+  constructor(config, deps = {}) {
     this.config = config;
+    this.store = deps.store;
     this.name = 'claude-code';
+    this.sessionByKey = new Map();
   }
 
   async run(prompt, context = {}) {
+    const sessionKey = context.sessionKey || 'default';
     if (context.images?.length && this.config.codexBin) {
-      log('info', 'claude-code image fallback via codex', { sessionKey: context.sessionKey || 'default', images: context.images.length });
+      log('info', 'claude-code image fallback via codex', { sessionKey, images: context.images.length });
       return runCodexVision(this.config.codexBin, prompt, context.images, this.config.workDir, this.config.taskTimeoutSeconds * 1000, this.config, context.onProgress);
     }
+    const stored = this.store?.getSession(sessionKey) || {};
+    const sessionId = this.sessionByKey.get(sessionKey) || stored.claudeSessionId;
+    const args = this.buildArgs(prompt, sessionId);
+    log('info', 'claude-code launch', { sessionKey, resume: Boolean(sessionId) });
+    let result;
+    try {
+      result = await runClaude(this.config.claudeBin, args, this.config.workDir, this.config.taskTimeoutSeconds * 1000, context.onProgress);
+    } catch (err) {
+      if (!sessionId || !shouldRetryFreshSession(err)) throw err;
+      log('warn', 'claude-code resume failed; retrying with fresh session', { sessionKey, sessionId, error: err.message });
+      this.sessionByKey.delete(sessionKey);
+      this.store?.patchSession(sessionKey, { claudeSessionId: '', adapter: this.name });
+      result = await runClaude(this.config.claudeBin, this.buildArgs(prompt, ''), this.config.workDir, this.config.taskTimeoutSeconds * 1000, context.onProgress);
+    }
+    if (result.sessionId) {
+      this.sessionByKey.set(sessionKey, result.sessionId);
+      this.store?.patchSession(sessionKey, { claudeSessionId: result.sessionId, adapter: this.name });
+    }
+    return result.text.trim();
+  }
+
+  buildArgs(prompt, sessionId = '') {
     // Claude Code 2.x requires --verbose when stream-json is used with --print/-p.
-    const args = ['-p', prompt, '--output-format', 'stream-json', '--verbose'];
-    if (this.config.mode === 'yolo') args.push('--dangerously-skip-permissions', '--permission-mode', 'bypassPermissions');
+    const args = [];
+    if (sessionId) args.push('--resume', sessionId);
+    args.push('-p', prompt, '--output-format', 'stream-json', '--verbose');
+    if (['full-auto', 'yolo'].includes(this.config.mode)) args.push('--dangerously-skip-permissions', '--permission-mode', 'bypassPermissions');
     if (this.config.model) args.push('--model', this.config.model);
-    log('info', 'claude-code launch', { sessionKey: context.sessionKey || 'default' });
-    return runClaude(this.config.claudeBin, args, this.config.workDir, this.config.taskTimeoutSeconds * 1000, context.onProgress);
+    return args;
   }
 }
 
+function shouldRetryFreshSession(err) {
+  const message = String(err?.message || err || '').toLowerCase();
+  return [
+    'resume',
+    'session',
+    'conversation',
+    'not found',
+    'does not exist',
+    'invalid',
+    'timed out',
+    'timeout',
+  ].some((needle) => message.includes(needle));
+}
+
 function runClaude(bin, args, cwd, timeoutMs, onEvent) {
   return new Promise((resolve, reject) => {
     const child = spawn(bin, args, { cwd, stdio: ['ignore', 'pipe', 'pipe'], env: { ...process.env } });
     let stderr = '';
     let finalResult = '';
     let streamError = '';
+    let sessionId = '';
     const rawLines = [];
     const assistantTexts = [];
     const timer = setTimeout(() => { child.kill('SIGTERM'); reject(new Error(`${bin} timed out`)); }, timeoutMs);
@@ -39,6 +80,8 @@ function runClaude(bin, args, cwd, timeoutMs, onEvent) {
         rawLines.push(line);
         if (rawLines.length > 20) rawLines.shift();
         const ev = JSON.parse(line);
+        const eventSessionId = extractSessionId(ev);
+        if (eventSessionId) sessionId = eventSessionId;
         if (onEvent) Promise.resolve(onEvent(ev)).catch(() => {});
         const evError = extractEventError(ev);
         if (evError) streamError = evError;
@@ -53,14 +96,29 @@ function runClaude(bin, args, cwd, timeoutMs, onEvent) {
     child.on('close', (code) => {
       clearTimeout(timer);
       if (code !== 0) reject(new Error(`${bin} exited ${code}: ${errorDetail({ stderr, streamError, finalResult, rawLines })}`));
-      else resolve((finalResult || dedupeAdjacent(assistantTexts).join('\n')).trim());
+      else resolve({ text: (finalResult || dedupeAdjacent(assistantTexts).join('\n')).trim(), sessionId });
     });
   });
 }
 
+function extractSessionId(ev) {
+  if (!ev) return '';
+  return ev.session_id
+    || ev.sessionId
+    || ev.conversation_id
+    || ev.conversationId
+    || ev.thread_id
+    || ev.threadId
+    || ev.message?.session_id
+    || ev.message?.sessionId
+    || ev.result?.session_id
+    || ev.result?.sessionId
+    || '';
+}
+
 async function runCodexVision(bin, prompt, images, cwd, timeoutMs, config = {}, onEvent) {
   const args = ['exec', '--skip-git-repo-check', '--json', '--cd', cwd];
-  if (config.mode === 'yolo') args.push('--dangerously-bypass-approvals-and-sandbox');
+  if (['full-auto', 'yolo'].includes(config.mode)) args.push('--dangerously-bypass-approvals-and-sandbox');
   for (const img of images || []) args.push('--image', img);
   args.push('-');
   return new Promise((resolve, reject) => {

package/src/permissions.js

@@ -1,7 +1,7 @@
 const MODE_TO_CODEX = {
   suggest: [],
   'auto-edit': ['--full-auto'],
-  'full-auto': ['--full-auto'],
+  'full-auto': ['--dangerously-bypass-approvals-and-sandbox'],
   yolo: ['--dangerously-bypass-approvals-and-sandbox'],
 };
 
@@ -23,6 +23,7 @@ export class PermissionBroker {
 
   describe() {
     if (this.config.mode === 'yolo') return 'yolo/dangerously-bypass-approvals-and-sandbox';
+    if (this.config.mode === 'full-auto') return 'full-auto/dangerously-bypass-approvals-and-sandbox';
     return this.config.mode;
   }
 }