@plannotator/opencode 0.27.6 → 0.27.7

package/dist/embedded.js

@@ -73591,6 +73591,36 @@ var init_claude_agent_sdk = __esm(() => {
   registerProviderFactory(PROVIDER_NAME, async (config) => new ClaudeAgentSDKProvider(config));
 });
 
+// ../../packages/ai/providers/child-io.ts
+function toChildError(err) {
+  return err instanceof Error ? err : new Error(String(err));
+}
+function guardChildStreams(proc, label, onFailure) {
+  const report = (stream) => (err) => {
+    onFailure(new Error(`${label} ${stream} failed: ${toChildError(err).message}`));
+  };
+  proc.on("error", report("process"));
+  proc.stdin?.on("error", report("stdin"));
+  proc.stdout?.on("error", report("stdout"));
+  proc.stderr?.on("error", report("stderr"));
+}
+function writeChildLine(proc, line, label, onAsyncFailure) {
+  const stdin = proc?.stdin;
+  if (!stdin || stdin.destroyed || stdin.writableEnded) {
+    return new Error(`${label} stdin is closed`);
+  }
+  try {
+    stdin.write(line, (err) => {
+      if (err) {
+        onAsyncFailure(new Error(`${label} stdin write failed: ${toChildError(err).message}`));
+      }
+    });
+  } catch (err) {
+    return new Error(`${label} stdin write failed: ${toChildError(err).message}`);
+  }
+  return null;
+}
+
 // ../../packages/ai/providers/codex-app-server.ts
 var exports_codex_app_server = {};
 __export(exports_codex_app_server, {
@@ -73772,6 +73802,7 @@ class CodexAppServerProcess {
       throw error;
     }
     this.proc = proc;
+    guardChildStreams(proc, CODEX_PROCESS_LABEL, (error) => this.failProcess(error));
     proc.once("exit", () => {
       this.handleProcessEnd(new Error("Codex app-server exited unexpectedly"));
     });
@@ -73807,6 +73838,17 @@ class CodexAppServerProcess {
     }
     this.send({ method: "initialized", params: {} });
   }
+  failProcess(error) {
+    const proc = this.proc;
+    this.startPromise = null;
+    this.handleProcessEnd(error);
+    if (proc) {
+      try {
+        if (!killWindowsProcessTree(proc.pid))
+          proc.kill();
+      } catch {}
+    }
+  }
   handleProcessEnd(error) {
     if (!this.proc && this.pendingRequests.size === 0)
       return;
@@ -73870,10 +73912,10 @@ class CodexAppServerProcess {
     }
   }
   send(message) {
-    if (!this.proc?.stdin || this.proc.stdin.destroyed)
-      return;
-    this.proc.stdin.write(`${JSON.stringify(message)}
-`);
+    const error = writeChildLine(this.proc, `${JSON.stringify(message)}
+`, CODEX_PROCESS_LABEL, (err) => this.failProcess(err));
+    if (error)
+      this.failProcess(error);
   }
   sendAndWait(message, timeoutMs = RPC_TIMEOUT_MS) {
     const id = ++this.nextId;
@@ -74028,7 +74070,7 @@ class CodexAppServerProvider {
     this.sessions.clear();
   }
 }
-var PROVIDER_NAME2 = "codex-sdk", DEFAULT_MODEL2 = "gpt-5.6-sol", CLIENT_NAME = "plannotator", IDLE_TIMEOUT_MS, RPC_TIMEOUT_MS = 30000, MODEL_DISCOVERY_TIMEOUT_MS = 6000, CMD_APPROVAL_METHOD = "item/commandExecution/requestApproval", FILE_APPROVAL_METHOD = "item/fileChange/requestApproval", PERMISSIONS_APPROVAL_METHOD = "item/permissions/requestApproval", REASONING_EFFORT_LABELS, CodexAppServerSession;
+var PROVIDER_NAME2 = "codex-sdk", CODEX_PROCESS_LABEL = "Codex app-server", DEFAULT_MODEL2 = "gpt-5.6-sol", CLIENT_NAME = "plannotator", IDLE_TIMEOUT_MS, RPC_TIMEOUT_MS = 30000, MODEL_DISCOVERY_TIMEOUT_MS = 6000, CMD_APPROVAL_METHOD = "item/commandExecution/requestApproval", FILE_APPROVAL_METHOD = "item/fileChange/requestApproval", PERMISSIONS_APPROVAL_METHOD = "item/permissions/requestApproval", REASONING_EFFORT_LABELS, CodexAppServerSession;
 var init_codex_app_server = __esm(() => {
   init_base_session();
   init_context();
@@ -74391,7 +74433,7 @@ class PiProcess {
         cwd,
         stdin: "pipe",
         stdout: "pipe",
-        stderr: "pipe"
+        stderr: "ignore"
       });
     } catch (err) {
       const error = err instanceof Error ? err : new Error(String(err));
@@ -74404,6 +74446,16 @@ class PiProcess {
       this.handleProcessEnd(new Error("Pi process exited unexpectedly"));
     });
   }
