Skip to content

Fix CI: duplicate imports, same-slug tests and unclassified autolink routes #246

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
danielehrhardt wants to merge 2 commits into from
Closed

Fix CI: duplicate imports, same-slug tests and unclassified autolink routes #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3dc4721
Fix CI after merging #241 and #243 together
danielehrhardt Oct 25, 2026
111e4c6
Classify the 2FA autolink routes for cloud access
danielehrhardt Oct 25, 2026
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
2 changes: 2 additions & 0 deletions packages/core/src/cloud/scope.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,8 @@ const RULES: [methods: string, path: string, rule: Rule][] = [
["GET", "/api/totp", A],
["POST", "/api/totp", S],
["GET", "/api/totp/codes", S],
["GET", "/api/totp/autolink", A],
["POST", "/api/totp/autolink", S],
["POST", "/api/totp/import", S],
["PATCH", "/api/totp/:id", S],
["DELETE", "/api/totp/:id", A],
Expand Down
19 changes: 9 additions & 10 deletions packages/core/test/remote-snapshot.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ import { all, closeDb, get, getMeta, insert, openDb, run as sql } from "../src/d
import { bus } from "../src/events/bus";
import { setLogLevel } from "../src/log";
import type { MemorySnapshot } from "../src/memory/files";
import { clearGroup, setGroup } from "../src/remote/group";
import { mergeMemory, readMemoryState, writeMemoryState } from "../src/remote/memorySync";
import { ensureReplica, resetReplicaCache } from "../src/remote/replica";
import { appliedDigest, applySnapshot, buildSnapshot, snapshotDigest, type ConfigSnapshot } from "../src/remote/snapshot";
import { clearGroup, setGroup } from "../src/remote/group";
import { ensureReplica, madeHere, pendingKeys, resetReplicaCache } from "../src/remote/replica";
Expand Down Expand Up @@ -726,7 +724,7 @@ describe("applying a snapshot on a runner", () => {
expect(vault.isUnlocked()).toBe(true);
});

test("a secondary keeps a project it made with the same name as one of the primary's, and the rest of the copy lands", async () => {
test("a secondary keeps a project it made with the same name as one of the primary's under a free slug, and the rest of the copy lands", async () => {
const secondary = mkdtempSync(join(tmpdir(), "godmode-snapshot-secondary-"));
try {
use(controller);
Expand All @@ -749,10 +747,10 @@ describe("applying a snapshot on a runner", () => {

use(secondary);
const result = await applySnapshot(copy);
expect(result.warnings).toEqual(['"Earshot" (projects) wasn\'t copied: this computer has its own one with the same name.']);
expect(exists("projects", "prj_here")).toBe(true);
expect(exists("projects", "prj_there")).toBe(false);
expect(row("agents", "agt_helper")).toMatchObject({ project_id: "prj_here", instructions: "Work on Earshot." });
expect(result.warnings).toEqual([]);
expect(row("projects", "prj_here").slug).toBe("earshot-2");
expect(row("projects", "prj_there").slug).toBe("earshot");
expect(row("agents", "agt_helper")).toMatchObject({ project_id: "prj_there", instructions: "Work on Earshot." });
expect(appliedDigest()).toBe(copy.digest);
} finally {
clearGroup();
Expand All @@ -779,10 +777,11 @@ describe("applying a snapshot on a runner", () => {

use(secondary);
const result = await applySnapshot(copy);
expect(result.warnings.join("\n")).toContain('"Studio" (workspaces) wasn\'t copied');
expect(result.warnings).toEqual([]);
expect(row("workspaces", "ws_here").slug).toBe("studio-2");
expect(row("workspaces", "ws_there").slug).toBe("studio");
expect(row("projects", "prj_here")).toMatchObject({ workspace_id: "ws_here", slug: "earshot" });
expect(exists("workspaces", "ws_there")).toBe(false);
expect(exists("projects", "prj_there")).toBe(false);
expect(row("projects", "prj_there")).toMatchObject({ workspace_id: "ws_there", slug: "earshot" });
expect(exists("agents", "agt_helper")).toBe(true);
expect(appliedDigest()).toBe(copy.digest);
} finally {
Expand Down