@cortexkit/aft-opencode 0.37.0 → 0.37.1

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA6MlD;;;;;;;;;;;;;;;;GAgBG;AAQH,QAAA,MAAM,MAAM,EAAE,MAA6D,CAAC;AAm5B5E,eAAe,MAAM,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAcA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AA8MlD;;;;;;;;;;;;;;;;GAgBG;AAQH,QAAA,MAAM,MAAM,EAAE,MAA6D,CAAC;AAs5B5E,eAAe,MAAM,CAAC"}

package/dist/index.js

@@ -14364,14 +14364,27 @@ function isCompressorHandledRunner(stage) {
   if (tokens.some((token) => token === "&&" || token === "||" || token.includes(";"))) {
     return false;
   }
-  const first = runnerName(tokens[0]);
-  const second = tokens[1];
-  const third = tokens[2];
-  const rest = tokens.slice(1);
+  let tokenOffset = 0;
+  while (tokenOffset < tokens.length && isEnvAssignment(tokens[tokenOffset])) {
+    tokenOffset++;
+  }
+  const first = runnerName(tokens[tokenOffset]);
+  const runnerArgs = tokens.slice(tokenOffset + 1);
+  const second = runnerArgs[0];
+  const third = runnerArgs[1];
+  const rest = runnerArgs;
   if (!first)
     return false;
-  if (first === "bun")
-    return second === "test" || second === "run" && startsWithTest(third);
+  if (first === "bun") {
+    let args = rest;
+    if (args[0] === "--cwd")
+      args = args.slice(2);
+    else if (args[0]?.startsWith("--cwd="))
+      args = args.slice(1);
+    const sub = args[0];
+    const subNext = args[1];
+    return sub === "test" || sub === "run" && startsWithTest(subNext);
+  }
   if (first === "npm" || first === "pnpm") {
     return second === "test" || second === "run" && startsWithTest(third);
   }
@@ -14394,14 +14407,20 @@ function isCompressorHandledRunner(stage) {
     return hasBuildTask(rest, ["test", "check", "build", "assemble", "clean"]);
   }
   if (first === "mvn" || first === "mvnw") {
-    return hasBuildTask(rest, ["test", "verify", "package", "install"]);
+    return hasBuildTask(rest, ["test", "verify", "package", "install", "clean"]);
   }
   if (first === "dotnet")
     return ["test", "build"].includes(second ?? "");
   if (first === "rspec")
     return true;
-  if (first === "rake")
-    return second === "test" || second === "spec";
+  if (first === "rake") {
+    const positionals = rest.filter((a) => !a.startsWith("-"));
+    if (positionals.length === 0)
+      return false;
+    if (positionals.some((a) => a.includes("/") || a.includes(".") || a.includes("=")))
+      return false;
+    return positionals.some((a) => a === "test" || a === "spec");
+  }
   if (first === "phpunit" || first === "pest")
     return true;
   if (first === "xcodebuild")
@@ -14424,6 +14443,11 @@ function isCompressorHandledRunner(stage) {
     "nox"
   ].includes(first);
 }
+function isEnvAssignment(token) {
+  if (!token)
+    return false;
+  return /^[a-zA-Z_][a-zA-Z0-9_]*=/.test(token);
+}
 function runnerName(token) {
   if (!token)
     return "";
@@ -33751,6 +33775,21 @@ function clearStatusBarSession(sessionID) {
   emitStateBySession.delete(sessionID);
 }
 
+// src/sync-watch-abort.ts
+var abortFlags = new Map;
+function signalSyncWatchAbort(sessionID) {
+  const key = sessionID || "__default__";
+  abortFlags.set(key, true);
+}
+function clearSyncWatchAbort(sessionID) {
+  const key = sessionID || "__default__";
+  abortFlags.delete(key);
+}
+function isSyncWatchAborted(sessionID) {
+  const key = sessionID || "__default__";
+  return abortFlags.get(key) === true;
+}
+
 // src/tool-perf.ts
 import { AsyncLocalStorage } from "node:async_hooks";
 var perfStore = new AsyncLocalStorage;
@@ -35219,6 +35258,12 @@ A notification will fire when the pattern matches or the task exits.`;
       const effectiveWaitMs = subagentForcedSync ? MAX_BASH_STATUS_WAIT_TIMEOUT_MS : Math.min(args.timeoutMs ?? DEFAULT_BASH_STATUS_WAIT_TIMEOUT_MS, MAX_BASH_STATUS_WAIT_TIMEOUT_MS);
       const data = await waitForBashStatus(ctx, context, taskId, undefined, waitFor, effectiveWaitMs);
       const waited = data.waited;
+      if (waited?.reason === "user_message") {
+        const convertedText = await convertToAsyncWatchOnAbort(ctx, context, taskId, waitFor, args.once !== false);
+        const metadata2 = context.metadata;
+        metadata2?.({ taskId, status: data.status, waited, convertedToAsync: true });
+        return convertedText;
+      }
       const metadata = context.metadata;
       if (waited)
         metadata?.({ taskId, status: data.status, waited });
@@ -35226,6 +35271,31 @@ A notification will fire when the pattern matches or the task exits.`;
     }
   };
 }
