@appchy/jarvis 0.1.42 → 0.1.44

package/dist/hooks/user-prompt-submit.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/hooks/drop.ts","../../src/config.ts","../../src/hooks/user-prompt-submit.ts"],"sourcesContent":["/**\n * Shared helpers for CC hook scripts.\n *\n * Each hook script (pre-tool-use, session-start, stop, …) is a tiny\n * stdin → append-line → exit binary. They all write to the same per-\n * session JSONL at `<hooksDir>/<sessionId>.jsonl`. This module\n * concentrates the envelope shape and the atomic append so the per-\n * hook scripts stay <30 lines each.\n *\n * Hot-path constraints: NEVER block, NEVER network, NEVER read user\n * input. Pure stdin parse + filesystem append + exit. Worst-case one\n * `mkdir` + one `appendFile` per fire.\n */\n\nimport { appendFile, mkdir } from \"node:fs/promises\";\nimport { join } from \"node:path\";\n\nimport { getHooksDir } from \"../config\";\n\n/** Wire-format envelope written one-per-line to the hook JSONL.\n *  The watcher in `sessions.ts` parses this exact shape — keep in sync. */\nexport interface HookDropEnvelope<TData = unknown> {\n  type: string;\n  sessionId: string;\n  ts: string;\n  /** Idempotency key. Lets the watcher's replay-on-restart skip drops\n   *  whose effects were already emitted (see `HookCursor.applied`). */\n  uniqId: string;\n  data: TData;\n}\n\nexport interface AppendDropRequest<TData> {\n  type: string;\n  sessionId: string;\n  uniqId: string;\n  data: TData;\n}\n\n/** Append one envelope line to the per-session hook JSONL. Atomic between\n *  hook processes via POSIX `O_APPEND` (Node's `fs.appendFile`) — concurrent\n *  appends from different CC sessions / hook types can't interleave bytes\n *  within a line as long as the line stays < `PIPE_BUF` (4KB). Drops are\n *  <1KB in practice, so this is safe without locks.\n *\n *  Stderr logs are written so `tail -f ~/.jarvis/hooks/hook.log` (when\n *  CC pipes hook stderr there, which it does by default) shows what fired.\n *  Stderr never breaks CC — it only watches stdout for decision JSON. */\nexport async function appendDrop<TData>(req: AppendDropRequest<TData>): Promise<void> {\n  if (!req.sessionId || !req.type || !req.uniqId) {\n    process.stderr.write(\n      `[hook] skip ${req.type ?? \"?\"} missing field ` +\n        `sessionId=${!!req.sessionId} uniqId=${!!req.uniqId}\\n`,\n    );\n    return;\n  }\n  const dir = getHooksDir();\n  await mkdir(dir, { recursive: true }).catch((err) => {\n    process.stderr.write(`[hook] mkdir failed ${dir}: ${err}\\n`);\n  });\n  const envelope: HookDropEnvelope<TData> = {\n    type: req.type,\n    sessionId: req.sessionId,\n    ts: new Date().toISOString(),\n    uniqId: req.uniqId,\n    data: req.data,\n  };\n  const file = join(dir, `${req.sessionId}.jsonl`);\n  try {\n    await appendFile(file, JSON.stringify(envelope) + \"\\n\");\n    process.stderr.write(\n      `[hook] ${req.type} appended sessionId=${req.sessionId} uniqId=${req.uniqId}\\n`,\n    );\n  } catch (err) {\n    process.stderr.write(`[hook] append failed ${file}: ${err}\\n`);\n  }\n}\n\n/** Read CC's hook payload from stdin. Returns `null` on parse failure\n *  (never throws — the hook must never block CC). */\nexport async function readHookStdin<T = Record<string, unknown>>(): Promise<T | null> {\n  try {\n    const chunks: Buffer[] = [];\n    for await (const chunk of process.stdin) {\n      chunks.push(typeof chunk === \"string\" ? Buffer.from(chunk) : chunk);\n    }\n    const raw = Buffer.concat(chunks).toString(\"utf-8\");\n    if (!raw) return null;\n    return JSON.parse(raw) as T;\n  } catch {\n    return null;\n  }\n}\n\n/** Hard cap any hook so an exotic stdin stall can't pile up forever\n *  before CC's terminal prompt fires. We exit 0 with no output → CC\n *  proceeds with its normal permission flow. */\nexport function installHookTimeout(ms = 750): void {\n  const timer = setTimeout(() => process.exit(0), ms);\n  timer.unref();\n}\n","/**\n * Agent Config\n *\n * Manages ~/.jarvis/config.json — saved by `jarvis connect <token>`,\n * read on `jarvis start`.\n */\n\nimport fs from \"fs\";\nimport path from \"path\";\nimport os from \"os\";\n\n// =============================================================================\n// Types\n// =============================================================================\n\nexport interface AgentConfig {\n  /** The jarvis this machine joined — the address a person opens in a browser,\n   *  and what pairing talks to. Ours by default; `jarvis init --url <url>` joins\n   *  someone else's. */\n  url?: string;\n  /** WS hub URL this machine dials. Written once, by pairing, from the hub the\n   *  joined instance named — and never from a flag, an environment variable or\n   *  any later command. Re-pointing a machine means unpairing it first. */\n  hubUrl?: string;\n  /** JWT auth token (from connect token) */\n  token?: string;\n  /** Long-lived refresh token for obtaining new access tokens */\n  refreshToken?: string;\n  /** User ID */\n  userId: string;\n  /** Environment ID */\n  envId?: string;\n  /** Workspace root path for repo operations */\n  workspacePath?: string;\n  /** Anthropic API key (for local-only use without cloud) */\n  anthropicApiKey?: string;\n  /** Use Anthropic subscription instead of API key */\n  useSubscription?: boolean;\n  /** When the config was last updated */\n  connectedAt?: string;\n}\n\nexport interface ConnectToken {\n  hubUrl: string;\n  jwt: string;\n  refreshToken: string;\n  userId: string;\n  envId: string;\n}\n\n// =============================================================================\n// Environment\n// =============================================================================\n\n/** The jarvis a machine pairs with when nothing else is named. Only ever read\n *  by pairing: `jarvis init --url <url>` joins someone else's instead, and the\n *  hub URL is whatever that instance hands back. */\nexport const DEFAULT_URL = \"https://jarvis.appchy.com\";\n\n// =============================================================================\n// Config directory\n// =============================================================================\n\n/** The config dir is the machine's identity: what it paired as, and therefore\n *  which hub it dials. One daemon per dir, so a second identity on the same\n *  machine — a storage rig, a localhost instance — is a second dir, named by\n *  `JARVIS_CONFIG_DIR`, never a second binary.\n *\n *  Called fresh on every read so a test that sets `JARVIS_CONFIG_DIR` AFTER\n *  module load still sees the override — caching at module init would lock it\n *  onto the host's real `~/.jarvis/` and leak production state into the\n *  in-memory infra. */\nfunction configDir(): string {\n  if (process.env.JARVIS_CONFIG_DIR) return process.env.JARVIS_CONFIG_DIR;\n  return path.join(os.homedir(), \".jarvis\");\n}\n\nfunction configFile(): string {\n  return path.join(configDir(), \"config.json\");\n}\n\n/** Absolute path to the per-daemon config directory — `~/.jarvis/` unless\n *  `JARVIS_CONFIG_DIR` names another. */\nexport function getConfigDir(): string {\n  return configDir();\n}\n\n/** Per-daemon directory for PreToolUse hook drop files. The CC hook script\n *  writes `<sessionId>/<toolUseId>.json` here; the sessions watcher consumes\n *  them. Each daemon owns the subtree under its own config dir, so a hook\n *  installed for one never feeds another. */\nexport function getHooksDir(): string {\n  return path.join(configDir(), \"hooks\");\n}\n\n// =============================================================================\n// Operations\n// =============================================================================\n\n/** Read the machine's config, accepting the names these two fields used to\n *  carry. `appUrl`/`apiUrl` were renamed on 2026-08-15 — `apiUrl` never held an\n *  API URL, it held the hub's. A config written before that still loads, and\n *  `saveConfig` only ever writes the current names, so a machine heals itself on\n *  its next write with nothing to run. Delete this tolerance once no config\n *  predating the rename is in use. */\nexport function loadConfig(): AgentConfig | null {\n  try {\n    const stored = JSON.parse(fs.readFileSync(configFile(), \"utf-8\")) as AgentConfig &\n      Partial<{ appUrl: string; apiUrl: string }>;\n    const { appUrl, apiUrl, ...config } = stored;\n    const url = config.url ?? appUrl;\n    const hubUrl = config.hubUrl ?? apiUrl;\n    return {\n      ...config,\n      ...(url !== undefined ? { url } : {}),\n      ...(hubUrl !== undefined ? { hubUrl } : {}),\n    };\n  } catch {\n    return null;\n  }\n}\n\n/** Persist the machine's config.\n *\n *  Refuses to move an already-paired machine to a different hub. A machine that\n *  joins the wrong control plane hands it credentials, so re-pointing one is a\n *  deliberate act — `jarvis unpair` (which clears the config) and then pair\n *  again — rather than something a stale token or a mistyped command can do on\n *  its way past. Re-pairing to the same hub is unaffected. */\nexport function saveConfig(config: AgentConfig): void {\n  const paired = loadConfig();\n  if (paired?.hubUrl && config.hubUrl && config.hubUrl !== paired.hubUrl) {\n    throw new Error(\n      `This machine is paired with ${paired.hubUrl} and cannot be moved to ${config.hubUrl}.\\n` +\n        `  Run 'jarvis unpair' first if you mean to join a different jarvis.`,\n    );\n  }\n  fs.mkdirSync(configDir(), { recursive: true });\n  fs.writeFileSync(configFile(), JSON.stringify(config, null, 2) + \"\\n\");\n}\n\nexport function clearConfig(): void {\n  try {\n    fs.unlinkSync(configFile());\n  } catch {}\n}\n\nexport function parseConnectToken(token: string): ConnectToken {\n  try {\n    const decoded = Buffer.from(token, \"base64\").toString(\"utf-8\");\n    const parsed = JSON.parse(decoded);\n    if (!parsed.hubUrl || !parsed.jwt || !parsed.userId) {\n      throw new Error(\"Invalid token: missing required fields (hubUrl, jwt, userId)\");\n    }\n    return parsed as ConnectToken;\n  } catch (err) {\n    if (err instanceof SyntaxError) {\n      throw new Error(\"Invalid token: not valid base64-encoded JSON\");\n    }\n    throw err;\n  }\n}\n\nexport function getConfigPath(): string {\n  return configFile();\n}\n","/**\n * UserPromptSubmit hook — drops an envelope each time a `claude` user submits\n * a prompt. Jarvis starts no sessions, so every drop observed here is a\n * person's turn.\n *\n * Used to flip `SessionCacheEntry.controller` to `\"claudeCode\"` on the\n * watcher side, surfacing the controller change in the web UI's pill.\n */\n\nimport { appendDrop, installHookTimeout, readHookStdin } from \"./drop\";\n\ninterface CcUserPromptSubmitInput {\n  session_id?: string;\n  transcript_path?: string;\n  cwd?: string;\n  prompt?: string;\n}\n\ninterface UserPromptSubmitDropData {\n  transcriptPath?: string;\n  cwd?: string;\n}\n\ninstallHookTimeout();\n\nasync function main(): Promise<void> {\n  const p = await readHookStdin<CcUserPromptSubmitInput>();\n  if (!p) return;\n  const sessionId = p.session_id;\n  if (!sessionId) return;\n\n  const ts = new Date().toISOString();\n  const data: UserPromptSubmitDropData = {\n    ...(p.transcript_path ? { transcriptPath: p.transcript_path } : {}),\n    ...(p.cwd ? { cwd: p.cwd } : {}),\n  };\n\n  await appendDrop<UserPromptSubmitDropData>({\n    type: \"user-prompt-submit\",\n    sessionId,\n    uniqId: `user-prompt-submit-${ts}`,\n    data,\n  });\n}\n\nvoid main().finally(() => process.exit(0));\n"],"mappings":";;;AAcA,SAAS,YAAY,aAAa;AAClC,SAAS,YAAY;;;ACPrB,OAAO,UAAU;AACjB,OAAO,QAAQ;AA+Df,SAAS,YAAoB;AAC3B,MAAI,QAAQ,IAAI,kBAAmB,QAAO,QAAQ,IAAI;AACtD,SAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,SAAS;AAC1C;AAgBO,SAAS,cAAsB;AACpC,SAAO,KAAK,KAAK,UAAU,GAAG,OAAO;AACvC;;;AD9CA,eAAsB,WAAkB,KAA8C;AACpF,MAAI,CAAC,IAAI,aAAa,CAAC,IAAI,QAAQ,CAAC,IAAI,QAAQ;AAC9C,YAAQ,OAAO;AAAA,MACb,eAAe,IAAI,QAAQ,GAAG,4BACf,CAAC,CAAC,IAAI,SAAS,WAAW,CAAC,CAAC,IAAI,MAAM;AAAA;AAAA,IACvD;AACA;AAAA,EACF;AACA,QAAM,MAAM,YAAY;AACxB,QAAM,MAAM,KAAK,EAAE,WAAW,KAAK,CAAC,EAAE,MAAM,CAAC,QAAQ;AACnD,YAAQ,OAAO,MAAM,uBAAuB,GAAG,KAAK,GAAG;AAAA,CAAI;AAAA,EAC7D,CAAC;AACD,QAAM,WAAoC;AAAA,IACxC,MAAM,IAAI;AAAA,IACV,WAAW,IAAI;AAAA,IACf,KAAI,oBAAI,KAAK,GAAE,YAAY;AAAA,IAC3B,QAAQ,IAAI;AAAA,IACZ,MAAM,IAAI;AAAA,EACZ;AACA,QAAM,OAAO,KAAK,KAAK,GAAG,IAAI,SAAS,QAAQ;AAC/C,MAAI;AACF,UAAM,WAAW,MAAM,KAAK,UAAU,QAAQ,IAAI,IAAI;AACtD,YAAQ,OAAO;AAAA,MACb,UAAU,IAAI,IAAI,uBAAuB,IAAI,SAAS,WAAW,IAAI,MAAM;AAAA;AAAA,IAC7E;AAAA,EACF,SAAS,KAAK;AACZ,YAAQ,OAAO,MAAM,wBAAwB,IAAI,KAAK,GAAG;AAAA,CAAI;AAAA,EAC/D;AACF;AAIA,eAAsB,gBAAgE;AACpF,MAAI;AACF,UAAM,SAAmB,CAAC;AAC1B,qBAAiB,SAAS,QAAQ,OAAO;AACvC,aAAO,KAAK,OAAO,UAAU,WAAW,OAAO,KAAK,KAAK,IAAI,KAAK;AAAA,IACpE;AACA,UAAM,MAAM,OAAO,OAAO,MAAM,EAAE,SAAS,OAAO;AAClD,QAAI,CAAC,IAAK,QAAO;AACjB,WAAO,KAAK,MAAM,GAAG;AAAA,EACvB,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAKO,SAAS,mBAAmB,KAAK,KAAW;AACjD,QAAM,QAAQ,WAAW,MAAM,QAAQ,KAAK,CAAC,GAAG,EAAE;AAClD,QAAM,MAAM;AACd;;;AE5EA,mBAAmB;AAEnB,eAAe,OAAsB;AACnC,QAAM,IAAI,MAAM,cAAuC;AACvD,MAAI,CAAC,EAAG;AACR,QAAM,YAAY,EAAE;AACpB,MAAI,CAAC,UAAW;AAEhB,QAAM,MAAK,oBAAI,KAAK,GAAE,YAAY;AAClC,QAAM,OAAiC;AAAA,IACrC,GAAI,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,IAAI,CAAC;AAAA,IACjE,GAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC;AAAA,EAChC;AAEA,QAAM,WAAqC;AAAA,IACzC,MAAM;AAAA,IACN;AAAA,IACA,QAAQ,sBAAsB,EAAE;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAEA,KAAK,KAAK,EAAE,QAAQ,MAAM,QAAQ,KAAK,CAAC,CAAC;","names":[]}
+{"version":3,"sources":["../../src/hooks/drop.ts","../../src/config.ts","../../src/hooks/user-prompt-submit.ts"],"sourcesContent":["/**\n * Shared helpers for CC hook scripts.\n *\n * Each hook script (pre-tool-use, session-start, stop, …) is a tiny\n * stdin → append-line → exit binary. They all write to the same per-\n * session JSONL at `<hooksDir>/<sessionId>.jsonl`. This module\n * concentrates the envelope shape and the atomic append so the per-\n * hook scripts stay <30 lines each.\n *\n * Hot-path constraints: NEVER block, NEVER network, NEVER read user\n * input. Pure stdin parse + filesystem append + exit. Worst-case one\n * `mkdir` + one `appendFile` per fire.\n */\n\nimport { appendFile, mkdir } from \"node:fs/promises\";\nimport { join } from \"node:path\";\n\nimport { getHooksDir } from \"../config\";\n\n/** Wire-format envelope written one-per-line to the hook JSONL.\n *  The watcher in `sessions.ts` parses this exact shape — keep in sync. */\nexport interface HookDropEnvelope<TData = unknown> {\n  type: string;\n  sessionId: string;\n  ts: string;\n  /** Idempotency key. Lets the watcher's replay-on-restart skip drops\n   *  whose effects were already emitted (see `HookCursor.applied`). */\n  uniqId: string;\n  data: TData;\n}\n\nexport interface AppendDropRequest<TData> {\n  type: string;\n  sessionId: string;\n  uniqId: string;\n  data: TData;\n}\n\n/** Append one envelope line to the per-session hook JSONL. Atomic between\n *  hook processes via POSIX `O_APPEND` (Node's `fs.appendFile`) — concurrent\n *  appends from different CC sessions / hook types can't interleave bytes\n *  within a line as long as the line stays < `PIPE_BUF` (4KB). Drops are\n *  <1KB in practice, so this is safe without locks.\n *\n *  Stderr logs are written so `tail -f ~/.jarvis/hooks/hook.log` (when\n *  CC pipes hook stderr there, which it does by default) shows what fired.\n *  Stderr never breaks CC — it only watches stdout for decision JSON. */\nexport async function appendDrop<TData>(req: AppendDropRequest<TData>): Promise<void> {\n  if (!req.sessionId || !req.type || !req.uniqId) {\n    process.stderr.write(\n      `[hook] skip ${req.type ?? \"?\"} missing field ` +\n        `sessionId=${!!req.sessionId} uniqId=${!!req.uniqId}\\n`,\n    );\n    return;\n  }\n  const dir = getHooksDir();\n  await mkdir(dir, { recursive: true }).catch((err) => {\n    process.stderr.write(`[hook] mkdir failed ${dir}: ${err}\\n`);\n  });\n  const envelope: HookDropEnvelope<TData> = {\n    type: req.type,\n    sessionId: req.sessionId,\n    ts: new Date().toISOString(),\n    uniqId: req.uniqId,\n    data: req.data,\n  };\n  const file = join(dir, `${req.sessionId}.jsonl`);\n  try {\n    await appendFile(file, JSON.stringify(envelope) + \"\\n\");\n    process.stderr.write(\n      `[hook] ${req.type} appended sessionId=${req.sessionId} uniqId=${req.uniqId}\\n`,\n    );\n  } catch (err) {\n    process.stderr.write(`[hook] append failed ${file}: ${err}\\n`);\n  }\n}\n\n/** Read CC's hook payload from stdin. Returns `null` on parse failure\n *  (never throws — the hook must never block CC). */\nexport async function readHookStdin<T = Record<string, unknown>>(): Promise<T | null> {\n  try {\n    const chunks: Buffer[] = [];\n    for await (const chunk of process.stdin) {\n      chunks.push(typeof chunk === \"string\" ? Buffer.from(chunk) : chunk);\n    }\n    const raw = Buffer.concat(chunks).toString(\"utf-8\");\n    if (!raw) return null;\n    return JSON.parse(raw) as T;\n  } catch {\n    return null;\n  }\n}\n\n/** Hard cap any hook so an exotic stdin stall can't pile up forever\n *  before CC's terminal prompt fires. We exit 0 with no output → CC\n *  proceeds with its normal permission flow. */\nexport function installHookTimeout(ms = 750): void {\n  const timer = setTimeout(() => process.exit(0), ms);\n  timer.unref();\n}\n","/**\n * Agent Config\n *\n * Manages ~/.jarvis/config.json — saved by `jarvis connect <token>`,\n * read on `jarvis start`.\n */\n\nimport fs from \"fs\";\nimport path from \"path\";\nimport os from \"os\";\n\n// =============================================================================\n// Types\n// =============================================================================\n\nexport interface AgentConfig {\n  /** The jarvis this machine joined — the address a person opens in a browser,\n   *  and what pairing talks to. Ours by default; `jarvis init --url <url>` joins\n   *  someone else's. */\n  url?: string;\n  /** WS hub URL this machine dials. Written once, by pairing, from the hub the\n   *  joined instance named — and never from a flag, an environment variable or\n   *  any later command. Re-pointing a machine means unpairing it first. */\n  hubUrl?: string;\n  /** JWT auth token (from connect token) */\n  token?: string;\n  /** Long-lived refresh token for obtaining new access tokens */\n  refreshToken?: string;\n  /** User ID */\n  userId: string;\n  /** Environment ID */\n  envId?: string;\n  /** Workspace root path for repo operations */\n  workspacePath?: string;\n  /** Anthropic API key (for local-only use without cloud) */\n  anthropicApiKey?: string;\n  /** Use Anthropic subscription instead of API key */\n  useSubscription?: boolean;\n  /** When the config was last updated */\n  connectedAt?: string;\n}\n\nexport interface ConnectToken {\n  hubUrl: string;\n  jwt: string;\n  refreshToken: string;\n  userId: string;\n  envId: string;\n}\n\n// =============================================================================\n// Environment\n// =============================================================================\n\n/** The jarvis a machine pairs with when nothing else is named. Only ever read\n *  by pairing: `jarvis init --url <url>` joins someone else's instead, and the\n *  hub URL is whatever that instance hands back. */\nexport const DEFAULT_URL = \"https://jarvis.appchy.com\";\n\n// =============================================================================\n// Config directory\n// =============================================================================\n\n/** The config dir is the machine's identity: what it paired as, and therefore\n *  which hub it dials. One daemon per dir, so a second identity on the same\n *  machine — a storage rig, a localhost instance — is a second dir, named by\n *  `JARVIS_CONFIG_DIR`. A development build is not a second identity and does carry\n *  its own name: it reads this same dir, so it is the same machine.\n *\n *  Called fresh on every read so a test that sets `JARVIS_CONFIG_DIR` AFTER\n *  module load still sees the override — caching at module init would lock it\n *  onto the host's real `~/.jarvis/` and leak production state into the\n *  in-memory infra. */\nfunction configDir(): string {\n  if (process.env.JARVIS_CONFIG_DIR) return process.env.JARVIS_CONFIG_DIR;\n  return path.join(os.homedir(), \".jarvis\");\n}\n\nfunction configFile(): string {\n  return path.join(configDir(), \"config.json\");\n}\n\n/** Absolute path to the per-daemon config directory — `~/.jarvis/` unless\n *  `JARVIS_CONFIG_DIR` names another. */\nexport function getConfigDir(): string {\n  return configDir();\n}\n\n/** Per-daemon directory for PreToolUse hook drop files. The CC hook script\n *  writes `<sessionId>/<toolUseId>.json` here; the sessions watcher consumes\n *  them. Each daemon owns the subtree under its own config dir, so a hook\n *  installed for one never feeds another. */\nexport function getHooksDir(): string {\n  return path.join(configDir(), \"hooks\");\n}\n\n// =============================================================================\n// Operations\n// =============================================================================\n\n/** Read the machine's config, accepting the names these two fields used to\n *  carry. `appUrl`/`apiUrl` were renamed on 2026-08-15 — `apiUrl` never held an\n *  API URL, it held the hub's. A config written before that still loads, and\n *  `saveConfig` only ever writes the current names, so a machine heals itself on\n *  its next write with nothing to run. Delete this tolerance once no config\n *  predating the rename is in use. */\nexport function loadConfig(): AgentConfig | null {\n  try {\n    const stored = JSON.parse(fs.readFileSync(configFile(), \"utf-8\")) as AgentConfig &\n      Partial<{ appUrl: string; apiUrl: string }>;\n    const { appUrl, apiUrl, ...config } = stored;\n    const url = config.url ?? appUrl;\n    const hubUrl = config.hubUrl ?? apiUrl;\n    return {\n      ...config,\n      ...(url !== undefined ? { url } : {}),\n      ...(hubUrl !== undefined ? { hubUrl } : {}),\n    };\n  } catch {\n    return null;\n  }\n}\n\n/** Persist the machine's config.\n *\n *  Refuses to move an already-paired machine to a different hub. A machine that\n *  joins the wrong control plane hands it credentials, so re-pointing one is a\n *  deliberate act — `jarvis unpair` (which clears the config) and then pair\n *  again — rather than something a stale token or a mistyped command can do on\n *  its way past. Re-pairing to the same hub is unaffected. */\nexport function saveConfig(config: AgentConfig): void {\n  const paired = loadConfig();\n  if (paired?.hubUrl && config.hubUrl && config.hubUrl !== paired.hubUrl) {\n    throw new Error(\n      `This machine is paired with ${paired.hubUrl} and cannot be moved to ${config.hubUrl}.\\n` +\n        `  Run 'jarvis unpair' first if you mean to join a different jarvis.`,\n    );\n  }\n  fs.mkdirSync(configDir(), { recursive: true });\n  fs.writeFileSync(configFile(), JSON.stringify(config, null, 2) + \"\\n\");\n}\n\nexport function clearConfig(): void {\n  try {\n    fs.unlinkSync(configFile());\n  } catch {}\n}\n\nexport function parseConnectToken(token: string): ConnectToken {\n  try {\n    const decoded = Buffer.from(token, \"base64\").toString(\"utf-8\");\n    const parsed = JSON.parse(decoded);\n    if (!parsed.hubUrl || !parsed.jwt || !parsed.userId) {\n      throw new Error(\"Invalid token: missing required fields (hubUrl, jwt, userId)\");\n    }\n    return parsed as ConnectToken;\n  } catch (err) {\n    if (err instanceof SyntaxError) {\n      throw new Error(\"Invalid token: not valid base64-encoded JSON\");\n    }\n    throw err;\n  }\n}\n\nexport function getConfigPath(): string {\n  return configFile();\n}\n","/**\n * UserPromptSubmit hook — drops an envelope each time a `claude` user submits\n * a prompt. Jarvis starts no sessions, so every drop observed here is a\n * person's turn.\n *\n * Used to flip `SessionCacheEntry.controller` to `\"claudeCode\"` on the\n * watcher side, surfacing the controller change in the web UI's pill.\n */\n\nimport { appendDrop, installHookTimeout, readHookStdin } from \"./drop\";\n\ninterface CcUserPromptSubmitInput {\n  session_id?: string;\n  transcript_path?: string;\n  cwd?: string;\n  prompt?: string;\n}\n\ninterface UserPromptSubmitDropData {\n  transcriptPath?: string;\n  cwd?: string;\n}\n\ninstallHookTimeout();\n\nasync function main(): Promise<void> {\n  const p = await readHookStdin<CcUserPromptSubmitInput>();\n  if (!p) return;\n  const sessionId = p.session_id;\n  if (!sessionId) return;\n\n  const ts = new Date().toISOString();\n  const data: UserPromptSubmitDropData = {\n    ...(p.transcript_path ? { transcriptPath: p.transcript_path } : {}),\n    ...(p.cwd ? { cwd: p.cwd } : {}),\n  };\n\n  await appendDrop<UserPromptSubmitDropData>({\n    type: \"user-prompt-submit\",\n    sessionId,\n    uniqId: `user-prompt-submit-${ts}`,\n    data,\n  });\n}\n\nvoid main().finally(() => process.exit(0));\n"],"mappings":";;;AAcA,SAAS,YAAY,aAAa;AAClC,SAAS,YAAY;;;ACPrB,OAAO,UAAU;AACjB,OAAO,QAAQ;AAgEf,SAAS,YAAoB;AAC3B,MAAI,QAAQ,IAAI,kBAAmB,QAAO,QAAQ,IAAI;AACtD,SAAO,KAAK,KAAK,GAAG,QAAQ,GAAG,SAAS;AAC1C;AAgBO,SAAS,cAAsB;AACpC,SAAO,KAAK,KAAK,UAAU,GAAG,OAAO;AACvC;;;AD/CA,eAAsB,WAAkB,KAA8C;AACpF,MAAI,CAAC,IAAI,aAAa,CAAC,IAAI,QAAQ,CAAC,IAAI,QAAQ;AAC9C,YAAQ,OAAO;AAAA,MACb,eAAe,IAAI,QAAQ,GAAG,4BACf,CAAC,CAAC,IAAI,SAAS,WAAW,CAAC,CAAC,IAAI,MAAM;AAAA;AAAA,IACvD;AACA;AAAA,EACF;AACA,QAAM,MAAM,YAAY;AACxB,QAAM,MAAM,KAAK,EAAE,WAAW,KAAK,CAAC,EAAE,MAAM,CAAC,QAAQ;AACnD,YAAQ,OAAO,MAAM,uBAAuB,GAAG,KAAK,GAAG;AAAA,CAAI;AAAA,EAC7D,CAAC;AACD,QAAM,WAAoC;AAAA,IACxC,MAAM,IAAI;AAAA,IACV,WAAW,IAAI;AAAA,IACf,KAAI,oBAAI,KAAK,GAAE,YAAY;AAAA,IAC3B,QAAQ,IAAI;AAAA,IACZ,MAAM,IAAI;AAAA,EACZ;AACA,QAAM,OAAO,KAAK,KAAK,GAAG,IAAI,SAAS,QAAQ;AAC/C,MAAI;AACF,UAAM,WAAW,MAAM,KAAK,UAAU,QAAQ,IAAI,IAAI;AACtD,YAAQ,OAAO;AAAA,MACb,UAAU,IAAI,IAAI,uBAAuB,IAAI,SAAS,WAAW,IAAI,MAAM;AAAA;AAAA,IAC7E;AAAA,EACF,SAAS,KAAK;AACZ,YAAQ,OAAO,MAAM,wBAAwB,IAAI,KAAK,GAAG;AAAA,CAAI;AAAA,EAC/D;AACF;AAIA,eAAsB,gBAAgE;AACpF,MAAI;AACF,UAAM,SAAmB,CAAC;AAC1B,qBAAiB,SAAS,QAAQ,OAAO;AACvC,aAAO,KAAK,OAAO,UAAU,WAAW,OAAO,KAAK,KAAK,IAAI,KAAK;AAAA,IACpE;AACA,UAAM,MAAM,OAAO,OAAO,MAAM,EAAE,SAAS,OAAO;AAClD,QAAI,CAAC,IAAK,QAAO;AACjB,WAAO,KAAK,MAAM,GAAG;AAAA,EACvB,QAAQ;AACN,WAAO;AAAA,EACT;AACF;AAKO,SAAS,mBAAmB,KAAK,KAAW;AACjD,QAAM,QAAQ,WAAW,MAAM,QAAQ,KAAK,CAAC,GAAG,EAAE;AAClD,QAAM,MAAM;AACd;;;AE5EA,mBAAmB;AAEnB,eAAe,OAAsB;AACnC,QAAM,IAAI,MAAM,cAAuC;AACvD,MAAI,CAAC,EAAG;AACR,QAAM,YAAY,EAAE;AACpB,MAAI,CAAC,UAAW;AAEhB,QAAM,MAAK,oBAAI,KAAK,GAAE,YAAY;AAClC,QAAM,OAAiC;AAAA,IACrC,GAAI,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,gBAAgB,IAAI,CAAC;AAAA,IACjE,GAAI,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,IAAI,CAAC;AAAA,EAChC;AAEA,QAAM,WAAqC;AAAA,IACzC,MAAM;AAAA,IACN;AAAA,IACA,QAAQ,sBAAsB,EAAE;AAAA,IAChC;AAAA,EACF,CAAC;AACH;AAEA,KAAK,KAAK,EAAE,QAAQ,MAAM,QAAQ,KAAK,CAAC,CAAC;","names":[]}

