@stage-labs/metro 0.1.0-beta.280 → 0.1.0-beta.282

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stage-labs/metro",
-  "version": "0.1.0-beta.280",
+  "version": "0.1.0-beta.282",
   "description": "The metro command line: run your agent on this machine, relaying its chat channels and connectors to Claude Code.",
   "license": "MIT",
   "repository": {

package/runtime/marketplace/plugin/.claude-plugin/plugin.json

@@ -1,6 +1,6 @@
 {
   "name": "metro",
-  "version": "0.1.0-beta.280",
+  "version": "0.1.0-beta.282",
   "description": "Metro for Claude Code, installed by the metro daemon on this machine: every connector the agent holds as its own MCP server relayed through the daemon, the orchestrator-only guard on the main thread, and the standing rules loaded at each session start. No vendor credential ever sits in a config file.",
   "author": {
     "name": "Bonustrack",

package/runtime/node_modules/@metro-labs/daemon/src/channels/inbound.ts

@@ -158,7 +158,7 @@ export class InboundRelay {
     await this.notify('notifications/claude/channel', {
       content:
         (e.text ? `${e.text}\n` : '') +
-        `[attachment(s) could not be fetched in time: ${names}]`,
+        `[attachment(s) still downloading: ${names}; they follow in a separate note]`,
       meta: {
         line: e.line,
         from: e.from,

package/runtime/node_modules/@metro-labs/daemon/src/claude/github-skills.ts

@@ -124,11 +124,13 @@ export class GitHubSkills {
 
   rows(activation = this.activation(), loaded = this.loaded(activation)): ClaudeSkill[] {
     if (loaded === null) return [];
+    const origin = loaded.source;
     const shadowed = activation.shadowed;
     return loaded.skills.map((skill) => ({
       id: `github:${skill.name}`, name: skill.name, title: skill.name, description: skill.description,
       path: join(skillRelease(this.root, loaded.id), 'skills', skill.name, 'SKILL.md'), editable: false,
       updatedAt: loaded.createdAt, managed: true, shadowed: shadowed.includes(skill.name),
+      ...(origin === null ? {} : { github: { repository: origin.repository, commit: origin.commit, folder: origin.folder } }),
     }));
   }
 

package/runtime/node_modules/@metro-labs/daemon/src/claude/skills.ts

@@ -20,6 +20,7 @@ export interface ClaudeSkill {
   updatedAt: string | null;
   managed?: boolean;
   shadowed?: boolean;
+  github?: { repository: string; commit: string; folder: string };
 }
 
 const frontmatterField = (text: string, field: string): string => {

package/runtime/node_modules/@metro-labs/xmtp/src/attachments.ts

@@ -12,8 +12,15 @@ import { errMsg } from '@metro-labs/core/log';
 
 export type { SavedAttachment };
 
-export const REMOTE_FETCH_ATTEMPTS = 3;
-const REMOTE_FETCH_BACKOFF_MS = 400;
+const READ_RETRY_DELAYS_MS: readonly number[] = [400, 800];
+export const REMOTE_FETCH_ATTEMPTS = READ_RETRY_DELAYS_MS.length + 1;
+export const INBOUND_RETRY_DELAYS_MS: readonly number[] = [
+  2_000, 4_000, 8_000, 15_000, 30_000, 30_000,
+  60_000, 60_000, 60_000, 60_000, 60_000, 60_000,
+];
+const REMOTE_FETCH_TIMEOUT_MS = 120_000;
+const SWARM_FALLBACK_GATEWAY = 'https://download.gateway.ethswarm.org/bzz/';
+const SWARM_BZZ_URL = /^https:\/\/[^/]+\/bzz\/([0-9a-f]{64}(?:[0-9a-f]{64})?)\/?$/i;
 
 const sleep = (ms: number): Promise<void> =>
   new Promise((resolve) => setTimeout(resolve, ms));
@@ -74,22 +81,54 @@ interface DecodedAttachment {
   data: Uint8Array;
 }
 
-async function loadRemote(r: RemoteEntry): Promise<DecodedAttachment> {
+function remoteUrls(url: string): string[] {
+  const ref = SWARM_BZZ_URL.exec(url)?.[1];
+  const fallback = ref === undefined ? url : `${SWARM_FALLBACK_GATEWAY}${ref}/`;
+  return fallback === url ? [url] : [url, fallback];
+}
+
+function withTimeout<T>(work: Promise<T>, ms: number): Promise<T> {
+  let timer: ReturnType<typeof setTimeout> | undefined;
+  const expired = new Promise<never>((_resolve, reject) => {
+    timer = setTimeout(() => {
+      reject(new Error(`no answer within ${ms / 1000}s`));
+    }, ms);
+  });
+  return Promise.race([work, expired]).finally(() => {
+    clearTimeout(timer);
+  });
+}
+
+function loadFrom(r: RemoteEntry, url: string): Promise<DecodedAttachment> {
+  return withTimeout(
+    RemoteAttachmentCodec.load<DecodedAttachment>(
+      { ...toRemoteDescriptor(r), url },
+      loadRegistry,
+    ),
+    REMOTE_FETCH_TIMEOUT_MS,
+  );
+}
+
+async function loadRemote(
+  r: RemoteEntry,
+  retryDelaysMs: readonly number[],
+): Promise<DecodedAttachment> {
+  const urls = remoteUrls(r.url);
   let last = '';
-  for (let attempt = 1; attempt <= REMOTE_FETCH_ATTEMPTS; attempt += 1) {
-    try {
-      return await RemoteAttachmentCodec.load<DecodedAttachment>(
-        toRemoteDescriptor(r),
-        loadRegistry,
-      );
-    } catch (err) {
-      last = errMsg(err);
-      if (attempt < REMOTE_FETCH_ATTEMPTS)
-        await sleep(REMOTE_FETCH_BACKOFF_MS * attempt);
+  for (const delay of [0, ...retryDelaysMs]) {
+    if (delay > 0) await sleep(delay);
+    const errors: string[] = [];
+    for (const url of urls) {
+      try {
+        return await loadFrom(r, url);
+      } catch (err) {
+        errors.push(errMsg(err));
+      }
     }
+    last = errors.join('; ');
   }
   throw new Error(
-    `xmtp remote attachment fetch failed after ${REMOTE_FETCH_ATTEMPTS} attempts: ${last}`,
+    `xmtp remote attachment fetch failed after ${retryDelaysMs.length + 1} attempts: ${last}`,
   );
 }
 
@@ -97,9 +136,10 @@ export async function saveRemoteAttachment(
   r: RemoteEntry,
   messageId: string,
   index = 0,
+  retryDelaysMs: readonly number[] = READ_RETRY_DELAYS_MS,
 ): Promise<SavedAttachment> {
   if (r.contentLength) assertAttachmentSize(r.contentLength);
-  const decoded = await loadRemote(r);
+  const decoded = await loadRemote(r, retryDelaysMs);
   return saveBufferToCache(decoded.data, messageId, index, {
     mime: decoded.mimeType,
     name: decoded.filename ?? r.filename,

package/runtime/node_modules/@metro-labs/xmtp/src/emit-payloads.ts

@@ -3,6 +3,7 @@ import type { Reply } from '@xmtp/content-type-reply';
 import { errMsg } from '@metro-labs/core/log';
 import { transcribeAndEmit } from './transcribe.js';
 import {
+  INBOUND_RETRY_DELAYS_MS,
   saveInlineAttachment,
   saveRemoteAttachment,
   type RemoteEntry,
@@ -207,7 +208,7 @@ function remoteStaticPayload(
   ctx: EnvelopeCtx,
 ): Record<string, unknown> {
   const kind = IMG_RE.test(c.url) ? 'image' : 'file';
-  reportAttachment(saveRemoteAttachment(c, ctx.msgId, 0), { station: 'xmtp', account: ctx.accountId, line: ctx.line, forId: ctx.baseId, index: 0 });
+  reportAttachment(saveRemoteAttachment(c, ctx.msgId, 0, INBOUND_RETRY_DELAYS_MS), { station: 'xmtp', account: ctx.accountId, line: ctx.line, forId: ctx.baseId, index: 0 });
   return {
     ...base,
     text: `[${kind}: ${c.filename ?? c.url}]`,
@@ -223,7 +224,7 @@ function multiRemoteEnvelope(
 ): Record<string, unknown> {
   const m = c as { attachments?: RemoteEntry[] };
   (Array.isArray(m.attachments) ? m.attachments : []).forEach((r, i) => {
-    reportAttachment(saveRemoteAttachment(r, ctx.msgId, i), { station: 'xmtp', account: ctx.accountId, line: ctx.line, forId: ctx.baseId, index: i });
+    reportAttachment(saveRemoteAttachment(r, ctx.msgId, i, INBOUND_RETRY_DELAYS_MS), { station: 'xmtp', account: ctx.accountId, line: ctx.line, forId: ctx.baseId, index: i });
   });
   return multiRemotePayload(base, typeId, c);
 }

package/runtime/runtime.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.1.0-beta.280"
+  "version": "0.1.0-beta.282"
 }

package/runtime/sdk-runner/runner.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-beta.280",
+  "version": "0.1.0-beta.282",
   "dependencies": {
     "@anthropic-ai/claude-agent-sdk": "0.3.287",
     "@modelcontextprotocol/sdk": "^1.29.0",