+async function convertToAsyncWatchOnAbort(ctx, context, taskId, waitFor, once) {
+  if (!waitFor) {
+    return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits; don't poll bash_status.`;
+  }
+  const notifyParams = {
+    task_id: taskId,
+    once
+  };
+  if (waitFor.kind === "regex")
+    notifyParams.regex = waitFor.source;
+  else
+    notifyParams.pattern = waitFor.value;
+  markExplicitControl(context.sessionID, taskId, false);
+  try {
+    const registered = await callBashBridge(ctx, context, "bash_notify", notifyParams);
+    if (registered.success === false) {
+      unmarkExplicitControl(context.sessionID, taskId);
+      return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `Auto-registering an async watch failed (${String(registered.message ?? "unknown error")}). ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits.`;
+    }
+    return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `The wait has been converted to an async watch (${registered.watch_id}). ` + `A notification will fire when the pattern matches or the task exits.`;
+  } catch (err) {
+    unmarkExplicitControl(context.sessionID, taskId);
+    return `Sync watch for task ${taskId} was interrupted because you sent a message. ` + `Auto-registering an async watch failed (${err instanceof Error ? err.message : String(err)}). ` + `The task is still running in the background. A completion reminder will be ` + `delivered automatically when the task exits.`;
+  }
+}
 function formatWatchResultText(taskId, data, waited) {
   const status = data.status;
   const exit = typeof data.exit_code === "number" ? ` (exit ${data.exit_code})` : "";
@@ -35265,6 +35335,7 @@ async function waitForBashStatus(ctx, runtime, taskId, outputMode, waitFor, effe
   let scanText = "";
   let scanBaseOffset = 0;
   const bridgeOptions = {};
+  clearSyncWatchAbort(runtime.sessionID);
   markTaskWaiting(runtime.sessionID, taskId);
   let sawTerminal = false;
   try {
@@ -35303,6 +35374,9 @@ async function waitForBashStatus(ctx, runtime, taskId, outputMode, waitFor, effe
         await markBgCompletionDelivered({ ctx, directory: projectRootFor(runtime), sessionID: runtime.sessionID }, taskId);
         return withWaited(data, { reason: "exited", elapsed_ms: Date.now() - startedAt });
       }
+      if (isSyncWatchAborted(runtime.sessionID)) {
+        return withWaited(data, { reason: "user_message", elapsed_ms: Date.now() - startedAt });
+      }
       if (Date.now() >= deadline) {
         return withWaited(data, { reason: "timeout", elapsed_ms: Date.now() - startedAt });
       }
@@ -38463,6 +38537,7 @@ Install: ${getManualInstallHint()}`).catch(() => {});
     "chat.message": async (messageInput) => {
       const sid = messageInput.sessionID ?? messageInput.sessionId ?? messageInput.id;
       warmSessionDirectory(input.client, sid, input.directory);
+      signalSyncWatchAbort(sid);
     },
     "tool.execute.before": async (toolInput) => {
       if (toolInput.sessionID)

package/dist/sync-watch-abort.d.ts

@@ -0,0 +1,26 @@
+/**
+ * Per-session abort flags for sync bash_watch waits.
+ *
+ * When a user sends a message while the agent is blocked in a sync
+ * bash_watch wait, the `chat.message` hook sets an abort flag for that
+ * session. The sync wait poll loop checks the flag each iteration and
+ * on abort: (1) stops blocking, (2) auto-registers the equivalent async
+ * watch so the completion/pattern notification still arrives, (3) returns
+ * text telling the agent the wait converted to async.
+ *
+ * Edge cases:
+ * - The flag is cleared at sync-wait start so stale flags from previous
+ *   turns don't insta-abort a new wait.
+ * - A wait that already matched/exited wins over abort (the flag is
+ *   checked only at the top of the poll loop, after match/exit checks).
+ * - Subagent sessions behave identically — the flag is keyed by sessionID.
+ */
+/** Signal that a sync watch for this session should abort. */
+export declare function signalSyncWatchAbort(sessionID: string | undefined): void;
+/** Clear any stale abort flag at the start of a new sync wait. */
+export declare function clearSyncWatchAbort(sessionID: string | undefined): void;
+/** Check whether the abort flag is set for this session. Does NOT clear it. */
+export declare function isSyncWatchAborted(sessionID: string | undefined): boolean;
+/** Test-only: reset all abort flags. */
+export declare function __resetSyncWatchAbortForTests(): void;
+//# sourceMappingURL=sync-watch-abort.d.ts.map

package/dist/sync-watch-abort.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"sync-watch-abort.d.ts","sourceRoot":"","sources":["../src/sync-watch-abort.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAIH,8DAA8D;AAC9D,wBAAgB,oBAAoB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAGxE;AAED,kEAAkE;AAClE,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI,CAGvE;AAED,+EAA+E;AAC/E,wBAAgB,kBAAkB,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAGzE;AAED,wCAAwC;AACxC,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD"}

package/dist/tools/bash_watch.d.ts

@@ -9,7 +9,7 @@ export type BashWaitPattern = {
     source: string;
 };
 export type BashStatusWaited = {
-    reason: "matched" | "exited" | "timeout";
+    reason: "matched" | "exited" | "timeout" | "user_message";
     elapsed_ms: number;
     match?: string;
     match_offset?: number;

package/dist/tools/bash_watch.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"bash_watch.d.ts","sourceRoot":"","sources":["../../src/tools/bash_watch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAavE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AASjD,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAC;IACzC,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAGlF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwFtE;AAiDD,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,eAAe,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,kBAAkB,CAAC,CA4D7B;AA6DD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,GAAG,SAAS,CAK5E;AA4DD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAEtC"}
+{"version":3,"file":"bash_watch.d.ts","sourceRoot":"","sources":["../../src/tools/bash_watch.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAcvE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AASjD,MAAM,MAAM,eAAe,GACvB;IAAE,IAAI,EAAE,WAAW,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,GACpC;IAAE,IAAI,EAAE,OAAO,CAAC;IAAC,KAAK,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC;AACrD,MAAM,MAAM,gBAAgB,GAAG;IAC7B,MAAM,EAAE,SAAS,GAAG,QAAQ,GAAG,SAAS,GAAG,cAAc,CAAC;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;CACvB,CAAC;AACF,KAAK,kBAAkB,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG;IAAE,MAAM,CAAC,EAAE,gBAAgB,CAAA;CAAE,CAAC;AAGlF,wBAAgB,mBAAmB,CAAC,GAAG,EAAE,aAAa,GAAG,cAAc,CAwGtE;AA8GD,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,MAAM,GAAG,SAAS,EAC9B,OAAO,EAAE,eAAe,GAAG,SAAS,EACpC,eAAe,EAAE,MAAM,GACtB,OAAO,CAAC,kBAAkB,CAAC,CAuE7B;AA6DD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,eAAe,GAAG,SAAS,CAK5E;AA4DD,wBAAgB,4BAA4B,CAC1C,IAAI,EAAE,MAAM,EACZ,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,eAAe,GACvB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,CAEtC"}

package/dist/tui.js

@@ -1,7 +1,7 @@
 // src/tui/index.tsx
 import { createMemo as createMemo2, createSignal as createSignal2, onCleanup as onCleanup2 } from "solid-js";
 // package.json
-var version = "0.37.0";
+var version = "0.37.1";
 
 // src/shared/rpc-client.ts
 import { existsSync, readdirSync, readFileSync, unlinkSync } from "node:fs";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cortexkit/aft-opencode",
-  "version": "0.37.0",
+  "version": "0.37.1",
   "type": "module",
   "description": "OpenCode plugin for Agent File Tools (AFT) — tree-sitter and lsp powered code analysis",
   "main": "dist/index.js",
@@ -30,19 +30,19 @@
   },
   "dependencies": {
     "@clack/prompts": "^1.2.0",
-    "@cortexkit/aft-bridge": "0.37.0",
+    "@cortexkit/aft-bridge": "0.37.1",
     "@xterm/headless": "^5.5.0",
     "comment-json": "^4.6.2",
     "undici": "^7.25.0",
     "zod": "^4.1.8"
   },
   "optionalDependencies": {
-    "@cortexkit/aft-darwin-arm64": "0.37.0",
-    "@cortexkit/aft-darwin-x64": "0.37.0",
-    "@cortexkit/aft-linux-arm64": "0.37.0",
-    "@cortexkit/aft-linux-x64": "0.37.0",
-    "@cortexkit/aft-win32-arm64": "0.37.0",
-    "@cortexkit/aft-win32-x64": "0.37.0"
+    "@cortexkit/aft-darwin-arm64": "0.37.1",
+    "@cortexkit/aft-darwin-x64": "0.37.1",
+    "@cortexkit/aft-linux-arm64": "0.37.1",
+    "@cortexkit/aft-linux-x64": "0.37.1",
+    "@cortexkit/aft-win32-arm64": "0.37.1",
+    "@cortexkit/aft-win32-x64": "0.37.1"
   },
   "devDependencies": {
     "@opencode-ai/plugin": "^1.15.11",