package/harness/hooks/guard.py

@@ -85,6 +85,26 @@ def _git(argv, stdin=""):
     if sub == "checkout" and rest and rest[0] in (".", "--"):
         return ("`git checkout .` discards every uncommitted change.",
                 "`git stash` keeps them.")
+    # `restore` is the modern spelling of the line above and destroys identically —
+    # git's own docs steer people to it, so covering one and not the other left the
+    # rule one synonym deep. It needs no `.`/`--` test: `restore` only ever takes
+    # paths, so there is no branch form to mistake a path for.
+    #
+    # `--staged` alone is the exception and it is a real one: that writes the index
+    # and leaves the working tree untouched, which is somebody unstaging a file.
+    # Denying it would spend the guard's authority on a safe, common command.
+    if sub == "restore" and rest:
+        touches_worktree = "--worktree" in rest or "-W" in rest or not (
+            "--staged" in rest or "-S" in rest)
+        if touches_worktree:
+            return ("`git restore` overwrites the working tree from another commit, "
+                    "discarding uncommitted changes with no reflog entry.",
+                    "`git stash` keeps them, or `git restore --staged` to unstage "
+                    "without touching the file.")
+    if sub == "stash" and rest and rest[0] == "clear":
+        return ("`git stash clear` deletes every stash on this machine at once, and "
+                "nothing prints what they were.",
+                "`git stash list` first, then `git stash drop` the one you mean.")
     return None
 
 
