@mrc2204/opencode-bridge 0.1.1 → 0.1.2

package/dist/chunk-LCJRXKI3.js

@@ -0,0 +1,288 @@
+// src/observability.ts
+function parseSseFramesFromBuffer(input) {
+  const normalized = input.replace(/\r\n/g, "\n");
+  const parts = normalized.split("\n\n");
+  const remainder = parts.pop() ?? "";
+  const frames = [];
+  for (const rawFrame of parts) {
+    const lines = rawFrame.split("\n");
+    let event;
+    let id;
+    let retry;
+    const dataLines = [];
+    for (const line of lines) {
+      if (!line || line.startsWith(":")) continue;
+      const idx = line.indexOf(":");
+      const field = idx >= 0 ? line.slice(0, idx).trim() : line.trim();
+      const value = idx >= 0 ? line.slice(idx + 1).replace(/^\s/, "") : "";
+      if (field === "event") event = value;
+      else if (field === "id") id = value;
+      else if (field === "retry") {
+        const n = Number(value);
+        if (Number.isFinite(n)) retry = n;
+      } else if (field === "data") dataLines.push(value);
+    }
+    if (dataLines.length <= 0) continue;
+    frames.push({
+      event,
+      id,
+      retry,
+      data: dataLines.join("\n"),
+      raw: rawFrame
+    });
+  }
+  return { frames, remainder };
+}
+function parseSseData(data) {
+  const trimmed = data.trim();
+  if (!trimmed) return null;
+  try {
+    return JSON.parse(trimmed);
+  } catch {
+    return { raw: trimmed };
+  }
+}
+function unwrapGlobalPayload(raw) {
+  let current = raw;
+  const wrappers = [];
+  for (let i = 0; i < 3; i += 1) {
+    if (!current || typeof current !== "object") break;
+    if ("payload" in current && current.payload !== void 0) {
+      wrappers.push("payload");
+      current = current.payload;
+      continue;
+    }
+    if ("data" in current && current.data !== void 0 && Object.keys(current).length <= 4) {
+      wrappers.push("data");
+      current = current.data;
+      continue;
+    }
+    break;
+  }
+  return { payload: current, wrappers };
+}
+function pickFirstString(obj, keys) {
+  if (!obj || typeof obj !== "object") return void 0;
+  for (const key of keys) {
+    const value = obj[key];
+    if (typeof value === "string" && value.trim()) return value.trim();
+  }
+  return void 0;
+}
+function asObject(value) {
+  return value && typeof value === "object" && !Array.isArray(value) ? value : void 0;
+}
+function asArray(value) {
+  return Array.isArray(value) ? value : [];
+}
+function uniqueStrings(values) {
+  return [...new Set(values.filter((item) => typeof item === "string" && item.trim()).map((item) => item.trim()))];
+}
+function inferLifecycleState(raw) {
+  const text = JSON.stringify(raw || {}).toLowerCase();
+  if (text.includes("permission") || text.includes("question.asked")) return "awaiting_permission";
+  if (text.includes("blocked") || text.includes("missing config") || text.includes("missing token") || text.includes("missing api_key")) return "blocked";
+  if (text.includes("error") || text.includes("failed")) return "failed";
+  if (text.includes("stalled")) return "stalled";
+  if (text.includes("compile") || text.includes("pytest") || text.includes("test") || text.includes("verify")) return "verifying";
+  if (text.includes("apply_patch") || text.includes("diff") || text.includes("edit") || text.includes("write")) return "coding";
+  if (text.includes("plan") || text.includes("discovery") || text.includes("ground") || text.includes("calibrate")) return "planning";
+  if (text.includes("complete") || text.includes("completed") || text.includes("done")) return "completed";
+  return "running";
+}
+function extractFilesChanged(raw) {
+  const files = [];
+  const root = asObject(raw) || {};
+  const payload = asObject(root.payload) || root;
+  const state = asObject(root.state) || asObject(payload.state) || {};
+  const metadata = asObject(state.metadata) || asObject(payload.metadata) || {};
+  for (const file of asArray(metadata.files)) {
+    const obj = asObject(file);
+    if (!obj) continue;
+    if (typeof obj.relativePath === "string") files.push(obj.relativePath);
+    else if (typeof obj.filePath === "string") files.push(obj.filePath);
+  }
+  for (const file of asArray(root.files)) {
+    if (typeof file === "string") files.push(file);
+  }
+  return uniqueStrings(files);
+}
+function extractVerifySummary(raw) {
+  const root = asObject(raw) || {};
+  const payload = asObject(root.payload) || root;
+  const state = asObject(root.state) || asObject(payload.state);
+  const input = asObject(state?.input);
+  const metadata = asObject(state?.metadata);
+  const command = typeof input?.command === "string" ? input.command : void 0;
+  const exit = typeof metadata?.exit === "number" ? metadata.exit : null;
+  const output = typeof state?.output === "string" ? state.output : typeof metadata?.output === "string" ? metadata.output : null;
+  if (!command && output == null) return null;
+  return {
+    command,
+    exit,
+    output_preview: typeof output === "string" ? output.slice(0, 500) : null
+  };
+}
+function extractBlockers(raw) {
+  const text = JSON.stringify(raw || {}).toLowerCase();
+  const blockers = [];
+  if (text.includes("no module named pytest")) blockers.push("pytest_missing");
+  if (text.includes("missing token") || text.includes("missing api_key") || text.includes("pow service not configured")) blockers.push("runtime_config_missing");
+  if (text.includes("permission") || text.includes("question.asked")) blockers.push("awaiting_permission");
+  return uniqueStrings(blockers);
+}
+function extractCompletionSummary(raw) {
+  const root = asObject(raw) || {};
+  const text = typeof root.text === "string" ? root.text : typeof root.summary === "string" ? root.summary : null;
+  return text ? text.slice(0, 2e3) : null;
+}
+function normalizeOpenCodeEvent(raw) {
+  const text = JSON.stringify(raw || {}).toLowerCase();
+  let kind = null;
+  let summary;
+  if (text.includes("permission") || text.includes("question.asked")) {
+    kind = "permission.requested";
+    summary = "OpenCode \u0111ang ch\u1EDD permission/user input";
+  } else if (text.includes("error") || text.includes("failed")) {
+    kind = "task.failed";
+    summary = "OpenCode task failed";
+  } else if (text.includes("stalled")) {
+    kind = "task.stalled";
+    summary = "OpenCode task stalled";
+  } else if (text.includes("complete") || text.includes("completed") || text.includes("done")) {
+    kind = "task.completed";
+    summary = "OpenCode task completed";
+  } else if (text.includes("progress") || text.includes("delta") || text.includes("assistant")) {
+    kind = "task.progress";
+    summary = "OpenCode task made progress";
+  } else if (text.includes("start") || text.includes("created") || text.includes("connected")) {
+    kind = "task.started";
+    summary = "OpenCode task/server started";
+  }
+  return {
+    kind,
+    summary,
+    raw,
+    lifecycleState: inferLifecycleState(raw),
+    filesChanged: extractFilesChanged(raw),
+    verifySummary: extractVerifySummary(raw),
+    blockers: extractBlockers(raw),
+    completionSummary: extractCompletionSummary(raw)
+  };
+}
+function normalizeTypedEventV1(frame, scope) {
+  const parsed = parseSseData(frame.data);
+  const unwrapped = unwrapGlobalPayload(parsed);
+  const normalized = normalizeOpenCodeEvent(unwrapped.payload);
+  return {
+    schema: "opencode.event.v1",
+    scope,
+    eventName: frame.event,
+    eventId: frame.id,
+    kind: normalized.kind,
+    summary: normalized.summary,
+    lifecycleState: normalized.lifecycleState,
+    filesChanged: normalized.filesChanged,
+    verifySummary: normalized.verifySummary,
+    blockers: normalized.blockers,
+    completionSummary: normalized.completionSummary,
+    runId: pickFirstString(unwrapped.payload, ["run_id", "runId"]),
+    taskId: pickFirstString(unwrapped.payload, ["task_id", "taskId"]),
+    sessionId: pickFirstString(unwrapped.payload, ["session_id", "sessionId", "session"]),
+    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
+    wrappers: unwrapped.wrappers,
+    payload: unwrapped.payload
+  };
+}
+function asString(value) {
+  return typeof value === "string" && value.trim() ? value.trim() : void 0;
+}
+function scoreSessionCandidate(candidate, ctx) {
+  const id = asString(candidate?.id) || "";
+  const candidateText = JSON.stringify(candidate || {}).toLowerCase();
+  const runId = ctx.runId?.toLowerCase();
+  const taskId = ctx.taskId?.toLowerCase();
+  const sessionKey = ctx.sessionKey?.toLowerCase();
+  const artifactSessionId = ctx.artifactSessionId;
+  let score = 0;
+  if (artifactSessionId && id === artifactSessionId) score += 1e3;
+  if (runId && candidateText.includes(runId)) score += 120;
+  if (taskId && candidateText.includes(taskId)) score += 70;
+  if (sessionKey && candidateText.includes(sessionKey)) score += 60;
+  if (runId && id.toLowerCase().includes(runId)) score += 30;
+  if (taskId && id.toLowerCase().includes(taskId)) score += 20;
+  score += Math.max(0, 20 - ctx.recencyRank);
+  return score;
+}
+function summarizeLifecycle(events = []) {
+  let current_state = null;
+  let last_event_kind = null;
+  let last_event_at = null;
+  const files_changed = /* @__PURE__ */ new Set();
+  const verify_summary = [];
+  const blockers = /* @__PURE__ */ new Set();
+  let completion_summary = null;
+  for (const item of events) {
+    if (item.lifecycleState) current_state = item.lifecycleState;
+    if (item.kind) last_event_kind = item.kind;
+    if (item.timestamp) last_event_at = item.timestamp;
+    for (const file of item.filesChanged || []) files_changed.add(file);
+    if (item.verifySummary) verify_summary.push(item.verifySummary);
+    for (const blocker of item.blockers || []) blockers.add(blocker);
+    if (item.completionSummary) completion_summary = item.completionSummary;
+  }
+  return {
+    current_state,
+    last_event_kind,
+    last_event_at,
+    files_changed: [...files_changed],
+    verify_summary,
+    blockers: [...blockers],
+    completion_summary
+  };
+}
+function resolveSessionId(input) {
+  if (input.explicitSessionId) {
+    return { sessionId: input.explicitSessionId, strategy: "explicit", score: 9999 };
+  }
+  const list = Array.isArray(input.sessionList) ? input.sessionList : [];
+  const withRecency = [...list].map((item, idx) => {
+    const updated = Number(item?.time?.updated || 0);
+    return { item, idx, updated };
+  }).sort((a, b) => b.updated - a.updated).map((x, rank) => ({ ...x, rank }));
+  if (input.artifactSessionId) {
+    const direct = withRecency.find((x) => asString(x.item?.id) === input.artifactSessionId);
+    if (direct) {
+      return { sessionId: input.artifactSessionId, strategy: "artifact", score: 1e3 };
+    }
+  }
+  let best = { score: -1 };
+  for (const candidate of withRecency) {
+    const id = asString(candidate.item?.id);
+    if (!id) continue;
+    const score = scoreSessionCandidate(candidate.item, {
+      runId: input.runId,
+      taskId: input.taskId,
+      sessionKey: input.sessionKey,
+      artifactSessionId: input.artifactSessionId,
+      recencyRank: candidate.rank
+    });
+    if (score > best.score) best = { id, score };
+  }
+  if (best.id && best.score > 0) {
+    return { sessionId: best.id, strategy: "scored_fallback", score: best.score };
+  }
+  const latest = withRecency.find((x) => asString(x.item?.id));
+  if (latest) return { sessionId: asString(latest.item?.id), strategy: "latest", score: 0 };
+  return { strategy: "none", score: -1 };
+}
+
+export {
+  parseSseFramesFromBuffer,
+  parseSseData,
+  unwrapGlobalPayload,
+  normalizeOpenCodeEvent,
+  normalizeTypedEventV1,
+  summarizeLifecycle,
+  resolveSessionId
+};

