airloom 0.1.9 → 0.1.11

package/dist/index.js

@@ -609,7 +609,7 @@ import QRCode from "qrcode";
 // src/server.ts
 import express from "express";
 import { createServer } from "http";
-import { existsSync as existsSync2 } from "fs";
+import { existsSync as existsSync3 } from "fs";
 import { WebSocketServer, WebSocket } from "ws";
 
 // src/adapters/anthropic.ts
@@ -1025,6 +1025,179 @@ function getConfigPath() {
   return CONFIG_PATH;
 }
 
+// src/terminal.ts
+import { basename, delimiter as delimiter2, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "path";
+import { existsSync as existsSync2 } from "fs";
+import { spawn as spawn2 } from "node-pty";
+function resolveExecutable2(command, envPath = process.env.PATH ?? "") {
+  if (!command) return null;
+  if (isAbsolute2(command) && existsSync2(command)) return command;
+  if (command.includes("/")) {
+    const candidate = resolve2(process.cwd(), command);
+    return existsSync2(candidate) ? candidate : null;
+  }
+  for (const dir of envPath.split(delimiter2)) {
+    if (!dir) continue;
+    const candidate = join3(dir.replace(/^~(?=$|\/)/, process.env.HOME ?? "~"), command);
+    if (existsSync2(candidate)) return candidate;
+  }
+  return null;
+}
+function parseCommand(command) {
+  const parts = command.match(/(?:[^\s"]+|"[^"]*")+/g) ?? [command];
+  return {
+    file: parts[0],
+    args: parts.slice(1).map((part) => part.replace(/^"|"$/g, ""))
+  };
+}
+function getDefaultTerminalCommand(explicitCommand) {
+  const configured = explicitCommand?.trim() || process.env.AIRLOOM_TERMINAL_COMMAND?.trim();
+  if (configured) return parseCommand(configured);
+  if (process.platform === "win32") {
+    const file = process.env.COMSPEC || "powershell.exe";
+    return { file, args: [] };
+  }
+  const shell = process.env.SHELL || "/bin/bash";
+  const name = basename(shell);
+  if (name === "bash" || name === "zsh" || name === "sh") return { file: shell, args: ["-il"] };
+  return { file: shell, args: ["-i"] };
+}
+var AdaptiveOutputBatcher = class {
+  constructor(onFlush, fastInterval = 16, slowInterval = 80, interactiveWindow = 250, maxBytes = 4096) {
+    this.onFlush = onFlush;
+    this.fastInterval = fastInterval;
+    this.slowInterval = slowInterval;
+    this.interactiveWindow = interactiveWindow;
+    this.maxBytes = maxBytes;
+  }
+  buffer = "";
+  timer = null;
+  lastInputAt = 0;
+  noteInput() {
+    this.lastInputAt = Date.now();
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    if (this.buffer) this.schedule();
+  }
+  write(data) {
+    this.buffer += data;
+    if (this.buffer.length >= this.maxBytes) {
+      this.flush();
+      return;
+    }
+    this.schedule();
+  }
+  flush() {
+    if (this.timer) {
+      clearTimeout(this.timer);
+      this.timer = null;
+    }
+    if (!this.buffer) return;
+    const data = this.buffer;
+    this.buffer = "";
+    this.onFlush(data);
+  }
+  destroy() {
+    this.flush();
+  }
+  schedule() {
+    if (this.timer) return;
+    const recentInput = Date.now() - this.lastInputAt <= this.interactiveWindow;
+    this.timer = setTimeout(() => this.flush(), recentInput ? this.fastInterval : this.slowInterval);
+  }
+};
+function getTerminalLaunchDisplay(explicitCommand) {
+  const command = getDefaultTerminalCommand(explicitCommand);
+  return [command.file, ...command.args].join(" ");
+}
+var TerminalSession = class {
+  constructor(channel, getLaunchCommand) {
+    this.channel = channel;
+    this.getLaunchCommand = getLaunchCommand;
+  }
+  pty = null;
+  stream = null;
+  batcher = null;
+  cols = 120;
+  rows = 36;
+  handleMessage(message) {
+    switch (message.type) {
+      case "terminal_open":
+        this.open(message);
+        break;
+      case "terminal_input":
+        this.writeInput(message);
+        break;
+      case "terminal_resize":
+        this.resize(message);
+        break;
+      case "terminal_close":
+        this.close();
+        break;
+      case "terminal_exit":
+        break;
+    }
+  }
+  close() {
+    this.batcher?.destroy();
+    this.batcher = null;
+    if (this.stream && !this.stream.ended) this.stream.end();
+    this.stream = null;
+    try {
+      this.pty?.kill();
+    } catch {
+    }
+    this.pty = null;
+  }
+  open(message) {
+    this.cols = Math.max(20, Math.floor(message.cols || this.cols));
+    this.rows = Math.max(5, Math.floor(message.rows || this.rows));
+    if (this.pty) {
+      this.pty.resize(this.cols, this.rows);
+      return;
+    }
+    const command = getDefaultTerminalCommand(this.getLaunchCommand?.());
+    const file = resolveExecutable2(command.file) ?? command.file;
+    const meta = { kind: "terminal", cols: this.cols, rows: this.rows };
+    this.stream = this.channel.createStream(meta);
+    this.batcher = new AdaptiveOutputBatcher((data) => this.stream?.write(data));
+    const env = { ...process.env, TERM: "xterm-256color" };
+    this.pty = spawn2(file, command.args, {
+      name: "xterm-256color",
+      cols: this.cols,
+      rows: this.rows,
+      cwd: process.cwd(),
+      env
+    });
+    this.pty.onData((data) => this.batcher?.write(data));
+    this.pty.onExit(({ exitCode, signal }) => {
+      this.batcher?.flush();
+      this.stream?.end();
+      this.channel.send({ type: "terminal_exit", exitCode, signal });
+      this.stream = null;
+      this.batcher = null;
+      this.pty = null;
+    });
+  }
+  writeInput(message) {
+    if (!this.pty) return;
+    this.batcher?.noteInput();
+    this.pty.write(message.data);
+  }
+  resize(message) {
+    this.cols = Math.max(20, Math.floor(message.cols || this.cols));
+    this.rows = Math.max(5, Math.floor(message.rows || this.rows));
+    this.pty?.resize(this.cols, this.rows);
+  }
+};
+function isTerminalMessage(data) {
+  if (!data || typeof data !== "object" || !("type" in data)) return false;
+  const type = data.type;
+  return type === "terminal_open" || type === "terminal_input" || type === "terminal_resize" || type === "terminal_close" || type === "terminal_exit";
+}
+
 // src/server.ts
 var MAX_MESSAGES = 200;
 function trimMessages(messages) {
@@ -1043,7 +1216,7 @@ function createHostServer(opts) {
   app.get("/", (_req, res) => {
     res.type("html").send(HOST_HTML);
   });
-  if (opts.viewerDir && existsSync2(opts.viewerDir)) {
+  if (opts.viewerDir && existsSync3(opts.viewerDir)) {
     app.use("/viewer", express.static(opts.viewerDir));
   }
   app.get("/api/status", (_req, res) => {
@@ -1093,19 +1266,17 @@ function createHostServer(opts) {
           break;
         }
         case "cli": {
-          const cmd = command || process.env.AIRLOOM_CLI_COMMAND;
-          if (!cmd) {
-            res.status(400).json({ error: "CLI adapter requires a command (or set AIRLOOM_CLI_COMMAND env var)" });
-            return;
-          }
-          const presetInfo = preset ? CLI_PRESETS.find((p) => p.id === preset) : void 0;
-          opts.state.adapter = new CLIAdapter({
-            command: cmd,
-            model,
-            mode: presetInfo?.mode,
-            silenceTimeout: presetInfo?.silenceTimeout
-          });
-          break;
+          const selectedPreset = typeof preset === "string" ? preset : "shell";
+          const presetInfo = CLI_PRESETS.find((p) => p.id === selectedPreset);
+          const cmd = selectedPreset === "shell" ? void 0 : typeof command === "string" && command.trim() ? command.trim() : presetInfo?.command;
+          opts.state.terminalLaunchCommand = cmd;
+          opts.state.terminalLaunch = getTerminalLaunchDisplay(cmd);
+          opts.state.adapter = null;
+          const cfg2 = { type: "terminal", preset: selectedPreset, command: cmd };
+          saveConfig(cfg2);
+          broadcast({ type: "terminal_configured", terminalLaunch: opts.state.terminalLaunch });
+          res.json({ ok: true, terminalLaunch: opts.state.terminalLaunch });
+          return;
         }
         default:
           res.status(400).json({ error: "Unknown adapter type" });
@@ -1118,7 +1289,7 @@ function createHostServer(opts) {
         cfg.preset = preset;
       }
       saveConfig(cfg);
-      broadcast({ type: "configured", adapter: { name: opts.state.adapter.name, model: opts.state.adapter.model } });
+      broadcast({ type: "configured", adapter: { name: opts.state.adapter?.name ?? "none", model: opts.state.adapter?.model ?? "" } });
       res.json({ ok: true });
     } catch (err) {
       const message = err instanceof Error ? err.message : "Configuration failed";
@@ -1142,6 +1313,18 @@ function createHostServer(opts) {
   wss.on("connection", (ws) => {
     uiClients.add(ws);
     ws.on("close", () => uiClients.delete(ws));
+    ws.on("message", (data) => {
+      try {
+        const message = JSON.parse(data.toString());
+        if (message.type && message.type.startsWith("terminal_")) {
+          if (opts.state.channel) {
+            opts.state.channel.send(message);
+          }
+        }
+      } catch (err) {
+        console.error("[host] Invalid WebSocket message:", err);
+      }
+    });
   });
   function broadcast(data) {
     const msg = JSON.stringify(data);
@@ -1251,6 +1434,18 @@ var HOST_HTML = `<!DOCTYPE html>
   @keyframes dot-pulse{0%,80%,100%{opacity:.25;transform:scale(.8)}40%{opacity:1;transform:scale(1)}}
   .input-area{display:flex;gap:8px}
   .input-area textarea{flex:1;resize:none;min-height:44px;max-height:120px;padding:10px 14px;border-radius:8px;border:1px solid #333;background:#111;color:#e0e0e0;font-family:inherit;font-size:.9rem}
+  
+  /* Terminal mode styles */
+  .terminal-mode .chat-only { display: none !important; }
+  .terminal-mode .terminal-only { display: block; }
+  .chat-mode .terminal-only { display: none !important; }
+  .chat-mode .chat-only { display: block; }
+  
+  .terminal-container{background:#05070c;border:1px solid #2a2a2a;border-radius:8px;height:400px;overflow:hidden;margin-bottom:12px}
+  #terminal{width:100%;height:100%;padding:8px}
+  .terminal-toolbar{display:flex;gap:8px;margin-bottom:12px}
+  .tool-btn{padding:6px 12px;font-size:.85rem;background:#333;border:none;border-radius:6px;color:#e0e0e0;cursor:pointer}
+  .tool-btn:hover{background:#444}
 </style>
 </head>
 <body>
@@ -1263,277 +1458,358 @@ var HOST_HTML = `<!DOCTYPE html>
     <div class="status"><div class="dot wait" id="dot"></div><span id="statusText">Initializing...</span></div>
     <p style="color:#888;font-size:.9rem;margin-top:8px" id="launchText">Launch: current shell</p>
   </div>
-  <div class="card" id="configCard">
-    <h2>AI Configuration</h2>
-    <div class="config-form">
-      <select id="adapterType"><option value="anthropic">Anthropic (Claude)</option><option value="openai">OpenAI (GPT)</option><option value="cli">CLI Tool</option></select>
-      <input type="password" id="apiKey" placeholder="API Key"/>
-      <input type="text" id="model" placeholder="Model (optional)"/>
-      <div id="cliConfig" style="display:none">
-        <select id="cliPreset" style="margin-bottom:8px"></select>
-        <input type="text" id="command" placeholder="CLI command (prompt appended as last arg)"/>
+  
+  <!-- Chat mode UI -->
+  <div id="chatMode" class="chat-mode">
+    <div class="card" id="configCard">
+      <h2>AI Configuration</h2>
+      <div class="config-form">
+        <select id="adapterType">
+          <option value="anthropic">Anthropic Claude</option>
+          <option value="openai">OpenAI GPT</option>
+          <option value="cli">CLI Adapter</option>
+        </select>
+        <input type="text" id="model" placeholder="Model (optional)" />
+        <input type="text" id="apiKey" placeholder="API Key (if not set in environment)" />
+        <button onclick="configureAdapter()">Configure Adapter</button>
+      </div>
+    </div>
+    
+    <div class="card chat-only" id="chatCard" style="display:none">
+      <h2>Chat Messages</h2>
+      <div class="messages" id="messages"></div>
+      <div class="input-area chat-only">
+        <textarea id="messageInput" placeholder="Type your message..." rows="1"></textarea>
+        <button onclick="sendMessage()">Send</button>
+      </div>
+    </div>
+  </div>
+  
+  <!-- Terminal mode UI -->
+  <div id="terminalMode" class="terminal-mode" style="display:none">
+    <div class="card">
+      <h2>Terminal Configuration</h2>
+      <div class="config-form">
+        <select id="cliPreset"></select>
+        <input type="text" id="command" placeholder="Custom launch command" style="display:none"/>
         <p style="color:#666;font-size:.8rem;margin-top:4px" id="presetDesc"></p>
+        <button onclick="configureTerminal()">Apply Launch Target</button>
+      </div>
+    </div>
+    
+    <div class="card terminal-only">
+      <h2>Terminal Session</h2>
+      <div class="terminal-toolbar terminal-only">
+        <button class="tool-btn" onclick="focusTerminal()">Focus</button>
+        <button class="tool-btn" onclick="sendCtrlC()">Ctrl+C</button>
+        <button class="tool-btn" onclick="sendEsc()">Esc</button>
+        <button class="tool-btn" onclick="sendTab()">Tab</button>
+      </div>
+      <div class="terminal-container terminal-only">
+        <div id="terminal"></div>
       </div>
-      <button onclick="configure()">Configure</button>
     </div>
   </div>
+  
   <div class="card pairing" id="pairingCard" style="display:none">
     <h2>Connect Your Phone</h2>
     <img id="qrCode" alt="QR Code"/>
     <div class="pairing-code" id="pairingCode"></div>
     <p style="color:#888;font-size:.85rem">Scan QR or enter code in viewer</p>
   </div>
-  <div class="card" id="chatCard" style="display:none">
-    <h2>Conversation</h2>
-    <div class="messages" id="messages"></div>
-    <div class="input-area">
-      <textarea id="msgInput" placeholder="Type a message..." onkeydown="if(event.key==='Enter'&&!event.shiftKey){event.preventDefault();sendMsg()}"></textarea>
-      <button onclick="sendMsg()">Send</button>
-    </div>
-  </div>
 </div>
-<script src="https://cdn.jsdelivr.net/npm/marked@15/marked.min.js"></script>
 <script>
-if(typeof marked!=='undefined'){marked.setOptions({gfm:true,breaks:true})}
-function renderMd(t){try{return typeof marked!=='undefined'?marked.parse(t):'<pre>'+t.replace(/</g,'&lt;')+'</pre>'}catch{return '<pre>'+t.replace(/</g,'&lt;')+'</pre>'}}
+// Import xterm dynamically to avoid bundling issues
+const loadTerminal = async () => {
+  if (window.Terminal) return;
+  const [{ Terminal }, { FitAddon }] = await Promise.all([
+    import('@xterm/xterm'),
+    import('@xterm/addon-fit')
+  ]);
+  window.Terminal = Terminal;
+  window.FitAddon = FitAddon;
+};
+
 const ws=new WebSocket((location.protocol==='https:'?'wss://':'ws://')+location.host+'/ws');
-let curResp='',streamEl=null,cliPresets=[];
-// Load CLI presets
+let cliPresets=[];
+let currentMode = null; // 'chat' or 'terminal'
+let term = null;
+let fitAddon = null;
+
+// Mode detection and UI switching
+function switchToMode(mode) {
+  if (currentMode === mode) return;
+  currentMode = mode;
+  
+  const chatMode = document.getElementById('chatMode');
+  const terminalMode = document.getElementById('terminalMode');
+  
+  if (mode === 'terminal') {
+    chatMode.style.display = 'none';
+    terminalMode.style.display = 'block';
+    document.body.classList.add('terminal-mode');
+    document.body.classList.remove('chat-mode');
+    initTerminal();
+  } else {
+    chatMode.style.display = 'block';
+    terminalMode.style.display = 'none';
+    document.body.classList.add('chat-mode');
+    document.body.classList.remove('terminal-mode');
+  }
+}
+
+// Terminal functionality
+async function initTerminal() {
+  if (term) return;
+  await loadTerminal();
+  
+  term = new window.Terminal({
+    cursorBlink: true,
+    fontFamily: 'ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas, monospace',
+    fontSize: 14,
+    lineHeight: 1.25,
+    allowTransparency: true,
+    scrollback: 5000,
+    theme: {
+      background: '#05070c',
+      foreground: '#e6edf3',
+      cursor: '#7c8aff',
+      cursorAccent: '#05070c',
+      selectionBackground: 'rgba(124,138,255,0.28)',
+      black: '#0a0d14',
+      red: '#ff7b72',
+      green: '#3fb950',
+      yellow: '#d29922',
+      blue: '#7c8aff',
+      magenta: '#bc8cff',
+      cyan: '#39c5cf',
+      white: '#c9d1d9',
+      brightBlack: '#6e7681',
+      brightRed: '#ffa198',
+      brightGreen: '#56d364',
+      brightYellow: '#e3b341',
+      brightBlue: '#a5b4ff',
+      brightMagenta: '#d2a8ff',
+      brightCyan: '#56d4dd',
+      brightWhite: '#f0f6fc',
+    },
+  });
+  
+  fitAddon = new window.FitAddon();
+  term.loadAddon(fitAddon);
+  term.open(document.getElementById('terminal'));
+  
+  term.onData((data) => {
+    if (ws.readyState === WebSocket.OPEN) {
+      ws.send(JSON.stringify({ type: 'terminal_input', data }));
+    }
+  });
+  
+  // Handle terminal resize
+  const resizeObserver = new ResizeObserver(() => {
+    if (fitAddon && term) {
+      fitAddon.fit();
+      if (ws.readyState === WebSocket.OPEN) {
+        ws.send(JSON.stringify({ 
+          type: 'terminal_resize', 
+          cols: term.cols, 
+          rows: term.rows 
+        }));
+      }
+    }
+  });
+  resizeObserver.observe(document.getElementById('terminalContainer'));
+  
+  // Auto-focus terminal
+  term.focus();
+}
+
+function focusTerminal() {
+  if (term) term.focus();
+}
+
+function sendCtrlC() {
+  if (ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify({ type: 'terminal_input', data: '' }));
+  }
+  if (term) term.focus();
+}
+
+function sendEsc() {
+  if (ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify({ type: 'terminal_input', data: '\x1B' }));
+  }
+  if (term) term.focus();
+}
+
+function sendTab() {
+  if (ws.readyState === WebSocket.OPEN) {
+    ws.send(JSON.stringify({ type: 'terminal_input', data: '	' }));
+  }
+  if (term) term.focus();
+}
+
+// Load CLI presets for terminal mode
 fetch('/api/cli-presets').then(r=>r.json()).then(presets=>{
   cliPresets=presets;
   const sel=document.getElementById('cliPreset');
+  const shellOpt=document.createElement('option');
+  shellOpt.value='shell';
+  shellOpt.textContent='Shell (default)';
+  sel.appendChild(shellOpt);
   presets.forEach(p=>{const o=document.createElement('option');o.value=p.id;o.textContent=p.name;sel.appendChild(o)});
   sel.addEventListener('change',()=>{
-    const p=cliPresets.find(x=>x.id===sel.value);
-    if(p){document.getElementById('command').value=p.command;document.getElementById('presetDesc').textContent=p.description;document.getElementById('command').style.display=p.id==='custom'?'':''}
+    const id=sel.value;
+    const p=cliPresets.find(x=>x.id===id);
+    const cmd=document.getElementById('command');
+    if(id==='shell'){cmd.style.display='none';cmd.value='';document.getElementById('presetDesc').textContent='Start an interactive login shell. Run commands directly in the phone terminal.';return;}
+    if(id==='custom'){cmd.style.display='';document.getElementById('presetDesc').textContent='Enter the exact launch command.';return;}
+    cmd.style.display='none';
+    document.getElementById('presetDesc').textContent=p?p.description:'';
   });
-  if(presets.length){sel.dispatchEvent(new Event('change'))}
-  // After presets are loaded, restore saved config
+  sel.value='shell';
+  sel.dispatchEvent(new Event('change'));
   return fetch('/api/config').then(r=>r.json());
 }).then(cfg=>{
   if(!cfg) return;
-  const {saved,envKeys}=cfg;
-  if(saved){
-    document.getElementById('adapterType').value=saved.type;
-    document.getElementById('adapterType').dispatchEvent(new Event('change'));
-    if(saved.model) document.getElementById('model').value=saved.model;
-    if(saved.type==='cli'){
-      if(saved.preset){document.getElementById('cliPreset').value=saved.preset;document.getElementById('cliPreset').dispatchEvent(new Event('change'))}
-      if(saved.command) document.getElementById('command').value=saved.command;
-    }
+  const {saved}=cfg;
+  if(saved && (saved.type==='terminal' || saved.type==='cli')){
+    if(saved.preset) document.getElementById('cliPreset').value=saved.preset;
+    if(saved.command) document.getElementById('command').value=saved.command;
+    document.getElementById('cliPreset').dispatchEvent(new Event('change'));
   }
-  // Show hints for env-var API keys
-  if(envKeys.anthropic) document.getElementById('apiKey').placeholder='API Key (ANTHROPIC_API_KEY set)';
-  if(envKeys.openai&&(!saved||saved.type==='openai')) document.getElementById('apiKey').placeholder='API Key (OPENAI_API_KEY set)';
 }).catch(()=>{});
-document.getElementById('adapterType').addEventListener('change',e=>{
-  const cli=e.target.value==='cli';
-  document.getElementById('apiKey').style.display=cli?'none':'';
-  document.getElementById('model').style.display=cli?'none':'';
-  document.getElementById('cliConfig').style.display=cli?'':'none';
-});
+
+// WebSocket message handling
 ws.onmessage=e=>{
   const d=JSON.parse(e.data);
-  if(d.type==='message'){addMsg(d.role,d.content);if(d.role==='user'){streamEl=addMsg('assistant','');streamEl.classList.add('typing');streamEl.innerHTML='<span class="dot"></span><span class="dot"></span><span class="dot"></span>';curResp=''}}
-  else if(d.type==='stream_chunk'){if(!streamEl){streamEl=addMsg('assistant','');streamEl.classList.add('typing');streamEl.innerHTML='<span class="dot"></span><span class="dot"></span><span class="dot"></span>'}curResp+=d.data;const trimmed=curResp.trimStart();if(trimmed){if(streamEl.classList.contains('typing'))streamEl.classList.remove('typing');streamEl.innerHTML=renderMd(trimmed)}streamEl.scrollIntoView({block:'end'})}
-  else if(d.type==='stream_end'){streamEl=null;curResp=''}
-  else if(d.type==='configured'){document.getElementById('statusText').textContent='Configured: '+d.adapter.name+' ('+d.adapter.model+')'}
-  else if(d.type==='peer_connected'){document.getElementById('dot').className='dot on';document.getElementById('statusText').textContent='Phone connected';document.getElementById('chatCard').style.display=''}
-  else if(d.type==='peer_disconnected'){document.getElementById('dot').className='dot wait';document.getElementById('statusText').textContent='Phone disconnected'}
+  if(d.type==='peer_connected'){
+    document.getElementById('dot').className='dot on';
+    document.getElementById('statusText').textContent='Phone connected';
+  }
+  else if(d.type==='peer_disconnected'){
+    document.getElementById('dot').className='dot wait';
+    document.getElementById('statusText').textContent='Phone disconnected';
+  }
+  else if(d.type==='terminal_configured'){
+    document.getElementById('launchText').textContent='Launch: '+d.terminalLaunch;
+    document.getElementById('statusText').textContent='Launch target updated';
+  }
+  else if(d.type==='configured'){
+    document.getElementById('statusText').textContent='AI adapter configured';
+  }
+  else if(d.type==='stream_chunk' && term){
+    term.write(d.data);
+  }
+  else if(d.type==='stream_end' && term){
+    // Terminal stream ended
+  }
+  else if(d.type==='terminal_exit' && term){
+    const detail = typeof d.exitCode === 'number' ? \`exit \${d.exitCode}\` : 'terminated';
+    term.writeln(\`\r
+[terminal \${detail}]\`);
+  }
+  else if(d.type==='message'){
+    // Chat message - add to chat UI
+    const messagesDiv = document.getElementById('messages');
+    if (messagesDiv) {
+      const msgDiv = document.createElement('div');
+      msgDiv.className = \`msg \${d.role}\`;
+      msgDiv.textContent = d.content;
+      messagesDiv.appendChild(msgDiv);
+      messagesDiv.scrollTop = messagesDiv.scrollHeight;
+    }
+  }
 };
+
+// Load initial status and determine mode
 fetch('/api/status').then(r=>r.json()).then(d=>{
   if(d.terminalLaunch) document.getElementById('launchText').textContent='Launch: '+d.terminalLaunch;
-  if(d.pairingCode){document.getElementById('pairingCard').style.display='';document.getElementById('pairingCode').textContent=d.pairingCode;if(d.pairingQR)document.getElementById('qrCode').src=d.pairingQR}
-  if(d.connected){document.getElementById('dot').className='dot on';document.getElementById('statusText').textContent='Phone connected';document.getElementById('chatCard').style.display=''}
-  else{document.getElementById('dot').className='dot wait';document.getElementById('statusText').textContent='Waiting for phone...'}
-  if(d.adapter)document.getElementById('statusText').textContent+=' | '+d.adapter.name;
-  if(d.messages)d.messages.forEach(m=>addMsg(m.role,m.content));
+  if(d.pairingCode){
+    document.getElementById('pairingCard').style.display='';
+    document.getElementById('pairingCode').textContent=d.pairingCode;
+    if(d.pairingQR) document.getElementById('qrCode').src=d.pairingQR;
+  }
+  if(d.connected){
+    document.getElementById('dot').className='dot on';
+    document.getElementById('statusText').textContent='Phone connected';
+  } else{
+    document.getElementById('dot').className='dot wait';
+    document.getElementById('statusText').textContent='Waiting for phone...';
+  }
+  
+  // Determine mode: terminal mode if no adapter but has terminal launch
+  if (!d.adapter && d.terminalLaunch) {
+    switchToMode('terminal');
+  } else {
+    switchToMode('chat');
+    if (d.adapter) {
+      document.getElementById('chatCard').style.display = 'block';
+    }
+  }
 });
-async function configure(){
-  const r=await fetch('/api/configure',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({type:document.getElementById('adapterType').value,apiKey:document.getElementById('apiKey').value,model:document.getElementById('model').value,command:document.getElementById('command').value,preset:document.getElementById('cliPreset').value})});
-  const d=await r.json();if(d.error)alert(d.error);
-}
-async function sendMsg(){
-  const el=document.getElementById('msgInput'),c=el.value.trim();if(!c)return;el.value='';
-  await fetch('/api/send',{method:'POST',headers:{'Content-Type':'application/json'},body:JSON.stringify({content:c})});
-}
-function addMsg(role,content){const el=document.createElement('div');el.className='msg '+role;if(role==='user'||!content){el.textContent=content}else{el.innerHTML=renderMd(content)}document.getElementById('messages').appendChild(el);el.scrollIntoView({block:'end'});return el}
-</script>
-</body>
-</html>`;
 
-// src/terminal.ts
-import { basename, delimiter as delimiter2, isAbsolute as isAbsolute2, join as join3, resolve as resolve2 } from "path";
-import { existsSync as existsSync3 } from "fs";
-import { spawn as spawn2 } from "node-pty";
-function resolveExecutable2(command, envPath = process.env.PATH ?? "") {
-  if (!command) return null;
-  if (isAbsolute2(command) && existsSync3(command)) return command;
-  if (command.includes("/")) {
-    const candidate = resolve2(process.cwd(), command);
-    return existsSync3(candidate) ? candidate : null;
-  }
-  for (const dir of envPath.split(delimiter2)) {
-    if (!dir) continue;
-    const candidate = join3(dir.replace(/^~(?=$|\/)/, process.env.HOME ?? "~"), command);
-    if (existsSync3(candidate)) return candidate;
+// Configuration functions
+async function configureAdapter() {
+  const type = document.getElementById('adapterType').value;
+  const model = document.getElementById('model').value;
+  const apiKey = document.getElementById('apiKey').value;
+  
+  const response = await fetch('/api/configure', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ type, model, apiKey })
+  });
+  const result = await response.json();
+  if (result.error) {
+    alert(result.error);
+  } else {
+    document.getElementById('chatCard').style.display = 'block';
   }
-  return null;
-}
-function parseCommand(command) {
-  const parts = command.match(/(?:[^\s"]+|"[^"]*")+/g) ?? [command];
-  return {
-    file: parts[0],
-    args: parts.slice(1).map((part) => part.replace(/^"|"$/g, ""))
-  };
 }
-function getDefaultTerminalCommand(explicitCommand) {
-  const configured = explicitCommand?.trim() || process.env.AIRLOOM_TERMINAL_COMMAND?.trim();
-  if (configured) return parseCommand(configured);
-  if (process.platform === "win32") {
-    const file = process.env.COMSPEC || "powershell.exe";
-    return { file, args: [] };
+
+async function configureTerminal() {
+  const preset = document.getElementById('cliPreset').value;
+  const command = document.getElementById('command').value;
+  
+  const response = await fetch('/api/configure', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ type: 'cli', preset, command })
+  });
+  const result = await response.json();
+  if (result.error) {
+    alert(result.error);
   }
-  const shell = process.env.SHELL || "/bin/bash";
-  const name = basename(shell);
-  if (name === "bash" || name === "zsh" || name === "sh") return { file: shell, args: ["-il"] };
-  return { file: shell, args: ["-i"] };
 }
-var AdaptiveOutputBatcher = class {
-  constructor(onFlush, fastInterval = 16, slowInterval = 80, interactiveWindow = 250, maxBytes = 4096) {
-    this.onFlush = onFlush;
-    this.fastInterval = fastInterval;
-    this.slowInterval = slowInterval;
-    this.interactiveWindow = interactiveWindow;
-    this.maxBytes = maxBytes;
-  }
-  buffer = "";
-  timer = null;
-  lastInputAt = 0;
-  noteInput() {
-    this.lastInputAt = Date.now();
-    if (this.timer) {
-      clearTimeout(this.timer);
-      this.timer = null;
-    }
-    if (this.buffer) this.schedule();
-  }
-  write(data) {
-    this.buffer += data;
-    if (this.buffer.length >= this.maxBytes) {
-      this.flush();
-      return;
-    }
-    this.schedule();
-  }
-  flush() {
-    if (this.timer) {
-      clearTimeout(this.timer);
-      this.timer = null;
-    }
-    if (!this.buffer) return;
-    const data = this.buffer;
-    this.buffer = "";
-    this.onFlush(data);
-  }
-  destroy() {
-    this.flush();
-  }
-  schedule() {
-    if (this.timer) return;
-    const recentInput = Date.now() - this.lastInputAt <= this.interactiveWindow;
-    this.timer = setTimeout(() => this.flush(), recentInput ? this.fastInterval : this.slowInterval);
-  }
-};
-function getTerminalLaunchDisplay(explicitCommand) {
-  const command = getDefaultTerminalCommand(explicitCommand);
-  return [command.file, ...command.args].join(" ");
+
+// Chat functionality
+function sendMessage() {
+  const input = document.getElementById('messageInput');
+  const content = input.value.trim();
+  if (!content) return;
+  
+  fetch('/api/send', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify({ content })
+  }).then(() => {
+    input.value = '';
+  }).catch(err => {
+    console.error('Failed to send message:', err);
+  });
 }
-var TerminalSession = class {
-  constructor(channel, launchCommand) {
-    this.channel = channel;
-    this.launchCommand = launchCommand;
-  }
-  pty = null;
-  stream = null;
-  batcher = null;
-  cols = 120;
-  rows = 36;
-  handleMessage(message) {
-    switch (message.type) {
-      case "terminal_open":
-        this.open(message);
-        break;
-      case "terminal_input":
-        this.writeInput(message);
-        break;
-      case "terminal_resize":
-        this.resize(message);
-        break;
-      case "terminal_close":
-        this.close();
-        break;
-      case "terminal_exit":
-        break;
-    }
-  }
-  close() {
-    this.batcher?.destroy();
-    this.batcher = null;
-    if (this.stream && !this.stream.ended) this.stream.end();
-    this.stream = null;
-    try {
-      this.pty?.kill();
-    } catch {
-    }
-    this.pty = null;
-  }
-  open(message) {
-    this.cols = Math.max(20, Math.floor(message.cols || this.cols));
-    this.rows = Math.max(5, Math.floor(message.rows || this.rows));
-    if (this.pty) {
-      this.pty.resize(this.cols, this.rows);
-      return;
-    }
-    const command = getDefaultTerminalCommand(this.launchCommand);
-    const file = resolveExecutable2(command.file) ?? command.file;
-    const meta = { kind: "terminal", cols: this.cols, rows: this.rows };
-    this.stream = this.channel.createStream(meta);
-    this.batcher = new AdaptiveOutputBatcher((data) => this.stream?.write(data));
-    const env = { ...process.env, TERM: "xterm-256color" };
-    this.pty = spawn2(file, command.args, {
-      name: "xterm-256color",
-      cols: this.cols,
-      rows: this.rows,
-      cwd: process.cwd(),
-      env
-    });
-    this.pty.onData((data) => this.batcher?.write(data));
-    this.pty.onExit(({ exitCode, signal }) => {
-      this.batcher?.flush();
-      this.stream?.end();
-      this.channel.send({ type: "terminal_exit", exitCode, signal });
-      this.stream = null;
-      this.batcher = null;
-      this.pty = null;
-    });
-  }
-  writeInput(message) {
-    if (!this.pty) return;
-    this.batcher?.noteInput();
-    this.pty.write(message.data);
-  }
-  resize(message) {
-    this.cols = Math.max(20, Math.floor(message.cols || this.cols));
-    this.rows = Math.max(5, Math.floor(message.rows || this.rows));
-    this.pty?.resize(this.cols, this.rows);
+
+// Handle Enter key in chat input
+document.getElementById('messageInput')?.addEventListener('keydown', (e) => {
+  if (e.key === 'Enter' && !e.shiftKey) {
+    e.preventDefault();
+    sendMessage();
   }
-};
-function isTerminalMessage(data) {
-  if (!data || typeof data !== "object" || !("type" in data)) return false;
-  const type = data.type;
-  return type === "terminal_open" || type === "terminal_input" || type === "terminal_resize" || type === "terminal_close" || type === "terminal_exit";
-}
+});
+</script>
+</body>
+</html>`;
 
 // src/index.ts
 function parseArgs(argv) {
@@ -1673,12 +1949,14 @@ async function main() {
   });
   await channel.connect(session.sessionToken);
   console.log("[host] Connected to relay, waiting for phone...");
+  const savedConfig = loadConfig();
   const launchPreset = cliArgs.preset ? CLI_PRESETS.find((p) => p.id === cliArgs.preset) : void 0;
   if (cliArgs.preset && !launchPreset) {
     console.error(`[host] Unknown preset "${cliArgs.preset}". Available: ${CLI_PRESETS.map((p) => p.id).join(", ")}`);
     process.exit(1);
   }
-  const launchCommand = cliArgs.cli ?? launchPreset?.command;
+  const savedTerminalCommand = !cliArgs.cli && !cliArgs.preset && savedConfig?.type === "terminal" ? savedConfig.command ?? (savedConfig.preset && savedConfig.preset !== "shell" ? CLI_PRESETS.find((p) => p.id === savedConfig.preset)?.command : void 0) : void 0;
+  const launchCommand = cliArgs.cli ?? launchPreset?.command ?? savedTerminalCommand;
   const terminalLaunch = getTerminalLaunchDisplay(launchCommand);
   const state = {
     channel,
@@ -1689,6 +1967,7 @@ async function main() {
     relayUrl: useAbly ? "ably" : RELAY_URL,
     connected: false,
     terminalLaunch,
+    terminalLaunchCommand: launchCommand,
     messages: []
   };
   console.log(`[host] Terminal launch: ${terminalLaunch}`);
@@ -1779,7 +2058,7 @@ async function main() {
     exec(`${cmd} ${localUrl}`);
   }).catch(() => {
   });
-  const terminal = new TerminalSession(channel, launchCommand);
+  const terminal = new TerminalSession(channel, () => state.terminalLaunchCommand);
   channel.on("ready", () => {
     console.log("[host] Phone connected! Channel ready.");
     state.connected = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "airloom",
-  "version": "0.1.9",
+  "version": "0.1.11",
   "description": "Run AI on your computer, control it from your phone. E2E encrypted.",
   "type": "module",
   "bin": {
@@ -12,6 +12,8 @@
   ],
   "dependencies": {
     "@noble/hashes": "^1.7.0",
+    "@xterm/addon-fit": "^0.11.0",
+    "@xterm/xterm": "^6.0.0",
     "ably": "^2.20.0",
     "events": "^3.3.0",
     "express": "^5.1.0",