orchestrar 0.2.0 → 0.3.1

package/orchestrator.js

@@ -47,7 +47,7 @@ async function runWorkInstance(createOpencode, docs, root) {
       "session.create"
     );
 
-    const sessionID = session.id;
+    const sessionID = extractSessionID(session, "session.create (work instance)");
     const promptPaths = buildPromptPaths(docs, root);
 
     await sendPrompt(
@@ -85,7 +85,7 @@ async function runCommitInstance(createOpencode, root) {
       "session.create"
     );
 
-    const sessionID = session.id;
+    const sessionID = extractSessionID(session, "session.create (commit instance)");
     await sendPrompt(
       client,
       sessionID,
@@ -156,7 +156,7 @@ async function runReviewCommand(createOpencode, root) {
       "session.create"
     );
 
-    const sessionID = session.id;
+    const sessionID = extractSessionID(session, "session.create (review instance)");
     const commandResult = await unwrap(
       client.session.command({
         path: { id: sessionID },
@@ -239,7 +239,11 @@ async function waitForSessionIdle(client, sessionID, root, timeoutOverrideMs) {
     );
     const status = statusMap?.[sessionID];
     if (!status) {
-      throw new Error(`Session status missing for ${sessionID}.`);
+      const knownSessions = statusMap ? Object.keys(statusMap) : [];
+      const knownList = knownSessions.length ? knownSessions.join(", ") : "none";
+      throw new Error(
+        `Session status missing for ${sessionID}. Known sessions: ${knownList}.`
+      );
     }
     if (status.type === "idle") {
       return;
@@ -443,15 +447,73 @@ async function fileExists(filePath) {
 }
 
 function unwrap(result, label) {
-  if (result && typeof result === "object" && "data" in result) {
-    if (result.error) {
-      throw new Error(`${label} failed: ${formatError(result.error)}`);
+  if (!result || typeof result !== "object") {
+    return result;
+  }
+
+  const hasWrapperFields =
+    "request" in result ||
+    "response" in result ||
+    "error" in result ||
+    Object.prototype.hasOwnProperty.call(result, "data");
+
+  if (result.error) {
+    throw new Error(`${label} failed: ${formatError(result.error)}`);
+  }
+
+  if (hasWrapperFields) {
+    if ("data" in result || result.data !== undefined) {
+      return result.data;
     }
-    return result.data;
   }
+
   return result;
 }
 
+function extractSessionID(session, context) {
+  if (!session || typeof session !== "object") {
+    throw new Error(`${context} did not return a session object.`);
+  }
+
+  const candidates = [
+    session.id,
+    session.sessionID,
+    session.data?.id,
+    session.data?.sessionID,
+    session.info?.id,
+    session.info?.sessionID,
+    session.data?.info?.id,
+    session.data?.info?.sessionID,
+    session.properties?.id,
+    session.properties?.sessionID,
+    session.properties?.info?.id,
+    session.properties?.info?.sessionID,
+    session.slug,
+  ];
+
+  for (const candidate of candidates) {
+    if (typeof candidate === "string" && candidate.trim()) {
+      return candidate;
+    }
+  }
+
+  throw new Error(
+    `${context} returned a session without an id. Response: ${safeStringify(session)}`
+  );
+}
+
+function safeStringify(value, maxLength = 1000) {
+  try {
+    const json = JSON.stringify(value);
+    if (typeof json === "string" && json.length > 0) {
+      return json.length > maxLength ? `${json.slice(0, maxLength)}...` : json;
+    }
+  } catch (error) {
+    // fall through to String()
+  }
+  return String(value);
+}
+
 function formatError(error) {
   if (!error) {
     return "Unknown error";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "orchestrar",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "description": "OpenCode milestone orchestrator",
   "license": "MIT",
   "type": "commonjs",