@oar-sh/oar 0.9.1 → 0.9.3

package/.github/extensions/web-relay/runtime/worker-websocket-link.mjs

@@ -1,325 +1,2 @@
-function normalizeText(value) {
-  const text = String(value || "").trim();
-  return text || null;
-}
-
-function normalizePositiveInt(value) {
-  const numeric = Number(value);
-  if (!Number.isFinite(numeric)) return null;
-  const intValue = Math.trunc(numeric);
-  return intValue > 0 ? intValue : null;
-}
-
-function resolveSocketStateValue(socket, stateName, fallback) {
-  const candidates = [
-    socket?.[stateName],
-    socket?.constructor?.[stateName],
-    globalThis?.WebSocket?.[stateName],
-  ];
-  for (const value of candidates) {
-    const numeric = Number(value);
-    if (Number.isFinite(numeric)) return numeric;
-  }
-  return fallback;
-}
-
-function toWebSocketUrl(serverUrl, token, getSessionId, getPid) {
-  const source = new URL(String(serverUrl || "http://localhost:3333"));
-  source.protocol = source.protocol === "https:" ? "wss:" : "ws:";
-  source.pathname = "/api/session-worker/ws";
-  source.search = "";
-  if (token) source.searchParams.set("token", token);
-  const sessionId = normalizeText(typeof getSessionId === "function" ? getSessionId() : null);
-  if (sessionId) source.searchParams.set("sessionId", sessionId);
-  const pid = normalizePositiveInt(typeof getPid === "function" ? getPid() : null);
-  if (pid) source.searchParams.set("pid", String(pid));
-  return source.toString();
-}
-
-export function createWorkerWebSocketLink({
-  serverUrl,
-  token,
-  dbg = () => {},
-  onDeliver = async () => {},
-  // Fire-and-forget control pushes from the server (e.g. stop a background
-  // task). Never blocks delivery; failures are the handler's to log.
-  onControl = () => {},
-  getSessionReady = () => false,
-  getSessionId = () => null,
-  getPid = () => null,
-  minBackoffMs = 1000,
-  maxBackoffMs = 8_000,
-  jitterMs = 250,
-  readyRefreshMs = 10_000,
-  staleConnectionMs = 30_000,
-  WebSocketImpl = globalThis.WebSocket,
-  setTimeoutImpl = setTimeout,
-  clearTimeoutImpl = clearTimeout,
-  setIntervalImpl = setInterval,
-  clearIntervalImpl = clearInterval,
-  now = () => Date.now(),
-} = {}) {
-  let ws = null;
-  let stopped = false;
-  let reconnectTimer = null;
-  let readyRefreshTimer = null;
-  let reconnectAttempt = 0;
-  let reconnectDelayMs = 0;
-  let deliveryInFlight = null;
-  let lastOpenAt = null;
-  let lastMessageAt = null;
-  let lastHelloSentAt = null;
-  let lastReadySentAt = null;
-  let lastPingSentAt = null;
-  let lastPongAt = null;
-  let lastQueueChangedAt = null;
-  let lastDeliveryAt = null;
-
-  function getNowMs() {
-    const value = Number(now());
-    return Number.isFinite(value) ? value : Date.now();
-  }
-
-  function isSocketOpen() {
-    return !!ws && ws.readyState === resolveSocketStateValue(ws, "OPEN", 1);
-  }
-
-  function send(payload) {
-    if (!isSocketOpen()) return false;
-    try {
-      ws.send(JSON.stringify(payload));
-      return true;
-    } catch {
-      return false;
-    }
-  }
-
-  function notifyHello(reason = "worker-hello") {
-    if (!getSessionReady()) return false;
-    const sent = send({
-      type: "worker.hello",
-      reason,
-      sessionId: normalizeText(getSessionId()),
-      pid: normalizePositiveInt(getPid()),
-    });
-    if (sent) lastHelloSentAt = getNowMs();
-    return sent;
-  }
-
-  async function notifyReady(reason = "worker-ready") {
-    if (!getSessionReady() || deliveryInFlight) return false;
-    const sent = send({
-      type: "worker.ready",
-      reason,
-      sessionId: normalizeText(getSessionId()),
-      pid: normalizePositiveInt(getPid()),
-    });
-    if (sent) lastReadySentAt = getNowMs();
-    return sent;
-  }
-
-  function notifyPing(reason = "readiness-refresh") {
-    if (!getSessionReady()) return false;
-    const sent = send({
-      type: "worker.ping",
-      reason,
-      sessionId: normalizeText(getSessionId()),
-      pid: normalizePositiveInt(getPid()),
-    });
-    if (sent) lastPingSentAt = getNowMs();
-    return sent;
-  }
-
-  async function deliverPending(pending, reason = "queue-deliver") {
-    if (!getSessionReady()) return false;
-    if (deliveryInFlight) return deliveryInFlight;
-    deliveryInFlight = Promise.resolve()
-      .then(() => onDeliver(pending, reason))
-      .catch((error) => {
-        dbg("worker ws delivery failed", reason, error?.message || String(error));
-        return false;
-      })
-      .finally(() => {
-        lastDeliveryAt = getNowMs();
-        deliveryInFlight = null;
-      });
-    return deliveryInFlight;
-  }
-
-  function clearReconnectTimer() {
-    if (!reconnectTimer) return;
-    clearTimeoutImpl(reconnectTimer);
-    reconnectTimer = null;
-  }
-
-  function clearReadyRefreshTimer() {
-    if (!readyRefreshTimer) return;
-    clearIntervalImpl(readyRefreshTimer);
-    readyRefreshTimer = null;
-  }
-
-  function closeStaleSocket(reason) {
-    if (!isSocketOpen()) return false;
-    dbg("worker ws stale connection closing", reason);
-    try { ws?.close?.(); } catch {}
-    return true;
-  }
-
-  function refreshReadiness(reason = "readiness-refresh") {
-    if (stopped || !getSessionReady() || !isSocketOpen()) return false;
-    const nowMs = getNowMs();
-    const staleMs = Math.max(0, Number(staleConnectionMs) || 0);
-    if (staleMs > 0 && lastMessageAt && (nowMs - lastMessageAt) > staleMs) {
-      return closeStaleSocket(`no-server-message:${reason}`);
-    }
-    notifyPing(reason);
-    if (deliveryInFlight) return true;
-    notifyHello(reason);
-    void notifyReady(reason);
-    return true;
-  }
-
-  function startReadyRefreshTimer() {
-    clearReadyRefreshTimer();
-    const intervalMs = Math.max(1000, Number(readyRefreshMs) || 10_000);
-    readyRefreshTimer = setIntervalImpl(() => {
-      refreshReadiness("readiness-refresh");
-    }, intervalMs);
-    if (typeof readyRefreshTimer?.unref === "function") readyRefreshTimer.unref();
-  }
-
-  function scheduleReconnect() {
-    if (stopped) return;
-    clearReconnectTimer();
-    reconnectAttempt += 1;
-    const backoff = Math.min(maxBackoffMs, minBackoffMs * (2 ** Math.max(0, reconnectAttempt - 1)));
-    const jitter = Math.floor(Math.random() * Math.max(0, jitterMs));
-    reconnectDelayMs = Math.min(maxBackoffMs, backoff + jitter);
-    dbg("worker ws reconnect scheduled", `attempt=${reconnectAttempt}`, `delayMs=${reconnectDelayMs}`);
-    reconnectTimer = setTimeoutImpl(() => {
-      reconnectTimer = null;
-      connect();
-    }, reconnectDelayMs);
-  }
-
-  function connect() {
-    if (stopped) return;
-    if (ws) {
-      const openState = resolveSocketStateValue(ws, "OPEN", 1);
-      const connectingState = resolveSocketStateValue(ws, "CONNECTING", 0);
-      if (ws.readyState === openState || ws.readyState === connectingState) return;
-    }
-    if (typeof WebSocketImpl !== "function") {
-      dbg("worker ws unavailable: global WebSocket is missing");
-      return;
-    }
-    const url = toWebSocketUrl(serverUrl, token, getSessionId, getPid);
-    ws = new WebSocketImpl(url);
-    ws.addEventListener("open", () => {
-      const openedAt = getNowMs();
-      reconnectAttempt = 0;
-      reconnectDelayMs = 0;
-      lastOpenAt = openedAt;
-      lastMessageAt = openedAt;
-      dbg("worker ws connected");
-      notifyHello("ws-open");
-      void notifyReady("ws-open");
-      startReadyRefreshTimer();
-    });
-    ws.addEventListener("message", (event) => {
-      lastMessageAt = getNowMs();
-      let payload = null;
-      try {
-        payload = JSON.parse(String(event?.data || ""));
-      } catch {
-        return;
-      }
-      if (payload?.type === "queue.deliver") {
-        void deliverPending(payload.pending || null, String(payload.reason || "queue-deliver"))
-          .finally(() => notifyReady("delivery-complete"));
-        return;
-      }
-      if (payload?.type === "server.hello") {
-        void notifyReady(String(payload.reason || "server-hello"));
-        return;
-      }
-      if (payload?.type === "server.pong") {
-        lastPongAt = getNowMs();
-        return;
-      }
-      if (payload?.type === "server.draining") {
-        dbg("worker ws draining", payload.reason || "relay-shutdown");
-        try { ws?.close?.(); } catch {}
-        return;
-      }
-      if (payload?.type === "queue.changed") {
-        lastQueueChangedAt = getNowMs();
-        void notifyReady("queue-changed");
-        return;
-      }
-      if (payload?.type === "worker.control") {
-        try {
-          void onControl(payload.control || null);
-        } catch (error) {
-          dbg("worker ws control handler failed", error?.message || String(error));
-        }
-        return;
-      }
-      if (payload?.type === "queue.blocked") {
-        dbg("worker ws blocked", payload.reason || "blocked");
-      }
-    });
-    ws.addEventListener("close", () => {
-      clearReadyRefreshTimer();
-      if (stopped) return;
-      dbg("worker ws disconnected");
-      scheduleReconnect();
-    });
-    ws.addEventListener("error", (error) => {
-      dbg("worker ws error", error?.message || String(error));
-      try { ws?.close?.(); } catch {}
-    });
-  }
-
-  function start() {
-    stopped = false;
-    connect();
-  }
-
-  function stop() {
-    stopped = true;
-    clearReconnectTimer();
-    clearReadyRefreshTimer();
-    if (ws) {
-      try { ws.close(); } catch {}
-      ws = null;
-    }
-  }
-
-  function status() {
-    // Some WebSocket implementations expose OPEN only on the constructor —
-    // the same reason every other check here goes through the resolver.
-    const connected = !!ws && ws.readyState === resolveSocketStateValue(ws, "OPEN", 1);
-    return {
-      connected,
-      delivering: !!deliveryInFlight,
-      reconnectAttempt,
-      reconnectDelayMs,
-      lastOpenAt,
-      lastMessageAt,
-      lastHelloSentAt,
-      lastReadySentAt,
-      lastPingSentAt,
-      lastPongAt,
-      lastQueueChangedAt,
-      lastDeliveryAt,
-    };
-  }
-
-  return {
-    notifyReady,
-    start,
-    stop,
-    status,
-  };
-}
+// relocated for extension retirement; shim dies with the extension engine
+export * from "../../../../shared/worker-runtime/worker-websocket-link.mjs";

