diff --git a/apps/server/src/cli/project.test.ts b/apps/server/src/cli/project.test.ts
index bca02daaf2916..5e33ad84bc120 100644
--- a/apps/server/src/cli/project.test.ts
+++ b/apps/server/src/cli/project.test.ts
@@ -89,7 +89,10 @@ const makeConfig = (baseDir: string) =>
} satisfies ServerConfig.ServerConfig["Service"];
});
-const readProjects = (baseDir: string) =>
+const withProjectService = (
+ baseDir: string,
+ use: (projects: ProjectService.ProjectService["Service"]) => Effect.Effect,
+) =>
Effect.gen(function* () {
const config = yield* makeConfig(baseDir);
const layer = RuntimeLayer.layerProjectService.pipe(
@@ -108,12 +111,12 @@ const readProjects = (baseDir: string) =>
Layer.provide(ServerConfig.layer(config)),
Layer.provide(Layer.succeed(References.MinimumLogLevel, config.logLevel)),
);
- return yield* ProjectService.ProjectService.pipe(
- Effect.flatMap((projects) => projects.snapshot),
- Effect.provide(layer),
- );
+ return yield* ProjectService.ProjectService.pipe(Effect.flatMap(use), Effect.provide(layer));
});
+const readProjects = (baseDir: string) =>
+ withProjectService(baseDir, (projects) => projects.snapshot);
+
it.effect("adds, renames, and removes projects through the V2 project CLI domain", () =>
Effect.gen(function* () {
const baseDir = NodeFS.mkdtempSync(NodePath.join(NodeOS.tmpdir(), "t3-v2-project-cli-"));
@@ -237,6 +240,36 @@ const makeProjectLookupFixture = Effect.fn("ProjectCliTest.makeProjectLookupFixt
return { baseDir, workspaceRoot, project: project! };
});
+it.effect.each([
+ { label: "keeps its title", titleArgs: [], expectedTitle: undefined },
+ { label: "applies --title", titleArgs: ["--title", " Back again "], expectedTitle: "Back again" },
+])(
+ "adding an archived project's folder again unarchives it and $label",
+ ({ titleArgs, expectedTitle }) =>
+ Effect.gen(function* () {
+ const { baseDir, workspaceRoot, project } = yield* makeProjectLookupFixture();
+ yield* withProjectService(baseDir, (projects) =>
+ projects.update({
+ commandId: CommandId.make("project-cli-archive"),
+ projectId: project.id,
+ archived: true,
+ }),
+ );
+
+ yield* runCli(["project", "add", workspaceRoot, ...titleArgs, "--base-dir", baseDir]);
+
+ const projects = (yield* readProjects(baseDir)).projects;
+ assert.deepEqual(
+ projects.map((entry) => ({
+ id: entry.id,
+ title: entry.title,
+ archivedAt: entry.archivedAt,
+ })),
+ [{ id: project.id, title: expectedTitle ?? project.title, archivedAt: null }],
+ );
+ }).pipe(Effect.provide(Layer.mergeAll(NodeServices.layer, NodeCrypto.layer)), Effect.scoped),
+);
+
const makeThreadPersistenceLayer = Effect.fn("ProjectCliTest.makeThreadPersistenceLayer")(
function* (baseDir: string) {
const config = yield* makeConfig(baseDir);
diff --git a/apps/server/src/cli/project.ts b/apps/server/src/cli/project.ts
index da63d65975ae5..3e59c5bd4735c 100644
--- a/apps/server/src/cli/project.ts
+++ b/apps/server/src/cli/project.ts
@@ -491,6 +491,20 @@ const projectAddCommand = Command.make("add", {
const existingProject = snapshot.projects.find(
(project) => project.deletedAt === null && project.workspaceRoot === workspaceRoot,
);
+ // Re-adding an archived project's folder restores it, matching the clients.
+ if (existingProject?.archivedAt != null) {
+ const title = Option.isSome(flags.title)
+ ? yield* resolveProjectTitle(workspaceRoot, flags.title.value)
+ : undefined;
+ yield* dispatch({
+ type: "project.update",
+ commandId: CommandId.make(yield* projectCommandUuid),
+ projectId: existingProject.id,
+ archived: false,
+ ...(title === undefined ? {} : { title }),
+ });
+ return `Unarchived project ${existingProject.id} (${title ?? existingProject.title}) at ${workspaceRoot}.`;
+ }
if (existingProject) {
return yield* new ProjectAlreadyExistsError({
operation: "addProject",