8c94e9005f
Co-authored-by: Brendan Allan <14191578+Brendonovich@users.noreply.github.com> Co-authored-by: Kit Langton <kit.langton@gmail.com> Co-authored-by: opencode-agent[bot] <opencode-agent[bot]@users.noreply.github.com> Co-authored-by: Affan Ali <93028901+affanali2k3@users.noreply.github.com> Co-authored-by: affanali2k3 <affanalikhanxx@gmail.com> Co-authored-by: Frank <frank@anoma.ly> Co-authored-by: opencode-agent[bot] <219766164+opencode-agent[bot]@users.noreply.github.com> Co-authored-by: 𝓛𝓲𝓽𝓽𝓵𝓮 𝓕𝓻𝓪𝓷𝓴 <little-frank@opencord.local> Co-authored-by: Aiden Cline <63023139+rekram1-node@users.noreply.github.com> Co-authored-by: Jay V <air@live.ca> Co-authored-by: Dax Raad <d@ironbay.co> Co-authored-by: Aarav Sareen <96787824+arvsrn@users.noreply.github.com> Co-authored-by: OpeOginni <107570612+OpeOginni@users.noreply.github.com> Co-authored-by: Luke Parker <10430890+Hona@users.noreply.github.com> Co-authored-by: Ben Guthrie <benjee.012@gmail.com> Co-authored-by: Dax <mail@thdxr.com> Co-authored-by: Filip <34747899+neriousy@users.noreply.github.com> Co-authored-by: Max Anderson <max.a.anderson95@gmail.com> Co-authored-by: Brendan Allan <git@brendonovich.dev> Co-authored-by: Jack <jack@anoma.ly> Co-authored-by: Shoubhit Dash <shoubhit2005@gmail.com> Co-authored-by: Dustin Deus <deusdustin@gmail.com> Co-authored-by: starptech <starptech@starptechs-MBP.fritz.box> Co-authored-by: Aiden Cline <aidenpcline@gmail.com> Co-authored-by: usrnk1 <7547651+usrnk1@users.noreply.github.com> Co-authored-by: Jay <53023+jayair@users.noreply.github.com> Co-authored-by: runvip <164729189+runvip@users.noreply.github.com> Co-authored-by: opencode <opencode@sst.dev> Co-authored-by: Julian Coy <julian@ex-machina.co> Co-authored-by: Vladimir Glafirov <vglafirov@gitlab.com>
169 lines
6.3 KiB
TypeScript
169 lines
6.3 KiB
TypeScript
import { describe, expect } from "bun:test"
|
|
import { Project } from "@/project/project"
|
|
import { Database } from "@opencode-ai/core/database/database"
|
|
import { eq } from "drizzle-orm"
|
|
import { SessionTable } from "@opencode-ai/core/session/sql"
|
|
import { ProjectTable } from "@opencode-ai/core/project/sql"
|
|
import { AbsolutePath } from "@opencode-ai/core/schema"
|
|
import { ProjectV2 } from "@opencode-ai/core/project"
|
|
import { SessionID } from "../../src/session/schema"
|
|
import { $ } from "bun"
|
|
import { tmpdirScoped } from "../fixture/fixture"
|
|
import { LayerNode } from "@opencode-ai/core/effect/layer-node"
|
|
import { CrossSpawnSpawner } from "@opencode-ai/core/cross-spawn-spawner"
|
|
import { Effect } from "effect"
|
|
import { testEffect } from "../lib/effect"
|
|
|
|
const it = testEffect(LayerNode.compile(LayerNode.group([Project.node, Database.node, CrossSpawnSpawner.node])))
|
|
|
|
function legacySessionID() {
|
|
// Global-session migration covers persisted IDs from before prefixed session IDs.
|
|
return crypto.randomUUID() as SessionID
|
|
}
|
|
|
|
function seed(opts: { id: SessionID; dir: string; project: ProjectV2.ID }) {
|
|
const now = Date.now()
|
|
return Database.Service.use(({ db }) =>
|
|
db
|
|
.insert(SessionTable)
|
|
.values({
|
|
id: opts.id,
|
|
project_id: opts.project,
|
|
slug: opts.id,
|
|
directory: opts.dir,
|
|
title: "test",
|
|
version: "0.0.0-test",
|
|
time_created: now,
|
|
time_updated: now,
|
|
})
|
|
.run()
|
|
.pipe(Effect.orDie),
|
|
)
|
|
}
|
|
|
|
function ensureGlobal() {
|
|
return Database.Service.use(({ db }) =>
|
|
db
|
|
.insert(ProjectTable)
|
|
.values({
|
|
id: ProjectV2.ID.global,
|
|
worktree: AbsolutePath.make("/"),
|
|
time_created: Date.now(),
|
|
time_updated: Date.now(),
|
|
sandboxes: [],
|
|
})
|
|
.onConflictDoNothing()
|
|
.run()
|
|
.pipe(Effect.orDie),
|
|
)
|
|
}
|
|
|
|
describe("migrateFromGlobal", () => {
|
|
it.live("migrates global sessions on first project creation", () =>
|
|
Effect.gen(function* () {
|
|
// 1. Start with git init but no commits — creates "global" project row
|
|
const tmp = yield* tmpdirScoped()
|
|
yield* Effect.promise(() => $`git init`.cwd(tmp).quiet())
|
|
yield* Effect.promise(() => $`git config user.name "Test"`.cwd(tmp).quiet())
|
|
yield* Effect.promise(() => $`git config user.email "test@opencode.test"`.cwd(tmp).quiet())
|
|
yield* Effect.promise(() => $`git config commit.gpgsign false`.cwd(tmp).quiet())
|
|
const projects = yield* Project.Service
|
|
const { project: pre } = yield* projects.fromDirectory(tmp)
|
|
expect(pre.id).toBe(ProjectV2.ID.global)
|
|
|
|
// 2. Seed a session under "global" with matching directory
|
|
const id = legacySessionID()
|
|
yield* seed({ id, dir: tmp, project: ProjectV2.ID.global })
|
|
|
|
// 3. Make a commit so the project gets a real ID
|
|
yield* Effect.promise(() => $`git commit --allow-empty -m "root"`.cwd(tmp).quiet())
|
|
|
|
const { project: real } = yield* projects.fromDirectory(tmp)
|
|
expect(real.id).not.toBe(ProjectV2.ID.global)
|
|
|
|
// 4. The session should have been migrated to the real project ID
|
|
const row = yield* Database.Service.use(({ db }) =>
|
|
db.select().from(SessionTable).where(eq(SessionTable.id, id)).get().pipe(Effect.orDie),
|
|
)
|
|
expect(row).toBeDefined()
|
|
expect(row!.project_id).toBe(real.id)
|
|
}),
|
|
)
|
|
|
|
it.live("migrates global sessions even when project row already exists", () =>
|
|
Effect.gen(function* () {
|
|
// 1. Create a repo with a commit — real project ID created immediately
|
|
const tmp = yield* tmpdirScoped({ git: true })
|
|
const projects = yield* Project.Service
|
|
const { project } = yield* projects.fromDirectory(tmp)
|
|
expect(project.id).not.toBe(ProjectV2.ID.global)
|
|
|
|
// 2. Ensure "global" project row exists (as it would from a prior no-git session)
|
|
yield* ensureGlobal()
|
|
|
|
// 3. Seed a session under "global" with matching directory.
|
|
// This simulates a session created before git init that wasn't
|
|
// present when the real project row was first created.
|
|
const id = legacySessionID()
|
|
yield* seed({ id, dir: tmp, project: ProjectV2.ID.global })
|
|
|
|
// 4. Call fromDirectory again — project row already exists,
|
|
// so the current code skips migration entirely. This is the bug.
|
|
yield* projects.fromDirectory(tmp)
|
|
|
|
const row = yield* Database.Service.use(({ db }) =>
|
|
db.select().from(SessionTable).where(eq(SessionTable.id, id)).get().pipe(Effect.orDie),
|
|
)
|
|
expect(row).toBeDefined()
|
|
expect(row!.project_id).toBe(project.id)
|
|
}),
|
|
)
|
|
|
|
it.live("does not claim sessions with empty directory", () =>
|
|
Effect.gen(function* () {
|
|
const tmp = yield* tmpdirScoped({ git: true })
|
|
const projects = yield* Project.Service
|
|
const { project } = yield* projects.fromDirectory(tmp)
|
|
expect(project.id).not.toBe(ProjectV2.ID.global)
|
|
|
|
yield* ensureGlobal()
|
|
|
|
// Legacy sessions may lack a directory value.
|
|
// Without a matching origin directory, they should remain global.
|
|
const id = legacySessionID()
|
|
yield* seed({ id, dir: "", project: ProjectV2.ID.global })
|
|
|
|
yield* projects.fromDirectory(tmp)
|
|
|
|
const row = yield* Database.Service.use(({ db }) =>
|
|
db.select().from(SessionTable).where(eq(SessionTable.id, id)).get().pipe(Effect.orDie),
|
|
)
|
|
expect(row).toBeDefined()
|
|
expect(row!.project_id).toBe(ProjectV2.ID.global)
|
|
}),
|
|
)
|
|
|
|
it.live("does not steal sessions from unrelated directories", () =>
|
|
Effect.gen(function* () {
|
|
const tmp = yield* tmpdirScoped({ git: true })
|
|
const projects = yield* Project.Service
|
|
const { project } = yield* projects.fromDirectory(tmp)
|
|
expect(project.id).not.toBe(ProjectV2.ID.global)
|
|
|
|
yield* ensureGlobal()
|
|
|
|
// Seed a session under "global" but for a DIFFERENT directory
|
|
const id = legacySessionID()
|
|
yield* seed({ id, dir: "/some/other/dir", project: ProjectV2.ID.global })
|
|
|
|
yield* projects.fromDirectory(tmp)
|
|
const row = yield* Database.Service.use(({ db }) =>
|
|
db.select().from(SessionTable).where(eq(SessionTable.id, id)).get().pipe(Effect.orDie),
|
|
)
|
|
expect(row).toBeDefined()
|
|
// Should remain under "global" — not stolen
|
|
expect(row!.project_id).toBe(ProjectV2.ID.global)
|
|
}),
|
|
)
|
|
})
|