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
6 changes: 6 additions & 0 deletions .changeset/session-share-isolation.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
"@knightcodeai/cli": patch
---

Give each `/share` its own temp directory so two shares running at once no
longer overwrite each other's export or delete the other's file mid-upload.
24 changes: 13 additions & 11 deletions packages/cli/src/modes/interactive/session-share.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,15 @@ export function exportSessionForShare(filePath: string, session: AgentSession):

/** Share the current session through Radius, falling back to a private gist. */
export async function shareSession(context: SessionShareContext): Promise<void> {
const jsonlFile = path.join(os.tmpdir(), "session.jsonl");
let htmlFile: string | null = null;
let tempDir: string;
try {
tempDir = fs.mkdtempSync(path.join(os.tmpdir(), "knightcode-share-"));
} catch (error: unknown) {
context.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
return;
}
const jsonlFile = path.join(tempDir, "session.jsonl");
const htmlFile = path.join(tempDir, "session.html");

try {
try {
Expand All @@ -68,22 +75,17 @@ export async function shareSession(context: SessionShareContext): Promise<void>
}

try {
htmlFile = path.join(os.tmpdir(), "session.html");
await context.session.exportToHtml(htmlFile, { themeName: theme.name });
} catch (error: unknown) {
context.showError(`Failed to export session: ${error instanceof Error ? error.message : "Unknown error"}`);
return;
}
await shareViaGist(htmlFile, context);
} finally {
for (const tmpFile of [jsonlFile, htmlFile]) {
try {
if (tmpFile !== null) {
fs.unlinkSync(tmpFile);
}
} catch {
// Ignore cleanup errors
}
try {
fs.rmSync(tempDir, { recursive: true, force: true });
} catch {
// Ignore cleanup errors
}
}
}
Expand Down
88 changes: 88 additions & 0 deletions packages/cli/test/session-share.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
import { EventEmitter } from "node:events";
import { readFileSync, writeFileSync } from "node:fs";
import { PassThrough } from "node:stream";
import { beforeAll, describe, expect, it, vi } from "vitest";

const childProcessMocks = vi.hoisted(() => ({
spawn: vi.fn(),
spawnSync: vi.fn(() => ({ status: 0 })),
}));

vi.mock("node:child_process", () => childProcessMocks);

import { shareSession } from "../src/modes/interactive/session-share.ts";
import { initTheme } from "../src/modes/interactive/theme/theme.ts";

function deferred(): { promise: Promise<void>; resolve: () => void } {
let resolve!: () => void;
const promise = new Promise<void>((done) => {
resolve = done;
});
return { promise, resolve };
}

describe("shareSession", () => {
beforeAll(() => initTheme("dark"));

it("keeps concurrent session exports isolated", async () => {
const uploads: string[] = [];
childProcessMocks.spawn.mockImplementation((_command: string, args: string[]) => {
uploads.push(readFileSync(args.at(-1)!, "utf8"));
const child = Object.assign(new EventEmitter(), {
stdout: new PassThrough(),
stderr: new PassThrough(),
kill: vi.fn(),
});
queueMicrotask(() => {
child.stdout.end(`https://gist.github.com/test/${uploads.length}\n`);
child.stderr.end();
child.emit("close", 0);
});
return child;
});

const aWritten = deferred();
const bWritten = deferred();
const releaseB = deferred();
const errors: string[] = [];
const context = (name: "A" | "B") => ({
session: {
sessionManager: {
getSessionId: () => name,
getCwd: () => "/tmp",
getBranch: () => [],
},
state: { systemPrompt: name, tools: [] },
modelRuntime: { getProvider: () => undefined },
exportToHtml: async (filePath: string) => {
writeFileSync(filePath, name);
if (name === "A") {
aWritten.resolve();
await bWritten.promise;
} else {
bWritten.resolve();
await releaseB.promise;
}
},
},
ui: { setFocus() {}, requestRender() {} },
editorContainer: { clear() {}, addChild() {} },
editor: {},
showStatus() {},
showError(message: string) {
errors.push(message);
},
});

const shareA = shareSession(context("A") as never);
await aWritten.promise;
const shareB = shareSession(context("B") as never);
await bWritten.promise;
await shareA;
releaseB.resolve();
await shareB;

expect(uploads).toEqual(["A", "B"]);
expect(errors).toEqual([]);
});
});