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
14 changes: 7 additions & 7 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -508,36 +508,36 @@
"@types/ua-parser-js": "0.7.39",
"@types/vscode": "^1.95.0",
"@types/ws": "^8.18.1",
"@typescript-eslint/eslint-plugin": "^8.54.0",
"@typescript-eslint/parser": "^8.54.0",
"@typescript-eslint/eslint-plugin": "^8.56.0",
"@typescript-eslint/parser": "^8.56.0",
"@vitejs/plugin-react": "catalog:",
"@vitest/coverage-v8": "^4.0.18",
"@vscode/test-cli": "^0.0.12",
"@vscode/test-electron": "^2.5.2",
"@vscode/vsce": "^3.7.1",
"babel-plugin-react-compiler": "catalog:",
"bufferutil": "^4.1.0",
"coder": "github:coder/coder#main",
"coder": "catalog:",
"concurrently": "^9.2.1",
"dayjs": "^1.11.19",
"electron": "^40.2.1",
"electron": "^40.4.1",
"esbuild": "^0.27.3",
"eslint": "^9.39.2",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import-x": "^4.16.1",
"eslint-plugin-package-json": "^0.88.2",
"eslint-plugin-package-json": "^0.88.3",
"eslint-plugin-react": "^7.37.5",
"eslint-plugin-react-hooks": "^7.0.1",
"globals": "^17.3.0",
"jsdom": "^28.0.0",
"jsdom": "^28.1.0",
"jsonc-eslint-parser": "^2.4.2",
"memfs": "^4.56.10",
"prettier": "^3.8.1",
"react": "catalog:",
"react-dom": "catalog:",
"typescript": "catalog:",
"typescript-eslint": "^8.54.0",
"typescript-eslint": "^8.56.0",
"utf-8-validate": "^6.0.6",
"vite": "catalog:",
"vitest": "^4.0.18"
Expand Down
2 changes: 1 addition & 1 deletion packages/shared/src/tasks/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export type LogsStatus = "ok" | "not_available" | "error";
*/
export interface TaskDetails extends TaskPermissions {
task: Task;
logs: TaskLogEntry[];
logs: readonly TaskLogEntry[];
logsStatus: LogsStatus;
}

Expand Down
2 changes: 1 addition & 1 deletion packages/tasks/src/components/AgentChatHistory.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { useFollowScroll } from "../hooks/useFollowScroll";
import type { LogsStatus, TaskLogEntry } from "@repo/shared";

interface AgentChatHistoryProps {
logs: TaskLogEntry[];
logs: readonly TaskLogEntry[];
logsStatus: LogsStatus;
isThinking: boolean;
}
Expand Down
334 changes: 179 additions & 155 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

