kira-glasses-bridge 2.9.0 → 2.11.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kira-glasses-bridge",
-  "version": "2.9.0",
+  "version": "2.11.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": {
@@ -28,5 +28,5 @@
     "kira"
   ],
   "license": "MIT",
-  "homepage": "https://hackchild.xyz/kira"
+  "homepage": "https://kira.glass"
 }

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/claude-sessions.mjs

@@ -1,42 +1,13 @@
-// Reads Claude Code's own session transcripts under ~/.claude/projects.
-// Each session is a .jsonl file; the entries we care about are user and
-// assistant messages, the ai-title entries, and cwd.
-import { readdir, readFile, stat } from 'node:fs/promises'
+// Claude Code's sessions on this Mac, read through the Agent SDK (listSessions, getSessionInfo,
+// getSessionMessages) rather than by parsing ~/.claude/projects ourselves: the transcript format
+// is Claude Code's own and changes between releases, and the SDK changes with it.
+import { getSessionInfo, getSessionMessages, listSessions as sdkListSessions } from '@anthropic-ai/claude-agent-sdk'
+import { open, readdir, stat } from 'node:fs/promises'
 import { homedir } from 'node:os'
 import { basename, join } from 'node:path'
 
-const PROJECTS = join(homedir(), '.claude', 'projects')
 const ACTIVE_WINDOW_MS = 3 * 60 * 1000
 
-async function sessionFiles() {
-  const out = []
-  let dirs = []
-  try {
-    dirs = await readdir(PROJECTS)
-  } catch {
-    return out
-  }
-  for (const d of dirs) {
-    let files = []
-    try {
-      files = await readdir(join(PROJECTS, d))
-    } catch {
-      continue
-    }
-    for (const f of files) {
-      if (!f.endsWith('.jsonl')) continue
-      const path = join(PROJECTS, d, f)
-      try {
-        const st = await stat(path)
-        if (st.size > 0) out.push({ path, mtime: st.mtimeMs, size: st.size })
-      } catch {
-        /* skip */
-      }
-    }
-  }
-  return out.sort((a, b) => b.mtime - a.mtime)
-}
-
 function textOf(message) {
   const c = message?.content
   if (typeof c === 'string') return c
@@ -44,52 +15,60 @@ function textOf(message) {
   return ''
 }
 
-/** Parse a transcript; only the last `tailBytes` are read for speed. */
-async function summarize(file, tailBytes = 400_000) {
-  const st = await stat(file.path)
-  const buf = await readFile(file.path)
-  const slice = buf.length > tailBytes ? buf.subarray(buf.length - tailBytes) : buf
-  const lines = slice.toString('utf8').split('\n')
-  if (buf.length > tailBytes) lines.shift() // drop a partial first line
-  let sessionId = file.path.split('/').pop().replace(/\.jsonl$/, '')
-  let cwd = null
-  let title = null
+/** The conversation as said: user and Claude text, without tool results, system blocks or subagents. */
+async function turnsOf(sessionId, dir) {
+  const messages = await getSessionMessages(sessionId, dir ? { dir } : undefined)
   const turns = []
-  for (const line of lines) {
-    if (!line) continue
-    let d
+  for (const m of messages) {
+    if (m.parent_tool_use_id) continue
+    const text = textOf(m.message).trim()
+    if (!text || text.startsWith('<')) continue // tool results / system blocks
+    turns.push({ role: m.type === 'user' ? 'user' : 'claude', text, at: m.timestamp ?? null })
+  }
+  return turns
+}
+
+/**
+ * The SDK reads a session's folder from the start of its transcript, and misses it when the
+ * transcript opens with large snapshot entries. Then: the first "cwd" in the first MB of the file.
+ */
+async function cwdOf(s) {
+  if (s.cwd) return s.cwd
+  const projects = join(homedir(), '.claude', 'projects')
+  for (const d of await readdir(projects).catch(() => [])) {
+    const fh = await open(join(projects, d, `${s.sessionId}.jsonl`)).catch(() => null)
+    if (!fh) continue
     try {
-      d = JSON.parse(line)
-    } catch {
-      continue
-    }
-    if (d.sessionId) sessionId = d.sessionId
-    if (d.cwd) cwd = d.cwd
-    if (d.type === 'ai-title' && typeof d.aiTitle === 'string') title = d.aiTitle
-    if ((d.type === 'user' || d.type === 'assistant') && d.message) {
-      const text = textOf(d.message).trim()
-      if (!text || text.startsWith('<') ) continue // skip tool results / system blocks
-      turns.push({ role: d.type === 'user' ? 'user' : 'claude', text, at: d.timestamp ?? null })
+      const buf = Buffer.alloc(1 << 20)
+      const { bytesRead } = await fh.read(buf, 0, buf.length, 0)
+      const m = /"cwd":"((?:[^"\\]|\\.)*)"/.exec(buf.subarray(0, bytesRead).toString('utf8'))
+      return m ? JSON.parse(`"${m[1]}"`) : null
+    } finally {
+      await fh.close()
     }
   }
-  return { sessionId, cwd, title, turns, lastActiveAt: new Date(st.mtimeMs).toISOString(), active: Date.now() - st.mtimeMs < ACTIVE_WINDOW_MS }
+  return null
 }
 
