@charzhu/openjaw-agent 0.2.0 → 0.2.2

package/dist/main.js

@@ -3540,6 +3540,13 @@ var init_tool_exposure = __esm({
 
 // src/copilot-auth.ts
 import { setTimeout as sleep } from "node:timers/promises";
+function isOAuthAbortError(err) {
+  if (!err || typeof err !== "object") return false;
+  const anyErr = err;
+  if (anyErr.name === "AbortError") return true;
+  if (anyErr.code === "ABORT_ERR") return true;
+  return false;
+}
 function oauthDomain(enterpriseUrl) {
   return enterpriseUrl ? normalizeCopilotEnterpriseDomain(enterpriseUrl) : "github.com";
 }
@@ -3578,11 +3585,14 @@ async function startCopilotDeviceFlow(clientId, enterpriseUrl) {
     enterpriseUrl: normalizedEnterpriseUrl
   };
 }
-async function completeCopilotDeviceFlow(flow) {
+async function completeCopilotDeviceFlow(flow, signal) {
   const domain = oauthDomain(flow.enterpriseUrl);
   let intervalMs = flow.intervalSeconds * 1e3;
   while (true) {
-    await sleep(intervalMs + OAUTH_POLLING_SAFETY_MARGIN_MS);
+    if (signal?.aborted) {
+      throw signal.reason instanceof Error ? signal.reason : new DOMException("Aborted", "AbortError");
+    }
+    await sleep(intervalMs + OAUTH_POLLING_SAFETY_MARGIN_MS, void 0, { signal });
     const res = await fetch(`https://${domain}/login/oauth/access_token`, {
       method: "POST",
       headers: {
@@ -3594,7 +3604,8 @@ async function completeCopilotDeviceFlow(flow) {
         client_id: flow.clientId,
         device_code: flow.deviceCode,
         grant_type: "urn:ietf:params:oauth:grant-type:device_code"
-      })
+      }),
+      signal
     });
     if (!res.ok) {
       throw new Error(`GitHub device login failed: ${res.status}`);
@@ -3633,6 +3644,7 @@ var init_copilot_auth = __esm({
     init_provider_auth();
     init_copilot();
     OAUTH_POLLING_SAFETY_MARGIN_MS = 3e3;
+    __name(isOAuthAbortError, "isOAuthAbortError");
     __name(oauthDomain, "oauthDomain");
     __name(startCopilotDeviceFlow, "startCopilotDeviceFlow");
     __name(completeCopilotDeviceFlow, "completeCopilotDeviceFlow");
@@ -3648,7 +3660,8 @@ __export(connect_exports, {
   disconnectContext: () => disconnectContext,
   handleConnectCommand: () => handleConnectCommand,
   listDisconnectChoices: () => listDisconnectChoices,
-  maestroConfig: () => maestroConfig
+  maestroConfig: () => maestroConfig,
+  resolveCopilotClientId: () => resolveCopilotClientId
 });
 function maestroConfig(flavor = "anthropic") {
   return {
@@ -8978,6 +8991,19 @@ import { DatabaseSync } from "node:sqlite";
 import { join as join12 } from "node:path";
 import { homedir as homedir9 } from "node:os";
 import { mkdirSync as mkdirSync8, existsSync as existsSync10 } from "node:fs";
+function hasFts5() {
+  return _hasFts5;
+}
+function detectFts5(database) {
+  const probe = `__fts5_probe_${Date.now()}_${Math.random().toString(36).slice(2, 8)}`;
+  try {
+    database.exec(`CREATE VIRTUAL TABLE temp.${probe} USING fts5(x)`);
+    database.exec(`DROP TABLE temp.${probe}`);
+    return true;
+  } catch {
+    return false;
+  }
+}
 function getMemoryDb() {
   if (!db) {
     if (!existsSync10(DB_DIR)) {
@@ -8987,12 +9013,12 @@ function getMemoryDb() {
     db.exec("PRAGMA journal_mode=WAL");
     db.exec("PRAGMA busy_timeout=5000");
     ensureSchema(db);
-    logger_default.debug("Memory database opened", { path: DB_PATH });
+    logger_default.debug("Memory database opened", { path: DB_PATH, hasFts5: _hasFts5 });
   }
   return db;
 }
-function ensureSchema(db2) {
-  db2.exec(`
+function ensureSchema(database) {
+  database.exec(`
     CREATE TABLE IF NOT EXISTS memories (
       id INTEGER PRIMARY KEY AUTOINCREMENT,
       content TEXT NOT NULL,
@@ -9002,36 +9028,49 @@ function ensureSchema(db2) {
       created_at TEXT NOT NULL DEFAULT (datetime('now'))
     )
   `);
-  db2.exec(`
-    CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
-      content,
-      content='memories',
-      content_rowid='id',
-      tokenize='unicode61'
-    )
-  `);
-  db2.exec(`
-    CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
-      INSERT INTO memories_fts(rowid, content) VALUES (new.id, new.content);
-    END
-  `);
-  db2.exec(`
-    CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
-      INSERT INTO memories_fts(memories_fts, rowid, content) VALUES ('delete', old.id, old.content);
-    END
-  `);
-  db2.exec(`
-    CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
-      INSERT INTO memories_fts(memories_fts, rowid, content) VALUES ('delete', old.id, old.content);
-      INSERT INTO memories_fts(rowid, content) VALUES (new.id, new.content);
-    END
-  `);
+  _hasFts5 = detectFts5(database);
+  if (_hasFts5) {
+    database.exec(`
+      CREATE VIRTUAL TABLE IF NOT EXISTS memories_fts USING fts5(
+        content,
+        content='memories',
+        content_rowid='id',
+        tokenize='unicode61'
+      )
+    `);
+    database.exec(`
+      CREATE TRIGGER IF NOT EXISTS memories_ai AFTER INSERT ON memories BEGIN
+        INSERT INTO memories_fts(rowid, content) VALUES (new.id, new.content);
+      END
+    `);
+    database.exec(`
+      CREATE TRIGGER IF NOT EXISTS memories_ad AFTER DELETE ON memories BEGIN
+        INSERT INTO memories_fts(memories_fts, rowid, content) VALUES ('delete', old.id, old.content);
+      END
+    `);
+    database.exec(`
+      CREATE TRIGGER IF NOT EXISTS memories_au AFTER UPDATE ON memories BEGIN
+        INSERT INTO memories_fts(memories_fts, rowid, content) VALUES ('delete', old.id, old.content);
+        INSERT INTO memories_fts(rowid, content) VALUES (new.id, new.content);
+      END
+    `);
+    try {
+      database.exec(`INSERT INTO memories_fts(memories_fts) VALUES('rebuild')`);
+    } catch (err) {
+      logger_default.warn("FTS5 rebuild failed (non-fatal)", { error: String(err) });
+    }
+  } else {
+    database.exec(`DROP TRIGGER IF EXISTS memories_ai`);
+    database.exec(`DROP TRIGGER IF EXISTS memories_ad`);
+    database.exec(`DROP TRIGGER IF EXISTS memories_au`);
+    logger_default.warn("FTS5 not available in this SQLite build \u2014 memory search will use LIKE-based fallback. For best performance, upgrade to Node 23.5+ (bundled SQLite includes FTS5 by default).");
+  }
   try {
-    db2.exec("ALTER TABLE memories ADD COLUMN hrr_vector BLOB");
+    database.exec("ALTER TABLE memories ADD COLUMN hrr_vector BLOB");
   } catch {
   }
 }
-var DB_DIR, DB_PATH, db;
+var DB_DIR, DB_PATH, db, _hasFts5;
 var init_db = __esm({
   "../openjaw-mcp/dist/memory/db.js"() {
     "use strict";
@@ -9039,6 +9078,9 @@ var init_db = __esm({
     DB_DIR = join12(homedir9(), ".openjaw");
     DB_PATH = join12(DB_DIR, "memory.db");
     db = null;
+    _hasFts5 = false;
+    __name(hasFts5, "hasFts5");
+    __name(detectFts5, "detectFts5");
     __name(getMemoryDb, "getMemoryDb");
     __name(ensureSchema, "ensureSchema");
   }
@@ -9135,11 +9177,15 @@ var init_hrr = __esm({
 });
 
 // ../openjaw-mcp/dist/memory/retrieval.js
-var STOPWORDS, DEFAULT_WEIGHTS, HybridRetriever;
+function escapeLike(token) {
+  return `%${token.replace(/[\\%_]/g, "\\$&")}%`;
+}
+var STOPWORDS, MAX_LIKE_TERMS, DEFAULT_WEIGHTS_FTS, DEFAULT_WEIGHTS_NO_FTS, HybridRetriever;
 var init_retrieval = __esm({
   "../openjaw-mcp/dist/memory/retrieval.js"() {
     "use strict";
     init_hrr();
+    init_db();
     init_logger();
     STOPWORDS = /* @__PURE__ */ new Set([
       "a",
@@ -9201,23 +9247,30 @@ var init_retrieval = __esm({
       "should",
       "could"
     ]);
-    DEFAULT_WEIGHTS = {
+    MAX_LIKE_TERMS = 16;
+    __name(escapeLike, "escapeLike");
+    DEFAULT_WEIGHTS_FTS = {
       fts: 0.4,
       jaccard: 0.3,
       hrr: 0.3
     };
+    DEFAULT_WEIGHTS_NO_FTS = {
+      fts: 0,
+      jaccard: 0.5,
+      hrr: 0.5
+    };
     HybridRetriever = class {
       static {
         __name(this, "HybridRetriever");
       }
       db;
       weights;
-      constructor(db2, weights = DEFAULT_WEIGHTS) {
+      constructor(db2, weights) {
         this.db = db2;
-        this.weights = weights;
+        this.weights = weights ?? (hasFts5() ? DEFAULT_WEIGHTS_FTS : DEFAULT_WEIGHTS_NO_FTS);
       }
       /**
-       * Hybrid search: FTS5 candidate retrieval → Jaccard + HRR re-ranking.
+       * Hybrid search: FTS5 (or LIKE fallback) candidate retrieval → Jaccard + HRR re-ranking.
        */
       search(query, limit = 10) {
         const queryTokens = query.toLowerCase().match(/[\w]+/g);
@@ -9228,27 +9281,47 @@ var init_retrieval = __esm({
           return [];
         const queryTokenSet = new Set(filtered);
         const candidateLimit = Math.max(limit * 5, 50);
-        const ftsQuery = filtered.join(" OR ");
         let hasHrrColumn = true;
         try {
           this.db.prepare("SELECT hrr_vector FROM memories LIMIT 0").all();
         } catch {
           hasHrrColumn = false;
         }
-        const selectCols = hasHrrColumn ? "m.id, m.content, m.source, m.created_at, m.hrr_vector, fts.rank" : "m.id, m.content, m.source, m.created_at, fts.rank";
-        let candidates;
-        try {
-          candidates = this.db.prepare(`
-        SELECT ${selectCols}
-        FROM memories_fts fts
-        JOIN memories m ON m.id = fts.rowid
-        WHERE memories_fts MATCH ?
-        ORDER BY fts.rank
-        LIMIT ?
-      `).all(ftsQuery, candidateLimit);
-        } catch (err) {
-          logger_default.warn("FTS5 search failed in hybrid retriever", { query: ftsQuery, error: String(err) });
-          return [];
+        let candidates = [];
+        if (hasFts5()) {
+          const selectCols = hasHrrColumn ? "m.id, m.content, m.source, m.created_at, m.hrr_vector, fts.rank" : "m.id, m.content, m.source, m.created_at, fts.rank";
+          const ftsQuery = filtered.join(" OR ");
+          try {
+            candidates = this.db.prepare(`
+          SELECT ${selectCols}
+          FROM memories_fts fts
+          JOIN memories m ON m.id = fts.rowid
+          WHERE memories_fts MATCH ?
+          ORDER BY fts.rank
+          LIMIT ?
+        `).all(ftsQuery, candidateLimit);
+          } catch (err) {
+            logger_default.warn("FTS5 search failed in hybrid retriever", { query: ftsQuery, error: String(err) });
+            return [];
+          }
+        } else {
+          const terms = Array.from(new Set(filtered)).slice(0, MAX_LIKE_TERMS);
+          const selectCols = hasHrrColumn ? "m.id, m.content, m.source, m.created_at, m.hrr_vector, 0 AS rank" : "m.id, m.content, m.source, m.created_at, 0 AS rank";
+          const wheres = terms.map(() => `m.content LIKE ? ESCAPE '\\'`).join(" OR ");
+          const params = terms.map(escapeLike);
+          params.push(candidateLimit);
+          try {
+            candidates = this.db.prepare(`
+          SELECT ${selectCols}
+          FROM memories m
+          WHERE ${wheres}
+          ORDER BY m.created_at DESC, m.id DESC
+          LIMIT ?
+        `).all(...params);
+          } catch (err) {
+            logger_default.warn("LIKE-fallback search failed in hybrid retriever", { error: String(err) });
+            return [];
+          }
         }
         if (candidates.length === 0)
           return [];
@@ -19380,6 +19453,9 @@ import { homedir as homedir11 } from "node:os";
 function setMemoryPrefetchQuery(query) {
   currentQuery = query;
 }
+function escapeLike2(token) {
+  return `%${token.replace(/[\\%_]/g, "\\$&")}%`;
+}
 function getMemorySection() {
   if (!currentQuery) return null;
   try {
@@ -19396,15 +19472,34 @@ function getMemorySection() {
       if (!tokens || tokens.length === 0) return null;
       const filtered = tokens.filter((t) => !STOPWORDS2.has(t));
       if (filtered.length === 0) return null;
-      const safeQuery = filtered.join(" OR ");
-      const rows = db2.prepare(`
-        SELECT m.content, m.source, m.created_at
-        FROM memories_fts fts
-        JOIN memories m ON m.id = fts.rowid
-        WHERE memories_fts MATCH ?
-        ORDER BY fts.rank
-        LIMIT ?
-      `).all(safeQuery, MAX_PREFETCH_RESULTS);
+      let rows = [];
+      const ftsQuery = filtered.join(" OR ");
+      try {
+        rows = db2.prepare(`
+          SELECT m.content, m.source, m.created_at
+          FROM memories_fts fts
+          JOIN memories m ON m.id = fts.rowid
+          WHERE memories_fts MATCH ?
+          ORDER BY fts.rank
+          LIMIT ?
+        `).all(ftsQuery, MAX_PREFETCH_RESULTS);
+      } catch {
+        const terms = Array.from(new Set(filtered)).slice(0, MAX_LIKE_TERMS2);
+        const wheres = terms.map(() => `content LIKE ? ESCAPE '\\'`).join(" OR ");
+        const params = terms.map(escapeLike2);
+        params.push(MAX_PREFETCH_RESULTS);
+        try {
+          rows = db2.prepare(`
+            SELECT content, source, created_at
+            FROM memories
+            WHERE ${wheres}
+            ORDER BY created_at DESC, id DESC
+            LIMIT ?
+          `).all(...params);
+        } catch {
+          return null;
+        }
+      }
       if (rows.length === 0) return null;
       let result = "# Relevant Memories\n\nRecalled from your memory database based on your current query:\n\n";
       for (const row of rows) {
@@ -19421,12 +19516,13 @@ function getMemorySection() {
     return null;
   }
 }
-var MAX_PREFETCH_RESULTS, MAX_PREFETCH_CHARS, STOPWORDS2, currentQuery;
+var MAX_PREFETCH_RESULTS, MAX_PREFETCH_CHARS, MAX_LIKE_TERMS2, STOPWORDS2, currentQuery;
 var init_memory2 = __esm({
   "src/prompts/memory.ts"() {
     "use strict";
     MAX_PREFETCH_RESULTS = 10;
     MAX_PREFETCH_CHARS = 4e3;
+    MAX_LIKE_TERMS2 = 16;
     STOPWORDS2 = /* @__PURE__ */ new Set([
       "a",
       "an",
@@ -19489,6 +19585,7 @@ var init_memory2 = __esm({
     ]);
     currentQuery = null;
     __name(setMemoryPrefetchQuery, "setMemoryPrefetchQuery");
+    __name(escapeLike2, "escapeLike");
     __name(getMemorySection, "getMemorySection");
   }
 });
@@ -47225,6 +47322,19 @@ function registerRpcHandlers(options) {
   let currentRun = null;
   const pendingResponders = /* @__PURE__ */ new Map();
   const promptCollector = createPromptCollector(bus, () => agentLoop.sessionId);
+  const OAUTH_FLOW_TTL_MS = 15 * 60 * 1e3;
+  const oauthFlows = /* @__PURE__ */ new Map();
+  const cleanupOAuthFlow = /* @__PURE__ */ __name((flowId, abort) => {
+    const entry = oauthFlows.get(flowId);
+    if (!entry) {
+      return;
+    }
+    clearTimeout(entry.timer);
+    if (abort && !entry.controller.signal.aborted) {
+      entry.controller.abort();
+    }
+    oauthFlows.delete(flowId);
+  }, "cleanupOAuthFlow");
   const onBridgeEvent = /* @__PURE__ */ __name((rawEvent) => {
     const source = inferBridgeSource(rawEvent);
     const user = bridgeUser(rawEvent, source);
@@ -47771,6 +47881,77 @@ ${helpMessage}` : field.label;
     }
     return { disconnected: true, slug };
   });
+  bus.registerRpc("model.oauth_start", async (params) => {
+    const slug = String(params.slug ?? "").trim();
+    if (!PROVIDERS2.includes(slug)) {
+      throw new Error(`unknown provider: ${slug}`);
+    }
+    const auth = PROVIDER_AUTH[slug];
+    if (auth.auth_type !== "oauth") {
+      throw new Error(`${PROVIDER_LABELS[slug]} does not use OAuth (auth_type=${auth.auth_type})`);
+    }
+    const clientId = resolveCopilotClientId();
+    if (!clientId) {
+      throw new Error(
+        "GitHub Copilot login needs a GitHub OAuth App client ID. Set GITHUB_COPILOT_CLIENT_ID or llm.copilot_oauth_client_id in ~/.openjaw-agent/config.yaml."
+      );
+    }
+    const enterpriseUrl = (() => {
+      const raw = params["enterprise_url"];
+      if (typeof raw === "string" && raw.trim()) {
+        return raw.trim();
+      }
+      return agentConfig.llm.copilot_enterprise_url;
+    })();
+    const flow = await startCopilotDeviceFlow(clientId, enterpriseUrl);
+    const flowId = randomUUID13();
+    const controller = new AbortController();
+    const timer = setTimeout(() => {
+      cleanupOAuthFlow(flowId, true);
+    }, OAUTH_FLOW_TTL_MS);
+    if (typeof timer.unref === "function") {
+      timer.unref();
+    }
+    oauthFlows.set(flowId, { controller, flow, slug, timer });
+    return {
+      flow_id: flowId,
+      interval_seconds: flow.intervalSeconds,
+      user_code: flow.userCode,
+      verification_uri: flow.verificationUri
+    };
+  });
+  bus.registerRpc("model.oauth_complete", async (params) => {
+    const flowId = String(params["flow_id"] ?? "").trim();
+    const entry = oauthFlows.get(flowId);
+    if (!entry) {
+      throw new Error("OAuth flow not found or already completed/expired");
+    }
+    try {
+      await completeCopilotDeviceFlow(entry.flow, entry.controller.signal);
+    } catch (err) {
+      cleanupOAuthFlow(flowId, false);
+      if (isOAuthAbortError(err) || entry.controller.signal.aborted) {
+        return { aborted: true, slug: entry.slug };
+      }
+      throw err;
+    }
+    cleanupOAuthFlow(flowId, false);
+    reconnectProviderContext(entry.slug);
+    const live = await fetchLiveModels(entry.slug, agentConfig, agentLoop.model);
+    return {
+      provider: buildProviderOption(entry.slug, agentLoop.providerName, agentLoop.model, live.models, live.error),
+      slug: entry.slug
+    };
+  });
+  bus.registerRpc("model.oauth_cancel", (params) => {
+    const flowId = String(params["flow_id"] ?? "").trim();
+    const entry = oauthFlows.get(flowId);
+    if (!entry) {
+      return { cancelled: false, reason: "flow not found" };
+    }
+    cleanupOAuthFlow(flowId, true);
+    return { cancelled: true, slug: entry.slug };
+  });
   bus.registerRpc("commands.catalog", () => {
     const skillCount = toolRegistry.listTools().filter((t) => /^skill[:_-]/i.test(t.name)).length;
     return buildCommandsCatalog({ skillCount });
@@ -48394,6 +48575,9 @@ ${helpMessage}` : field.label;
     bridgeEmitter?.off("bridgeEvent", onBridgeEvent);
     mcpManager.off("tools-changed", onToolsChanged);
     pendingResponders.clear();
+    for (const id of Array.from(oauthFlows.keys())) {
+      cleanupOAuthFlow(id, true);
+    }
   };
 }
 var PROVIDERS2, PROVIDER_LABELS, PROVIDER_AUTH, isProviderAuthenticated, buildProviderOption, fetchLiveModels, BRIDGE_SOURCES, isBridgeSource, inferBridgeSource, bridgeLabels, bridgeEventLabels, stripBridgeGlyph, firstLogLine, bridgeUser, formatBridgeText, runProcess, contentToText, sessionMessageToMarkdown, usageSnapshot, sessionInfoSnapshot;
@@ -48402,6 +48586,7 @@ var init_rpcHandlers = __esm({
     "use strict";
     init_connect();
     init_config();
+    init_copilot_auth();
     init_context_manager();
     init_eventBridge();
     init_fork();
@@ -56261,8 +56446,8 @@ var init_providers2 = __esm({
 });
 
 // src/components/modelPicker.tsx
-import { useEffect as useEffect17, useMemo as useMemo12, useState as useState19 } from "react";
-import { jsx as jsx25, jsxs as jsxs13 } from "react/jsx-runtime";
+import { useEffect as useEffect17, useMemo as useMemo12, useRef as useRef17, useState as useState19 } from "react";
+import { Fragment as Fragment5, jsx as jsx25, jsxs as jsxs13 } from "react/jsx-runtime";
 function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t }) {
   const [providers, setProviders] = useState19([]);
   const [currentModel, setCurrentModel] = useState19("");
@@ -56275,10 +56460,19 @@ function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t })
   const [keyInput, setKeyInput] = useState19("");
   const [keySaving, setKeySaving] = useState19(false);
   const [keyError, setKeyError] = useState19("");
+  const [oauthStatus, setOauthStatus] = useState19("starting");
+  const [oauthVerificationUri, setOauthVerificationUri] = useState19("");
+  const [oauthUserCode, setOauthUserCode] = useState19("");
+  const [oauthError, setOauthError] = useState19("");
+  const oauthFlowIdRef = useRef17(null);
+  const oauthProviderSlugRef = useRef17(null);
+  const oauthAttemptRef = useRef17(0);
+  const mountedRef = useRef17(true);
   const { stdout } = useStdout();
   const width = Math.max(MIN_WIDTH2, Math.min(MAX_WIDTH2, (stdout?.columns ?? 80) - 6));
   useEffect17(() => {
     gw.request("model.options", sessionId ? { session_id: sessionId } : {}).then((raw) => {
+      if (!mountedRef.current) return;
       const r = asRpcResult(raw);
       if (!r) {
         setErr("invalid response: model.options");
@@ -56299,6 +56493,7 @@ function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t })
       setErr("");
       setLoading(false);
     }).catch((e) => {
+      if (!mountedRef.current) return;
       setErr(rpcErrorMessage(e));
       setLoading(false);
     });
@@ -56306,7 +56501,121 @@ function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t })
   const provider = providers[providerIdx];
   const models = provider?.models ?? [];
   const names = useMemo12(() => providerDisplayNames(providers), [providers]);
+  useEffect17(() => {
+    mountedRef.current = true;
+    return () => {
+      mountedRef.current = false;
+      const flowId = oauthFlowIdRef.current;
+      if (flowId) {
+        gw.request("model.oauth_cancel", { flow_id: flowId }).catch(() => {
+        });
+        oauthFlowIdRef.current = null;
+      }
+    };
+  }, [gw]);
+  const refreshProviders = /* @__PURE__ */ __name(() => gw.request("model.options", sessionId ? { session_id: sessionId } : {}).then((raw) => {
+    if (!mountedRef.current) return;
+    const r = asRpcResult(raw);
+    if (!r) {
+      return;
+    }
+    setProviders(r.providers ?? []);
+    setCurrentModel(String(r.model ?? ""));
+  }).catch(() => {
+  }), "refreshProviders");
+  const cancelActiveOAuth = /* @__PURE__ */ __name(() => {
+    oauthAttemptRef.current += 1;
+    const flowId = oauthFlowIdRef.current;
+    if (!flowId) {
+      return;
+    }
+    oauthFlowIdRef.current = null;
+    gw.request("model.oauth_cancel", { flow_id: flowId }).catch(() => {
+    });
+  }, "cancelActiveOAuth");
+  const startOAuthFlow = /* @__PURE__ */ __name((slug) => {
+    cancelActiveOAuth();
+    const attempt = ++oauthAttemptRef.current;
+    oauthProviderSlugRef.current = slug;
+    setStage("oauth");
+    setOauthStatus("starting");
+    setOauthVerificationUri("");
+    setOauthUserCode("");
+    setOauthError("");
+    const isCurrent = /* @__PURE__ */ __name(() => mountedRef.current && oauthAttemptRef.current === attempt, "isCurrent");
+    gw.request("model.oauth_start", {
+      slug,
+      ...sessionId ? { session_id: sessionId } : {}
+    }).then((raw) => {
+      const r = asRpcResult(raw);
+      if (!isCurrent()) {
+        if (r?.flow_id) {
+          gw.request("model.oauth_cancel", { flow_id: r.flow_id }).catch(() => {
+          });
+        }
+        return;
+      }
+      if (!r?.flow_id) {
+        setOauthStatus("error");
+        setOauthError("invalid response from model.oauth_start");
+        return;
+      }
+      oauthFlowIdRef.current = r.flow_id;
+      setOauthVerificationUri(r.verification_uri);
+      setOauthUserCode(r.user_code);
+      setOauthStatus("waiting");
+      gw.request("model.oauth_complete", {
+        flow_id: r.flow_id,
+        ...sessionId ? { session_id: sessionId } : {}
+      }).then((rawComplete) => {
+        if (!isCurrent()) return;
+        if (oauthFlowIdRef.current !== r.flow_id) return;
+        oauthFlowIdRef.current = null;
+        const rc = asRpcResult(rawComplete);
+        if (!rc) {
+          setOauthStatus("error");
+          setOauthError("invalid response from model.oauth_complete");
+          return;
+        }
+        if (rc.aborted) {
+          setStage("provider");
+          return;
+        }
+        if (rc.provider) {
+          setProviders(
+            (prev) => prev.map((p) => p.slug === rc.provider.slug ? rc.provider : p)
+          );
+        } else {
+          refreshProviders();
+        }
+        if (mode === "connect") {
+          onCancel();
+          return;
+        }
+        setStage("model");
+        setModelIdx(0);
+      }).catch((e) => {
+        if (!isCurrent()) return;
+        if (oauthFlowIdRef.current !== r.flow_id) return;
+        oauthFlowIdRef.current = null;
+        setOauthStatus("error");
+        setOauthError(rpcErrorMessage(e));
+      });
+    }).catch((e) => {
+      if (!isCurrent()) return;
+      setOauthStatus("error");
+      setOauthError(rpcErrorMessage(e));
+    });
+  }, "startOAuthFlow");
   const back = /* @__PURE__ */ __name(() => {
+    if (stage === "oauth") {
+      cancelActiveOAuth();
+      setStage("provider");
+      setOauthVerificationUri("");
+      setOauthUserCode("");
+      setOauthError("");
+      return;
+    }
     if (stage === "model" || stage === "key" || stage === "disconnect") {
       setStage("provider");
       setModelIdx(0);
@@ -56317,8 +56626,30 @@ function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t })
     }
     onCancel();
   }, "back");
-  useOverlayKeys({ onBack: back, onClose: onCancel });
+  const close = /* @__PURE__ */ __name(() => {
+    if (stage === "oauth") {
+      cancelActiveOAuth();
+    }
+    onCancel();
+  }, "close");
+  useOverlayKeys({ onBack: back, onClose: close });
   use_input_default((ch, key) => {
+    if (stage === "oauth") {
+      if (key.escape) {
+        back();
+        return;
+      }
+      if (key.return && oauthStatus === "error") {
+        const slug = oauthProviderSlugRef.current;
+        if (slug) {
+          startOAuthFlow(slug);
+        } else {
+          back();
+        }
+        return;
+      }
+      return;
+    }
     if (stage === "key") {
       if (keySaving) {
         return;
@@ -56424,6 +56755,11 @@ function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t })
             setStage("key");
             setKeyInput("");
             setKeyError("");
+            return;
+          }
+          if (provider.auth_type === "oauth") {
+            startOAuthFlow(provider.slug);
+            return;
           }
           return;
         }
@@ -56470,6 +56806,41 @@ function ModelPicker2({ gw, mode = "switch", onCancel, onSelect, sessionId, t })
       /* @__PURE__ */ jsx25(OverlayHint, { t, children: "Esc/q cancel" })
     ] });
   }
+  if (stage === "oauth") {
+    const slug = oauthProviderSlugRef.current;
+    const providerName = providers.find((p) => p.slug === slug)?.name ?? "GitHub Copilot";
+    return /* @__PURE__ */ jsxs13(Box_default, { flexDirection: "column", width, children: [
+      /* @__PURE__ */ jsxs13(Text9, { bold: true, color: t.color.accent, wrap: "truncate-end", children: [
+        "Sign in to ",
+        providerName
+      ] }),
+      /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: " " }),
+      oauthStatus === "starting" ? /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: "requesting device code\u2026" }) : oauthStatus === "error" ? /* @__PURE__ */ jsxs13(Fragment5, { children: [
+        /* @__PURE__ */ jsxs13(Text9, { color: t.color.label, wrap: "truncate-end", children: [
+          "error: ",
+          oauthError || "failed to start GitHub sign-in"
+        ] }),
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: " " }),
+        /* @__PURE__ */ jsx25(OverlayHint, { t, children: "Enter retry \xB7 Esc back" })
+      ] }) : /* @__PURE__ */ jsxs13(Fragment5, { children: [
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: "1. Open this URL in your browser:" }),
+        /* @__PURE__ */ jsxs13(Text9, { bold: true, color: t.color.accent, wrap: "truncate-end", children: [
+          "   ",
+          oauthVerificationUri
+        ] }),
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: " " }),
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: "2. Enter this code on the GitHub page:" }),
+        /* @__PURE__ */ jsxs13(Text9, { bold: true, color: t.color.accent, wrap: "truncate-end", children: [
+          "   ",
+          oauthUserCode
+        ] }),
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: " " }),
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: "waiting for authorization\u2026" }),
+        /* @__PURE__ */ jsx25(Text9, { color: t.color.muted, wrap: "truncate-end", children: " " }),
+        /* @__PURE__ */ jsx25(OverlayHint, { t, children: "Esc cancel" })
+      ] })
+    ] });
+  }
   if (stage === "key" && provider) {
     const masked = keyInput ? "\u2022".repeat(Math.min(keyInput.length, 40)) : "";
     return /* @__PURE__ */ jsxs13(Box_default, { flexDirection: "column", width, children: [
@@ -57423,7 +57794,7 @@ var init_appOverlays = __esm({
 
 // src/components/branding.tsx
 import { useEffect as useEffect20, useState as useState24 } from "react";
-import { Fragment as Fragment5, jsx as jsx30, jsxs as jsxs18 } from "react/jsx-runtime";
+import { Fragment as Fragment6, jsx as jsx30, jsxs as jsxs18 } from "react/jsx-runtime";
 function useColumns() {
   const { stdout } = useStdout();
   const [cols, setCols] = useState24(stdout?.columns ?? 80);
@@ -58864,7 +59235,7 @@ var init_syntax = __esm({
 });
 
 // src/components/markdown.tsx
-import { Fragment as Fragment6, memo, useMemo as useMemo14 } from "react";
+import { Fragment as Fragment7, memo, useMemo as useMemo14 } from "react";
 import { jsx as jsx34, jsxs as jsxs21 } from "react/jsx-runtime";
 function ResolvedLink({ fallbackLabel, t, url }) {
   const fetched = useLinkTitle(url);
@@ -59396,7 +59767,7 @@ var init_markdown = __esm({
       const cellWidth = /* @__PURE__ */ __name((raw) => stringWidth(stripInlineMarkup(raw)), "cellWidth");
       const widths = rows[0].map((_, ci) => Math.max(...rows.map((r) => cellWidth(r[ci] ?? ""))));
       const sep2 = widths.map((w) => "\u2500".repeat(Math.max(1, w))).join("  ");
-      return /* @__PURE__ */ jsx34(Box_default, { flexDirection: "column", paddingLeft: 2, children: rows.map((row, ri) => /* @__PURE__ */ jsxs21(Fragment6, { children: [
+      return /* @__PURE__ */ jsx34(Box_default, { flexDirection: "column", paddingLeft: 2, children: rows.map((row, ri) => /* @__PURE__ */ jsxs21(Fragment7, { children: [
         /* @__PURE__ */ jsx34(Box_default, { children: widths.map((w, ci) => /* @__PURE__ */ jsxs21(Text9, { bold: ri === 0, color: ri === 0 ? t.color.accent : void 0, children: [
           /* @__PURE__ */ jsx34(MdInline, { t, text: row[ci] ?? "" }),
           " ".repeat(Math.max(0, w - cellWidth(row[ci] ?? ""))),
@@ -59437,7 +59808,7 @@ var init_markdown = __esm({
 });
 
 // src/components/streamingMarkdown.tsx
-import { memo as memo2, useRef as useRef17 } from "react";
+import { memo as memo2, useRef as useRef18 } from "react";
 import { jsx as jsx35, jsxs as jsxs22 } from "react/jsx-runtime";
 var fenceOpenAt, findStableBoundary, StreamingMd;
 var init_streamingMarkdown = __esm({
@@ -59500,7 +59871,7 @@ var init_streamingMarkdown = __esm({
       return -1;
     }, "findStableBoundary");
     StreamingMd = memo2(/* @__PURE__ */ __name(function StreamingMd2({ compact, t, text }) {
-      const stablePrefixRef = useRef17("");
+      const stablePrefixRef = useRef18("");
       if (!text.startsWith(stablePrefixRef.current)) {
         stablePrefixRef.current = "";
       }
@@ -59527,7 +59898,7 @@ var init_streamingMarkdown = __esm({
 // src/components/thinking.tsx
 import { memo as memo3, useEffect as useEffect23, useMemo as useMemo15, useState as useState26 } from "react";
 import spinners from "unicode-animations";
-import { Fragment as Fragment7, jsx as jsx36, jsxs as jsxs23 } from "react/jsx-runtime";
+import { Fragment as Fragment8, jsx as jsx36, jsxs as jsxs23 } from "react/jsx-runtime";
 import { createElement } from "react";
 function TreeRow({
   branch,
@@ -59786,7 +60157,7 @@ function SubagentAccordion({
         {
           branch: index === item.tools.length - 1 ? "last" : "mid",
           color: t.color.text,
-          content: /* @__PURE__ */ jsxs23(Fragment7, { children: [
+          content: /* @__PURE__ */ jsxs23(Fragment8, { children: [
             /* @__PURE__ */ jsx36(Text9, { color: t.color.accent, children: "\u25CF " }),
             line
           ] }),
@@ -60059,7 +60430,7 @@ var init_thinking = __esm({
             color: t.color.muted,
             dimColor: true,
             key: `tr-${i}`,
-            content: groups.length ? /* @__PURE__ */ jsxs23(Fragment7, { children: [
+            content: groups.length ? /* @__PURE__ */ jsxs23(Fragment8, { children: [
               /* @__PURE__ */ jsx36(Spinner3, { color: t.color.accent, variant: "think" }),
               " ",
               line
@@ -60076,7 +60447,7 @@ var init_thinking = __esm({
           key: tool.id,
           label,
           details: [],
-          content: /* @__PURE__ */ jsxs23(Fragment7, { children: [
+          content: /* @__PURE__ */ jsxs23(Fragment8, { children: [
             /* @__PURE__ */ jsx36(Spinner3, { color: t.color.accent, variant: "tool" }),
             " ",
             label,
@@ -60104,7 +60475,7 @@ var init_thinking = __esm({
       const inlineDelegateKey = hasSubagents && delegateGroups.length === 1 ? delegateGroups[0].key : null;
       const toolLabel = /* @__PURE__ */ __name((group) => {
         const { duration, label } = splitToolDuration(String(group.content));
-        return duration ? /* @__PURE__ */ jsxs23(Fragment7, { children: [
+        return duration ? /* @__PURE__ */ jsxs23(Fragment8, { children: [
           label,
           /* @__PURE__ */ jsx36(Text9, { color: t.color.statusFg, dim: true, children: duration })
         ] }) : group.content;
@@ -60216,7 +60587,7 @@ var init_thinking = __esm({
                 {
                   branch,
                   color: group.color,
-                  content: /* @__PURE__ */ jsxs23(Fragment7, { children: [
+                  content: /* @__PURE__ */ jsxs23(Fragment8, { children: [
                     /* @__PURE__ */ jsx36(Text9, { color: t.color.accent, children: "\u25CF " }),
                     toolLabel(group)
                   ] }),
@@ -60319,7 +60690,7 @@ var init_thinking = __esm({
           {
             branch: "last",
             color: t.color.statusFg,
-            content: /* @__PURE__ */ jsxs23(Fragment7, { children: [
+            content: /* @__PURE__ */ jsxs23(Fragment8, { children: [
               /* @__PURE__ */ jsx36(Text9, { color: t.color.accent, children: "\u03A3 " }),
               totalTokensLabel
             ] }),
@@ -60622,7 +60993,7 @@ var init_queuedMessages = __esm({
 // src/components/streamingAssistant.tsx
 import { useStore as useStore8 } from "@nanostores/react";
 import { memo as memo6 } from "react";
-import { Fragment as Fragment8, jsx as jsx40, jsxs as jsxs27 } from "react/jsx-runtime";
+import { Fragment as Fragment9, jsx as jsx40, jsxs as jsxs27 } from "react/jsx-runtime";
 var groupedSegments, StreamingAssistant, LiveTodoPanel;
 var init_streamingAssistant = __esm({
   "src/components/streamingAssistant.tsx"() {
@@ -60650,7 +61021,7 @@ var init_streamingAssistant = __esm({
       if (!progress.showProgressArea && !showStreamingArea && !activeTools.length) {
         return null;
       }
-      return /* @__PURE__ */ jsxs27(Fragment8, { children: [
+      return /* @__PURE__ */ jsxs27(Fragment9, { children: [
         groupedSegments(streamSegments).map((msg, i) => /* @__PURE__ */ jsx40(
           MessageLine,
           {
@@ -60719,8 +61090,8 @@ var init_streamingAssistant = __esm({
 
 // src/components/appLayout.tsx
 import { useStore as useStore9 } from "@nanostores/react";
-import { Fragment as Fragment9, memo as memo7, useMemo as useMemo16, useRef as useRef18 } from "react";
-import { Fragment as Fragment10, jsx as jsx41, jsxs as jsxs28 } from "react/jsx-runtime";
+import { Fragment as Fragment10, memo as memo7, useMemo as useMemo16, useRef as useRef19 } from "react";
+import { Fragment as Fragment11, jsx as jsx41, jsxs as jsxs28 } from "react/jsx-runtime";
 var PromptPrefix, TranscriptPane, ComposerPane, AgentsOverlayPane, StatusRulePane, AppLayout;
 var init_appLayout = __esm({
   "src/components/appLayout.tsx"() {
@@ -60776,7 +61147,7 @@ var init_appLayout = __esm({
         () => transcript.historyItems.findIndex((m) => m.role === "user"),
         [transcript.historyItems]
       );
-      return /* @__PURE__ */ jsxs28(Fragment10, { children: [
+      return /* @__PURE__ */ jsxs28(Fragment11, { children: [
         /* @__PURE__ */ jsx41(
           ScrollBox_default,
           {
@@ -60850,7 +61221,7 @@ var init_appLayout = __esm({
       const promptBlank = " ".repeat(promptWidth);
       const inputColumns = stableComposerColumns(composer.cols, promptWidth);
       const inputHeight = inputVisualHeight(composer.input, inputColumns);
-      const inputMouseRef = useRef18(null);
+      const inputMouseRef = useRef19(null);
       const captureInputDrag = /* @__PURE__ */ __name((e) => {
         if (e.button !== 0) {
           return;
@@ -60920,7 +61291,7 @@ var init_appLayout = __esm({
                 }
               ),
               composer.input === "?" && !composer.inputBuf.length && /* @__PURE__ */ jsx41(HelpHint, { t: ui.theme }),
-              !isBlocked && /* @__PURE__ */ jsxs28(Fragment10, { children: [
+              !isBlocked && /* @__PURE__ */ jsxs28(Fragment11, { children: [
                 composer.inputBuf.map((line, i) => /* @__PURE__ */ jsxs28(Box_default, { children: [
                   /* @__PURE__ */ jsx41(Box_default, { width: promptWidth, children: i === 0 ? /* @__PURE__ */ jsx41(PromptPrefix, { color: ui.theme.color.muted, promptText, width: promptWidth }) : /* @__PURE__ */ jsx41(Text9, { color: ui.theme.color.muted, children: promptBlank }) }),
                   /* @__PURE__ */ jsx41(Text9, { color: ui.theme.color.composeText, children: line || " " })
@@ -61026,11 +61397,11 @@ var init_appLayout = __esm({
     }) {
       const overlay = useStore9($overlayState);
       const ui = useStore9($uiState);
-      const Shell = INLINE_MODE ? Fragment9 : AlternateScreen;
+      const Shell = INLINE_MODE ? Fragment10 : AlternateScreen;
       const shellProps = INLINE_MODE ? {} : { mouseTracking };
       return /* @__PURE__ */ jsx41(Shell, { ...shellProps, children: /* @__PURE__ */ jsxs28(Box_default, { flexDirection: "column", flexGrow: 1, children: [
         /* @__PURE__ */ jsx41(Box_default, { flexDirection: "row", flexGrow: 1, children: overlay.agents ? /* @__PURE__ */ jsx41(PerfPane, { id: "agents", children: /* @__PURE__ */ jsx41(AgentsOverlayPane, {}) }) : /* @__PURE__ */ jsx41(PerfPane, { id: "transcript", children: /* @__PURE__ */ jsx41(TranscriptPane, { actions, composer, progress, transcript }) }) }),
-        !overlay.agents && /* @__PURE__ */ jsxs28(Fragment10, { children: [
+        !overlay.agents && /* @__PURE__ */ jsxs28(Fragment11, { children: [
           /* @__PURE__ */ jsx41(PerfPane, { id: "prompt", children: /* @__PURE__ */ jsx41(
             PromptZone,
             {