paseo-bm 0.2.0-alpha.1 → 0.3.0-alpha.4

package/README.md

@@ -9,7 +9,7 @@
 - **Reviewer** — checks each stage and returns a verdict. It never edits anything.
 - **Screens in Paseo** — **Metric** (what each request did and cost), **Beads** (the workspace's beads) and **Setup** (tools, skills and your own role instructions).
 
-> **Status:** prerelease (`0.2.0-alpha.*`). Command names, flags, exit codes and the `--json` shape are a public contract, but expect rough edges.
+> **Status:** prerelease (`0.3.0-alpha.*`). Command names, flags, exit codes and the `--json` shape are a public contract, but expect rough edges.
 
 ## Quick start
 

package/dist/index.js

@@ -3574,8 +3574,13 @@ var MISSING_CONFIG = (path, present, readable) => ({
   mcpInjectIntoAgents: false,
   agentProviderIds: [],
   agentProfileIds: [],
-  providerPaseoTools: {}
+  providerPaseoTools: {},
+  providerExtends: {},
+  profileModels: {}
 });
+function nonEmptyString(value) {
+  return typeof value === "string" && value.length > 0 ? value : void 0;
+}
 var readPaseoConfigFacts = async (configFile) => {
   let text;
   try {
@@ -3598,8 +3603,19 @@ var readPaseoConfigFacts = async (configFile) => {
   const providers = asRecordObject(asRecordObject(root["agents"])?.["providers"]) ?? {};
   const profiles = Array.isArray(daemon?.["agentProfiles"]) ? daemon["agentProfiles"] : [];
   const providerPaseoTools = {};
+  const providerExtends = {};
   for (const [id, value] of Object.entries(providers)) {
-    providerPaseoTools[id] = paseoToolsEnabled(asRecordObject(value)?.["paseoTools"]);
+    const provider = asRecordObject(value);
+    providerPaseoTools[id] = paseoToolsEnabled(provider?.["paseoTools"]);
+    const base = nonEmptyString(provider?.["extends"]);
+    if (base !== void 0) providerExtends[id] = base;
+  }
+  const profileModels = {};
+  for (const entry of profiles) {
+    const profile = asRecordObject(entry);
+    const id = nonEmptyString(profile?.["id"]);
+    const model = nonEmptyString(profile?.["model"]);
+    if (id !== void 0 && model !== void 0 && !(id in profileModels)) profileModels[id] = model;
   }
   return {
     path: configFile,
@@ -3609,7 +3625,9 @@ var readPaseoConfigFacts = async (configFile) => {
     mcpInjectIntoAgents: mcp?.["injectIntoAgents"] === true,
     agentProviderIds: Object.keys(providers),
     agentProfileIds: profiles.map((entry) => asRecordObject(entry)?.["id"]).filter((id) => typeof id === "string" && id.length > 0),
-    providerPaseoTools
+    providerPaseoTools,
+    providerExtends,
+    profileModels
   };
 };
 var probeOwnedFiles = async (record, installHome) => {
@@ -3915,6 +3933,9 @@ function switchChecks(config) {
   ];
 }
 function roleChecks(record, config) {
+  return [...presenceChecks(record, config), ...changedInAppChecks(record, config)];
+}
+function presenceChecks(record, config) {
   return ROLE_NAMES.map((role) => {
     const id = roleId(role);
     const checkId = `role-${id}`;
@@ -3958,6 +3979,32 @@ function roleChecks(record, config) {
     );
   });
 }
+var CHANGED_IN_APP_SEVERITY = "ok";
+function changedInAppChecks(record, config) {
+  if (!config.readable) return [];
+  const notes = [];
+  for (const role of ROLE_NAMES) {
+    const entry = record.roles.find((candidate) => candidate.role === role);
+    if (entry === void 0) continue;
+    if (!config.agentProviderIds.includes(entry.providerId) || !config.agentProfileIds.includes(entry.profileId)) {
+      continue;
+    }
+    const base = config.providerExtends[entry.providerId];
+    const model = config.profileModels[entry.profileId];
+    const baseChanged = base !== void 0 && base !== entry.baseProvider;
+    const modelChanged = model !== void 0 && model !== entry.model;
+    if (!baseChanged && !modelChanged) continue;
+    notes.push(
+      check(
+        "roles.changed-in-app",
+        CHANGED_IN_APP_SEVERITY,
+        `${roleId(role)}: base provider or model differs from what the installer wrote (changed in the app).`,
+        `Nothing to do if the change was on purpose: installing again keeps role settings changed in the app. The installer wrote ${entry.baseProvider}/${entry.model}; Paseo's configuration has ${base ?? "(not set)"}/${model ?? "(not set)"}.`
+      )
+    );
+  }
+  return notes;
+}
 function inventoryChecks(record) {
   const versions = record.versions.length;
   const active = record.versions.find((entry) => entry.active)?.version ?? "none";
@@ -4688,8 +4735,10 @@ function applyProviders(config, edit, changedPaths) {
   const providers = isPlainObject(existing) ? existing : {};
   parent[leaf] = providers;
   for (const [id, value] of entries) {
-    if (!deepEqual(providers[id], value)) {
-      providers[id] = structuredClone(value);
+    const current = providers[id];
+    const next = mergedEntry(current, value, edit.providerMerge?.[id]);
+    if (!deepEqual(current, next)) {
+      providers[id] = next;
       changedPaths.push(`${PROVIDERS_PATH}.${id}`);
     }
   }
@@ -4725,8 +4774,10 @@ function applyProfiles(config, edit, changedPaths) {
       changedPaths.push(profileField(profile.id));
       continue;
     }
-    if (!deepEqual(list[index], profile)) {
-      list[index] = structuredClone(profile);
+    const current = list[index];
+    const next = mergedEntry(current, profile, edit.profileMerge?.[profile.id]);
+    if (!deepEqual(current, next)) {
+      list[index] = next;
       changed = true;
       changedPaths.push(profileField(profile.id));
     }
@@ -4747,11 +4798,45 @@ function applyProfiles(config, edit, changedPaths) {
 function profileField(id) {
   return `${AGENT_PROFILES_PATH}[${id}]`;
 }
+function mergedEntry(current, entry, rule) {
+  if (!isPlainObject(current) || !isPlainObject(entry)) {
+    return structuredClone(entry);
+  }
+  const merged = structuredClone(current);
+  for (const [key, value] of Object.entries(entry)) {
+    const mode = rule?.keys?.[key] ?? "set";
+    const existing = merged[key];
+    switch (mode) {
+      case "create-only":
+        break;
+      case "fill":
+        if (existing === void 0 || existing === null) {
+          merged[key] = structuredClone(value);
+        }
+        break;
+      case "merge":
+        merged[key] = isPlainObject(existing) && isPlainObject(value) ? { ...existing, ...structuredClone(value) } : structuredClone(value);
+        break;
+      case "set":
+        merged[key] = structuredClone(value);
+        break;
+    }
+  }
+  const drop = rule?.drop;
+  if (drop !== void 0 && !deepEqual(current[drop.whenChanged], merged[drop.whenChanged])) {
+    for (const key of drop.keys) {
+      delete merged[key];
+    }
+  }
+  return merged;
+}
 function assertOnlyOurKeys(edit) {
   const ids = [
     ...Object.keys(edit.providers ?? {}),
+    ...Object.keys(edit.providerMerge ?? {}),
     ...edit.removeProviders ?? [],
     ...(edit.profiles ?? []).map((profile) => profile.id),
+    ...Object.keys(edit.profileMerge ?? {}),
     ...edit.removeProfiles ?? []
   ];
   for (const path of edit.removeEmptyContainers ?? []) {
@@ -6776,6 +6861,8 @@ var PROVIDER_LOGIN_COMMANDS = {
   codex: { executable: "codex", args: ["login"] },
   opencode: { executable: "opencode", args: ["providers", "login"] }
 };
+var PI_PROVIDER_ID = "pi";
+var PI_SIGN_IN_GUIDANCE = "Pi has no login command paseo-bm knows; sign in the way Pi's own documentation describes, then run doctor.";
 function loginCommandFor(providerId) {
   return Object.prototype.hasOwnProperty.call(PROVIDER_LOGIN_COMMANDS, providerId) ? PROVIDER_LOGIN_COMMANDS[providerId] : void 0;
 }
@@ -6864,6 +6951,22 @@ async function ensureProviderLogins(options) {
   }
   const providers = [];
   for (const [provider, roles] of rolesByProvider) {
+    if (provider === PI_PROVIDER_ID) {
+      print(PI_SIGN_IN_GUIDANCE);
+      providers.push({
+        provider,
+        roles,
+        before: "unknown",
+        after: "unknown",
+        command: null,
+        outcome: "unknown",
+        ran: false,
+        run: null,
+        manualInstructions: [PI_SIGN_IN_GUIDANCE],
+        warning: null
+      });
+      continue;
+    }
     const before = (await checkProviderLogin(options.runner, provider)).state;
     const login = loginCommandFor(provider);
     const command = login === void 0 ? null : formatLoginCommand(login);
@@ -6965,6 +7068,32 @@ function roleProfileEntry(selection) {
     notes: ROLE_PROFILE_NOTES[selection.role]
   };
 }
+function isNewRoleChoice(selection) {
+  return selection.source !== "record";
+}
+function roleProviderMerge(selection) {
+  const chosen = isNewRoleChoice(selection);
+  return {
+    keys: {
+      extends: chosen ? "set" : "fill",
+      label: chosen ? "set" : "create-only",
+      paseoTools: "merge"
+    }
+  };
+}
+function roleProfileMerge(selection) {
+  const chosen = isNewRoleChoice(selection);
+  return {
+    keys: {
+      id: "set",
+      name: chosen ? "set" : "fill",
+      provider: "set",
+      model: chosen ? "set" : "fill",
+      notes: "create-only"
+    },
+    ...chosen ? { drop: { whenChanged: "model", keys: ["thinkingOptionId"] } } : {}
+  };
+}
 var RoleRegistrationError = class extends Error {
   constructor(message) {
     super(message);
@@ -6974,7 +7103,9 @@ var RoleRegistrationError = class extends Error {
 function roleRegistrationEdit(selections) {
   const seen = /* @__PURE__ */ new Set();
   const providers = {};
+  const providerMerge = {};
   const profiles = [];
+  const profileMerge = {};
   for (const selection of selections) {
     if (seen.has(selection.role)) {
       throw new RoleRegistrationError(
@@ -6982,10 +7113,13 @@ function roleRegistrationEdit(selections) {
       );
     }
     seen.add(selection.role);
-    providers[roleId(selection.role)] = roleProviderEntry(selection);
+    const id = roleId(selection.role);
+    providers[id] = roleProviderEntry(selection);
+    providerMerge[id] = roleProviderMerge(selection);
     profiles.push(roleProfileEntry(selection));
+    profileMerge[id] = roleProfileMerge(selection);
   }
-  return { providers, profiles };
+  return { providers, profiles, providerMerge, profileMerge };
 }
 async function registerRoles(options) {
   const edit = roleRegistrationEdit(options.selections);
@@ -7184,25 +7318,29 @@ function nonBlank(value) {
   return typeof value === "string" && value.trim().length > 0 ? value : void 0;
 }
 function roleActions(config, selections) {
-  const edit = roleRegistrationEdit(selections);
-  const changed = new Set(editConfig(config, edit).changedPaths);
-  const providers = asObject2(asObject2(config["agents"])?.["providers"]);
-  const profiles = asObject2(config["daemon"])?.["agentProfiles"];
+  const edited = editConfig(config, roleRegistrationEdit(selections));
+  const changed = new Set(edited.changedPaths);
   const actions = [];
   for (const selection of selections) {
     const id = roleId(selection.role);
     const providerPath = `${PROVIDERS_PATH}.${id}`;
-    const providerFrom = providers?.[id];
     actions.push(
-      configAction(providerPath, changed.has(providerPath), providerFrom, edit.providers?.[id] ?? null)
+      configAction(providerPath, changed.has(providerPath), providerOf(config, id), providerOf(edited.config, id) ?? null)
     );
     const profilePath = `${AGENT_PROFILES_PATH}[${id}]`;
-    const profileFrom = Array.isArray(profiles) ? profiles.find((entry) => asObject2(entry)?.["id"] === id) : void 0;
-    const profileTo = (edit.profiles ?? []).find((entry) => entry.id === id) ?? null;
-    actions.push(configAction(profilePath, changed.has(profilePath), profileFrom, profileTo));
+    actions.push(
+      configAction(profilePath, changed.has(profilePath), profileOf(config, id), profileOf(edited.config, id) ?? null)
+    );
   }
   return actions;
 }
+function providerOf(config, id) {
+  return asObject2(asObject2(config["agents"])?.["providers"])?.[id];
+}
+function profileOf(config, id) {
+  const profiles = asObject2(config["daemon"])?.["agentProfiles"];
+  return Array.isArray(profiles) ? profiles.find((entry) => asObject2(entry)?.["id"] === id) : void 0;
+}
 function configAction(key, changes, from, to) {
   const target = `paseoHome/config.json#${key}`;
   if (!changes) {