@oar-sh/oar 0.9.1 → 0.9.3

package/.github/extensions/web-relay/extension.mjs

@@ -423,7 +423,6 @@ async function ensureSessionForConversation(conversationId, reason = "dequeue")
 
 const sessionIo = createSessionIoHelpers({
   getSession: () => session,
-  sleep,
   dbg,
 });
 
@@ -510,7 +509,6 @@ async function startPolling() {
       setModelForMessage,
       buildPromptWithRelayContext,
       sendAndWaitWithHardTimeout,
-      sendWithBestEffortStreaming,
       extractFinalText,
       extractGeneratedImages,
       getLastActivityText: () => getScopedLastActivityText(),
@@ -969,4 +967,3 @@ async function ensureRelayActive(reason) {
 const extractFinalText = sessionIo.extractFinalText;
 const extractGeneratedImages = sessionIo.extractGeneratedImages;
 const sendAndWaitWithHardTimeout = sessionIo.sendAndWaitWithHardTimeout;
-const sendWithBestEffortStreaming = sessionIo.sendWithBestEffortStreaming;

package/.github/extensions/web-relay/polling/heartbeat.mjs

@@ -1,55 +1,2 @@
-export function createHeartbeatController({
-  api,
-  pollMs,
-  getSessionReady,
-  getHeartbeatTimer,
-  setHeartbeatTimer,
-  getActiveQueueMessageId,
-  // Optional: every queue message the worker currently owns work for (a
-  // persistent-process worker can hold a running turn, a delivered message
-  // queued behind it, and a background continuation at once). Each reported
-  // id gets its owner lease refreshed; unreported owned rows are recovered.
-  getActiveQueueMessageIds,
-}) {
-  async function pulseHeartbeat() {
-    if (!getSessionReady()) return false;
-    try {
-      const activeQueueMessageId = typeof getActiveQueueMessageId === "function"
-        ? String(getActiveQueueMessageId() || "").trim()
-        : "";
-      const activeQueueMessageIds = typeof getActiveQueueMessageIds === "function"
-        ? (getActiveQueueMessageIds() || []).map((id) => String(id || "").trim()).filter(Boolean)
-        : [];
-      const body = {
-        ...(activeQueueMessageId ? { activeQueueMessageId } : {}),
-        ...(activeQueueMessageIds.length ? { activeQueueMessageIds } : {}),
-      };
-      await api("POST", "/api/heartbeat", body);
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  function startHeartbeat() {
-    if (getHeartbeatTimer()) return;
-    void pulseHeartbeat();
-    const timer = setInterval(() => {
-      void pulseHeartbeat();
-    }, pollMs);
-    setHeartbeatTimer(timer);
-  }
-
-  function stopHeartbeat() {
-    const timer = getHeartbeatTimer();
-    if (!timer) return;
-    clearInterval(timer);
-    setHeartbeatTimer(null);
-  }
-
-  return {
-    pulseHeartbeat,
-    startHeartbeat,
-    stopHeartbeat,
-  };
-}
+// relocated for extension retirement; shim dies with the extension engine
+export * from "../../../../shared/worker-runtime/heartbeat.mjs";

package/.github/extensions/web-relay/polling/polling-loop.mjs

@@ -428,7 +428,6 @@ export function createPollingLoop({
   setModelForMessage,
   buildPromptWithRelayContext,
   sendAndWaitWithHardTimeout,
-  sendWithBestEffortStreaming,
   extractFinalText,
   extractGeneratedImages = () => [],
   getLastActivityText,

package/.github/extensions/web-relay/runtime/api-client.mjs

@@ -1,34 +1,2 @@
-export function createApiClient({ serverUrl, token, getHeaders }) {
-  return async function api(method, routePath, body) {
-    const url = `${serverUrl}${routePath}`;
-    const extraHeaders = typeof getHeaders === "function" ? (getHeaders() || {}) : {};
-    const opts = {
-      method,
-      headers: {
-        "Content-Type": "application/json",
-        Authorization: `Bearer ${token}`,
-        ...extraHeaders,
-      },
-      ...(method !== "GET" ? { body: JSON.stringify(body || {}) } : {}),
-    };
-
-    const res = await fetch(url, opts);
-    if (!res.ok) {
-      const rawText = String(await res.text().catch(() => "")).trim();
-      let detail = rawText;
-      if (rawText) {
-        try {
-          const payload = JSON.parse(rawText);
-          detail = String(payload?.error || payload?.message || rawText).trim();
-        } catch {
-          detail = rawText;
-        }
-      }
-      const error = new Error(`HTTP ${res.status} ${routePath}${detail ? `: ${detail}` : ""}`);
-      error.status = res.status;
-      error.detail = detail;
-      throw error;
-    }
-    return res.json();
-  };
-}
+// relocated for extension retirement; shim dies with the extension engine
+export * from "../../../../shared/worker-runtime/api-client.mjs";

package/.github/extensions/web-relay/runtime/config-loader.mjs

@@ -1,104 +1,2 @@
-import fs from "fs";
-import path from "path";
-import { fileURLToPath } from "url";
-
-function toAbsolutePath(value) {
-  if (!value) return "";
-  return path.isAbsolute(value) ? value : path.resolve(process.cwd(), value);
-}
-
-function looksLikeServerDir(serverDir) {
-  if (!serverDir) return false;
-  return fs.existsSync(path.join(serverDir, "server.js")) && fs.existsSync(path.join(serverDir, "config.json"));
-}
-
-export function resolveRelayPaths(importMetaUrl) {
-  const __dirname = path.dirname(fileURLToPath(importMetaUrl));
-  const projectServerDir = path.resolve(__dirname, "../../../server");
-  const cwdServerDir = path.resolve(process.cwd(), "server");
-  const envRoot = toAbsolutePath(process.env.COPILOT_WEB_RELAY_ROOT || "");
-  const envServerDir = toAbsolutePath(process.env.COPILOT_WEB_RELAY_SERVER_DIR || "");
-  const envConfigPath = toAbsolutePath(process.env.COPILOT_WEB_RELAY_CONFIG || "");
-  const envToolsPath = toAbsolutePath(process.env.COPILOT_WEB_RELAY_TOOLS || "");
-  const envLogDir = toAbsolutePath(process.env.COPILOT_WEB_RELAY_LOG_DIR || "");
-
-  const resolvedServerDir =
-    (looksLikeServerDir(envServerDir) && envServerDir) ||
-    (looksLikeServerDir(path.join(envRoot, "server")) && path.join(envRoot, "server")) ||
-    (looksLikeServerDir(projectServerDir) && projectServerDir) ||
-    (looksLikeServerDir(cwdServerDir) && cwdServerDir) ||
-    projectServerDir;
-
-  const SERVER_DIR = resolvedServerDir;
-  const CONFIG_PATH = envConfigPath || path.resolve(SERVER_DIR, "config.json");
-  const RELAY_TOOLS_PATH = envToolsPath || path.resolve(SERVER_DIR, "relay-tools.md");
-  const LOG_DIR = envLogDir || path.resolve(SERVER_DIR, "logs");
-  const SERVER_LOG_PATH = path.resolve(LOG_DIR, "server.log");
-  const SERVER_ERR_PATH = path.resolve(LOG_DIR, "server-err.log");
-
-  return {
-    __dirname,
-    CONFIG_PATH,
-    RELAY_TOOLS_PATH,
-    SERVER_DIR,
-    LOG_DIR,
-    SERVER_LOG_PATH,
-    SERVER_ERR_PATH,
-  };
-}
-
-export function loadTokenFromConfig(configPath) {
-  try {
-    const cfg = loadRelayConfig(configPath);
-    return String(cfg.authToken || "").trim();
-  } catch {
-    return "";
-  }
-}
-
-export function loadRelayConfig(configPath) {
-  try {
-    const parsed = JSON.parse(fs.readFileSync(configPath, "utf8"));
-    return parsed && typeof parsed === "object" ? parsed : {};
-  } catch {
-    return {};
-  }
-}
-
-function normalizeLoopbackHost(value) {
-  const host = String(value || "").trim();
-  if (!host || host === "0.0.0.0" || host === "::") return "127.0.0.1";
-  if (host === "localhost") return "127.0.0.1";
-  return host;
-}
-
-export function resolveRelayServerUrl({ configPath, env = process.env } = {}) {
-  const explicitUrl = String(env.COPILOT_WEB_RELAY_SERVER_URL || "").trim();
-  if (explicitUrl) {
-    const url = new URL(explicitUrl);
-    if (url.protocol !== "http:" && url.protocol !== "https:") {
-      throw new Error(`invalid-relay-server-url:${url.protocol}`);
-    }
-    url.pathname = "";
-    url.search = "";
-    url.hash = "";
-    return url.toString().replace(/\/$/, "");
-  }
-
-  const config = loadRelayConfig(configPath);
-  const configuredPort = Number.parseInt(String(config.port || ""), 10);
-  const port = Number.isInteger(configuredPort) && configuredPort > 0 && configuredPort <= 65535
-    ? configuredPort
-    : 3333;
-  const host = normalizeLoopbackHost(config.host);
-  const formattedHost = host.includes(":") && !host.startsWith("[") ? `[${host}]` : host;
-  return `http://${formattedHost}:${port}`;
-}
-
-export function loadRelayInstructionsFromFile(relayToolsPath) {
-  try {
-    return String(fs.readFileSync(relayToolsPath, "utf8")).trim();
-  } catch {
-    return "";
-  }
-}
+// relocated for extension retirement; shim dies with the extension engine
+export * from "../../../../shared/worker-runtime/config-loader.mjs";

package/.github/extensions/web-relay/runtime/send-and-wait-errors.mjs

@@ -1,170 +1,2 @@
-function readErrorText(error) {
-  return String(error?.message || error || "").trim();
-}
-
-function extractFirstMatch(text, pattern) {
-  const match = text.match(pattern);
-  return String(match?.[1] || "").trim() || null;
-}
-
-export function toKebabToken(value) {
-  return String(value || "")
-    .trim()
-    .toLowerCase()
-    .replace(/[^a-z0-9]+/g, "-")
-    .replace(/^-+|-+$/g, "") || null;
-}
-
-// The runtime's own vocabulary for "the billing window is spent". The Copilot
-// SDK's `ErrorData.errorCode` documents `quota_exceeded` and
-// `session_quota_exceeded`; `errorType` documents the coarser `quota`
-// category; HTTP 402 is the transport-level form of the same thing.
-const QUOTA_ERROR_CODES = new Set([
-  "quota_exceeded",
-  "session_quota_exceeded",
-  "quota-exceeded",
-  "session-quota-exceeded",
-  "quota",
-]);
-
-/**
- * True when a runtime flagged quota exhaustion STRUCTURALLY, independent of
- * how the prose was worded. This exists because the prose is the one part
- * GitHub rewords freely ("premium requests" → "AI credits" → "monthly quota"),
- * and a quota failure misfiled as retryable burns the retry budget against a
- * window that cannot reset until the next billing period.
- *
- * Accepts the loose shapes callers actually hold: an `Error` with `code` /
- * `statusCode`, or a runtime error payload with `errorCode` / `errorType` /
- * `statusCode`.
- */
-export function isStructuredQuotaError(source) {
-  if (!source || typeof source !== "object") return false;
-  for (const field of ["code", "errorCode", "errorType"]) {
-    const token = String(source[field] || "").trim().toLowerCase();
-    if (token && QUOTA_ERROR_CODES.has(token)) return true;
-  }
-  const status = Number(source.statusCode ?? source.status);
-  return status === 402;
-}
-
-const QUOTA_EXHAUSTED = {
-  code: "quota-exhausted",
-  message: "GitHub Copilot has no AI credits left for this billing window, so the request was rejected.",
-  guidance: "Open Check Usage for the reset time and retry after the reset, or switch this conversation to another provider.",
-};
-
-/**
- * `hint` carries structured signals that outrank the prose. Only quota is
- * modelled today; the prose branches below are unchanged and remain the sole
- * classifier when no hint is supplied, which is the extension's path.
- */
-function classifyTerminalError(text, hint = {}) {
-  // Checked before the prose so a structurally-flagged quota error lands in
-  // the non-retryable branch however mildly it was worded.
-  if (hint.quota === true) return QUOTA_EXHAUSTED;
-
-  const lower = text.toLowerCase();
-  if (!lower) return null;
-
-  if (lower.includes("no tool output found for function call")) {
-    return {
-      code: "missing-tool-output",
-      message: "No tool output was returned for a required function call.",
-      guidance: "Retry the message. If this keeps happening, restart the relay and include the error code.",
-    };
-  }
-  if (lower.includes("tool call") && (lower.includes("not found") || lower.includes("missing"))) {
-    return {
-      code: "tool-call-missing",
-      message: "A required tool call was missing in the runtime response.",
-      guidance: "Retry the message. If it repeats, restart the relay and include the error code.",
-    };
-  }
-  if (lower.includes("tool output") && lower.includes("invalid")) {
-    return {
-      code: "invalid-tool-output",
-      message: "Tool output returned from the runtime was invalid.",
-      guidance: "Retry the message. If it repeats, restart the relay and include the error code.",
-    };
-  }
-  // Monthly/plan quota exhaustion is not transient: retrying before the
-  // billing window resets can never succeed. Distinct from "rate limit"
-  // (per-minute throttling), which stays retryable below.
-  if ((lower.includes("quota") && (lower.includes("exceeded") || lower.includes("exhaust")))
-    || lower.includes("out of ai credits")
-    || lower.includes("premium request allowance")) {
-    return QUOTA_EXHAUSTED;
-  }
-  if ((lower.includes("capierror") || lower.includes("http 400") || lower.includes("status 400") || /^400\b/.test(lower))
-    && !lower.includes("timeout")
-    && !lower.includes("temporar")
-    && !lower.includes("rate limit")) {
-    return {
-      code: "request-invalid",
-      message: "The runtime rejected the request as invalid and non-retryable.",
-      guidance: "Retry after adjusting the request. If it persists, restart the relay and include the error code.",
-    };
-  }
-
-  return null;
-}
-
-/**
- * `options` lets a caller that holds structured error fields (an SDK error
- * payload rather than a thrown `Error`) pass them in explicitly:
- * `{ quota: true }`, or `{ errorCode, errorType, statusCode }` to be judged
- * here. Structured fields carried on the error object itself (`error.code`,
- * `error.statusCode`) are read as well, so plain HTTP-ish errors classify
- * without the caller doing anything.
- */
-export function normalizeTerminalSendAndWaitError(error, options = {}) {
-  const detail = readErrorText(error);
-  const quota = options.quota === true
-    || isStructuredQuotaError(options)
-    || isStructuredQuotaError(error);
-  const base = classifyTerminalError(detail, { quota });
-  if (!base) return null;
-  const functionCallId = extractFirstMatch(detail, /function call\s+([a-z0-9_-]+)/i)
-    || extractFirstMatch(detail, /\b(call_[a-z0-9_-]+)/i);
-  // GitHub request ids are colon-separated hex segments (AFAC:3C07CD:…).
-  const requestId = extractFirstMatch(detail, /\brequest(?:\s+id|_id)?[:=]\s*([a-z0-9_-]+(?::[a-z0-9_-]+)*)/i)
-    || extractFirstMatch(detail, /\b(req_[a-z0-9_-]+)/i);
-  return {
-    terminal: true,
-    code: base.code,
-    stableCode: `relay.${base.code}`,
-    message: base.message,
-    guidance: base.guidance,
-    detail: detail || "unknown error",
-    functionCallId,
-    requestId,
-    classificationHint: toKebabToken(error?.code || error?.name || null),
-  };
-}
-
-export function isTerminalSendAndWaitError(error, options = {}) {
-  return !!normalizeTerminalSendAndWaitError(error, options);
-}
-
-export function buildTerminalFailureText(error, options = {}) {
-  const normalized = normalizeTerminalSendAndWaitError(error, options) || {
-    stableCode: "relay.unknown-terminal",
-    message: "The relay runtime hit a terminal error and could not complete this turn.",
-    guidance: "Retry the message.",
-    detail: readErrorText(error) || "unknown error",
-    functionCallId: null,
-    requestId: null,
-  };
-  const ids = [
-    normalized.functionCallId ? `functionCallId=${normalized.functionCallId}` : null,
-    normalized.requestId ? `requestId=${normalized.requestId}` : null,
-  ].filter(Boolean);
-  return [
-    normalized.message,
-    `Error code: ${normalized.stableCode}.`,
-    ids.length ? `IDs: ${ids.join(", ")}.` : null,
-    normalized.guidance,
-    `Details: ${normalized.detail}`,
-  ].filter(Boolean).join(" ");
-}
+// relocated for extension retirement; shim dies with the extension engine
+export * from "../../../../shared/worker-runtime/send-and-wait-errors.mjs";

package/.github/extensions/web-relay/runtime/session-io.mjs

@@ -223,17 +223,7 @@ function extractGeneratedImages(finalEvent) {
   return deduped.slice(0, 8);
 }
 
-export function createSessionIoHelpers({ getSession, sleep, dbg = () => {} }) {
-  const STREAM_WAIT_POLL_MS = 5_000;
-  const WAIT_TICK = Symbol("relay-stream-wait-tick");
-
-  function buildRelayStreamTimeoutError(timeoutMs) {
-    const error = new Error(`Hard timeout after ${timeoutMs}ms while streaming session.send`);
-    error.code = "RELAY_STREAM_TIMEOUT";
-    error.stableCode = "relay.stream-timeout";
-    return error;
-  }
-
+export function createSessionIoHelpers({ getSession, dbg = () => {} }) {
   async function sendAndWaitWithHardTimeout(payload, timeoutMs) {
     // The loser timer is cancelled when the race settles: a fast turn must
     // not leave a five-minute timer armed to fire a rejection into a settled
@@ -254,65 +244,6 @@ export function createSessionIoHelpers({ getSession, sleep, dbg = () => {} }) {
     }
   }
 
-  async function sendWithBestEffortStreaming(payload, timeoutMs, onEvent, options = {}) {
-    const session = getSession();
-    if (!session) throw new Error("No active Copilot session");
-    if (typeof session.send !== "function") {
-      return sendAndWaitWithHardTimeout(payload, timeoutMs);
-    }
-
-    const streamOrResult = await session.send(payload);
-    if (streamOrResult && typeof streamOrResult[Symbol.asyncIterator] === "function") {
-      const deadline = Date.now() + timeoutMs + 5_000;
-      let finalEvent = null;
-      const iterator = streamOrResult[Symbol.asyncIterator]();
-      const onWaiting = typeof options?.onWaiting === "function" ? options.onWaiting : null;
-      const waitPollMs = Math.max(250, Math.min(Number(options?.waitPollMs) || STREAM_WAIT_POLL_MS, 30_000));
-
-      try {
-        while (true) {
-          const remainingMs = deadline - Date.now();
-          if (remainingMs <= 0) {
-            throw buildRelayStreamTimeoutError(timeoutMs);
-          }
-
-          const nextOrTick = await Promise.race([
-            iterator.next(),
-            sleep(Math.min(waitPollMs, remainingMs)).then(() => WAIT_TICK),
-          ]);
-
-          if (nextOrTick === WAIT_TICK) {
-            if (onWaiting) {
-              await onWaiting({
-                timeoutMs,
-                deadline,
-                remainingMs: Math.max(0, deadline - Date.now()),
-              });
-            }
-            continue;
-          }
-
-          if (nextOrTick?.done) break;
-          const event = nextOrTick?.value;
-          finalEvent = event;
-          if (typeof onEvent === "function") {
-            try { await onEvent(event); } catch {}
-          }
-        }
-      } finally {
-        if (typeof iterator?.return === "function") {
-          try { await iterator.return(); } catch {}
-        }
-      }
-      return finalEvent || {};
-    }
-
-    if (typeof onEvent === "function") {
-      try { await onEvent(streamOrResult); } catch {}
-    }
-    return streamOrResult;
-  }
-
   function extractFinalTextWithLogging(finalEvent) {
     const result = extractFinalText(finalEvent, dbg);
     // Always log envelope structure so we can diagnose extraction misses
@@ -344,6 +275,5 @@ export function createSessionIoHelpers({ getSession, sleep, dbg = () => {} }) {
     extractFinalText: extractFinalTextWithLogging,
     extractGeneratedImages: extractGeneratedImagesWithLogging,
     sendAndWaitWithHardTimeout,
-    sendWithBestEffortStreaming,
   };
 }