Skip to content

armgit / Orkas

Public Imported from GitHub
0

Orkas is an open-source (MIT), local-first AI team for your desktop: a Commander turns your goal into to-dos and coordinates 16 built-in specialist agents plus Claude Code, Codex, OpenCode, OpenClaw and Hermes, with projects, scheduled automations and connectors. Free app for macOS & Windows; built-in models or your own keys.

Recover Windows shell turns after abort

wyt988451e1978b
diff --git a/src/core-agent/src/sandbox/executor.ts b/src/core-agent/src/sandbox/executor.ts
index e345bc32..a43b1e49 100644
--- a/src/core-agent/src/sandbox/executor.ts
+++ b/src/core-agent/src/sandbox/executor.ts
@@ -102,6 +102,14 @@ export function buildShellInvocation(
command: string,
platform: NodeJS.Platform = process.platform,
): ShellInvocation {
+ if (platform === "win32" && /^\s*cmd(?:\.exe)?\s+(?:\/d\s+)?(?:\/s\s+)?\/c\b/i.test(command)) {
+ return {
+ command: "cmd.exe",
+ args: ["/d", "/s", "/c", command],
+ kind: "cmd",
+ };
+ }
+
const kind = inferShellKind(shell, platform);
if (platform === "win32" && kind === "powershell") {
return {
@@ -192,11 +200,33 @@ export function decodeProcessOutput(
function buildWindowsCanonicalPathEntries(env: NodeJS.ProcessEnv): string[] {
const root = getEnvValue(env, ["SystemRoot", "WINDIR"]) || "C:\\Windows";
- return [
- path.win32.join(root, "System32"),
- root,
- path.win32.join(root, "System32", "WindowsPowerShell", "v1.0"),
- ];
+ const programFiles = getEnvValue(env, ["ProgramFiles"]) || "C:\\Program Files";
+ const programFilesX86 = getEnvValue(env, ["ProgramFiles(x86)"]) || "C:\\Program Files (x86)";
+ const appData = getEnvValue(env, ["APPDATA"]);
+ const localAppData = getEnvValue(env, ["LOCALAPPDATA"]);
+ const out: string[] = [];
+ const seen = new Set<string>();
+ const add = (entry: string | undefined) => {
+ if (!entry) return;
+ const normalized = path.win32.normalize(entry);
+ const key = normalized.toLowerCase();
+ if (seen.has(key)) return;
+ seen.add(key);
+ out.push(normalized);
+ };
+
+ add(path.win32.join(root, "System32"));
+ add(root);
+ add(path.win32.join(root, "System32", "WindowsPowerShell", "v1.0"));
+ add(path.win32.join(programFiles, "nodejs"));
+ add(path.win32.join(programFilesX86, "nodejs"));
+ if (appData) add(path.win32.join(appData, "npm"));
+ if (localAppData) {
+ add(path.win32.join(localAppData, "npm"));
+ add(path.win32.join(localAppData, "Programs", "nodejs"));
+ }
+
+ return out;
}
function getEnvValue(env: NodeJS.ProcessEnv, names: string[]): string | undefined {
diff --git a/src/core-agent/test/sandbox.test.ts b/src/core-agent/test/sandbox.test.ts
index 5449b19c..b105a68a 100644
--- a/src/core-agent/test/sandbox.test.ts
+++ b/src/core-agent/test/sandbox.test.ts
@@ -142,6 +142,22 @@ describe("augmentPath", () => {
expect(parts).not.toContain("\\Tools\\bin");
});
+ it("adds common Windows Node.js and npm shim locations", () => {
+ const out = augmentPath("C:\\Windows\\System32", "win32", {
+ SystemRoot: "C:\\Windows",
+ ProgramFiles: "C:\\Program Files",
+ "ProgramFiles(x86)": "C:\\Program Files (x86)",
+ APPDATA: "C:\\Users\\me\\AppData\\Roaming",
+ LOCALAPPDATA: "C:\\Users\\me\\AppData\\Local",
+ });
+ const parts = out.split(";");
+ expect(parts).toContain("C:\\Program Files\\nodejs");
+ expect(parts).toContain("C:\\Program Files (x86)\\nodejs");
+ expect(parts).toContain("C:\\Users\\me\\AppData\\Roaming\\npm");
+ expect(parts).toContain("C:\\Users\\me\\AppData\\Local\\npm");
+ expect(parts).toContain("C:\\Users\\me\\AppData\\Local\\Programs\\nodejs");
+ });
+
describe("Windows shell selection", () => {
it("defaults Windows to PowerShell instead of a POSIX-incompatible cmd -c path", () => {
expect(defaultShellForPlatform("win32")).toBe("powershell.exe");
@@ -153,6 +169,14 @@ describe("augmentPath", () => {
expect(inv.args).toEqual(["/d", "/s", "/c", "echo hi"]);
});
+ it("routes explicit cmd /c commands to cmd even when PowerShell is the default shell", () => {
+ const command = 'cmd /c dir "%USERPROFILE%\\.orkas\\skills" 2>nul || echo missing';
+ const inv = buildShellInvocation("powershell.exe", command, "win32");
+ expect(inv.kind).toBe("cmd");
+ expect(inv.command).toBe("cmd.exe");
+ expect(inv.args).toEqual(["/d", "/s", "/c", command]);
+ });
+
it("passes PowerShell commands through without bash-syntax rewriting", () => {
const command = '$ORKAS_NODE "$ORKAS_PC_DIR/bin/run-skill.cjs" calculator eval';
const inv = buildShellInvocation("powershell.exe", command, "win32");
diff --git a/src/main/model/core-agent/client.ts b/src/main/model/core-agent/client.ts
index 90483039..550c55b7 100644
--- a/src/main/model/core-agent/client.ts
+++ b/src/main/model/core-agent/client.ts
@@ -51,6 +51,41 @@ function startRecording(_input: unknown): NoopRecorder {
};
}
+export async function* stopStreamOnAbort<T>(
+ events: AsyncIterable<T>,
+ signal: AbortSignal,
+ label = 'stream',
+): AsyncGenerator<T, void, unknown> {
+ const iterator = events[Symbol.asyncIterator]();
+ const aborted = Symbol('aborted');
+ let abortListener: (() => void) | null = null;
+ const abortPromise = new Promise<typeof aborted>((resolve) => {
+ abortListener = () => resolve(aborted);
+ if (signal.aborted) resolve(aborted);
+ else signal.addEventListener('abort', abortListener, { once: true });
+ });
+
+ try {
+ while (true) {
+ const next = iterator.next();
+ const result = await Promise.race([next, abortPromise]);
+ if (result === aborted) {
+ const ret = iterator.return?.();
+ if (ret) {
+ void Promise.resolve(ret).catch((err) => {
+ log.warn(`abortable ${label} return failed: ${(err as Error).message}`);
+ });
+ }
+ return;
+ }
+ if (result.done) return;
+ yield result.value;
+ }
+ } finally {
+ if (abortListener) signal.removeEventListener('abort', abortListener);
+ }
+}
+
/**
* Env vars injected into the sandbox child process so skill scripts can
* run under Electron-as-Node:
@@ -343,7 +378,8 @@ export async function* streamChatWithModel(opts: ChatOptions): AsyncGenerator<St
// terminal final/error synthesis. We re-yield every event it produces,
// resetting the idle timer on each one.
let eventCount = 0;
- for await (const ev of mapCoreAgentEvents(captureResult(rawEvents), { userId, skillDisplayNameById, agentDisplayNameById })) {
+ const mappedEvents = mapCoreAgentEvents(captureResult(rawEvents), { userId, skillDisplayNameById, agentDisplayNameById });
+ for await (const ev of stopStreamOnAbort(mappedEvents, controller.signal, turnTag)) {
resetIdle();
eventCount += 1;
recorder.record(ev as any);
diff --git a/test/main/model/core-agent/client.test.ts b/test/main/model/core-agent/client.test.ts
index 97b50bd9..12105d2e 100644
--- a/test/main/model/core-agent/client.test.ts
+++ b/test/main/model/core-agent/client.test.ts
@@ -44,4 +44,20 @@ describe('core-agent client skill sandbox env', () => {
ORKAS_WORKSPACE_ROOT: path.resolve(tmpDir),
});
});
+
+ it('stops waiting for a wedged event stream when the abort signal fires', async () => {
+ const client = await import('../../../../src/main/model/core-agent/client');
+ const controller = new AbortController();
+
+ async function* stuckStream() {
+ yield { type: 'delta', text: 'started' };
+ await new Promise(() => { /* never resolves */ });
+ }
+
+ const iterator = client.stopStreamOnAbort(stuckStream(), controller.signal, 'test')[Symbol.asyncIterator]();
+ expect(await iterator.next()).toEqual({ value: { type: 'delta', text: 'started' }, done: false });
+ const pending = iterator.next();
+ controller.abort();
+ await expect(pending).resolves.toEqual({ value: undefined, done: true });
+ });
});