quoxcli 0.3.1 → 0.5.0

package/lib/commands/blog.js

@@ -0,0 +1,110 @@
+/**
+ * `quox blog draft submit|list|show|mark-published` (BLOG-DRAFT).
+ *
+ * Submit saves the draft as a NotesQ note in the blog-drafts collection and files a hand-off to
+ * the blog publisher (a line in the publisher's slot plus an inbox item). It NEVER publishes:
+ * publishing is the publisher's governed pipeline after the owner's yes. `mark-published` is the
+ * publisher-side verb that records the URL and tells the originating conversation/objective.
+ */
+
+import { readFileSync } from 'fs';
+import { formatOutput, formatDetail, printSuccess, printInfo } from '../core/output.js';
+import { line as glyphLine, printEvent } from '../core/quoxglyph.js';
+import { resolveEndpoint } from '../api/endpoints.js';
+
+const isJson = (program) => program.opts().output === 'json';
+const printJson = (d) => console.log(JSON.stringify(d, null, 2));
+
+async function readBody(options, ctx) {
+  if (options.file) return readFileSync(options.file, 'utf-8');
+  if (options.stdin) {
+    const input = ctx.stdin || process.stdin;
+    let buf = '';
+    for await (const chunk of input) buf += chunk;
+    return buf;
+  }
+  return null;
+}
+
+export function registerBlogCommands(program, ctx) {
+  const { client, auth } = ctx;
+  const blog = program.command('blog').description('Blog: hand drafts to the blog publisher (never publishes)');
+  const draft = blog.command('draft').description('Blog drafts: saved as revisioned NotesQ notes in the blog-drafts collection');
+
+  draft
+    .command('submit')
+    .description('Save a draft and hand it to the blog publisher (slot + inbox). Does NOT publish.')
+    .requiredOption('--title <title>', 'post title')
+    .option('--file <path>', 'read the post markdown from a file')
+    .option('--stdin', 'read the post markdown from stdin')
+    .option('--hero <image>', 'hero image path or URL')
+    .option('--tag <tag...>', 'tag (repeatable)')
+    .option('--conversation <id>', 'originating conversation id (so its publication is reported back)')
+    .option('--objective <id>', 'originating objective id')
+    .action(async (options) => {
+      auth.requireAuth();
+      const markdown = await readBody(options, ctx);
+      if (markdown === null) throw new Error('give the post body with --file <path> or --stdin');
+      if (!markdown.trim()) throw new Error('the draft body is empty; nothing to submit');
+      const body = { title: options.title, markdown };
+      if (options.hero) body.hero = options.hero;
+      if (options.tag && options.tag.length) body.tags = options.tag;
+      if (options.conversation) body.conversation_id = options.conversation;
+      if (options.objective) body.objective_id = options.objective;
+      const ep = resolveEndpoint('blog.drafts.submit');
+      const data = await client.post(ep.path, { service: ep.service, body });
+      if (isJson(program)) return printJson(data);
+      printEvent(glyphLine('quox', `blog draft submit "${options.title}"`, `note ${data.note_id}`));
+      printSuccess(`Draft saved as note ${data.note_id} and handed to the publisher slot ${data.slot} (hand-off ${data.handoff_id}).`);
+      if (data.link) console.log(`link: ${data.link}`);
+      printInfo('Not published: nothing goes live until the publisher publishes after the owner approves.');
+    });
+
+  draft
+    .command('list')
+    .description('List blog drafts')
+    .option('--status <status>', 'draft | published')
+    .action(async (options) => {
+      auth.requireAuth();
+      const ep = resolveEndpoint('blog.drafts.list');
+      const data = await client.get(ep.path, { service: ep.service, query: options.status ? { status: options.status } : {} });
+      if (isJson(program)) return printJson(data);
+      const rows = (data.drafts || []).map((d) => ({ id: d.id, title: d.title, status: d.status, url: d.url || '', updated: d.updated || '' }));
+      if (!rows.length) return printInfo('No blog drafts.');
+      formatOutput({ columns: ['id', 'title', 'status', 'url', 'updated'], rows });
+    });
+
+  draft
+    .command('show')
+    .description('Show one blog draft (body and hand-off facts)')
+    .argument('<id>', 'draft (note) id')
+    .action(async (id) => {
+      auth.requireAuth();
+      const ep = resolveEndpoint('blog.drafts.get', { id });
+      const data = await client.get(ep.path, { service: ep.service });
+      if (isJson(program)) return printJson(data);
+      const d = data.draft || {};
+      const { markdown, ...facts } = d;
+      formatDetail(facts);
+      console.log('');
+      console.log(markdown || '');
+    });
+
+  draft
+    .command('mark-published')
+    .description('Publisher side: record the published URL and tell the originating conversation/objective')
+    .argument('<id>', 'draft (note) id')
+    .requiredOption('--url <url>', 'the published https URL')
+    .action(async (id, options) => {
+      auth.requireAuth();
+      if (!/^https:\/\//i.test(options.url)) throw new Error('--url must be an https URL');
+      const ep = resolveEndpoint('blog.drafts.published', { id });
+      const data = await client.post(ep.path, { service: ep.service, body: { url: options.url } });
+      if (isJson(program)) return printJson(data);
+      printSuccess(data.already ? `Draft ${id} was already marked published at ${data.url}.` : `Draft ${id} marked published at ${data.url}.`);
+      if (data.notified) {
+        const n = data.notified;
+        printInfo(`Told: ${[n.conversation_id && `conversation ${n.conversation_id}`, n.objective_id && `objective ${n.objective_id}`, n.inbox_item_id && `inbox ${n.inbox_item_id}`].filter(Boolean).join(', ') || 'inbox only'}.`);
+      }
+    });
+}

package/lib/commands/capabilities.js

@@ -8,18 +8,19 @@
  */
 
 import { resolveEndpoint } from '../api/endpoints.js';
-import { capabilityLines, findCapability, offerFor } from '../quoxon/capabilities.js';
+import { capabilityLines, findCapability, offerFor, needsSetupNames } from '../quoxon/capabilities.js';
 
 export function registerCapabilitiesCommands(program, ctx) {
   const { client, auth } = ctx;
   program
     .command('capabilities [name]')
     .description('What this Quox can do for your org: ready, needs setup, not available, planned')
+    .addHelpText('after', '\nAdd --json for the full list (id, name, availability, reason, setup, permissions_ok).')
     .action(async (name) => {
       auth.requireAuth();
       const ep = resolveEndpoint('v1.capabilities');
       const data = await client.get(ep.path, { service: ep.service });
-      if (program.opts().output === 'json') { console.log(JSON.stringify(data, null, 2)); return; }
+      if (program.opts().output === 'json') { console.log(JSON.stringify({ needs_setup: needsSetupNames(data?.capabilities), ...data }, null, 2)); return; }
       const res = { ok: Array.isArray(data?.capabilities), capabilities: data?.capabilities, error: 'unexpected response' };
       if (name) {
         const c = findCapability(name, res);

package/lib/commands/chat.js

@@ -4,7 +4,12 @@
 
 import chalk from 'chalk';
 import { formatDetail } from '../core/output.js';
+import { eventLine, announceMuted } from '../core/announce.js';
 import { resolveEndpoint } from '../api/endpoints.js';
+import { existsSync } from 'node:fs';
+import { lastConversation, saveLastConversation } from './chatState.js';
+import { loadChatCompanion } from './chatCompanion.js';
+import { companionPlan, motionPolicy, VENDORED_DRAGONLAB } from '../dragon/select.js';
 
 /**
  * Build the POST body for /chat/stream (quox#782). The prompt and context
@@ -66,6 +71,14 @@ function printTrace(ev) {
   if (f) process.stderr.write((TONE_PAINT[f.tone] || chalk.cyan)(f.text) + '\n');
 }
 
+/** A turn's quox_event frame as its QuoxGlyph line on stderr (stdout stays the answer); silent under --json/--quiet. */
+export function printQuoxEvent(ev) {
+  if (announceMuted()) return null;
+  const q = eventLine(ev);
+  if (q) process.stderr.write(`${q}\n`);
+  return q;
+}
+
 function generateQueryId() {
   return `CLI_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
 }
@@ -74,9 +87,10 @@ function generateQueryId() {
  * Consume a chat SSE stream, printing chunks as they arrive.
  * Returns { text, sessionId, agentUsed } once the stream completes.
  */
-export async function consumeStream(client, { message, agent, sessionId, context }, { onAgentLabel, trace = false } = {}) {
+export async function consumeStream(client, { message, agent, sessionId, context }, { onAgentLabel, trace = false, companionPath, companionDisplay } = {}) {
   const queryId = generateQueryId();
   const body = buildStreamQuery({ queryId, message, agent, sessionId, context });
+  body.turn_id = queryId; // an explicit turn id selects the v1 event stream: tool and quox_event frames only flow with it
 
   let text = '';
   let resultSessionId = sessionId;
@@ -90,19 +104,25 @@ export async function consumeStream(client, { message, agent, sessionId, context
     onAgentLabel?.(agentUsed);
   };
 
-  const iter = client.stream(resolveEndpoint('chat.stream').path, { service: resolveEndpoint('chat.stream').service, body, untilClose: Boolean(trace) })[Symbol.asyncIterator]();
+  const companion = await loadChatCompanion(companionPath, { display: companionDisplay });
+  const write = text => companion ? companion.write(text) : process.stdout.write(text);
+  // Native terminal status follows legacy `done`; observe it when opted in.
+  let iter;
+  try {
+  iter = client.stream(resolveEndpoint('chat.stream').path, { service: resolveEndpoint('chat.stream').service, body, untilClose: Boolean(trace || companion) })[Symbol.asyncIterator]();
   while (true) {
     let step;
     try {
       step = await iter.next();
     } catch (err) {
       // A refusal before the stream opened carries the layers it really evaluated.
-      if (trace && Array.isArray(err?.body?.aocl_layers)) for (const l of err.body.aocl_layers) printTrace({ type: 'aocl.layer', ...l });
+      if (trace && Array.isArray(err?.body?.aocl_layers)) { companion?.suspend(); for (const l of err.body.aocl_layers) printTrace({ type: 'aocl.layer', ...l }); }
       throw err;
     }
     if (step.done) break;
     const event = step.value;
-    if (trace) printTrace(event);
+    companion?.event(event);
+    if (trace) { companion?.suspend(); printTrace(event); }
     switch (event.type) {
       case 'connected':
         break;
@@ -110,9 +130,9 @@ export async function consumeStream(client, { message, agent, sessionId, context
       case 'thinking': {
         const stage = event.stage || '';
         if (stage === 'tool_call' || stage.includes('tool')) {
-          console.log(chalk.dim(`  ⚙ using tool: ${event.message}`));
+          write(chalk.dim(`  ⚙ using tool: ${event.message}`) + '\n');
         } else if (process.argv.includes('--verbose') || process.argv.includes('-v')) {
-          console.log(chalk.dim(`  … ${event.message}`));
+          write(chalk.dim(`  … ${event.message}`) + '\n');
         }
         break;
       }
@@ -120,19 +140,23 @@ export async function consumeStream(client, { message, agent, sessionId, context
       case 'chunk':
         printLabel();
         sawChunk = true;
-        process.stdout.write(event.content || '');
+        write(event.content || '');
         text += event.content || '';
         break;
 
       case 'done':
         if (!sawChunk && event.full_response) {
           printLabel();
-          process.stdout.write(event.full_response);
+          write(event.full_response);
           text = event.full_response;
         }
         if (event.session_id) resultSessionId = event.session_id;
         if (event.agent_used) agentUsed = event.agent_used;
-        console.log();
+        write('\n');
+        break;
+
+      case 'quox_event':
+        printQuoxEvent(event);
         break;
 
       case 'error':
@@ -142,28 +166,99 @@ export async function consumeStream(client, { message, agent, sessionId, context
         break;
     }
   }
+  } catch (err) {
+    companion?.event({ type: 'error' });
+    throw err;
+  } finally {
+    await companion?.close();
+    try { await iter?.return?.(); } catch { /* cleanup must not mask a stream error */ }
+  }
 
   return { text, sessionId: resultSessionId, agentUsed };
 }
 
-/** One-shot (non-streaming) chat via POST /chat/claude. */
-async function sendOneShot(client, { message, agent, sessionId }) {
-  const body = { prompt: message };
-  if (agent) body.selected_agent = agent;
-  if (sessionId) body.session_id = sessionId;
+/** The words for a failed turn: the server's plain message first, the bare error code only as a fallback. */
+export function turnFailureText(result, httpStatus) {
+  return result?.message || result?.error || `chat turn failed (HTTP ${httpStatus})`;
+}
 
-  const data = await client.post(resolveEndpoint('chat.claude').path, {
-    service: resolveEndpoint('chat.claude').service,
-    body,
-    timeout: 120000,
-  });
+const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
+
+/**
+ * Poll a server-side chat turn until it is done. The turn keeps running on the server whatever this
+ * client does, so giving up early would hide a result (and any objects it created) from the user.
+ */
+async function awaitTurn(client, turnId) {
+  const capMs = Number(process.env.QUOX_CHAT_TURN_TIMEOUT_MS) || 20 * 60 * 1000;
+  const fixed = Number(process.env.QUOX_CHAT_POLL_MS) || 0;
+  const started = Date.now();
+  let wait = fixed || 1500;
+  let failures = 0;
+  const ep = resolveEndpoint('chat.turn.get', { id: turnId });
+  while (true) {
+    let t;
+    try {
+      t = await client.get(ep.path, { service: ep.service });
+      failures = 0;
+    } catch (err) {
+      if (err?.status === 404 || /not.found/i.test(err?.message || '')) {
+        throw new Error(`The server no longer has chat turn ${turnId} (expired, or the collector restarted). Check \`quox conversation list\` to see whether it finished.`);
+      }
+      if (++failures >= 5) throw err;
+      t = { status: 'running' };
+    }
+    if (t.status === 'done') {
+      if (t.http_status >= 400) throw new Error(turnFailureText(t.result, t.http_status));
+      return t.result || {};
+    }
+    if (t.status === 'error') throw new Error(`chat turn ${turnId} failed on the server: ${t.error || 'unknown error'}`);
+    if (Date.now() - started > capMs) {
+      throw new Error(`Chat turn ${turnId} is still running after ${Math.round(capMs / 1000)}s. It has not been lost: fetch it with \`quox chat --resume ${turnId}\`.`);
+    }
+    await sleep(wait);
+    if (!fixed) wait = Math.min(wait + 500, 5000);
+  }
+}
+
+/** One-shot (non-streaming) chat via POST /chat/claude, kept server side as a pollable turn. */
+async function sendOneShot(client, { message, agent, sessionId, resumeTurn }) {
+  let data;
+  if (resumeTurn) {
+    data = await awaitTurn(client, resumeTurn);
+  } else {
+    const body = { prompt: message };
+    if (agent) body.selected_agent = agent;
+    if (sessionId) body.session_id = sessionId;
+
+    // Prefer: respond-async returns 202 {turn_id} at once, so no client timeout can orphan a
+    // multi-tool turn. An older collector ignores it and answers synchronously (handled below).
+    data = await client.post(resolveEndpoint('chat.claude').path, {
+      service: resolveEndpoint('chat.claude').service,
+      body,
+      headers: { Prefer: 'respond-async' },
+      timeout: 30000,
+    });
+    if (data && data.turn_id && data.status === 'running') data = await awaitTurn(client, data.turn_id);
+  }
 
   const response = data.result || data.response || data.text || JSON.stringify(data);
   return { data, response, sessionId: data.session_id || sessionId };
 }
 
+/** Explicit --dragon-module wins; otherwise pick the dragon for the attached agent (null path = ordinary chat). */
+export function chooseCompanion({ options, config, env = process.env, isTTY = Boolean(process.stdout.isTTY), exists = existsSync }) {
+  const policy = motionPolicy(env);
+  if (options.dragonModule) return { companionPath: options.dragonModule, companionDisplay: { still: policy.still, mono: policy.mono } };
+  let settings = {};
+  try { settings = config?.getActiveProfile?.()?.quoxon || {}; } catch { /* no profile settings */ }
+  const e = options.dragon ? { ...env, QUOX_DRAGON_COMPANION: options.dragon } : env;
+  const plan = companionPlan({ agent: options.agent, settings, env: e, isTTY, exists, bundled: VENDORED_DRAGONLAB });
+  if (!plan.enabled) return { companionPath: undefined, companionDisplay: undefined };
+  return { companionPath: plan.file, companionDisplay: { still: plan.still, mono: plan.mono, persist: plan.persist } };
+}
+
 export function registerChatCommands(program, ctx) {
-  const { client, auth } = ctx;
+  const { client, auth, config } = ctx;
 
   const chat = program
     .command('chat')
@@ -172,13 +267,25 @@ export function registerChatCommands(program, ctx) {
     .option('--agent <name>', 'route to a specific agent (e.g. sentinel, cipher, nova)')
     .option('--no-stream', 'disable streaming output (one-shot request/response)')
     .option('--conversation <id>', 'continue a conversation (session id)')
+    .option('--continue', 'continue the last conversation for this profile and directory')
+    .option('--resume <turn>', 'fetch a chat turn that was still running (its id is printed if a turn outlives the wait)')
     .option('--trace', 'print the turn\'s protocol events (per-layer AOCL, traces, summary) to stderr as they arrive')
+    .option('--dragon <mode>', 'dragon companion for dragon-backed agents: on, greeting or off (default from /dragon companion; art is bundled; QUOX_DRAGONLAB overrides it)')
+    .option('--dragon-module <path>', 'opt in to a trusted local dragon companion module (streaming, single-message mode)')
     .action(async (message, options) => {
       auth.requireAuth();
       const streaming = options.stream !== false;
+      const profileName = (() => { try { return config?.getActiveProfileName?.(); } catch { return undefined; } })();
+      const noteConversation = (id) => {
+        if (!id) return;
+        saveLastConversation(profileName, process.cwd(), id);
+        if (program.opts().output !== 'json') process.stderr.write(`conversation: ${id}\n`);
+      };
+      if (!options.conversation && options.continue) options.conversation = lastConversation(profileName, process.cwd());
+      if (options.dragonModule && (!message || !streaming)) throw new Error('--dragon-module requires a single message with streaming enabled.');
 
-      // Interactive mode if no message
-      if (!message) {
+      // Interactive mode if no message (a --resume fetch is not interactive)
+      if (!message && !options.resume) {
         const { default: inquirer } = await import('inquirer');
         let currentAgent = options.agent || 'quox';
         let sessionId = options.conversation;
@@ -216,7 +323,7 @@ export function registerChatCommands(program, ctx) {
                 onAgentLabel: (agentUsed) => process.stdout.write(chalk.green(`${(agentUsed || currentAgent).toUpperCase()}: `)),
                 trace: Boolean(options.trace),
               });
-              if (result.sessionId) sessionId = result.sessionId;
+              if (result.sessionId) { sessionId = result.sessionId; saveLastConversation(profileName, process.cwd(), sessionId); }
               console.log();
             } else {
               const { response, sessionId: newSessionId } = await sendOneShot(client, {
@@ -224,7 +331,7 @@ export function registerChatCommands(program, ctx) {
                 agent: currentAgent,
                 sessionId,
               });
-              if (newSessionId) sessionId = newSessionId;
+              if (newSessionId) { sessionId = newSessionId; saveLastConversation(profileName, process.cwd(), sessionId); }
               console.log(chalk.green(`${currentAgent.toUpperCase()}:`), response);
               console.log();
             }
@@ -236,16 +343,19 @@ export function registerChatCommands(program, ctx) {
       }
 
       // Single message mode
-      if (streaming) {
+      if (streaming && !options.resume) {
+        const companion = chooseCompanion({ options, config });
         try {
-          await consumeStream(client, {
+          const result = await consumeStream(client, {
             message,
             agent: options.agent,
             sessionId: options.conversation,
           }, {
             onAgentLabel: () => {}, // no label prefix in single-shot streaming; just print tokens
             trace: Boolean(options.trace),
+            ...companion,
           });
+          noteConversation(result?.sessionId);
         } catch (err) {
           console.error(chalk.red(`Error: ${err.message}`));
           process.exitCode = 1;
@@ -257,15 +367,18 @@ export function registerChatCommands(program, ctx) {
       const spinner = ora('Thinking...').start();
 
       try {
-        const { data, response } = await sendOneShot(client, {
+        const { data, response, sessionId: convId } = await sendOneShot(client, {
           message,
           agent: options.agent,
           sessionId: options.conversation,
+          resumeTurn: options.resume,
         });
         spinner.stop();
+        noteConversation(convId);
+        for (const qe of Array.isArray(data.quox_events) ? data.quox_events : []) printQuoxEvent(qe); // the server's per-turn Quox effects, when it returns them
 
         if (program.opts().output === 'json') {
-          console.log(JSON.stringify(data, null, 2));
+          console.log(JSON.stringify({ ...data, conversation_id: convId || null }, null, 2));
         } else {
           console.log(response);
 
@@ -293,3 +406,4 @@ export function registerChatCommands(program, ctx) {
       });
     });
 }
+

package/lib/commands/chatCompanion.js

@@ -0,0 +1,27 @@
+import { resolve } from 'node:path';
+import { pathToFileURL } from 'node:url';
+
+/** Explicit local opt-in only. A display failure must not interrupt a chat. */
+export async function loadChatCompanion(path, { output = process.stdout, warn = console.error, display = {} } = {}) {
+  if (!path || !output.isTTY) return null;
+  try {
+    const mod = await import(pathToFileURL(resolve(path)).href);
+    const c = await mod.createCompanion({ output, ...display });
+    if (!c || !['event', 'write', 'close', 'suspend'].every(k => typeof c[k] === 'function')) {
+      try { c?.close?.(); } catch {}
+      throw new Error('Expected createCompanion() with event/write/close/suspend');
+    }
+    let active = true;
+    const stop = async () => { active = false; try { await c.close(); } catch {} };
+    return {
+      event(e) { if (active) try { c.event(e); } catch { stop(); } },
+      write(text) { if (!active) output.write(text); else c.write(text); },
+      // Trace writes to stderr: relinquish the block first to prevent overlap.
+      suspend() { if (active) try { c.suspend(); } catch { stop(); } },
+      close: stop,
+    };
+  } catch (e) {
+    warn('Dragon companion unavailable; continuing normal chat: ' + e.message);
+    return null;
+  }
+}

package/lib/commands/chatState.js

@@ -0,0 +1,45 @@
+/**
+ * Last conversation per (profile, cwd), so `quox chat --continue` keeps context without the user
+ * copying a session id. Best-effort: a read/write failure never breaks a chat turn.
+ */
+import { homedir } from 'node:os';
+import { join, dirname } from 'node:path';
+import { readFileSync, writeFileSync, mkdirSync, readlinkSync } from 'node:fs';
+
+const stateFile = () => process.env.QUOX_CHAT_STATE || join(homedir(), '.config', 'quox', 'chat-last.json');
+/**
+ * Who is calling: $QUOX_SESSION when set, else this terminal's tty, else nothing (a headless
+ * caller with no session id falls back to profile + cwd only). Parallel terminals/sessions must
+ * never share a "last conversation".
+ */
+export function callerScope(env = process.env) {
+  if (env.QUOX_SESSION) return `session:${String(env.QUOX_SESSION).slice(0, 64)}`;
+  for (const fd of [0, 1, 2]) {
+    try {
+      const t = readlinkSync(`/proc/self/fd/${fd}`);
+      if (/^\/dev\/(pts\/\d+|tty\w*)$/.test(t)) return `tty:${t}`;
+    } catch { /* not linux, or fd closed */ }
+  }
+  return '';
+}
+const keyOf = (profile, cwd) => `${profile || 'default'}|${cwd || process.cwd()}|${callerScope()}`;
+
+function read() {
+  try { return JSON.parse(readFileSync(stateFile(), 'utf8')) || {}; } catch { return {}; }
+}
+
+export function lastConversation(profile, cwd) {
+  const v = read()[keyOf(profile, cwd)];
+  return typeof v === 'string' && v ? v : undefined;
+}
+
+export function saveLastConversation(profile, cwd, id) {
+  if (!id) return;
+  try {
+    const all = read();
+    all[keyOf(profile, cwd)] = id;
+    const f = stateFile();
+    mkdirSync(dirname(f), { recursive: true });
+    writeFileSync(f, JSON.stringify(all, null, 2));
+  } catch { /* best-effort */ }
+}

package/lib/commands/claude.js

@@ -1,5 +1,5 @@
 /**
- * quox claude / codex / gemini / run / sessions: governed tmux sessions. The runner
+ * quox claude / codex / run / sessions: governed tmux sessions. The runner
  * lives in core/governedSession.js; this file holds argument parsing and the
  * commander wiring. argv arrays only; user input never reaches a shell string.
  */
@@ -29,6 +29,7 @@ export {
  */
 export function parseClaudeArgs(raw) {
   let noTmux = false;
+  let force = false;
   let as;
   let slot;
   const args = [];
@@ -38,6 +39,7 @@ export function parseClaudeArgs(raw) {
     if (past) { args.push(a); continue; }
     if (a === '--') { past = true; args.push(a); continue; }
     if (a === '--no-tmux') noTmux = true;
+    else if (a === '--force') force = true;
     else if ((a === '--as' || a === '--slot') && raw[i + 1] && !raw[i + 1].startsWith('-')) {
       if (a === '--as') as = raw[i + 1]; else slot = raw[i + 1];
       i++;
@@ -72,7 +74,7 @@ export function parseClaudeArgs(raw) {
     }
   }
   if (name !== undefined && !validateName(name)) name = undefined;
-  return { args, name, resume, noTmux, as, slot };
+  return { args, name, resume, noTmux, ...(force ? { force } : {}), as, slot };
 }
 
 /**
@@ -102,22 +104,6 @@ export const runClaude = ({ as, slot, ...opts } = {}, over) => gs.runGoverned({
   program: 'claude',
   ...(as || slot ? { preattach: { agent: as, slot, session: opts.name } } : {}),
 }, over);
-/**
- * quox gemini <args>: verbatim to `gemini`. Gemini resumes by index or
- * "latest" (`--resume latest`, `-r 5`), not by name, so the tmux session is
- * auto-named; reattach with `quox sessions attach NAME`.
- */
-export function parseGeminiArgs(raw) {
-  let noTmux = false;
-  const args = [];
-  for (const a of raw) {
-    if (a === '--no-tmux') noTmux = true;
-    else args.push(a);
-  }
-  const resume = args.some((a) => a === '--resume' || a === '-r' || a.startsWith('--resume='));
-  return { args, name: undefined, resume, noTmux };
-}
-
 /**
  * quox wrap <program> [args...]: wrap ANY command. Known programs use their
  * registry entry (so `quox wrap codex` == `quox codex`); unknown ones get the
@@ -135,12 +121,11 @@ export function parseRunArgs(raw) {
 }
 
 export function runRun({ bin, args = [], noTmux = false } = {}, over) {
-  const known = ['claude', 'codex', 'gemini'].find((k) => PROGRAMS[k].bin === bin);
+  const known = ['claude', 'codex'].find((k) => PROGRAMS[k].bin === bin);
   if (known) return gs.runGoverned({ program: known, args, noTmux }, over);
   return gs.runGoverned({ program: 'run', bin, args, noTmux }, over);
 }
 
-export const runGemini = (opts, over) => gs.runGoverned({ ...opts, program: 'gemini' }, over);
 export const runCodex = (opts, over) => gs.runGoverned({ ...opts, program: 'codex' }, over);
 export const runTui = (opts, over) => gs.runGoverned({ ...opts, program: 'tui' }, over);
 export const runHelp = gs.runHelp;
@@ -168,6 +153,7 @@ quox's own flags (consumed here, not passed to claude):
   --as <agent>    start already attached to a Quox agent
   --slot <name>   start already holding a dev slot
   --no-tmux       run claude directly, without tmux
+  --force         with --resume: start a second copy even if that conversation is already running
   -n, --name <n>  name the session (also names the tmux session; claude's own flag)
   --resume <n>    resume the named session (claude's own flag)
   -h, --help      show this help
@@ -219,18 +205,6 @@ Claude's own --agent is untouched and passes through to claude.`)
       const parsed = parseCodexArgs(i >= 0 ? raw.slice(i + 1) : []);
       process.exitCode = runCodex(parsed, over);
     });
-  markForwardsRawArgs(program
-    .command('gemini'), 'forwards argv after the verb verbatim')
-    .description('Run Gemini CLI (same arguments as gemini) in a tmux session that survives sleep and drops')
-    .argument('[args...]', 'passed to gemini exactly as given (quox adds only --no-tmux)')
-    .helpOption(false)
-    .allowUnknownOption()
-    .allowExcessArguments()
-    .action((_a, _o, cmd) => {
-      const raw = (cmd.parent && cmd.parent.rawArgs) || process.argv;
-      const i = raw.indexOf('gemini', 2);
-      process.exitCode = runGemini(parseGeminiArgs(i >= 0 ? raw.slice(i + 1) : []), over);
-    });
   markForwardsRawArgs(program
     .command('wrap'), 'forwards argv after the verb verbatim')
     .description('Run any program in a governed tmux session: quox wrap <program> [args...]')
@@ -299,7 +273,7 @@ Claude's own --agent is untouched and passes through to claude.`)
   sessions.command('heartbeat <tmuxSession>', { hidden: true })
     .description('Heartbeat one wrapped tmux session to the org session index (started by quox claude)')
     .option('--loop', 'keep beating until the tmux session ends')
-    .option('--backend <program>', 'claude, codex, gemini, ...')
+    .option('--backend <program>', 'claude, codex, ...')
     .option('--agent <agent>', 'agent the session started attached to (--as)')
     .option('--slot <slot>', 'slot the session started holding (--slot)')
     .action(async (name, o) => {