20 changes: 9 additions & 11 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
@@ -1,30 +1,28 @@
packages:
- packages/*

# Shared dependency versions (use "catalog:" in package.json to reference)
catalog:
"@tanstack/react-query": ^5.90.21
"@types/react": ^19.2.14
"@types/react-dom": ^19.2.3
"@types/vscode-webview": ^1.57.5
"@vitejs/plugin-react": ^5.1.4
"@vscode-elements/react-elements": ^2.4.0
"@types/vscode-webview": ^1.57.5
"@vscode/codicons": ^0.0.44
babel-plugin-react-compiler: ^1.0.0
coder: github:coder/coder#main
react: ^19.2.4
react-dom: ^19.2.4
typescript: ^5.9.3
vite: ^7.3.1

# Enforce all shared deps come from catalog to prevent version drift
catalogMode: strict

# Native modules allowed to run install scripts (pnpm blocks by default for security)
onlyBuiltDependencies:
- "@vscode/vsce-sign" # vsce signing
- bufferutil # ws perf
- electron # tests
- esbuild # build
- keytar # vsce credentials
- unrs-resolver # eslint resolver
- utf-8-validate # ws validation
- "@vscode/vsce-sign"
- bufferutil
- electron
- esbuild
- keytar
- unrs-resolver
- utf-8-validate
18 changes: 0 additions & 18 deletions src/api/coderApi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {
type ServerSentEvent,
type GetInboxNotificationResponse,
type ProvisionerJobLog,
type TaskLogEntry,
type Workspace,
type WorkspaceAgent,
type WorkspaceAgentLog,
Expand Down Expand Up @@ -193,23 +192,6 @@ export class CoderApi extends Api implements vscode.Disposable {
});
}

getTaskLogs = async (user: string, taskId: string) => {
const response = await this.getAxiosInstance().get<{
logs: TaskLogEntry[];
}>(`/api/v2/tasks/${user}/${taskId}/logs`);
return response.data.logs ?? [];
};

sendTaskInput = async (
user: string,
taskId: string,
input: string,
): Promise<void> => {
await this.getAxiosInstance().post(`/api/v2/tasks/${user}/${taskId}/send`, {
input,
});
};

watchInboxNotifications = async (
watchTemplates: string[],
watchTargets: string[],
Expand Down
10 changes: 5 additions & 5 deletions src/webviews/tasks/tasksPanel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ export class TasksPanel
// Cache logs for last viewed task in stable state
private cachedLogs?: {
taskId: string;
logs: TaskLogEntry[];
logs: readonly TaskLogEntry[];
status: LogsStatus;
};

Expand Down Expand Up @@ -542,7 +542,7 @@ export class TasksPanel
*/
private async getLogsWithCache(
task: Task,
): Promise<{ logs: TaskLogEntry[]; logsStatus: LogsStatus }> {
): Promise<{ logs: readonly TaskLogEntry[]; logsStatus: LogsStatus }> {
const stable = isStableTask(task);

// Use cache if same task in stable state
Expand All @@ -562,10 +562,10 @@ export class TasksPanel

private async fetchTaskLogs(
taskId: string,
): Promise<{ logs: TaskLogEntry[]; status: LogsStatus }> {
): Promise<{ logs: readonly TaskLogEntry[]; status: LogsStatus }> {
try {
const logs = await this.client.getTaskLogs("me", taskId);
return { logs, status: "ok" };
const response = await this.client.getTaskLogs("me", taskId);
return { logs: response.logs, status: "ok" };
} catch (err) {
if (isAxiosError(err) && err.response?.status === 409) {
return { logs: [], status: "not_available" };
Expand Down
24 changes: 12 additions & 12 deletions test/unit/webviews/tasks/tasksPanel.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { beforeEach, describe, expect, it, vi } from "vitest";
import { beforeEach, describe, expect, it, vi, type Mock } from "vitest";
import * as vscode from "vscode";

import { TasksPanel } from "@/webviews/tasks/tasksPanel";
Expand Down Expand Up @@ -44,13 +44,13 @@ type TasksPanelClient = Pick<
| "getHost"
>;

type MockClient = { [K in keyof TasksPanelClient]: ReturnType<typeof vi.fn> };
type MockClient = { [K in keyof TasksPanelClient]: Mock<TasksPanelClient[K]> };

function createClient(baseUrl = "https://coder.example.com"): MockClient {
return {
getTasks: vi.fn().mockResolvedValue([]),
getTask: vi.fn(),
getTaskLogs: vi.fn().mockResolvedValue([]),
getTaskLogs: vi.fn().mockResolvedValue({ logs: [] }),
createTask: vi.fn(),
deleteTask: vi.fn().mockResolvedValue(undefined),
getTemplates: vi.fn().mockResolvedValue([]),
Expand All @@ -59,7 +59,7 @@ function createClient(baseUrl = "https://coder.example.com"): MockClient {
stopWorkspace: vi.fn().mockResolvedValue(undefined),
sendTaskInput: vi.fn().mockResolvedValue(undefined),
getHost: vi.fn().mockReturnValue(baseUrl),
};
} as MockClient;
}

interface Harness {
Expand Down Expand Up @@ -268,9 +268,9 @@ describe("TasksPanel", () => {
it("returns task with logs", async () => {
const h = createHarness();
h.client.getTask.mockResolvedValue(task());
h.client.getTaskLogs.mockResolvedValue([
logEntry({ content: "Starting" }),
]);
h.client.getTaskLogs.mockResolvedValue({
logs: [logEntry({ content: "Starting" })],
});

const res = await h.request(TasksApi.getTaskDetails, {
taskId: "task-1",
Expand Down Expand Up @@ -319,7 +319,7 @@ describe("TasksPanel", () => {
h.client.getTask.mockResolvedValue(
task({ current_state: { timestamp: "", state, message: "", uri: "" } }),
);
h.client.getTaskLogs.mockResolvedValue([logEntry()]);
h.client.getTaskLogs.mockResolvedValue({ logs: [logEntry()] });

await h.request(TasksApi.getTaskDetails, { taskId: "task-1" });
await h.request(TasksApi.getTaskDetails, { taskId: "task-1" });
Expand Down Expand Up @@ -574,7 +574,7 @@ describe("TasksPanel", () => {
describe("downloadLogs", () => {
it("saves logs to file", async () => {
const h = createHarness();
h.client.getTaskLogs.mockResolvedValue([logEntry()]);
h.client.getTaskLogs.mockResolvedValue({ logs: [logEntry()] });
const saveUri = vscode.Uri.file("/downloads/logs.txt");
vi.mocked(vscode.window.showSaveDialog).mockResolvedValue(saveUri);
h.ui.setResponse(`Logs saved to ${saveUri.fsPath}`, "Open File");
Expand All @@ -593,7 +593,7 @@ describe("TasksPanel", () => {

it("does not open file when notification is dismissed", async () => {
const h = createHarness();
h.client.getTaskLogs.mockResolvedValue([logEntry()]);
h.client.getTaskLogs.mockResolvedValue({ logs: [logEntry()] });
const saveUri = vscode.Uri.file("/downloads/logs.txt");
vi.mocked(vscode.window.showSaveDialog).mockResolvedValue(saveUri);
h.ui.setResponse(`Logs saved to ${saveUri.fsPath}`, undefined);
Expand All @@ -612,7 +612,7 @@ describe("TasksPanel", () => {

it("shows warning when no logs", async () => {
const h = createHarness();
h.client.getTaskLogs.mockResolvedValue([]);
h.client.getTaskLogs.mockResolvedValue({ logs: [] });

const res = await h.request(TasksApi.downloadLogs, {
taskId: "task-1",
Expand Down Expand Up @@ -644,7 +644,7 @@ describe("TasksPanel", () => {

it("does nothing when user cancels", async () => {
const h = createHarness();
h.client.getTaskLogs.mockResolvedValue([logEntry()]);
h.client.getTaskLogs.mockResolvedValue({ logs: [logEntry()] });
vi.mocked(vscode.window.showSaveDialog).mockResolvedValue(undefined);

const res = await h.request(TasksApi.downloadLogs, {
Expand Down