Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "opencode-for-devcontainers",
"displayName": "OpenCode for Dev Containers",
"description": "Run OpenCode locally but execute commands within a devcontainer",
"version": "0.1.2",
"version": "0.1.3",
"publisher": "marchingphoenix",
"license": "MIT",
"repository": {
Expand Down
10 changes: 10 additions & 0 deletions src/chat/chatParticipant.ts
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,7 @@ async function handleAsk(
}
completed = true;
eventListener.dispose();
stateListener.dispose();
cancelListener.dispose();

// Render subagent summary.
Expand All @@ -223,6 +224,15 @@ async function handleAsk(
}
});

// Safety net: if the bridge stops or errors without emitting an
// event (e.g. process killed externally), resolve the promise so
// the chat response doesn't hang indefinitely.
const stateListener = bridge.onStateChanged((state) => {
if (state === "stopped" || state === "error") {
finish({ error: "OpenCode process exited unexpectedly" });
}
});

const cancelListener = token.onCancellationRequested(() => {
bridge.cancelCurrentRequest();
stream.markdown("\n_Request cancelled._\n");
Expand Down
65 changes: 65 additions & 0 deletions src/chat/opencodeBridge.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -301,6 +301,71 @@ describe("onStateChanged", () => {
});
});

// ---------------------------------------------------------------------------
// process exit — event notification
// ---------------------------------------------------------------------------

describe("process exit", () => {
function getExitHandler() {
const exitCall = mockProcess.on.mock.calls.find(
([event]: [string]) => event === "exit"
);
return exitCall?.[1] as ((code: number | null) => void) | undefined;
}

it("fires error event on clean exit (code 0)", async () => {
await bridge.start();
const listener = vi.fn();
bridge.onEvent(listener);

const exitHandler = getExitHandler();
expect(exitHandler).toBeDefined();
exitHandler!(0);

expect(listener).toHaveBeenCalledWith(
expect.objectContaining({
type: "error",
message: expect.stringContaining("exited unexpectedly"),
})
);
expect(bridge.state).toBe("stopped");
});

it("fires error event on clean exit (code null)", async () => {
await bridge.start();
const listener = vi.fn();
bridge.onEvent(listener);

const exitHandler = getExitHandler();
exitHandler!(null);

expect(listener).toHaveBeenCalledWith(
expect.objectContaining({
type: "error",
message: expect.stringContaining("exited unexpectedly"),
})
);
expect(bridge.state).toBe("stopped");
});

it("fires error event on non-zero exit", async () => {
await bridge.start();
const listener = vi.fn();
bridge.onEvent(listener);

const exitHandler = getExitHandler();
exitHandler!(1);

expect(listener).toHaveBeenCalledWith(
expect.objectContaining({
type: "error",
message: expect.stringContaining("exited with code 1"),
})
);
expect(bridge.state).toBe("error");
});
});

// ---------------------------------------------------------------------------
// dispose
// ---------------------------------------------------------------------------
Expand Down
4 changes: 4 additions & 0 deletions src/chat/opencodeBridge.ts
Original file line number Diff line number Diff line change
Expand Up @@ -276,6 +276,10 @@ export class OpenCodeBridge implements vscode.Disposable {
});
this.setState("error");
} else {
this._onEvent.fire({
type: "error",
message: "OpenCode process exited unexpectedly",
});
this.setState("stopped");
}
}
Expand Down