@ixo/oracle-runtime-workers 0.41.0 → 0.41.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ixo/oracle-runtime-workers",
-  "version": "0.41.0",
+  "version": "0.41.1",
   "description": "QiForge oracle runtime for Cloudflare Workers — Durable Object per user (SQLite in WASM over DO storage), Matrix E2EE gateway Durable Object, Hono HTTP/SSE shell.",
   "private": false,
   "publishConfig": {
@@ -67,9 +67,9 @@
     "protobufjs": "^7.6.5",
     "@ixo/topic-protocol": "1.0.0-rc.8",
     "survey-core": "2.3.11",
+    "@ixo/ucan": "2.3.0",
     "@ixo/common": "1.8.0",
     "@ixo/ixo-transaction": "0.2.0",
-    "@ixo/ucan": "2.3.0",
     "@ixo/action-interactions": "0.1.1"
   },
   "devDependencies": {

package/src/plugins/asks/skills.ts

@@ -2,14 +2,14 @@
  * The asks skills, read at runtime from the released ixo-plugins repo so a
  * newly published skill needs no oracle release: mainnet reads
  * `plugins/asks/skills/<name>/SKILL.md`, testnet and devnet
- * `plugins/asks-testnet/...` (practice money). The names come from the
- * folder listing.
+ * `plugins/asks-testnet/...` (practice money). The names come from
+ * `plugins/<folder>/skills/index.json`.
  *
  * Never on a turn's path: `skills()` answers from memory, then the Workers
  * cache (across isolate restarts), then the bundled copy, and refreshes in
  * the background once the copy is an hour old, with `If-None-Match` so an
- * unchanged file costs a 304 (which GitHub does not count against its rate
- * limit). Any failure keeps what is there.
+ * unchanged file costs a 304. Everything is read from
+ * raw.githubusercontent.com. Any failure keeps what is there.
  *
  * The bundled copy (`skills.bundled.json`) was taken from ixo-plugins `main`;
  * refresh it by re-reading the same two folders when the skills change a lot.
@@ -158,25 +158,18 @@ export class AsksSkills {
   private async pull(): Promise<void> {
     const { folder } = this.deps;
     const before = this.snapshot ?? bundledSnapshot(folder);
+    // Not GitHub's API: unauthenticated, it answers 403 on Cloudflare's shared IPs.
     const list = await this.deps.fetch(
-      `https://api.github.com/repos/${REPO}/contents/plugins/${folder}/skills?ref=${BRANCH}`,
-      {
-        headers: {
-          accept: 'application/vnd.github+json',
-          'user-agent': 'ixo-oracle',
-          ...(before.listEtag ? { 'if-none-match': before.listEtag } : {}),
-        },
-      },
+      `https://raw.githubusercontent.com/${REPO}/${BRANCH}/plugins/${folder}/skills/index.json`,
+      { headers: before.listEtag ? { 'if-none-match': before.listEtag } : {} },
     );
     let names: string[];
     if (list.status === 304) names = Object.keys(before.files);
     else if (list.ok) {
-      const entries =
-        await list.json<Array<{ name?: unknown; type?: unknown }>>();
-      names = entries.flatMap((one) =>
-        one.type === 'dir' && typeof one.name === 'string' ? [one.name] : [],
-      );
-    } else throw new Error(`listing answered ${list.status}`);
+      const index = await list.json<unknown>();
+      if (!Array.isArray(index)) throw new Error('index.json is not a list');
+      names = index.filter((name): name is string => typeof name === 'string');
+    } else throw new Error(`index.json answered ${list.status}`);
     names = names.filter((name) => SKILL_NAME.test(name)).slice(0, MAX_SKILLS);
 
     const files: SkillSnapshot['files'] = {};

package/src/plugins/asks/testing.ts

@@ -141,7 +141,6 @@ export function fakeContext(
       error: () => undefined,
       debug: () => undefined,
     },
-    background: (work: Promise<unknown>) => void work,
     ...extra,
   } as unknown as RuntimeContext;
 }

package/src/plugins/asks/tools.ts

@@ -470,8 +470,13 @@ function connectorTool(
   };
 }
 
-/** The connector's tools for this turn: cached definitions, a lazy client. `null`: signed out. */
-async function connectorTools(turn: AsksTurn): Promise<PluginTool[] | null> {
+/**
+ * The connector's tools for this turn: cached definitions, a lazy client.
+ * `null`: signed out. `'loading'`: none cached yet, being fetched for the next message.
+ */
+async function connectorTools(
+  turn: AsksTurn,
+): Promise<PluginTool[] | null | 'loading'> {
   const { mcpUrl } = turn;
   const cached = defsCache.get(mcpUrl);
   const list = async (token: string) => {
@@ -479,8 +484,30 @@ async function connectorTools(turn: AsksTurn): Promise<PluginTool[] | null> {
     defsCache.set(mcpUrl, { defs: fresh, expiresAt: turn.now() + DEFS_TTL_MS });
     return fresh;
   };
+  const refresh = (background: (work: Promise<unknown>) => void) => {
+    if (defsRefreshing.has(mcpUrl)) return;
+    defsRefreshing.add(mcpUrl);
+    const work = turn.conn
+      .token()
+      .then(async (read) => {
+        if (read.ok) await list(read.access);
+        else if (read.reason !== 'unreachable') await markSeen(turn, null);
+      })
+      .catch((error: unknown) =>
+        turn.ctx.logger.warn(
+          `[asks] could not list asks tools: ${String(error)}`,
+        ),
+      )
+      .finally(() => defsRefreshing.delete(mcpUrl));
+    background(work);
+  };
   let defs = cached?.defs;
   if (!defs) {
+    // Never hold a turn on asks.world: the full list is there from the next message.
+    if (turn.ctx.background) {
+      refresh(turn.ctx.background);
+      return 'loading';
+    }
     const read = await turn.conn.token();
     if (!read.ok) {
       if (read.reason === 'unreachable')
@@ -489,19 +516,9 @@ async function connectorTools(turn: AsksTurn): Promise<PluginTool[] | null> {
       return null;
     }
     defs = await list(read.access);
-  } else if (
-    cached &&
-    cached.expiresAt <= turn.now() &&
-    !defsRefreshing.has(mcpUrl)
-  ) {
+  } else if (cached && cached.expiresAt <= turn.now() && turn.ctx.background) {
     // Stale definitions keep serving while they refresh in the background.
-    defsRefreshing.add(mcpUrl);
-    const work = turn.conn
-      .token()
-      .then((read) => (read.ok ? list(read.access) : undefined))
-      .catch(() => undefined)
-      .finally(() => defsRefreshing.delete(mcpUrl));
-    turn.ctx.background?.(work);
+    refresh(turn.ctx.background);
   }
   const session = new AsksSession(turn);
   return defs.map((def) => connectorTool(turn, session, def));
@@ -710,5 +727,13 @@ export async function asksTools(turn: AsksTurn): Promise<PluginTool[]> {
     return [];
   });
   if (remote === null) return base;
+  if (remote === 'loading') {
+    const status = base[1]!;
+    base[1] = {
+      ...status,
+      description: `${status.description} asks.world's other actions are still loading and are there from the next message: never say asks cannot do something.`,
+    };
+    return [...base, disconnectTool(turn), attachTool(turn)];
+  }
   return [...base, disconnectTool(turn), attachTool(turn), ...remote];
 }