@100xprompt/brain 0.1.5 → 0.1.6

package/src/settings/catalog.ts

@@ -168,7 +168,7 @@ async function reconnect(ctx: Ctx, tool: string, change: { model?: string; conte
   if (cs.state === "not-connected") return { ok: true }
   if (!cs.settings) return { ok: false, error: olderBrain(tool) }
   if (!hasKey(ctx.home)) return { ok: false, error: "not signed in to the gateway (brain gateway login)" }
-  const r = await connect(ctx.home, tool, { settings: connectSettings(ctx, tool, change), probe: false, env: ctx.env })
+  const r = await connect(ctx.home, tool, { settings: connectSettings(ctx, tool, change), probe: false, env: ctx.env, keepTheirs: { for: change.model !== undefined ? "model" : "contextEdit" } })
   return r.ok ? { ok: true, notes: notesOf(r.lines, ctx.home, /^warning: /) } : { ok: false, error: cleanText(r.lines.join("; "), ctx.home) }
 }
 
@@ -397,7 +397,25 @@ const reports: Family = {
   },
 }
 
-export const FAMILIES: Family[] = [gateway, model, contextEdit, mcp, hooks, leanAuto, leanThreshold, leanMinChars, memoryEnabled, reports]
+// Only this computer decides whether the website may move its sessions, and whether its session list leaves it.
+const movesFromDashboard = internal("moves.fromDashboard", {
+  label: "Moves from the dashboard",
+  help: "A session move asked from your dashboard: ask (this computer asks you first), allow (it runs), or off (it is refused).",
+  type: { kind: "choice", choices: ["ask", "allow", "off"] },
+  levels: ["computer"],
+  remote: "no",
+  team: "none",
+})
+const reportsSessions = internal("reports.sessions", {
+  label: "Session list to your account",
+  help: "This computer sends its session list (titles and project folder names; never chat text) so the dashboard can list and move sessions.",
+  type: { kind: "bool" },
+  levels: ["computer"],
+  remote: "no",
+  team: "none",
+})
+
+export const FAMILIES: Family[] = [gateway, model, contextEdit, mcp, hooks, leanAuto, leanThreshold, leanMinChars, memoryEnabled, reports, reportsSessions, movesFromDashboard]
 
 // ---- ids and values -----------------------------------------------------------------------------------------------------
 

package/src/settings/cli.ts

@@ -399,6 +399,11 @@ export async function statusCommand(home: string, io: Io = { out: (l) => console
   if (refused.length) io.out(`  refused by your account (this computer went back to its value): ${refused.map((r) => `${r.id} = ${String(r.value)} (${r.message || r.code})`).join("; ")}`)
   const { serviceStatusLines } = await import("../service.ts")
   if (acct.paired) serviceStatusLines(home).forEach((l) => io.out(l))
+  if (acct.paired) {
+    const { movesState } = await import("../moves.ts")
+    const mv = movesState(home)
+    if (mv.waiting) io.out(`moves from the dashboard: ${mv.waiting} wait${mv.waiting === 1 ? "s" : ""} for you here (brain moves)`)
+  }
   const recorded = readRecordedEnv(home)
   // As the code that obeys them reads them: BRAIN_NO_REPORT anything but empty, 0 or false; BRAIN_NO_MEMORY exactly 1.
   const envOff = [...(off && /BRAIN_NO_REPORT/.test(off) ? ["BRAIN_NO_REPORT"] : []), ...(env.BRAIN_NO_MEMORY === "1" ? ["BRAIN_NO_MEMORY"] : [])]
@@ -439,6 +444,9 @@ export async function syncCommand(home: string, io: Io = { out: (l) => console.l
   else {
     noticeOnce(home, io.out)
     const { buildReport } = await import("../dashboard/report.ts")
+    const { sendSessions } = await import("../dashboard/sessions.ts")
+    const listSent = await sendSessions(home, { env, force: true, ...(deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}) })
+    if (listSent.sent) io.out(`sessions: sent this computer's list (${listSent.total}) for the dashboard`)
     const sent = await sendReport(home, await buildReport(home, { env }), { timeoutMs: 5_000, ...(deps.fetchImpl ? { fetchImpl: deps.fetchImpl } : {}) })
     io.out(sent.ok ? `report: sent to ${gatewayUrl(home)}` : `report: not sent (${sent.why})`)
   }

package/src/settings/values.ts

@@ -12,15 +12,22 @@ export const LIMITS = {
   "lean.minChars": { min: 300, max: 100_000 },
 } as const
 
+/** Whether a session move asked from the dashboard runs here: ask the person first, run it, or refuse it. */
+export const MOVES_CHOICES = ["ask", "allow", "off"] as const
+export type MovesSetting = (typeof MOVES_CHOICES)[number]
+
 export const DEFAULTS: Record<string, Value> = {
   "lean.auto": LEAN_DEFAULTS.auto,
   "lean.threshold": LEAN_DEFAULTS.threshold,
   "lean.minChars": LEAN_DEFAULTS.minChars,
   "memory.enabled": true,
+  "moves.fromDashboard": "ask",
+  "reports.sessions": true,
 }
 
 /** Whether a value is a valid one for this setting (a hand-edited or newer file may hold anything). */
 export function validValue(id: string, v: Value): boolean {
+  if (id === "moves.fromDashboard") return typeof v === "string" && (MOVES_CHOICES as readonly string[]).includes(v)
   if (typeof DEFAULTS[id] === "boolean") return typeof v === "boolean"
   const lim = LIMITS[id as keyof typeof LIMITS]
   return typeof v === "number" && Number.isInteger(v) && (!lim || (v >= lim.min && v <= lim.max))
@@ -55,6 +62,27 @@ export function memoryOn(home: string, d?: SettingsDoc): boolean {
   return r.problem === "damaged" ? false : (valueOf(r.doc, "memory.enabled") as boolean)
 }
 
+/** A setting only this computer can have: its own level counts, nothing set from elsewhere or by a team. */
+const localValue = (d: SettingsDoc, id: string): Value => {
+  const e = d.levels.computer[id]
+  return e && validValue(id, e.value) ? e.value : DEFAULTS[id]!
+}
+
+/** Whether moves asked from the dashboard run here (`brain settings set moves.fromDashboard ask|allow|off`; ask by default). */
+export function movesSetting(home: string, d?: SettingsDoc): MovesSetting {
+  if (d) return localValue(d, "moves.fromDashboard") as MovesSetting
+  const r = readSettingsFile(home)
+  // A file that cannot be read gives no permission: the person is asked.
+  return r.problem === "damaged" ? "ask" : (localValue(r.doc, "moves.fromDashboard") as MovesSetting)
+}
+
+/** Whether this computer sends its session list (titles, project folder names) to the account; on by default. */
+export function sessionsListOn(home: string, d?: SettingsDoc): boolean {
+  if (d) return localValue(d, "reports.sessions") as boolean
+  const r = readSettingsFile(home)
+  return r.problem === "damaged" ? false : (localValue(r.doc, "reports.sessions") as boolean)
+}
+
 /** What brain says where memory would have been used. */
 export const MEMORY_OFF = "memory is turned off on this computer (`brain settings set memory.enabled on` turns it on)"