package/dist/index.js

@@ -1,8 +1,9 @@
 import {
   normalizeTypedEventV1,
   parseSseFramesFromBuffer,
-  resolveSessionId
-} from "./chunk-6NIQKNRA.js";
+  resolveSessionId,
+  summarizeLifecycle
+} from "./chunk-LCJRXKI3.js";
 
 // src/runtime.ts
 import { mkdirSync, readFileSync, writeFileSync, existsSync } from "fs";
@@ -55,6 +56,7 @@ function getRuntimeConfig(cfg) {
   return {
     opencodeServerUrl: fileCfg.opencodeServerUrl || cfg?.opencodeServerUrl,
     projectRegistry: fileCfg.projectRegistry || cfg?.projectRegistry || [],
+    executionAgentMappings: fileCfg.executionAgentMappings || cfg?.executionAgentMappings || [],
     hookBaseUrl: fileCfg.hookBaseUrl || cfg?.hookBaseUrl,
     hookToken: fileCfg.hookToken || cfg?.hookToken
   };
@@ -94,13 +96,66 @@ function findRegistryEntry(cfg, projectId, repoRoot) {
   }
   return void 0;
 }
+function resolveExecutionAgent(input) {
+  const requestedAgentId = asString(input.requestedAgentId);
+  if (!requestedAgentId) {
+    return {
+      ok: false,
+      requestedAgentId: "",
+      mappingConfigured: false,
+      error: "requestedAgentId is required"
+    };
+  }
+  const explicitExecutionAgentId = asString(input.explicitExecutionAgentId);
+  if (explicitExecutionAgentId) {
+    return {
+      ok: true,
+      requestedAgentId,
+      resolvedAgentId: explicitExecutionAgentId,
+      strategy: "explicit_param"
+    };
+  }
+  const runtimeCfg = getRuntimeConfig(input.cfg);
+  const mappings = asArray(runtimeCfg.executionAgentMappings).map((x) => x && typeof x === "object" ? x : {}).map((x) => ({
+    requestedAgentId: asString(x.requestedAgentId),
+    executionAgentId: asString(x.executionAgentId)
+  })).filter((x) => x.requestedAgentId && x.executionAgentId);
+  if (mappings.length > 0) {
+    const matched = mappings.find((x) => x.requestedAgentId === requestedAgentId);
+    if (!matched) {
+      return {
+        ok: false,
+        requestedAgentId,
+        mappingConfigured: true,
+        error: `Execution agent mapping is configured but no mapping matched requestedAgentId=${requestedAgentId}`
+      };
+    }
+    return {
+      ok: true,
+      requestedAgentId,
+      resolvedAgentId: matched.executionAgentId,
+      strategy: "config_mapping"
+    };
+  }
+  return {
+    ok: true,
+    requestedAgentId,
+    resolvedAgentId: requestedAgentId,
+    strategy: "identity"
+  };
+}
 function buildEnvelope(input) {
   return {
     task_id: input.taskId,
     run_id: input.runId,
-    agent_id: input.agentId,
-    session_key: buildSessionKey(input.agentId, input.taskId),
+    agent_id: input.resolvedAgentId,
+    requested_agent_id: input.requestedAgentId,
+    resolved_agent_id: input.resolvedAgentId,
+    session_key: buildSessionKey(input.resolvedAgentId, input.taskId),
     origin_session_key: input.originSessionKey,
+    ...input.originSessionId ? { origin_session_id: input.originSessionId } : {},
+    callback_target_session_key: input.originSessionKey,
+    ...input.originSessionId ? { callback_target_session_id: input.originSessionId } : {},
     project_id: input.projectId,
     repo_root: input.repoRoot,
     opencode_server_url: input.serverUrl,
@@ -113,6 +168,7 @@ function buildEnvelope(input) {
 function mapEventToState(event) {
   switch (event) {
     case "task.started":
+      return "planning";
     case "task.progress":
       return "running";
     case "permission.requested":
@@ -314,12 +370,20 @@ async function fetchJsonSafe(url) {
 }
 function resolveSessionForRun(input) {
   const artifactEnvelope = input.runStatus?.envelope;
+  const callbackTargetSessionId = typeof artifactEnvelope?.callback_target_session_id === "string" ? artifactEnvelope.callback_target_session_id : void 0;
+  const originSessionId = typeof artifactEnvelope?.origin_session_id === "string" ? artifactEnvelope.origin_session_id : void 0;
+  const callbackTargetSessionKey = typeof artifactEnvelope?.callback_target_session_key === "string" ? artifactEnvelope.callback_target_session_key : void 0;
+  const originSessionKey = typeof artifactEnvelope?.origin_session_key === "string" ? artifactEnvelope.origin_session_key : void 0;
+  const executionSessionKey = typeof artifactEnvelope?.session_key === "string" ? artifactEnvelope.session_key : void 0;
+  const artifactSessionId = callbackTargetSessionId || originSessionId || (typeof artifactEnvelope?.session_id === "string" ? artifactEnvelope.session_id : void 0) || (typeof artifactEnvelope?.sessionId === "string" ? artifactEnvelope.sessionId : void 0);
+  const artifactSessionKey = callbackTargetSessionKey || originSessionKey || executionSessionKey;
+  const hasCallerSessionKey = Boolean(callbackTargetSessionKey || originSessionKey);
   const resolved = resolveSessionId({
     explicitSessionId: input.sessionId,
-    runId: input.runId || input.runStatus?.runId,
-    taskId: input.runStatus?.taskId,
-    sessionKey: artifactEnvelope?.session_key,
-    artifactSessionId: (typeof artifactEnvelope?.session_id === "string" ? artifactEnvelope.session_id : void 0) || (typeof artifactEnvelope?.sessionId === "string" ? artifactEnvelope.sessionId : void 0),
+    runId: hasCallerSessionKey ? void 0 : input.runId || input.runStatus?.runId,
+    taskId: hasCallerSessionKey ? void 0 : input.runStatus?.taskId,
+    sessionKey: artifactSessionKey,
+    artifactSessionId,
     sessionList: input.sessionList
   });
   return { sessionId: resolved.sessionId, strategy: resolved.strategy, ...resolved.score !== void 0 ? { score: resolved.score } : {} };
@@ -355,6 +419,11 @@ async function collectSseEvents(serverUrl, scope, options) {
           data: typed.payload,
           normalizedKind: typed.kind,
           summary: typed.summary,
+          lifecycle_state: typed.lifecycleState,
+          files_changed: typed.filesChanged,
+          verify_summary: typed.verifySummary,
+          blockers: typed.blockers,
+          completion_summary: typed.completionSummary,
           runId: typed.runId || options?.runIdHint,
           taskId: typed.taskId || options?.taskIdHint,
           sessionId: typed.sessionId || options?.sessionIdHint,
@@ -377,6 +446,11 @@ async function collectSseEvents(serverUrl, scope, options) {
           data: typed.payload,
           normalizedKind: typed.kind,
           summary: typed.summary,
+          lifecycle_state: typed.lifecycleState,
+          files_changed: typed.filesChanged,
+          verify_summary: typed.verifySummary,
+          blockers: typed.blockers,
+          completion_summary: typed.completionSummary,
           runId: typed.runId || options?.runIdHint,
           taskId: typed.taskId || options?.taskIdHint,
           sessionId: typed.sessionId || options?.sessionIdHint,
@@ -424,6 +498,7 @@ function buildHookPolicyChecklist(agentId, sessionKey) {
 }
 
 // src/registrar.ts
+var PLUGIN_VERSION = "0.1.1";
 function registerOpenCodeBridgeTools(api, cfg) {
   console.log("[opencode-bridge] scaffold loaded");
   console.log(`[opencode-bridge] opencodeServerUrl=${cfg.opencodeServerUrl || "(unset)"}`);
@@ -437,7 +512,7 @@ function registerOpenCodeBridgeTools(api, cfg) {
       const runtimeCfg = getRuntimeConfig(cfg);
       const registry = normalizeRegistry(runtimeCfg.projectRegistry);
       return {
-        content: [{ type: "text", text: JSON.stringify({ ok: true, pluginId: "opencode-bridge", version: "0.1.0", assumption: "1 project = 1 opencode serve instance", sessionKeyConvention: "hook:opencode:<agentId>:<taskId>", lifecycleStates: ["queued", "server_ready", "session_created", "prompt_sent", "running", "awaiting_permission", "stalled", "failed", "completed"], requiredEnvelopeFields: ["task_id", "run_id", "agent_id", "session_key", "origin_session_key", "project_id", "repo_root", "opencode_server_url"], callbackPrimary: "/hooks/agent", callbackNotPrimary: ["/hooks/wake", "cron", "group:sessions"], config: { bridgeConfigPath: getBridgeConfigPath(), opencodeServerUrl: runtimeCfg.opencodeServerUrl || null, hookBaseUrl: runtimeCfg.hookBaseUrl || null, hookTokenPresent: Boolean(runtimeCfg.hookToken), projectRegistry: registry, stateDir: getBridgeStateDir(), runStateDir: getRunStateDir(), auditDir: getAuditDir() }, note: "Runtime-ops scaffold in progress. Plugin-owned config/state is stored under ~/.openclaw/opencode-bridge. New projects are auto-registered only when using opencode_serve_spawn (not by passive envelope build alone)." }, null, 2) }]
+        content: [{ type: "text", text: JSON.stringify({ ok: true, pluginId: "opencode-bridge", version: PLUGIN_VERSION, assumption: "1 project = 1 opencode serve instance", sessionKeyConvention: "hook:opencode:<agentId>:<taskId>", lifecycleStates: ["queued", "server_ready", "session_created", "prompt_sent", "running", "awaiting_permission", "stalled", "failed", "completed"], requiredEnvelopeFields: ["task_id", "run_id", "agent_id", "requested_agent_id", "resolved_agent_id", "session_key", "origin_session_key", "callback_target_session_key", "project_id", "repo_root", "opencode_server_url"], callbackPrimary: "/hooks/agent", callbackNotPrimary: ["/hooks/wake", "cron", "group:sessions"], config: { bridgeConfigPath: getBridgeConfigPath(), opencodeServerUrl: runtimeCfg.opencodeServerUrl || null, hookBaseUrl: runtimeCfg.hookBaseUrl || null, hookTokenPresent: Boolean(runtimeCfg.hookToken), projectRegistry: registry, executionAgentMappings: runtimeCfg.executionAgentMappings || [], stateDir: getBridgeStateDir(), runStateDir: getRunStateDir(), auditDir: getAuditDir() }, note: "Runtime-ops scaffold in progress. Plugin-owned config/state is stored under ~/.openclaw/opencode-bridge. New projects are auto-registered only when using opencode_serve_spawn (not by passive envelope build alone)." }, null, 2) }]
       };
     }
   }, { optional: true });
@@ -455,7 +530,7 @@ function registerOpenCodeBridgeTools(api, cfg) {
     name: "opencode_build_envelope",
     label: "OpenCode Build Envelope",
     description: "D\u1EF1ng routing envelope chu\u1EA9n cho task delegate sang OpenCode v\u1EDBi sessionKey convention hook:opencode:<agentId>:<taskId>.",
-    parameters: { type: "object", properties: { taskId: { type: "string" }, runId: { type: "string" }, agentId: { type: "string" }, originSessionKey: { type: "string" }, projectId: { type: "string" }, repoRoot: { type: "string" }, channel: { type: "string" }, to: { type: "string" }, deliver: { type: "boolean" }, priority: { type: "string" } }, required: ["taskId", "runId", "agentId", "originSessionKey", "projectId", "repoRoot"] },
+    parameters: { type: "object", properties: { taskId: { type: "string" }, runId: { type: "string" }, agentId: { type: "string", description: "Requester/origin agent id" }, executionAgentId: { type: "string", description: "Optional explicit OpenCode execution agent id" }, originSessionKey: { type: "string" }, originSessionId: { type: "string" }, projectId: { type: "string" }, repoRoot: { type: "string" }, channel: { type: "string" }, to: { type: "string" }, deliver: { type: "boolean" }, priority: { type: "string" } }, required: ["taskId", "runId", "agentId", "originSessionKey", "projectId", "repoRoot"] },
     async execute(_id, params) {
       const entry = findRegistryEntry(cfg, params?.projectId, params?.repoRoot);
       const serverUrl = entry?.serverUrl;
@@ -465,11 +540,25 @@ function registerOpenCodeBridgeTools(api, cfg) {
           content: [{ type: "text", text: JSON.stringify({ ok: false, error: "Missing project registry mapping. Use opencode_serve_spawn for the project or add a matching projectRegistry entry in ~/.openclaw/opencode-bridge/config.json first." }, null, 2) }]
         };
       }
+      const requestedAgentId = asString(params?.agentId);
+      const resolved = resolveExecutionAgent({
+        cfg,
+        requestedAgentId: requestedAgentId || "",
+        explicitExecutionAgentId: asString(params?.executionAgentId)
+      });
+      if (!resolved.ok) {
+        return {
+          isError: true,
+          content: [{ type: "text", text: JSON.stringify({ ok: false, error: resolved.error, requestedAgentId: resolved.requestedAgentId, mappingConfigured: resolved.mappingConfigured }, null, 2) }]
+        };
+      }
       const envelope = buildEnvelope({
         taskId: params.taskId,
         runId: params.runId,
-        agentId: params.agentId,
+        requestedAgentId: resolved.requestedAgentId,
+        resolvedAgentId: resolved.resolvedAgentId,
         originSessionKey: params.originSessionKey,
+        originSessionId: asString(params.originSessionId),
         projectId: params.projectId,
         repoRoot: params.repoRoot,
         serverUrl,
@@ -479,7 +568,7 @@ function registerOpenCodeBridgeTools(api, cfg) {
         priority: params.priority
       });
       return {
-        content: [{ type: "text", text: JSON.stringify({ ok: true, envelope, registryMatch: entry || null }, null, 2) }]
+        content: [{ type: "text", text: JSON.stringify({ ok: true, envelope, agentResolution: resolved, registryMatch: entry || null }, null, 2) }]
       };
     }
   }, { optional: true });
@@ -532,7 +621,27 @@ function registerOpenCodeBridgeTools(api, cfg) {
         runId
       });
       const sessionId = resolution.sessionId;
-      const state = artifact?.state || (sessionId ? "running" : "queued");
+      const eventScope = sessionId ? "session" : "global";
+      const events = await collectSseEvents(serverUrl, eventScope, {
+        limit: DEFAULT_EVENT_LIMIT,
+        timeoutMs: DEFAULT_OBS_TIMEOUT_MS,
+        runIdHint: runId,
+        taskIdHint: artifact?.taskId,
+        sessionIdHint: sessionId
+      });
+      const lifecycleSummary = summarizeLifecycle(
+        events.map((event) => ({
+          kind: event.normalizedKind,
+          summary: event.summary,
+          lifecycleState: event.lifecycle_state,
+          filesChanged: event.files_changed,
+          verifySummary: event.verify_summary,
+          blockers: event.blockers,
+          completionSummary: event.completion_summary,
+          timestamp: event.timestamp
+        }))
+      );
+      const state = lifecycleSummary.current_state || artifact?.state || (sessionId ? "running" : "queued");
       const response = {
         ok: true,
         source: {
@@ -550,8 +659,15 @@ function registerOpenCodeBridgeTools(api, cfg) {
           }
         },
         state,
+        current_state: lifecycleSummary.current_state || state,
         lastEvent: artifact?.lastEvent,
+        last_event_kind: artifact?.lastEvent,
         lastSummary: artifact?.lastSummary,
+        last_event_at: artifact?.updatedAt || (/* @__PURE__ */ new Date()).toISOString(),
+        files_changed: lifecycleSummary.files_changed,
+        verify_summary: lifecycleSummary.verify_summary,
+        blockers: lifecycleSummary.blockers,
+        completion_summary: lifecycleSummary.completion_summary || artifact?.lastSummary || null,
         updatedAt: (/* @__PURE__ */ new Date()).toISOString(),
         timestamps: {
           ...artifact?.updatedAt ? { artifactUpdatedAt: artifact.updatedAt } : {},
@@ -799,10 +915,11 @@ function registerOpenCodeBridgeTools(api, cfg) {
 }
 
 // src/index.ts
+var PLUGIN_VERSION2 = "0.1.1";
 var plugin = {
   id: "opencode-bridge",
   name: "OpenCode Bridge",
-  version: "0.1.0",
+  version: PLUGIN_VERSION2,
   register(api) {
     const cfg = api?.pluginConfig || {};
     registerOpenCodeBridgeTools(api, cfg);

package/dist/observability.d.ts

@@ -14,6 +14,15 @@ type TypedEventV1 = {
     eventId?: string;
     kind: OpenCodeEventKind | null;
     summary?: string;
+    lifecycleState?: "planning" | "coding" | "verifying" | "blocked" | "running" | "awaiting_permission" | "stalled" | "failed" | "completed";
+    filesChanged?: string[];
+    verifySummary?: {
+        command?: string;
+        exit?: number | null;
+        output_preview?: string | null;
+    } | null;
+    blockers?: string[];
+    completionSummary?: string | null;
     runId?: string;
     taskId?: string;
     sessionId?: string;
@@ -34,8 +43,43 @@ declare function normalizeOpenCodeEvent(raw: any): {
     kind: OpenCodeEventKind | null;
     summary?: string;
     raw: any;
+    lifecycleState?: TypedEventV1["lifecycleState"];
+    filesChanged?: string[];
+    verifySummary?: {
+        command?: string;
+        exit?: number | null;
+        output_preview?: string | null;
+    } | null;
+    blockers?: string[];
+    completionSummary?: string | null;
 };
 declare function normalizeTypedEventV1(frame: SseFrame, scope: EventScope): TypedEventV1;
+declare function summarizeLifecycle(events?: Array<{
+    kind?: OpenCodeEventKind | null;
+    summary?: string;
+    lifecycleState?: TypedEventV1["lifecycleState"];
+    filesChanged?: string[];
+    verifySummary?: {
+        command?: string;
+        exit?: number | null;
+        output_preview?: string | null;
+    } | null;
+    blockers?: string[];
+    completionSummary?: string | null;
+    timestamp?: string;
+}>): {
+    current_state: "planning" | "coding" | "verifying" | "blocked" | "running" | "awaiting_permission" | "stalled" | "failed" | "completed" | null;
+    last_event_kind: OpenCodeEventKind | null;
+    last_event_at: string | null;
+    files_changed: string[];
+    verify_summary: {
+        command?: string;
+        exit?: number | null;
+        output_preview?: string | null;
+    }[];
+    blockers: string[];
+    completion_summary: string | null;
+};
 declare function resolveSessionId(input: {
     explicitSessionId?: string;
     runId?: string;
@@ -49,4 +93,4 @@ declare function resolveSessionId(input: {
     score?: number;
 };
 
-export { type EventScope, type OpenCodeEventKind, type SseFrame, type TypedEventV1, normalizeOpenCodeEvent, normalizeTypedEventV1, parseSseData, parseSseFramesFromBuffer, resolveSessionId, unwrapGlobalPayload };
+export { type EventScope, type OpenCodeEventKind, type SseFrame, type TypedEventV1, normalizeOpenCodeEvent, normalizeTypedEventV1, parseSseData, parseSseFramesFromBuffer, resolveSessionId, summarizeLifecycle, unwrapGlobalPayload };

package/dist/observability.js

@@ -4,13 +4,15 @@ import {
   parseSseData,
   parseSseFramesFromBuffer,
   resolveSessionId,
+  summarizeLifecycle,
   unwrapGlobalPayload
-} from "./chunk-6NIQKNRA.js";
+} from "./chunk-LCJRXKI3.js";
 export {
   normalizeOpenCodeEvent,
   normalizeTypedEventV1,
   parseSseData,
   parseSseFramesFromBuffer,
   resolveSessionId,
+  summarizeLifecycle,
   unwrapGlobalPayload
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mrc2204/opencode-bridge",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "OpenClaw ↔ OpenCode bridge plugin for routing, callback, SSE probing, and runtime-ops scaffolding.",
   "type": "module",
   "main": "./dist/index.js",

package/skills/opencode-orchestration/SKILL.md

@@ -500,6 +500,38 @@ Agents must describe these limits honestly and avoid over-claiming completion.
 
 ### Execution lane assumptions (MANDATORY)
 
+### Current-session callback integrity (MANDATORY)
+
+Bridge-aware execution must preserve caller identity and callback destination explicitly.
+
+Required fields to preserve whenever available:
+- `requested_agent_id`
+- `resolved_agent_id`
+- `origin_session_key`
+- `origin_session_id`
+- `callback_target_session_key`
+- `callback_target_session_id`
+
+Operational rules:
+- Callback must return to the **current caller session**, not an arbitrary latest/execution session.
+- If bridge/runtime cannot resolve the requested execution agent cleanly, it must **fail fast** instead of silently falling back to a default agent.
+- If callback target session information is missing or inconsistent, treat that as a routing integrity error, not a soft warning.
+- Reporting/trace should always expose:
+  - requested agent
+  - resolved execution agent
+  - callback target session key/id
+  - whether fallback was used
+
+### Runtime hygiene after completion (MANDATORY)
+
+When a task or epic is marked `done/closed`, any OpenCode serve/process that was started only for that execution must be shut down immediately unless there is an explicit reason to keep it alive.
+
+Operational rules:
+- Do not leave lingering OpenCode serves after work completes.
+- Treat serve shutdown as part of completion hygiene, not optional cleanup.
+- If a serve remains alive intentionally, the agent must report the reason explicitly.
+
+
 1. **One project = one OpenCode serve instance**
    - Do not assume one shared serve is safe for multiple repos.
    - Always bind execution to a single project/repo root.

package/dist/chunk-6NIQKNRA.js

@@ -1,176 +0,0 @@
-// src/observability.ts
-function parseSseFramesFromBuffer(input) {
-  const normalized = input.replace(/\r\n/g, "\n");
-  const parts = normalized.split("\n\n");
-  const remainder = parts.pop() ?? "";
-  const frames = [];
-  for (const rawFrame of parts) {
-    const lines = rawFrame.split("\n");
-    let event;
-    let id;
-    let retry;
-    const dataLines = [];
-    for (const line of lines) {
-      if (!line || line.startsWith(":")) continue;
-      const idx = line.indexOf(":");
-      const field = idx >= 0 ? line.slice(0, idx).trim() : line.trim();
-      const value = idx >= 0 ? line.slice(idx + 1).replace(/^\s/, "") : "";
-      if (field === "event") event = value;
-      else if (field === "id") id = value;
-      else if (field === "retry") {
-        const n = Number(value);
-        if (Number.isFinite(n)) retry = n;
-      } else if (field === "data") dataLines.push(value);
-    }
-    if (dataLines.length <= 0) continue;
-    frames.push({
-      event,
-      id,
-      retry,
-      data: dataLines.join("\n"),
-      raw: rawFrame
-    });
-  }
-  return { frames, remainder };
-}
-function parseSseData(data) {
-  const trimmed = data.trim();
-  if (!trimmed) return null;
-  try {
-    return JSON.parse(trimmed);
-  } catch {
-    return { raw: trimmed };
-  }
-}
-function unwrapGlobalPayload(raw) {
-  let current = raw;
-  const wrappers = [];
-  for (let i = 0; i < 3; i += 1) {
-    if (!current || typeof current !== "object") break;
-    if ("payload" in current && current.payload !== void 0) {
-      wrappers.push("payload");
-      current = current.payload;
-      continue;
-    }
-    if ("data" in current && current.data !== void 0 && Object.keys(current).length <= 4) {
-      wrappers.push("data");
-      current = current.data;
-      continue;
-    }
-    break;
-  }
-  return { payload: current, wrappers };
-}
-function pickFirstString(obj, keys) {
-  if (!obj || typeof obj !== "object") return void 0;
-  for (const key of keys) {
-    const value = obj[key];
-    if (typeof value === "string" && value.trim()) return value.trim();
-  }
-  return void 0;
-}
-function normalizeOpenCodeEvent(raw) {
-  const text = JSON.stringify(raw || {}).toLowerCase();
-  if (text.includes("permission") || text.includes("question.asked")) {
-    return { kind: "permission.requested", summary: "OpenCode \u0111ang ch\u1EDD permission/user input", raw };
-  }
-  if (text.includes("error") || text.includes("failed")) {
-    return { kind: "task.failed", summary: "OpenCode task failed", raw };
-  }
-  if (text.includes("stalled")) {
-    return { kind: "task.stalled", summary: "OpenCode task stalled", raw };
-  }
-  if (text.includes("complete") || text.includes("completed") || text.includes("done")) {
-    return { kind: "task.completed", summary: "OpenCode task completed", raw };
-  }
-  if (text.includes("progress") || text.includes("delta") || text.includes("assistant")) {
-    return { kind: "task.progress", summary: "OpenCode task made progress", raw };
-  }
-  if (text.includes("start") || text.includes("created") || text.includes("connected")) {
-    return { kind: "task.started", summary: "OpenCode task/server started", raw };
-  }
-  return { kind: null, raw };
-}
-function normalizeTypedEventV1(frame, scope) {
-  const parsed = parseSseData(frame.data);
-  const unwrapped = unwrapGlobalPayload(parsed);
-  const normalized = normalizeOpenCodeEvent(unwrapped.payload);
-  return {
-    schema: "opencode.event.v1",
-    scope,
-    eventName: frame.event,
-    eventId: frame.id,
-    kind: normalized.kind,
-    summary: normalized.summary,
-    runId: pickFirstString(unwrapped.payload, ["run_id", "runId"]),
-    taskId: pickFirstString(unwrapped.payload, ["task_id", "taskId"]),
-    sessionId: pickFirstString(unwrapped.payload, ["session_id", "sessionId", "session"]),
-    timestamp: (/* @__PURE__ */ new Date()).toISOString(),
-    wrappers: unwrapped.wrappers,
-    payload: unwrapped.payload
-  };
-}
-function asString(value) {
-  return typeof value === "string" && value.trim() ? value.trim() : void 0;
-}
-function scoreSessionCandidate(candidate, ctx) {
-  const id = asString(candidate?.id) || "";
-  const candidateText = JSON.stringify(candidate || {}).toLowerCase();
-  const runId = ctx.runId?.toLowerCase();
-  const taskId = ctx.taskId?.toLowerCase();
-  const sessionKey = ctx.sessionKey?.toLowerCase();
-  const artifactSessionId = ctx.artifactSessionId;
-  let score = 0;
-  if (artifactSessionId && id === artifactSessionId) score += 1e3;
-  if (runId && candidateText.includes(runId)) score += 120;
-  if (taskId && candidateText.includes(taskId)) score += 70;
-  if (sessionKey && candidateText.includes(sessionKey)) score += 60;
-  if (runId && id.toLowerCase().includes(runId)) score += 30;
-  if (taskId && id.toLowerCase().includes(taskId)) score += 20;
-  score += Math.max(0, 20 - ctx.recencyRank);
-  return score;
-}
-function resolveSessionId(input) {
-  if (input.explicitSessionId) {
-    return { sessionId: input.explicitSessionId, strategy: "explicit", score: 9999 };
-  }
-  const list = Array.isArray(input.sessionList) ? input.sessionList : [];
-  const withRecency = [...list].map((item, idx) => {
-    const updated = Number(item?.time?.updated || 0);
-    return { item, idx, updated };
-  }).sort((a, b) => b.updated - a.updated).map((x, rank) => ({ ...x, rank }));
-  if (input.artifactSessionId) {
-    const direct = withRecency.find((x) => asString(x.item?.id) === input.artifactSessionId);
-    if (direct) {
-      return { sessionId: input.artifactSessionId, strategy: "artifact", score: 1e3 };
-    }
-  }
-  let best = { score: -1 };
-  for (const candidate of withRecency) {
-    const id = asString(candidate.item?.id);
-    if (!id) continue;
-    const score = scoreSessionCandidate(candidate.item, {
-      runId: input.runId,
-      taskId: input.taskId,
-      sessionKey: input.sessionKey,
-      artifactSessionId: input.artifactSessionId,
-      recencyRank: candidate.rank
-    });
-    if (score > best.score) best = { id, score };
-  }
-  if (best.id && best.score > 0) {
-    return { sessionId: best.id, strategy: "scored_fallback", score: best.score };
-  }
-  const latest = withRecency.find((x) => asString(x.item?.id));
-  if (latest) return { sessionId: asString(latest.item?.id), strategy: "latest", score: 0 };
-  return { strategy: "none", score: -1 };
-}
-
-export {
-  parseSseFramesFromBuffer,
-  parseSseData,
-  unwrapGlobalPayload,
-  normalizeOpenCodeEvent,
-  normalizeTypedEventV1,
-  resolveSessionId
-};