@@ -132,6 +152,10 @@ DENY = (_rm, _git, _sql, _fs)
 #: fine here: the cost of a false positive is one extra line of output.
 WARN = {
     "--no-verify": "skips the pre-commit hooks this repo installed on purpose",
+    # Recoverable and therefore not denied: `drop` prints the sha it dropped, so the
+    # work is reachable until it is collected. Named anyway, because the sha is only
+    # useful to somebody who noticed it go past.
+    "git stash drop": "deletes a stash — the sha it prints is the only way back",
     "npm publish": "publishes to the registry — a version number cannot be reused",
     "pnpm publish": "publishes to the registry — a version number cannot be reused",
     "terraform apply": "changes real infrastructure",

package/harness/test_work.py

@@ -2807,6 +2807,30 @@ def test_the_guard_blocks_the_unrecoverable_and_allows_everything_else():
     assert guard.check("git commit --no-verify -m x")[0] == "warn"
 
 
+def test_a_destructive_git_verb_is_covered_by_both_its_spellings():
+    # `git restore` is what git's own docs steer people to, and it destroys exactly
+    # what `git checkout --` destroys. Covering one and not the other made the rule
+    # one synonym deep, and the synonym is the one a newer hand reaches for first.
+    # Measured cost of the gap: a session in another repo ran `git checkout -- work/`
+    # here and took a 68-line rule that had never been committed.
+    guard = _load_guard()
+    for bad in ("git restore work/", "git restore .",
+                "git restore --worktree src/a.ts",
+                "git restore --staged --worktree src/a.ts",
+                "git restore --source=HEAD~1 src/a.ts",
+                "git stash clear"):
+        assert guard.check(bad)[0] == "deny", f"should have blocked: {bad}"
+
+    # `--staged` on its own writes the index and leaves the file alone — somebody
+    # unstaging, which is safe and common. Denying it would spend the guard's
+    # authority on ordinary work, and an authority-less guard protects nothing.
+    for ok in ("git restore --staged src/a.ts", "git restore -S src/a.ts"):
+        assert guard.check(ok)[0] != "deny", f"false positive: {ok}"
+
+    # Recoverable, so it is named rather than refused: `drop` prints the sha.
+    assert guard.check("git stash drop")[0] == "warn"
+
+
 def test_a_quoted_separator_does_not_switch_the_guard_off():
     # The headline hole: `re.split` cut at the `;` INSIDE the string, both halves
     # then failed to parse as unbalanced quotes, and every rule was skipped. A

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appchy/jarvis",
-  "version": "0.1.42",
+  "version": "0.1.44",
   "description": "Jarvis — local AI coding assistant CLI",
   "private": false,
   "type": "module",
@@ -51,13 +51,13 @@
     "vitest": "^2.1.0",
     "@jarvis/agents": "1.0.0",
     "@jarvis/anthropic": "1.0.0",
+    "@jarvis/board": "0.1.0",
+    "@jarvis/data": "0.1.0",
     "@jarvis/logger": "1.0.0",
     "@jarvis/rpc": "1.0.0",
-    "@jarvis/board": "0.1.0",
     "@jarvis/types": "1.0.0",
     "@jarvis/typescript-config": "1.0.0",
-    "@jarvis/vitest-config": "1.0.0",
-    "@jarvis/data": "0.1.0"
+    "@jarvis/vitest-config": "1.0.0"
   },
   "scripts": {
     "dev": "tsx watch src/bin.ts start --foreground",