kira-glasses-bridge 2.9.0 → 2.10.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kira-glasses-bridge",
-  "version": "2.9.0",
+  "version": "2.10.0",
   "description": "Connects your Mac to Kira, the assistant for Even G2 glasses: Claude Code sessions, files, folders and apps, by voice.",
   "type": "module",
   "bin": {

package/src/agents/claude.mjs

@@ -202,6 +202,9 @@ export async function run({ prompt, sessionId, cwd, policy, persona, abort }, io
         // A team member's soul, skills and conventions ride on top of Claude Code's own prompt; its preset says which tools it does without.
         ...(persona?.systemPrompt ? { systemPrompt: { type: 'preset', preset: 'claude_code', append: persona.systemPrompt } } : {}),
         ...(persona?.disallowedTools?.length ? { disallowedTools: persona.disallowedTools } : {}),
+        // Kira has its own Gmail/Calendar/Drive tools; keep the user's claude.ai connectors out of
+        // the sessions it runs, so there's one pathway for acting on their accounts (Kira's).
+        env: { ...process.env, ENABLE_CLAUDEAI_MCP_SERVERS: 'false' },
         canUseTool,
         hooks: { PreToolUse: [{ hooks: [preToolUse] }] },
         ...(process.env.KIRA_CLAUDE_BIN ? { pathToClaudeCodeExecutable: process.env.KIRA_CLAUDE_BIN } : {}),

package/src/index.mjs

@@ -35,19 +35,50 @@ function sendLive(obj) {
 }
 const ANSWER_TIMEOUT_MS = 3 * 60 * 1000
 
-/** Start the bridge with resolved settings. Runs until the process exits. */
-export function startBridge(config) {
+/**
+ * How the host hears from the bridge. The CLI passes nothing (logs to stdout, exits when the
+ * token is rejected); an app embedding it (the Kira desktop app) passes its own:
+ *   log(line)               every log line
+ *   onStatus(status)        'connecting' | 'connected' | 'disconnected' | 'rejected'
+ */
+let hooks = {}
+let stopped = false
+let reconnectTimer = null
+
+/** Start the bridge with resolved settings. Runs until stopBridge() or the process exits. */
+export function startBridge(config, hostHooks = {}) {
+  hooks = hostHooks
   URL_ = config.url
   TOKEN = config.token
   if (config.claudeBin) process.env.KIRA_CLAUDE_BIN = config.claudeBin
   if (!URL_ || !TOKEN) {
-    console.error('No token. Run: npx kira-glasses-bridge --token <token>  (from the Kira portal → Connections → Claude Code)')
-    process.exit(1)
+    throw new Error('No token. Run: npx kira-glasses-bridge --token <token>  (from the Kira portal → Connections → Claude Code)')
   }
+  stopped = false
   log(`kira-bridge ${BRIDGE_VERSION} · agents: ${Object.keys(AGENTS).join(', ')}`)
   connect()
 }
 
+/** Disconnect and stop reconnecting (the app calls this on sign-out or a token change). */
+export function stopBridge() {
+  stopped = true
+  clearTimeout(reconnectTimer)
+  const ws = live
+  live = null
+  try {
+    ws?.close(1000, 'stopped')
+  } catch {
+    /* already closed */
+  }
+  status('disconnected')
+}
+
+export const bridgeVersion = BRIDGE_VERSION
+
+function status(s) {
+  hooks.onStatus?.(s)
+}
+
 const tools = {
   async list_files(args) {
     return listFiles(args)
@@ -196,6 +227,22 @@ end tell`
     return { repo: await repoOfFolder(args.path) }
   },
 
+  /** Which Claude account Claude Code on this Mac is signed in to (`claude auth status --json`). */
+  async claude_account() {
+    const { execFile } = await import('node:child_process')
+    const bin = process.env.KIRA_CLAUDE_BIN || 'claude'
+    return new Promise(resolve =>
+      execFile(bin, ['auth', 'status', '--json'], { timeout: 10_000 }, (err, stdout) => {
+        try {
+          const s = JSON.parse(stdout)
+          resolve({ loggedIn: !!s.loggedIn, email: s.email ?? null, plan: s.subscriptionType ?? null, org: s.orgName ?? null, method: s.authMethod ?? null })
+        } catch {
+          resolve({ error: err?.code === 'ENOENT' ? 'Claude Code is not installed on this Mac' : 'Claude Code did not say which account it uses' })
+        }
+      }),
+    )
+  },
+
   /** Read-only git facts for a folder: repo, branch, head, dirty files. */
   async git_status(args) {
     const s = await snapshot(resolveCwd(args.path ?? args.cwd))
@@ -227,6 +274,8 @@ async function withChange(pathArg, fn) {
 
 let backoff = 1000
 function connect() {
+  if (stopped) return
+  status('connecting')
   const ws = new WebSocket(`${URL_}?token=${encodeURIComponent(TOKEN)}`)
   let ping
   ws.on('open', () => {
@@ -251,6 +300,7 @@ function connect() {
         log(`sending ${outbox.length} queued job messages`)
         for (const o of outbox.splice(0)) ws.send(JSON.stringify(o))
       }
+      status('connected')
       return log(`registered as bridge ${msg.bridgeId} (${Object.keys(tools).length} tools)`)
     }
     if (msg.type === 'job.answer') {
@@ -277,10 +327,14 @@ function connect() {
     if (live === ws) live = null
     if (code === 4001) {
       log('token rejected; create a new one in the portal')
-      process.exit(1)
+      status('rejected')
+      if (!hooks.onStatus) process.exit(1) // the CLI's behavior; an app decides for itself
+      return
     }
+    if (stopped) return
+    status('disconnected')
     log(`disconnected (${code} ${reason}); retrying in ${backoff / 1000}s`)
-    setTimeout(connect, backoff)
+    reconnectTimer = setTimeout(connect, backoff)
     backoff = Math.min(backoff * 2, 30_000)
   })
   ws.on('error', err => log(`socket error: ${err.message}`))
@@ -290,6 +344,8 @@ function send(ws, obj) {
   if (ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify(obj))
 }
 function log(m) {
-  console.log(`[kira-bridge ${new Date().toLocaleTimeString()}] ${m}`)
+  const line = `[kira-bridge ${new Date().toLocaleTimeString()}] ${m}`
+  if (hooks.log) hooks.log(line)
+  else console.log(line)
 }