create-open-autonomy 2.3.8 → 2.3.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "create-open-autonomy",
-  "version": "2.3.8",
+  "version": "2.3.10",
   "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": {
@@ -28,7 +28,7 @@
     "check": "bunx tsc --noEmit"
   },
   "dependencies": {
-    "@open-autonomy/sdk": "2.3.2"
+    "@open-autonomy/sdk": "2.3.3"
   },
   "devDependencies": {
     "@types/bun": "^1.3.10",

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.3.8' } as const;
+export const KIT = { name: 'hermes', version: '2.3.10' } as const;
 export const KIT_FILE = '.open-autonomy/kit.json';
 const TEMPLATE = resolve(import.meta.dir, '..', 'template');
 

package/template/.github/workflows/land.yml

@@ -25,5 +25,10 @@ jobs:
               --body "Opened by the landing workflow for \`$BRANCH\`. It merges on its own when the required checks pass."
             existing=$(gh pr list -R "$REPO" --head "$BRANCH" --state open --json number -q '.[0].number')
           fi
-          gh pr merge -R "$REPO" "$existing" --merge
-          echo "pull request #$existing: merged"
+          # The merge races other landings ("base branch was modified") and GitHub's own mergeability check; try again a
+          # few times before giving up, so two branches landing in the same minute both land.
+          for attempt in 1 2 3 4 5 6; do
+            if gh pr merge -R "$REPO" "$existing" --merge; then echo "pull request #$existing: merged"; exit 0; fi
+            echo "merge attempt $attempt did not go through; retrying in 20s"; sleep 20
+          done
+          echo "pull request #$existing: could not be merged after six attempts"; exit 1

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

@@ -80,6 +80,22 @@ function jobName(id: string): string {
   return jobNames.get(id) ?? id;
 }
 const sourceOf = (d: SessionDescriptor): string => (d.recurrence?.job_id ? jobName(d.recurrence.job_id) : d.trigger === 'task' ? 'board' : d.surface?.platform ?? kindOf(d));
+// A provider id is safe to publish; an endpoint and credential are not. The kit's `custom` provider is the
+// platform only when its configured base URL names the valve. For any other configured provider, the owner's
+// provider account funds the session. An incomplete custom configuration stays unknown.
+function configuredProvider(home: string): string | undefined {
+  const config = readText(resolve(home, 'config.yaml')) ?? readText(resolve(cfg.hermes_home, 'config.yaml')) ?? '';
+  const provider = /^\s+provider:\s*["']?([^\s"']+)/m.exec(config)?.[1];
+  const endpoint = /^\s+base_url:\s*["']?([^\s"']+)/m.exec(config)?.[1];
+  if (!provider) return undefined;
+  if (endpoint === '${OPEN_AUTONOMY_BASE_URL}' || (endpoint && endpoint.replace(/\/$/, '') === baseUrl.replace(/\/$/, ''))) return 'open-autonomy';
+  if (provider === 'custom' && !endpoint) return undefined;
+  return provider;
+}
+function modelProviderOf(d: SessionDescriptor): string | undefined {
+  const home = d.profile && d.profile !== 'default' ? resolve(cfg.hermes_home, 'profiles', d.profile) : cfg.hermes_home;
+  return configuredProvider(home);
+}
 function publishes(d: SessionDescriptor): boolean {
   const id = d.locator.session_id;
   if (cfg.publish.private.includes(id) || (d.recurrence?.job_id && cfg.publish.private.includes(d.recurrence.job_id))) return false;
@@ -127,7 +143,7 @@ class Followed {
   constructor(readonly d: SessionDescriptor) {}
   get key(): string { return this.d.locator.session_id; }
   async open(): Promise<void> {
-    const start = { key: this.key, kind: kindOf(this.d), source: sourceOf(this.d), title: this.d.title ?? undefined, startedAt: this.d.updated_at_ms ? new Date(this.d.updated_at_ms).toISOString() : undefined };
+    const start = { key: this.key, kind: kindOf(this.d), source: sourceOf(this.d), title: this.d.title ?? undefined, modelProvider: modelProviderOf(this.d), startedAt: this.d.updated_at_ms ? new Date(this.d.updated_at_ms).toISOString() : undefined };
     this.session = await oa.resume(this.key, cfg.account, start);
     this.seq = this.session.seq;
     // Resuming at the platform's turn offset: the message index it corresponds to.
@@ -302,7 +318,7 @@ async function setup(): Promise<void> {
   const home = cfg.hermes_home;
   const config = readText(resolve(home, 'config.yaml')) ?? '';
   const model = /^\s+default:\s*(\S+)/m.exec(config)?.[1];
-  const provider = /^\s+provider:\s*(\S+)/m.exec(config)?.[1];
+  const provider = configuredProvider(home);
   let schedule: Array<{ name: string; schedule: string; description?: string }> = [];
   try { const seed = JSON.parse(readText(resolve(home, 'cron', 'jobs.seed.json')) ?? '{}') as { jobs?: Array<{ name?: string; schedule?: string; prompt?: string; script?: string }> }; schedule = (seed.jobs ?? []).filter((j) => j.name && j.schedule).map((j) => ({ name: j.name!, schedule: j.schedule!, description: j.prompt ?? (j.script ? `runs ${j.script}` : undefined) })); } catch { /* no seed */ }
   const skills: string[] = [];