mixdog 1.4.1 → 1.4.2

package/src/session-runtime/boot/tools.mjs

@@ -22,6 +22,7 @@ import { TOOL_DEFS as OFFICE_TOOL_DEFS } from '../../runtime/office/tool-defs.mj
 import { TOOL_DEFS as MEDIA_TOOL_DEFS } from '../../runtime/media/tool-defs.mjs';
 import { TOOL_DEFS as TIDY_TOOL_DEFS } from '../../runtime/tidy/tool-defs.mjs';
 import { TOOL_DEFS as VISUALIZE_BRIDGE_TOOL_DEFS } from '../../runtime/visualize-bridge/tool-defs.mjs';
+import { TOOL_DEFS as EXPLORE_TOOL_DEFS } from '../../runtime/explore/tool-defs.mjs';
 import {
   ASK_USER_TOOL_DEFS,
   HANDOFF_USER_TOOL_DEFS,
@@ -172,6 +173,7 @@ function wireToolSurface(boot) {
     mediaToolDefs: MEDIA_TOOL_DEFS,
     tidyToolDefs: TIDY_TOOL_DEFS,
     visualizeToolDefs: VISUALIZE_BRIDGE_TOOL_DEFS,
+    exploreToolDefs: EXPLORE_TOOL_DEFS,
     setupToolDefs: SETUP_TOOL_DEFS,
     askUserToolDefs: ASK_USER_TOOL_DEFS,
     handoffUserToolDefs: HANDOFF_USER_TOOL_DEFS,

package/src/session-runtime/bot-status.mjs

@@ -204,6 +204,109 @@ function routineDetail(routine, now) {
   return cut(`${routine.kind} ${quotedText(routine.name, 64)}: ${parts.join(', ')}`, 240);
 }
 
+/** Everything known about one bot, from the gathered state. */
+function botState(bot, ctx) {
+  const homeId = agentHomeSessionId(bot.id);
+  const owned = ctx.owned.get(bot.id) || [];
+  const home = ctx.rows.get(homeId) || null;
+  // Work this bot sent that is running now: a session working with the bot's
+  // send in flight (`handedBy`, bot-owned-work.mjs). A turn the user typed
+  // in the bot's task session is the user's, not the bot working.
+  const sentWork = (row) => isWorking(row) && row.handedBy?.includes(bot.id);
+  // Running task sessions: a turn whose report is still owed, or the bot's
+  // work running now.
+  const tasks = new Map();
+  const addTask = (id, title, at) => {
+    const known = tasks.get(id);
+    if (!known) tasks.set(id, { id, title, at });
+    else if (at && (!known.at || at < known.at)) known.at = at;
+  };
+  for (const watch of ctx.watches) {
+    if (watch.agentId !== bot.id || watch.target === 'session' || !watch.taskSessionId) continue;
+    addTask(watch.taskSessionId, watch.title, Number(watch.at) || 0);
+  }
+  for (const row of owned) {
+    if (row.id === homeId || roomMemberOfSession(row.id) || !sentWork(row)) continue;
+    addTask(row.id, row.title, Number(row.createdAt) || 0);
+  }
+  const running = [...tasks.values()].sort((left, right) => left.at - right.at || (left.id < right.id ? -1 : 1));
+  const held = ctx.held.filter((entry) => entry.agentId === bot.id);
+  const approvals = held.length + [homeId, ...running.map((task) => task.id)].filter(ctx.awaitingApproval).length;
+  const routines = ctx.routines.rows
+    .filter((routine) => (routine.owner || MIXY_AGENT_ID) === bot.id)
+    .sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
+  const flags = [];
+  if (approvals) flags.push(`${plural(approvals, 'approval')} waiting`);
+  for (const routine of routines) {
+    const trouble = routineTrouble(routine);
+    if (trouble.length) flags.push(`${quotedText(routine.name, 20)} ${trouble.join(', ')}`);
+  }
+  if (bot.disabled) flags.push('disabled');
+  return {
+    bot,
+    homeId,
+    home,
+    owned,
+    running,
+    held,
+    approvals,
+    routines,
+    flags,
+    working: isWorking(home) || running.some((task) => sentWork(ctx.rows.get(task.id))),
+    lastAt: activityOf(home),
+  };
+}
+
+function botLine(state, now) {
+  const { bot } = state;
+  const parts = [`${quotedText(bot.name, 40)} (${bot.id})`, `chat ${state.homeId}`];
+  if (bot.self) parts.push('you');
+  parts.push(state.working ? 'working' : 'idle');
+  if (state.flags.length) parts.push(`attention: ${state.flags.join('; ')}`);
+  parts.push(state.lastAt ? `last ${ago(state.lastAt, now)}` : 'no chat yet');
+  if (state.running.length) {
+    const [first] = state.running;
+    const more = state.running.length > 1 ? ` +${state.running.length - 1}` : '';
+    const count = state.running.length > 1 ? `${state.running.length} tasks:` : 'task';
+    parts.push(`${count} "${quotedText(first.title, 24)}"${first.at ? ` ${span(now - first.at)}` : ''}${more}`);
+  }
+  if (state.routines.length) {
+    const next = state.routines
+      .filter((routine) => routine.enabled !== false && epoch(routine.nextFireAt))
+      .sort((left, right) => epoch(left.nextFireAt) - epoch(right.nextFireAt))[0];
+    parts.push(
+      `${plural(state.routines.length, 'routine')}${next ? `, next ${quotedText(next.name, 20)} ${until(epoch(next.nextFireAt), now)}` : ''}`
+    );
+  }
+  const fixed = parts.join(' · ');
+  const preview = oneLine(state.home?.lastMessagePreview || state.home?.preview);
+  const room = BOT_LINE_LIMIT - fixed.length - 5;
+  return cut(preview && room >= MIN_PREVIEW ? `${fixed} · "${quotedText(preview, room)}"` : fixed, BOT_LINE_LIMIT);
+}
+
+const mixyBot = (ctx) => ({ id: MIXY_AGENT_ID, name: ctx.mixy, self: true });
+
+/** The bots the caller sees: every bot then Mixy when she has something to
+ *  show, or just the caller's own bot. */
+function visibleStates(ctx) {
+  if (ctx.own) {
+    const bot = ctx.own === MIXY_AGENT_ID ? mixyBot(ctx) : ctx.bots[0];
+    return bot ? [botState(bot, ctx)] : [];
+  }
+  const states = ctx.bots
+    .map((bot) => botState(bot, ctx))
+    .sort(
+      (left, right) =>
+        Number(right.flags.length > 0) - Number(left.flags.length > 0) ||
+        Number(right.working) - Number(left.working) ||
+        right.lastAt - left.lastAt ||
+        (left.bot.id < right.bot.id ? -1 : 1)
+    );
+  const mixy = botState(mixyBot(ctx), ctx);
+  if (mixy.routines.length || mixy.running.length || mixy.approvals) states.push(mixy);
+  return states;
+}
+
 export function createBotStatus({
   getSessionService,
   listBots = defaultListBots,
@@ -260,109 +363,6 @@ export function createBotStatus({
     };
   }
 
-  /** Everything known about one bot, from the gathered state. */
-  function botState(bot, ctx) {
-    const homeId = agentHomeSessionId(bot.id);
-    const owned = ctx.owned.get(bot.id) || [];
-    const home = ctx.rows.get(homeId) || null;
-    // Work this bot sent that is running now: a session working with the bot's
-    // send in flight (`handedBy`, bot-owned-work.mjs). A turn the user typed
-    // in the bot's task session is the user's, not the bot working.
-    const sentWork = (row) => isWorking(row) && row.handedBy?.includes(bot.id) === true;
-    // Running task sessions: a turn whose report is still owed, or the bot's
-    // work running now.
-    const tasks = new Map();
-    const addTask = (id, title, at) => {
-      const known = tasks.get(id);
-      if (!known) tasks.set(id, { id, title, at });
-      else if (at && (!known.at || at < known.at)) known.at = at;
-    };
-    for (const watch of ctx.watches) {
-      if (watch.agentId !== bot.id || watch.target === 'session' || !watch.taskSessionId) continue;
-      addTask(watch.taskSessionId, watch.title, Number(watch.at) || 0);
-    }
-    for (const row of owned) {
-      if (row.id === homeId || roomMemberOfSession(row.id) || !sentWork(row)) continue;
-      addTask(row.id, row.title, Number(row.createdAt) || 0);
-    }
-    const running = [...tasks.values()].sort((left, right) => left.at - right.at || (left.id < right.id ? -1 : 1));
-    const held = ctx.held.filter((entry) => entry.agentId === bot.id);
-    const approvals = held.length + [homeId, ...running.map((task) => task.id)].filter(ctx.awaitingApproval).length;
-    const routines = ctx.routines.rows
-      .filter((routine) => (routine.owner || MIXY_AGENT_ID) === bot.id)
-      .sort((left, right) => (left.name < right.name ? -1 : left.name > right.name ? 1 : 0));
-    const flags = [];
-    if (approvals) flags.push(`${plural(approvals, 'approval')} waiting`);
-    for (const routine of routines) {
-      const trouble = routineTrouble(routine);
-      if (trouble.length) flags.push(`${quotedText(routine.name, 20)} ${trouble.join(', ')}`);
-    }
-    if (bot.disabled) flags.push('disabled');
-    return {
-      bot,
-      homeId,
-      home,
-      owned,
-      running,
-      held,
-      approvals,
-      routines,
-      flags,
-      working: isWorking(home) || running.some((task) => sentWork(ctx.rows.get(task.id))),
-      lastAt: activityOf(home),
-    };
-  }
-
-  function botLine(state, now) {
-    const { bot } = state;
-    const parts = [`${quotedText(bot.name, 40)} (${bot.id})`, `chat ${state.homeId}`];
-    if (bot.self) parts.push('you');
-    parts.push(state.working ? 'working' : 'idle');
-    if (state.flags.length) parts.push(`attention: ${state.flags.join('; ')}`);
-    parts.push(state.lastAt ? `last ${ago(state.lastAt, now)}` : 'no chat yet');
-    if (state.running.length) {
-      const [first] = state.running;
-      const more = state.running.length > 1 ? ` +${state.running.length - 1}` : '';
-      const count = state.running.length > 1 ? `${state.running.length} tasks:` : 'task';
-      parts.push(`${count} "${quotedText(first.title, 24)}"${first.at ? ` ${span(now - first.at)}` : ''}${more}`);
-    }
-    if (state.routines.length) {
-      const next = state.routines
-        .filter((routine) => routine.enabled !== false && epoch(routine.nextFireAt))
-        .sort((left, right) => epoch(left.nextFireAt) - epoch(right.nextFireAt))[0];
-      parts.push(
-        `${plural(state.routines.length, 'routine')}${next ? `, next ${quotedText(next.name, 20)} ${until(epoch(next.nextFireAt), now)}` : ''}`
-      );
-    }
-    const fixed = parts.join(' · ');
-    const preview = oneLine(state.home?.lastMessagePreview || state.home?.preview);
-    const room = BOT_LINE_LIMIT - fixed.length - 5;
-    return cut(preview && room >= MIN_PREVIEW ? `${fixed} · "${quotedText(preview, room)}"` : fixed, BOT_LINE_LIMIT);
-  }
-
-  const mixyBot = (ctx) => ({ id: MIXY_AGENT_ID, name: ctx.mixy, self: true });
-
-  /** The bots the caller sees: every bot then Mixy when she has something to
-   *  show, or just the caller's own bot. */
-  function visibleStates(ctx) {
-    if (ctx.own) {
-      const bot = ctx.own === MIXY_AGENT_ID ? mixyBot(ctx) : ctx.bots[0];
-      return bot ? [botState(bot, ctx)] : [];
-    }
-    const states = ctx.bots
-      .map((bot) => botState(bot, ctx))
-      .sort(
-        (left, right) =>
-          Number(right.flags.length > 0) - Number(left.flags.length > 0) ||
-          Number(right.working) - Number(left.working) ||
-          right.lastAt - left.lastAt ||
-          (left.bot.id < right.bot.id ? -1 : 1)
-      );
-    const mixy = botState(mixyBot(ctx), ctx);
-    if (mixy.routines.length || mixy.running.length || mixy.approvals) states.push(mixy);
-    return states;
-  }
-
   async function overview(own) {
     const ctx = await gather(own);
     const states = visibleStates(ctx);

package/src/session-runtime/connector-merge-migration.mjs

@@ -1,6 +1,6 @@
-// After the multi-account connector merge (connector-catalog.mjs
-// mergeConnectorAccountServers) `gmail-2`, `google-calendar-2`… are accounts of
-// one server, no longer servers. Every store of ours that keys a setting by
+// After the connector merge (connector-catalog.mjs mergeConnectorAccountServers)
+// `gmail-2`, `notion-2`, `postgres-2`… are accounts of their connector's one
+// server, no longer servers. Every store of ours that keys a setting by
 // MCP server name must name the surviving server instead:
 //   agents/<id>/agent.json, bots/<id>/agent.json   connectors.off / connectors.tools
 //                                                  (a legacy allow list too)
@@ -11,14 +11,15 @@
 // name models, not servers.) Project and plugin hook files are the user's or
 // the plugin's own and are never rewritten here.
 //
-// Rule: the merged connector is OFF for an agent/project only when EVERY
-// merged server was off (the same rule as the merged server's `enabled`: one
-// working account keeps the connector usable). Per-tool permissions move to
-// the surviving name; where two merged servers disagree on a tool the MORE
-// PERMISSIVE permission wins, as "on beats off" does at server level. Entries
-// of a server that was off are dormant and are dropped when the connector
-// stays on, so they never become live. A setting that names no merged-away
-// server is never touched, which makes every run after the first a no-op.
+// Rule: differences are ignored and the topmost server decides. The merged
+// connector is on or off for an agent/project as the surviving server was
+// there when the setting names it, else as the lowest-numbered merged server
+// it names (so a switched-off `-N` server never becomes reachable through the
+// merge). Per-tool permissions move to the surviving name; where merged
+// servers disagree on a tool the surviving server's own entry wins, else the
+// first merged server's. Entries of a server that was off are dormant and
+// dropped when the connector stays on. A setting that names no merged-away
+// server is never touched, so every run after the first is a no-op.
 //
 // The merge is saved to the config once, so the rename mapping outlives it:
 // `<data>/connector-merge-pending.json` ({ merged: [{ name, from }] }) is
@@ -35,7 +36,6 @@ import { readdirSync, readFileSync, rmSync } from 'node:fs';
 import { join } from 'node:path';
 import { normalizeRules, standardConfigReport } from './services/hook-bus/config.mjs';
 import {
-  PERMISSION_RANK,
   PROJECT_CONNECTORS_FILE,
   connectorEnabled,
   parseConnectorPolicy,
@@ -56,7 +56,8 @@ function mapMergedConnectorPolicy(policy, merged) {
       current.off.includes(server) || current.allow?.includes(server) || Object.hasOwn(current.tools, server);
     if (!gone.some(named)) continue;
     const live = from.filter((server) => connectorEnabled(current, server));
-    const on = live.length > 0;
+    // `from` lists the surviving server first, then the others lowest-numbered first.
+    const on = connectorEnabled(current, from.find(named));
     const off = current.off.filter((server) => !from.includes(server));
     const allow = current.allow?.filter((server) => !from.includes(server));
     if (allow && on) allow.push(name);
@@ -64,9 +65,11 @@ function mapMergedConnectorPolicy(policy, merged) {
     const tools = { ...current.tools };
     for (const server of from) delete tools[server];
     const moved = {};
-    for (const server of on ? live : from) {
+    const sources = on ? live : from;
+    for (const server of [name, ...sources.filter((id) => id !== name)]) {
+      if (!sources.includes(server)) continue;
       for (const [tool, permission] of Object.entries(current.tools[server] || {})) {
-        if (!(tool in moved) || PERMISSION_RANK[permission] > PERMISSION_RANK[moved[tool]]) moved[tool] = permission;
+        if (!(tool in moved)) moved[tool] = permission;
       }
     }
     if (Object.keys(moved).length) tools[name] = moved;