+  failProcess(error) {
+    const proc = this.proc;
+    this.handleProcessEnd(error);
+    if (proc) {
+      try {
+        if (!killWindowsProcessTree(proc.pid))
+          proc.kill();
+      } catch {}
+    }
+  }
   handleProcessEnd(error) {
     if (!this.proc && this.pendingRequests.size === 0)
       return;
@@ -74461,12 +74513,24 @@ class PiProcess {
     }
   }
   send(command) {
-    if (!this.proc?.stdin || typeof this.proc.stdin === "number")
+    const stdin = this.proc?.stdin;
+    if (!stdin || typeof stdin === "number") {
+      this.failProcess(new Error("Pi process stdin is closed"));
       return;
-    const sink = this.proc.stdin;
-    sink.write(`${JSON.stringify(command)}
+    }
+    const sink = stdin;
+    try {
+      sink.write(`${JSON.stringify(command)}
 `);
-    sink.flush();
+      const flushed = sink.flush();
+      if (flushed && typeof flushed.then === "function") {
+        flushed.catch((err) => {
+          this.failProcess(new Error(`Pi process stdin write failed: ${err instanceof Error ? err.message : String(err)}`));
+        });
+      }
+    } catch (err) {
+      this.failProcess(new Error(`Pi process stdin write failed: ${err instanceof Error ? err.message : String(err)}`));
+    }
   }
   sendAndWait(command) {
     const id = `req_${++this.nextId}`;
@@ -77947,6 +78011,8 @@ function jjCompareTargetRevset(target) {
   if (remoteBookmark) {
     return `remote_bookmarks(exact:${quoteJjString(remoteBookmark.name)}, exact:${quoteJjString(remoteBookmark.remote)})`;
   }
+  if (JJ_FULL_COMMIT_ID.test(target))
+    return target;
   const localBookmark = parseJjBookmarkName(target);
   return localBookmark ? `bookmarks(exact:${quoteJjString(localBookmark)})` : target;
 }
@@ -79113,11 +79179,12 @@ function isBinaryPatchFile(patch, filePath) {
   }
   return false;
 }
-var JJ_TRUNK_REVSET = "trunk()", MAX_REVIEW_FILE_CONTENT_BYTES, MAX_UNTRACKED_DIFF_CONCURRENCY = 4, MAX_UNTRACKED_FINGERPRINT_CONTENT_BYTES, RECENT_COMMIT_LIMIT_DEFAULT = 20, COMMIT_FIELD_SEP = "\x1F", NULL_OBJECT_ID, BOUNDED_DIFF_GIT_CONFIG, WORKTREE_SUB_TYPES, BARE_HEX_SHA_RE, MAX_UNTRACKED_FINGERPRINT_FILES = 20, UNTRACKED_STATUS_OUTPUT_CAP, collapsedUntrackedCwds;
+var JJ_TRUNK_REVSET = "trunk()", MAX_REVIEW_FILE_CONTENT_BYTES, MAX_UNTRACKED_DIFF_CONCURRENCY = 4, MAX_UNTRACKED_FINGERPRINT_CONTENT_BYTES, JJ_FULL_COMMIT_ID, RECENT_COMMIT_LIMIT_DEFAULT = 20, COMMIT_FIELD_SEP = "\x1F", NULL_OBJECT_ID, BOUNDED_DIFF_GIT_CONFIG, WORKTREE_SUB_TYPES, BARE_HEX_SHA_RE, MAX_UNTRACKED_FINGERPRINT_FILES = 20, UNTRACKED_STATUS_OUTPUT_CAP, collapsedUntrackedCwds;
 var init_review_core = __esm(() => {
   init_diff_paths2();
   MAX_REVIEW_FILE_CONTENT_BYTES = 5 * 1024 * 1024;
   MAX_UNTRACKED_FINGERPRINT_CONTENT_BYTES = 1024 * 1024;
+  JJ_FULL_COMMIT_ID = /^(?:[0-9a-f]{40}|[0-9a-f]{64})$/;
   NULL_OBJECT_ID = /^0+$/;
   BOUNDED_DIFF_GIT_CONFIG = {
     "core.bigFileThreshold": String(MAX_REVIEW_FILE_CONTENT_BYTES)
@@ -79372,13 +79439,27 @@ async function selectDefaultJjCompareTarget(runtime, cwd) {
     "log",
     "--no-graph",
     "-r",
-    JJ_TRUNK_REVSET,
+    JJ_LINE_BASE_REVSET,
     "-T",
-    "json(bookmarks)"
+    'json(bookmarks) ++ "\\t" ++ commit_id ++ "\\n"'
   ], { cwd });
   if (result.exitCode !== 0)
     return JJ_TRUNK_REVSET;
-  return parseJjResolvedBookmarks(result.stdout)[0] ?? JJ_TRUNK_REVSET;
+  const [record] = splitJjTemplateRecords(result.stdout);
+  if (!record)
+    return JJ_TRUNK_REVSET;
+  const fields = splitJjTemplateFields(record);
+  const bookmark = parseJjResolvedBookmarks(fields?.[0] ?? record).find((name) => !isGeneratedPushBookmark(name));
+  if (bookmark)
+    return bookmark;
+  const commitId = fields?.[1]?.trim();
+  if (commitId && !JJ_ROOT_COMMIT_ID.test(commitId))
+    return commitId;
+  return JJ_TRUNK_REVSET;
+}
+function isGeneratedPushBookmark(target) {
+  const name = parseRemoteBookmark(target)?.name ?? target;
+  return name.startsWith(JJ_GENERATED_PUSH_BOOKMARK_PREFIX);
 }
 function parseJjResolvedBookmarks(value) {
   try {
@@ -79545,9 +79626,11 @@ function firstErrorLine(stderr) {
     return;
   return line.length > 200 ? line.slice(0, 200) + "..." : line;
 }
+var JJ_LINE_BASE_REVSET = "latest(fork_point(roots(reachable(@, mutable()))-), 1)", JJ_GENERATED_PUSH_BOOKMARK_PREFIX = "push-", JJ_ROOT_COMMIT_ID;
 var init_jj_core = __esm(() => {
   init_review_core();
   init_review_core();
+  JJ_ROOT_COMMIT_ID = /^0+$/;
 });
 
 // ../../packages/shared/gitbutler-core.ts
@@ -83693,9 +83776,9 @@ function parseCallDiffWorkerResult(value) {
   if (!isRecord2(value.result) || !Array.isArray(value.result.trees)) {
     throw new Error("CallDiff worker response is missing its diff trees.");
   }
-  if (value.result.trees.length > MAX_TREES) {
-    throw new Error("CallDiff result exceeded Plannotator's tree limits.");
-  }
+  const totalTreeCount = value.result.trees.length;
+  const truncatedTrees = totalTreeCount > MAX_TREES;
+  const boundedTreeCandidates = truncatedTrees ? value.result.trees.slice(0, MAX_TREES) : value.result.trees;
   let nodeCount = 0;
   const parseNode = (candidate, depth) => {
     if (!isRecord2(candidate) || depth > MAX_TREE_DEPTH || ++nodeCount > MAX_NODES) {
@@ -83727,7 +83810,7 @@ function parseCallDiffWorkerResult(value) {
     };
   };
   const raw2 = boundedRaw(value.result.ascii);
-  const trees = value.result.trees.map((candidate) => {
+  const trees = boundedTreeCandidates.map((candidate) => {
     if (!isRecord2(candidate))
       throw new Error("CallDiff worker returned an invalid tree.");
     const entry = boundedString(candidate.entry, "tree entry");
@@ -83759,6 +83842,12 @@ function parseCallDiffWorkerResult(value) {
       });
     }
   }
+  if (truncatedTrees) {
+    diagnostics.push({
+      level: "warning",
+      message: `Showing the first ${MAX_TREES.toLocaleString("en-US")} of ${totalTreeCount.toLocaleString("en-US")} call trees; the rest were truncated to bound the result.`
+    });
+  }
   return {
     version: boundedString(value.version, "version", 100),
     from: boundedString(value.result.from, "from snapshot"),
@@ -83825,7 +83914,7 @@ function indexCallFlowImpacts(trees) {
     }
   };
 }
-var MAX_TREES = 100, MAX_NODES = 5000, MAX_TREE_DEPTH = 32, MAX_DIAGNOSTICS = 100, MAX_TEXT_LENGTH = 2000, MAX_RAW_LENGTH;
+var MAX_TREES = 2000, MAX_NODES = 5000, MAX_TREE_DEPTH = 32, MAX_DIAGNOSTICS = 100, MAX_TEXT_LENGTH = 2000, MAX_RAW_LENGTH;
 var init_call_flow_types = __esm(() => {
   MAX_RAW_LENGTH = 1024 * 1024;
 });

package/dist/index.js

@@ -12940,7 +12940,8 @@ var PLAN_TOOL_NAMES = {
   "copilot-cli": "exit_plan_mode",
   pi: "plannotator_submit_plan",
   codex: "ExitPlanMode",
-  "gemini-cli": "exit_plan_mode"
+  "gemini-cli": "exit_plan_mode",
+  "oh-my-pi": "ExitPlanMode"
 };
 function getPlanToolName(runtime) {
   return runtime && PLAN_TOOL_NAMES[runtime] || "ExitPlanMode";

package/dist/server.js

@@ -433,7 +433,8 @@ var PLAN_TOOL_NAMES = {
   "copilot-cli": "exit_plan_mode",
   pi: "plannotator_submit_plan",
   codex: "ExitPlanMode",
-  "gemini-cli": "exit_plan_mode"
+  "gemini-cli": "exit_plan_mode",
+  "oh-my-pi": "ExitPlanMode"
 };
 function getPlanToolName(runtime) {
   return runtime && PLAN_TOOL_NAMES[runtime] || "ExitPlanMode";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plannotator/opencode",
-  "version": "0.27.6",
+  "version": "0.27.7",
   "type": "module",
   "description": "Plannotator plugin for OpenCode - interactive plan review with visual annotation",
   "author": "backnotprop",
@@ -27,22 +27,25 @@
   "exports": {
     ".": "./dist/server.js"
   },
+  "//files": "skills/ is generated by build:skill from apps/skills/core/plannotator and is gitignored, so the shipped copy cannot drift from the single source.",
   "files": [
     "dist",
     "commands",
+    "skills",
     "README.md",
     "plannotator.html",
     "review-editor.html"
   ],
   "scripts": {
-    "build": "mkdir -p dist && cp ../hook/dist/index.html ./plannotator.html && cp ../review/dist/index.html ./review-editor.html && bun build embedded.ts --outfile dist/embedded.js --target bun --external @opencode-ai/plugin && bun build index.ts --outfile dist/index.js --target node && bun build server.ts --outfile dist/server.js --target node --external @opencode-ai/plugin",
+    "build": "bun run build:skill && mkdir -p dist && cp ../hook/dist/index.html ./plannotator.html && cp ../review/dist/index.html ./review-editor.html && bun build embedded.ts --outfile dist/embedded.js --target bun --external @opencode-ai/plugin && bun build index.ts --outfile dist/index.js --target node && bun build server.ts --outfile dist/server.js --target node --external @opencode-ai/plugin",
+    "build:skill": "rm -rf skills && mkdir -p skills && cp -R ../skills/core/plannotator skills/plannotator",
     "smoke:v2": "bun fixtures/v2-installed-smoke.ts",
-    "postinstall": "mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/opencode/commands && cp ./commands/*.md ${XDG_CONFIG_HOME:-$HOME/.config}/opencode/commands/ 2>/dev/null || true",
+    "postinstall": "mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/opencode/commands && cp ./commands/*.md ${XDG_CONFIG_HOME:-$HOME/.config}/opencode/commands/ 2>/dev/null || true; mkdir -p ${XDG_CONFIG_HOME:-$HOME/.config}/opencode/skills/plannotator && cp ./skills/plannotator/SKILL.md ${XDG_CONFIG_HOME:-$HOME/.config}/opencode/skills/plannotator/ 2>/dev/null || true",
     "prepublishOnly": "bun run build"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "0.0.0-next-16775",
-    "@plannotator/server": "0.27.3",
+    "@plannotator/server": "0.27.6",
     "@plannotator/shared": "0.0.1"
   },
   "engines": {