package/.github/extensions/web-relay/skills/prompt-context.mjs

@@ -1,160 +1,2 @@
-import {
-  applyPreviewInstructions,
-  createPreviewInstructionsProvider,
-} from "../../../../shared/preview-instructions.mjs";
-
-export { createPreviewInstructionsProvider };
-
-export function buildPrompt(message) {
-  const text = String(message?.text || "").trim();
-  const attachments = Array.isArray(message?.attachments) ? message.attachments : [];
-  if (!attachments.length) return text;
-
-  const attachmentNote = attachments.map((att) => {
-    const name = att?.name ? String(att.name) : "attachment";
-    const type = att?.type ? String(att.type) : "file";
-    if (type.startsWith("image/")) return `${name} (${type}, inline image attachment)`;
-    const reference = att?.path ? ` @${att.path}` : "";
-    return `${name} (${type})${reference}`;
-  }).join(", ");
-  const suffix = `\n\n[Attached file${attachments.length === 1 ? "" : "s"}: ${attachmentNote}]`;
-  return text ? `${text}${suffix}` : suffix.trimStart();
-}
-
-function normalizeRelayMode(mode) {
-  const value = String(mode || "agent").trim().toLowerCase();
-  if (value === "plan" || value === "ask" || value === "autopilot" || value === "agent") return value;
-  return "agent";
-}
-
-function buildModeInstructionText(mode) {
-  if (mode === "plan") {
-    return [
-      "Draft a concise plan only.",
-      "Use read-only inspection tools (glob, rg, view) only when they materially improve plan quality; otherwise draft from provided context.",
-      "Do not edit repository files or run mutating commands unless the user explicitly asks for implementation.",
-      "If clarification is required, pause and ask through the web relay.",
-      "These instructions remain in effect until relay mode changes.",
-    ].join(" ");
-  }
-  if (mode === "ask") {
-    return [
-      "Prioritize clarification questions before doing any implementation work.",
-      "If the request is ambiguous or underspecified, pause and ask through the web relay before making assumptions.",
-      "Do not make broad assumptions when a question would materially change the result.",
-      "These instructions remain in effect until relay mode changes.",
-    ].join(" ");
-  }
-  if (mode === "autopilot") {
-    return [
-      "Act directly on the request and use tools when needed.",
-      "Keep moving unless user input is truly blocking.",
-      "These instructions remain in effect until relay mode changes.",
-    ].join(" ");
-  }
-  return [
-    "Proceed as an interactive coding agent and use tools as needed.",
-    "If you need clarification, pause and ask through the web relay instead of stalling silently.",
-    "These instructions remain in effect until relay mode changes.",
-  ].join(" ");
-}
-
-export function buildModeMarker(mode) {
-  return `[Relay mode: ${normalizeRelayMode(mode)}]`;
-}
-
-export function buildModePrompt(mode, toolInstructions = "", options = {}) {
-  const normalizedMode = normalizeRelayMode(mode);
-  const includeInstructions = options?.includeInstructions !== false;
-  const parts = [buildModeMarker(normalizedMode)];
-  if (includeInstructions) {
-    parts.push(buildModeInstructionText(normalizedMode));
-    if (toolInstructions) {
-      parts.push(toolInstructions);
-    }
-  }
-  return parts.join(" ");
-}
-
-export function buildPromptWithMode(message, toolInstructions = "", options = {}) {
-  const modePrompt = buildModePrompt(message?.relayMode, toolInstructions, options);
-  const body = buildPrompt(message);
-  return [modePrompt, body].filter(Boolean).join(" ");
-}
-
-/**
- * The relay's prompt prefix builder: tool guidance rides along only when the
- * relay mode changed, so repeat turns in one mode stay cheap.
- */
-export function createRelayPromptBuilder({
-  toolInstructions = "",
-  getPreviewInstructions = null,
-} = {}) {
-  let lastPromptedRelayMode = null;
-  return async function buildPromptWithRelayContext(message) {
-    const relayMode = normalizeRelayMode(message?.relayMode);
-    const includeInstructions = lastPromptedRelayMode !== relayMode;
-    let instructions = "";
-    if (includeInstructions) {
-      // Guidance is advisory: a preview lookup that fails must cost the block,
-      // never the turn.
-      const previewBlock = typeof getPreviewInstructions === "function"
-        ? await Promise.resolve().then(getPreviewInstructions).catch(() => "")
-        : "";
-      instructions = applyPreviewInstructions(toolInstructions, previewBlock);
-    }
-    const prompt = buildPromptWithMode({ ...message, relayMode }, instructions, { includeInstructions });
-    lastPromptedRelayMode = relayMode;
-    return prompt;
-  };
-}
-
-export function stripPromptPrefix(text, promptPrefix = "") {
-  const value = String(text || "").trim();
-  if (!value) return "";
-  const prompt = String(promptPrefix || "").trim();
-  if (!prompt) return value;
-  if (!value.startsWith(prompt)) return value;
-  const remainder = value.slice(prompt.length).trim();
-  return remainder || "";
-}
-
-function escapeRegExp(value) {
-  return String(value || "").replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-}
-
-function whitespaceFlexiblePattern(value) {
-  return String(value || "")
-    .trim()
-    .split(/\s+/)
-    .filter(Boolean)
-    .map((part) => escapeRegExp(part))
-    .join("\\s+");
-}
-
-function stripPromptPrefixFlexible(text, promptPrefix = "") {
-  const value = String(text || "").trim();
-  const prompt = String(promptPrefix || "").trim();
-  if (!value || !prompt) return value;
-  const pattern = new RegExp(`^${whitespaceFlexiblePattern(prompt)}\\s*`, "i");
-  const stripped = value.replace(pattern, "").trim();
-  return stripped || "";
-}
-
-export function stripPromptContextPrefix(text, message, toolInstructions = "", promptPrefix = "") {
-  const value = String(text || "").trim();
-  if (!value) return "";
-  const candidates = [
-    String(promptPrefix || "").trim(),
-    buildPromptWithMode(message, toolInstructions),
-    buildPromptWithMode(message, toolInstructions, { includeInstructions: false }),
-    buildModeMarker(message?.relayMode),
-  ].filter(Boolean);
-  for (const candidate of candidates) {
-    const stripped = stripPromptPrefix(value, candidate);
-    if (stripped !== value) return stripped;
-    const flexibleStripped = stripPromptPrefixFlexible(value, candidate);
-    if (flexibleStripped !== value) return flexibleStripped;
-  }
-  return value;
-}
+// relocated for extension retirement; shim dies with the extension engine
+export * from "../../../../shared/worker-runtime/prompt-context.mjs";