create-open-autonomy 2.4.1 → 2.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-open-autonomy",
-  "version": "2.4.1",
+  "version": "2.4.3",
   "description": "The default Open Autonomy starter kit: a complete repository that runs its own Hermes agent against the platform, with the SDK wired in. `bun create open-autonomy <dir>` scaffolds one.",
   "license": "Apache-2.0",
   "repository": {

package/src/kit.ts

@@ -9,7 +9,7 @@
 import { existsSync, mkdirSync, readFileSync, readdirSync, rmSync, writeFileSync } from 'node:fs';
 import { dirname, join, relative, resolve } from 'node:path';
 
-export const KIT = { name: 'hermes', version: '2.4.1' } as const;
+export const KIT = { name: 'hermes', version: '2.4.3' } as const;
 export const KIT_FILE = '.open-autonomy/kit.json';
 const TEMPLATE = resolve(import.meta.dir, '..', 'template');
 

package/template/.open-autonomy/start.ts

@@ -19,7 +19,8 @@
 // The processes, in order:
 //   ssh-agent   holds <secrets>/deploy_key, its socket at <home>/ssh-agent.sock; the gateway pushes through it
 //               and never holds the key (absent: pushes are your own git's business)
-//   the clone   <project> cloned from --origin when it is not a checkout yet (a container's first boot)
+//   the clone   <project> cloned from --origin when it is not a checkout yet (a container's first boot); a clean
+//               checkout is brought to origin/main on every start, so the agent is what the repository says today
 //   the home    hermes/ in the checkout copied into <home> before every start — the repository is the source of
 //               truth for what the agent IS; the home keeps what it has since done (its .env is kept)
 //   valve       <secrets>/agent.env on :8787 (the developer's key), <secrets>/treasurer.env on :8788 (the
@@ -35,7 +36,10 @@ import { basename, resolve } from 'node:path';
 const argv = process.argv.slice(2);
 const arg = (name: string): string | undefined => { const i = argv.indexOf(name); return i >= 0 ? argv[i + 1] : undefined; };
 const project = resolve(arg('--project') ?? resolve(import.meta.dir, '..'));
-const home = resolve(arg('--home') ?? process.env.AGENT_HOME ?? resolve(homedir(), '.local', 'state', 'open-autonomy', basename(project), 'home'));
+// The home's default is named by the project's account (owner/repo from .open-autonomy/config.yaml), never by the
+// checkout's directory name: two projects checked out as `project` must not share one home.
+const account = /^account:\s*(\S+)/m.exec(existsSync(resolve(project, '.open-autonomy', 'config.yaml')) ? readFileSync(resolve(project, '.open-autonomy', 'config.yaml'), 'utf8') : '')?.[1];
+const home = resolve(arg('--home') ?? process.env.AGENT_HOME ?? resolve(homedir(), '.local', 'state', 'open-autonomy', ...(account ?? basename(project)).split('/'), 'home'));
 const secrets = resolve(arg('--secrets') ?? process.env.AGENT_SECRETS ?? resolve(homedir(), '.config', 'open-autonomy'));
 const origin = arg('--origin') ?? process.env.ORIGIN;
 const as = arg('--as');
@@ -87,6 +91,16 @@ if (!existsSync(resolve(project, '.git'))) {
   const clone = Bun.spawnSync({ cmd: drop(['git', 'clone', '-q', origin, project]), env: agentEnv(), stdout: 'inherit', stderr: 'inherit' });
   if (clone.exitCode !== 0) { console.error(`start: cannot clone ${origin}`); process.exit(1); }
   say(`cloned ${origin} → ${project}`);
+} else {
+  // What the agent IS is what main says: a clean checkout moves to origin/main before the home is synced from it
+  // (the skills, the schedule, the documents the reporter publishes). A dirty one — a killed attempt's work — is
+  // left as it is; the next attempt starts from a fresh main itself. A fetch that fails (no network, a world) is
+  // said and not fatal.
+  const git = (...args: string[]) => Bun.spawnSync({ cmd: drop(['git', ...args]), cwd: project, env: agentEnv(), stdout: 'pipe', stderr: 'pipe' });
+  const dirty = git('status', '--porcelain').stdout.toString().trim();
+  if (dirty) say(`checkout ${project} has uncommitted changes; left where it is`);
+  else if (git('fetch', '-q', 'origin').exitCode !== 0) say(`cannot fetch origin in ${project}; left where it is`);
+  else if (git('checkout', '-q', '--detach', 'origin/main').exitCode === 0) say(`checkout ${project} at origin/main (${git('rev-parse', '--short', 'HEAD').stdout.toString().trim()})`);
 }
 
 // 3. The home, from the checkout: everything under hermes/ except its .env, which is the home's own.
@@ -129,8 +143,14 @@ const githubFile = resolve(secrets, 'github-app.json');
 if (githubApp) keys.push('--github-app', `${githubFile}:${valvePort + 3}`);
 spawn('valve', ['bun', resolve(import.meta.dir, 'sdk', 'valve.ts'), ...keys], {});
 
-// 5. The reporter and the gateway, as the agent.
+// 5. The reporter and the gateway, as the agent. The reporter's own dependencies (supercode, beside it in
+//    .open-autonomy/package.json) are installed on the first start of a bare checkout.
 const env = agentEnv();
+if (!existsSync(resolve(import.meta.dir, 'node_modules'))) {
+  const install = Bun.spawnSync({ cmd: drop(['bun', 'install']), cwd: import.meta.dir, env, stdout: 'inherit', stderr: 'inherit' });
+  if (install.exitCode !== 0) { console.error(`start: cannot install the reporter's dependencies in ${import.meta.dir}`); process.exit(1); }
+  say(`reporter dependencies installed in ${import.meta.dir}`);
+}
 spawn('reporter', ['bun', resolve(import.meta.dir, 'reporter.ts'), '--config', resolve(project, '.open-autonomy', 'config.yaml')], { asAgent: true, env: { ...env, OPEN_AUTONOMY_BASE_URL: baseUrl } });
 spawn('gateway', ['hermes', 'gateway', 'run'], { asAgent: true, env });
 say(`gateway up in ${project} as ${user?.name ?? userInfo().username}, home ${home}; the valve on :${valvePort}${existsSync(resolve(secrets, 'treasurer.env')) ? ` and :${valvePort + 1}` : ''}${existsSync(codexFile) ? `; the Codex subscription on :${codexPort}` : ''}${githubApp ? `; the GitHub App on :${valvePort + 3}` : ''}`);