@myvillage/cli 2.13.1 → 2.13.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@myvillage/cli",
-  "version": "2.13.1",
+  "version": "2.13.2",
   "description": "MyVillageOS CLI for community developers",
   "type": "module",
   "bin": {

package/src/agent-runtime/runner.js

@@ -24,10 +24,10 @@ import path from 'path';
 import { getConfig } from '../utils/config.js';
 import { getAccessToken, isTokenExpired } from '../utils/auth.js';
 import { refreshAccessToken } from '../utils/api.js';
-import { listLocalAgents, readAgentConfig, getAgentDir, writeAgentConfig } from '../utils/local-agent.js';
+import { listLocalAgents, readAgentConfig, getAgentDir } from '../utils/local-agent.js';
 import { startDaemon, stopDaemon, isDaemonRunning, getDaemonInfo } from './daemon.js';
 import { shipLogsOnce, forgetLogCursor } from './log-shipper.js';
-import { writeSyncedModel } from '../utils/agent-models.js';
+import { writePublishedAgentConfig, readSyncedVersion } from '../utils/agent-config-sync.js';
 
 const RUNNER_STATE_FILE = path.join(os.homedir(), '.myvillage', 'runner.json');
 const DEFAULT_HEARTBEAT_MS = 20_000;
@@ -128,20 +128,6 @@ async function request(networkBaseUrl, pathname, method, body, headers) {
 
 // ── Config sync (materialise an assigned agent from the control plane) ───────
 
-// Records which published config version this machine last wrote, so we only
-// re-write files when the definition actually changed.
-function syncedVersionPath(agentDir) {
-  return path.join(agentDir, '.config-version');
-}
-
-function readSyncedVersion(agentDir) {
-  try {
-    return Number(fs.readFileSync(syncedVersionPath(agentDir), 'utf8').trim()) || 0;
-  } catch {
-    return 0;
-  }
-}
-
 /**
  * Write an assigned agent's files from its published definition, creating the
  * agent directory if this machine has never run it. Returns true when the agent
@@ -167,53 +153,12 @@ async function syncAgentConfig(ctx, assignment) {
     log(`could not fetch config for ${name} (${res.status}) — leaving local files alone`);
     return exists;
   }
-  const c = res.json.data;
-
-  fs.mkdirSync(agentDir, { recursive: true });
-  if (typeof c.promptMd === 'string' && c.promptMd) {
-    fs.writeFileSync(path.join(agentDir, 'prompt.md'), c.promptMd);
-  }
-  if (typeof c.toolsYaml === 'string' && c.toolsYaml) {
-    fs.writeFileSync(path.join(agentDir, 'tools.yaml'), c.toolsYaml);
-  }
-
-  // The trained models this agent was given travel with its config.
-  if (c.models && typeof c.models === 'object') {
-    for (const [slug, entry] of Object.entries(c.models)) {
-      const result = writeSyncedModel(slug, entry);
-      if (result === 'written') log(`synced model ${slug} for ${name}`);
-      else if (result === 'kept-local') log(`kept this machine's own model ${slug} for ${name}`);
-      else if (result === 'invalid') log(`skipped model ${slug} for ${name}: its files didn't check out`);
-    }
+  const { models } = writePublishedAgentConfig(name, { ...res.json.data, version: configVersion });
+  for (const { slug, result } of models) {
+    if (result === 'written') log(`synced model ${slug} for ${name}`);
+    else if (result === 'kept-local') log(`kept this machine's own model ${slug} for ${name}`);
+    else if (result === 'invalid') log(`skipped model ${slug} for ${name}: its files didn't check out`);
   }
-
-  // Compose agent.config.yaml from server-known identity + published schedule
-  // and brain, preserving anything already set locally that the control plane
-  // does not own.
-  let existingCfg = {};
-  try { existingCfg = readAgentConfig(name) || {}; } catch { /* first sync */ }
-  const cfg = {
-    ...existingCfg,
-    name,
-    display_name: c.displayName || existingCfg.display_name || name,
-    description: c.description ?? existingCfg.description ?? '',
-    man: {
-      ...(existingCfg.man || {}),
-      agent_id: c.agentId,
-      ...(c.villageAgentId ? { village_agent_id: c.villageAgentId } : {}),
-      handle: c.handle || name,
-    },
-    ...(c.schedule ? { schedule: c.schedule } : {}),
-    ...(c.brain ? { brain: c.brain } : {}),
-  };
-  writeAgentConfig(name, cfg);
-
-  // Keep an empty .env so the daemon's loader and 0600 expectations hold, but
-  // never overwrite secrets a person put here.
-  const envPath = path.join(agentDir, '.env');
-  if (!fs.existsSync(envPath)) fs.writeFileSync(envPath, '', { mode: 0o600 });
-
-  fs.writeFileSync(syncedVersionPath(agentDir), String(configVersion));
   log(`synced ${name} config v${configVersion}${exists ? '' : ' (new on this machine)'}`);
   return true;
 }