+const titleOf = s => s.customTitle || s.summary || s.firstPrompt || null
+const activeOf = s => Date.now() - s.lastModified < ACTIVE_WINDOW_MS
+
 export async function listSessions(max = 10) {
-  const files = (await sessionFiles()).slice(0, Math.min(Math.max(Number(max) || 10, 1), 20))
+  const n = Math.min(Math.max(Number(max) || 10, 1), 20)
   const sessions = []
-  for (const f of files) {
+  for (const s of await sdkListSessions({ limit: n })) {
     try {
-      const s = await summarize(f, 120_000)
-      const lastUser = [...s.turns].reverse().find(t => t.role === 'user')
-      const lastClaude = [...s.turns].reverse().find(t => t.role === 'claude')
+      const cwd = await cwdOf(s)
+      const turns = await turnsOf(s.sessionId, cwd)
+      const lastUser = [...turns].reverse().find(t => t.role === 'user')
+      const lastClaude = [...turns].reverse().find(t => t.role === 'claude')
       sessions.push({
         session_id: s.sessionId,
-        title: s.title ?? (lastUser ? lastUser.text.slice(0, 60) : '(untitled)'),
-        project: s.cwd ? s.cwd.split('/').slice(-2).join('/') : null,
-        cwd: s.cwd,
-        active: s.active,
-        last_active_at: s.lastActiveAt,
+        title: titleOf(s) ?? (lastUser ? lastUser.text.slice(0, 60) : '(untitled)'),
+        project: cwd ? cwd.split('/').slice(-2).join('/') : null,
+        cwd,
+        active: activeOf(s),
+        last_active_at: new Date(s.lastModified).toISOString(),
         last_user_message: lastUser ? lastUser.text.slice(0, 200) : null,
         last_claude_message: lastClaude ? lastClaude.text.slice(0, 200) : null,
       })
@@ -101,49 +80,31 @@ export async function listSessions(max = 10) {
 }
 
 export async function readSession(sessionId, turns = 6) {
-  const files = await sessionFiles()
-  const file = files.find(f => f.path.endsWith(`/${sessionId}.jsonl`))
-  if (!file) return { error: `No session ${sessionId} on this machine` }
-  const s = await summarize(file)
+  const info = await getSessionInfo(sessionId).catch(() => undefined)
+  if (!info) return { error: `No session ${sessionId} on this machine` }
+  const cwd = await cwdOf(info)
+  const all = await turnsOf(sessionId, cwd)
   const n = Math.min(Math.max(Number(turns) || 6, 1), 30)
-  return { session_id: s.sessionId, title: s.title, cwd: s.cwd, active: s.active, last_active_at: s.lastActiveAt, turns: s.turns.slice(-n).map(t => ({ ...t, text: t.text.slice(0, 2000) })) }
+  return { session_id: info.sessionId, title: titleOf(info), cwd, active: activeOf(info), last_active_at: new Date(info.lastModified).toISOString(), turns: all.slice(-n).map(t => ({ ...t, text: t.text.slice(0, 2000) })) }
 }
 
-/**
- * Project folders Claude Code has been used in, newest first. One cheap read
- * per project: the head of its newest transcript carries the cwd.
- */
+/** Project folders Claude Code has been used in (that still exist), newest first. */
 export async function listProjects(max = 20) {
   const n = Math.min(Math.max(Number(max) || 20, 1), 50)
-  let dirs = []
-  try {
-    dirs = await readdir(PROJECTS)
-  } catch {
-    return { count: 0, projects: [] }
+  const byCwd = new Map()
+  for (const s of await sdkListSessions()) {
+    if (!s.cwd) continue
+    const p = byCwd.get(s.cwd) ?? { sessions: 0, last: 0 }
+    p.sessions++
+    p.last = Math.max(p.last, s.lastModified)
+    byCwd.set(s.cwd, p)
   }
   const projects = []
-  for (const d of dirs) {
-    const dir = join(PROJECTS, d)
-    let files = []
-    try {
-      files = (await readdir(dir)).filter(f => f.endsWith('.jsonl'))
-    } catch {
-      continue
-    }
-    let newest = null
-    for (const f of files) {
-      const st = await stat(join(dir, f)).catch(() => null)
-      if (st && st.size > 0 && (!newest || st.mtimeMs > newest.mtime)) newest = { path: join(dir, f), mtime: st.mtimeMs }
-    }
-    if (!newest) continue
-    const head = (await readFile(newest.path)).subarray(0, 65536).toString('utf8')
-    const m = /"cwd":"((?:[^"\\]|\\.)*)"/.exec(head)
-    if (!m) continue
-    const cwd = JSON.parse(`"${m[1]}"`)
+  for (const [cwd, p] of [...byCwd].sort((a, b) => b[1].last - a[1].last)) {
+    if (projects.length >= n) break
     const exists = await stat(cwd).then(st => st.isDirectory()).catch(() => false)
     if (!exists) continue
-    projects.push({ cwd, name: basename(cwd), parent: basename(join(cwd, '..')), sessions: files.length, last_active_at: new Date(newest.mtime).toISOString(), _mtime: newest.mtime })
+    projects.push({ cwd, name: basename(cwd), parent: basename(join(cwd, '..')), sessions: p.sessions, last_active_at: new Date(p.last).toISOString() })
   }
-  projects.sort((a, b) => b._mtime - a._mtime)
-  return { count: Math.min(projects.length, n), projects: projects.slice(0, n).map(({ _mtime, ...p }) => p) }
+  return { count: projects.length, projects }
 }

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)
 }