package/src/commands/agent-local.js

@@ -15,6 +15,7 @@ import {
   listCommunities,
   getAgentActivity,
   listMyAgents,
+  getAgentPublishedConfig,
   listMyUnlinkedAgentProfiles,
   createVillageAgent as apiCreateVillageAgent,
   listAgentTasks,
@@ -45,6 +46,7 @@ import {
   readAgentLogs,
   getLogFilePath,
 } from '../utils/local-agent.js';
+import { writePublishedAgentConfig } from '../utils/agent-config-sync.js';
 import { scaffoldAgent, TOOL_CATALOG, resolveCatalogEntry } from '../utils/agent-scaffolder.js';
 import { loadAgentRecipe, listAgentRecipes } from '../utils/agent-recipes.js';
 import { formatLocalAgentList, formatLocalAgentStatus } from '../utils/formatters.js';
@@ -1315,12 +1317,12 @@ export async function agentRememberCommand(name, text, options = {}) {
 // already has the agent — this command scaffolds the missing local config
 // (~/.myvillage/agents/<handle>/) so `agent start` can launch the daemon.
 //
-// What pulls down: the network identity (id, handle, displayName) and a
-// link to the existing VillageAgent task queue.
-// What doesn't: custom prompt edits, tools.yaml customizations, and any
-// API keys. Those stay machine-local and you'll need to redo them if you
-// want an exact replica. The scaffold defaults are a reasonable starting
-// point that will boot.
+// What pulls down: the network identity (id, handle, displayName), a link to
+// the existing VillageAgent task queue, and — when the agent has a published
+// definition (Studio publishes on every save) — its prompt.md, tools.yaml,
+// schedule, model settings and trained models.
+// What doesn't: API keys and other .env secrets. Those stay machine-local.
+// An agent that was never published falls back to the scaffold defaults.
 
 async function fetchMyAgentByHandle(handle) {
   const result = await listMyAgents({ includeVillageAgent: true });
@@ -1365,8 +1367,17 @@ export async function agentPullCommand(handle, options = {}) {
     return;
   }
 
-  // Default scaffold: just the always-on MyVillage MCP tool. Users can add
-  // more via `agent add-tool` once they're up.
+  // The published definition, if there is one. A failure here is not fatal:
+  // the scaffold defaults still boot.
+  let published = null;
+  try {
+    const c = await getAgentPublishedConfig(profile.id);
+    if (c && c.version > 0) published = c;
+  } catch { /* fall back to defaults */ }
+
+  // Scaffold first so the directory has everything `start` expects (routines/,
+  // logs/, .env); the published definition is then written over the defaults.
+  // Default scaffold: just the always-on MyVillage MCP tool.
   const agentDir = getAgentDir(agentName);
   try {
     scaffoldAgent(agentDir, {
@@ -1394,6 +1405,16 @@ export async function agentPullCommand(handle, options = {}) {
   }
   writeAgentConfig(agentName, cfg);
 
+  let models = [];
+  if (published) {
+    try {
+      ({ models } = writePublishedAgentConfig(agentName, published));
+    } catch (err) {
+      spinner.warn(`Pulled ${handle}, but its saved setup couldn't be written: ${err.message}`);
+      published = null;
+    }
+  }
+
   spinner.succeed(`Pulled ${handle} to ~/.myvillage/agents/${agentName}/`);
 
   console.log('');
@@ -1404,11 +1425,25 @@ export async function agentPullCommand(handle, options = {}) {
   } else {
     console.log(`    - ${chalk.yellow('No VillageAgent shim found — one will be created on first start.')}`);
   }
-  console.log('');
-  console.log(brand.teal('  Defaults that may need tweaking:'));
-  console.log(`    - ${brand.gold('prompt.md')} (system prompt — generic template)`);
-  console.log(`    - ${brand.gold('tools.yaml')} (only the MyVillage tool is enabled)`);
-  console.log(`    - ${brand.gold('agent.config.yaml')} (anthropic + claude-sonnet by default)`);
+  if (published) {
+    const brain = published.brain;
+    console.log(`    - Saved setup v${published.version}: ${published.promptMd ? 'prompt.md, ' : ''}${published.toolsYaml ? 'tools.yaml, ' : ''}schedule & model settings`);
+    if (brain?.model) console.log(`    - Model: ${brain.provider ? `${brain.provider} / ` : ''}${brain.model}`);
+    const written = models.filter(m => m.result === 'written' || m.result === 'kept-local').map(m => m.slug);
+    if (written.length) console.log(`    - Trained models: ${written.join(', ')}`);
+    const skipped = models.filter(m => m.result === 'invalid').map(m => m.slug);
+    if (skipped.length) console.log(`    - ${chalk.yellow(`Skipped models whose files didn't check out: ${skipped.join(', ')}`)}`);
+    console.log('');
+    console.log(brand.teal('  Not included:'));
+    console.log(`    - ${brand.gold('.env')} secrets (API keys etc.) stay on the machine they were set on.`);
+  } else {
+    console.log('');
+    console.log(brand.teal('  No saved setup on the network yet, so these are defaults:'));
+    console.log(`    - ${brand.gold('prompt.md')} (system prompt — generic template)`);
+    console.log(`    - ${brand.gold('tools.yaml')} (only the MyVillage tool is enabled)`);
+    console.log(`    - ${brand.gold('agent.config.yaml')} (anthropic + claude-sonnet by default)`);
+    console.log(`    Open the agent in Studio and save once on the original machine to publish it.`);
+  }
   console.log('');
   console.log(brand.teal('  Next:'));
   console.log(`    ${brand.gold(`myvillage agent edit ${agentName}`)}    Customize prompt / tools`);

package/src/utils/agent-config-sync.js

@@ -0,0 +1,79 @@
+// Write an agent's published definition (GET /agents/:id/config) to its local
+// directory. Shared by the fleet runner, which keeps assigned agents in sync,
+// and `agent pull`, which rehydrates an agent on a new machine.
+//
+// `.env` is never written from the server: secrets stay per-machine until they
+// can be envelope-encrypted (see AgentConfig in the ed-platform schema).
+
+import fs from 'fs';
+import path from 'path';
+import { readAgentConfig, getAgentDir, writeAgentConfig } from './local-agent.js';
+import { writeSyncedModel } from './agent-models.js';
+
+// Records which published config version this machine last wrote, so the
+// runner only re-writes files when the definition actually changed.
+export function syncedVersionPath(agentDir) {
+  return path.join(agentDir, '.config-version');
+}
+
+export function readSyncedVersion(agentDir) {
+  try {
+    return Number(fs.readFileSync(syncedVersionPath(agentDir), 'utf8').trim()) || 0;
+  } catch {
+    return 0;
+  }
+}
+
+/**
+ * Materialise a published config `c` into ~/.myvillage/agents/<name>/.
+ * Anything already set locally that the control plane does not own is kept.
+ * Returns { models: [{ slug, result }] } so callers can report what happened.
+ */
+export function writePublishedAgentConfig(name, c) {
+  const agentDir = getAgentDir(name);
+  fs.mkdirSync(agentDir, { recursive: true });
+
+  if (typeof c.promptMd === 'string' && c.promptMd) {
+    fs.writeFileSync(path.join(agentDir, 'prompt.md'), c.promptMd);
+  }
+  if (typeof c.toolsYaml === 'string' && c.toolsYaml) {
+    fs.writeFileSync(path.join(agentDir, 'tools.yaml'), c.toolsYaml);
+  }
+
+  // The trained models this agent was given travel with its config.
+  const models = [];
+  if (c.models && typeof c.models === 'object') {
+    for (const [slug, entry] of Object.entries(c.models)) {
+      models.push({ slug, result: writeSyncedModel(slug, entry) });
+    }
+  }
+
+  // Compose agent.config.yaml from server-known identity + published schedule
+  // and brain, preserving anything already set locally that the control plane
+  // does not own.
+  let existingCfg = {};
+  try { existingCfg = readAgentConfig(name) || {}; } catch { /* first sync */ }
+  const cfg = {
+    ...existingCfg,
+    name,
+    display_name: c.displayName || existingCfg.display_name || name,
+    description: c.description ?? existingCfg.description ?? '',
+    man: {
+      ...(existingCfg.man || {}),
+      agent_id: c.agentId,
+      ...(c.villageAgentId ? { village_agent_id: c.villageAgentId } : {}),
+      handle: c.handle || name,
+    },
+    ...(c.schedule ? { schedule: c.schedule } : {}),
+    ...(c.brain ? { brain: c.brain } : {}),
+  };
+  writeAgentConfig(name, cfg);
+
+  // Keep an empty .env so the daemon's loader and 0600 expectations hold, but
+  // never overwrite secrets a person put here.
+  const envPath = path.join(agentDir, '.env');
+  if (!fs.existsSync(envPath)) fs.writeFileSync(envPath, '', { mode: 0o600 });
+
+  if (c.version) fs.writeFileSync(syncedVersionPath(agentDir), String(c.version));
+  return { models };
+}

package/src/utils/api.js

@@ -302,6 +302,14 @@ export async function listMyAgents(options = {}) {
   return response.data;
 }
 
+// The agent's published definition (prompt, tools, schedule, model settings,
+// trained models). Studio republishes it on every save.
+export async function getAgentPublishedConfig(id) {
+  const client = getNetworkClient();
+  const response = await client.get(`/agents/${id}/config`);
+  return response.data?.data ?? response.data;
+}
+
 export async function getAgent(id) {
   const client = getNetworkClient();
   const response = await client.get(`/agents/${id}`);