Skip to content

Commit 22eb7fa

Browse files
saphidclaude
authored andcommitted
fix(cli): t3 update no longer says a service awaiting restart runs the new version
Co-Authored-By: Claude Opus 5.5 <[email protected]>
1 parent 61c3794 commit 22eb7fa

2 files changed

Lines changed: 85 additions & 2 deletions

File tree

‎apps/server/src/cli/update.test.ts‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ import * as Layer from "effect/Layer";
1010
import * as Option from "effect/Option";
1111
import * as Path from "effect/Path";
1212
import * as TestClock from "effect/testing/TestClock";
13+
import * as TestConsole from "effect/testing/TestConsole";
1314
import { HttpClient, HttpClientResponse } from "effect/http";
1415
import * as ChildProcessSpawner from "effect/process/ChildProcessSpawner";
1516
import { afterEach, vi } from "vite-plus/test";
1617

18+
import packageJson from "../../package.json" with { type: "json" };
1719
import * as BootService from "../cloud/bootService.ts";
18-
import { prunePinnedRuntimes } from "../cloud/pinnedRuntime.ts";
20+
import { pinnedRuntimePaths, prunePinnedRuntimes } from "../cloud/pinnedRuntime.ts";
1921
import * as ManagedPolicy from "../policy/ManagedPolicy.ts";
2022
import * as ProcessRunner from "../processRunner.ts";
2123
import { repointLauncher, resolveLauncherPath, resolveNewestVersion, runUpdate } from "./update.ts";
@@ -364,3 +366,77 @@ it.layer(NodeServices.layer)("t3 update launcher", (it) => {
364366
}).pipe(Effect.scoped, Effect.provideService(HostProcess.Platform, "linux")),
365367
);
366368
});
369+
370+
it.layer(NodeServices.layer)("t3 update with a background service", (it) => {
371+
it.effect("names the version a service with a pending restart still runs", () =>
372+
Effect.gen(function* () {
373+
const fs = yield* FileSystem.FileSystem;
374+
const path = yield* Path.Path;
375+
const baseDir = yield* fs.makeTempDirectoryScoped({ prefix: "t3-update-" });
376+
const version = packageJson.version;
377+
const runtime = pinnedRuntimePaths(path, baseDir, version, "linux");
378+
yield* fs.makeDirectory(runtime.versionDir, { recursive: true });
379+
yield* fs.writeFileString(runtime.entryPath, "");
380+
yield* fs.writeFileString(runtime.sentinelPath, `${version}\n`);
381+
const unitPath = path.join(baseDir, "t3code.service");
382+
const logPath = path.join(baseDir, "boot-service.log");
383+
// An earlier `t3 update` pointed the service at this version without restarting it.
384+
const service = Layer.mock(BootService.BootService, {
385+
status: Effect.succeed<BootService.BootServiceStatus>({
386+
supported: true,
387+
installed: true,
388+
current: false,
389+
installedVersion: version,
390+
installedBaseDir: baseDir,
391+
problems: ["restart-pending"],
392+
unitPath,
393+
logPath,
394+
}),
395+
install: () => Effect.succeed({ program: [runtime.entryPath], baseDir, unitPath, logPath }),
396+
});
397+
vi.spyOn(BootService, "layer").mockReturnValue(service);
398+
const runner = ProcessRunner.ProcessRunner.of({
399+
run: (input) =>
400+
input.args?.includes("--version") === true
401+
? unrelatedLsof
402+
.run(input)
403+
.pipe(Effect.map((result) => ({ ...result, stdout: `t3 v${version}\n` })))
404+
: unrelatedLsof.run(input),
405+
});
406+
407+
const output = yield* runUpdate({
408+
baseDir,
409+
logsDir: baseDir,
410+
serverRuntimeStatePath: path.join(baseDir, "server-runtime.json"),
411+
channel: undefined,
412+
requestedVersion: version,
413+
allowDowngrade: false,
414+
assumeYes: false,
415+
}).pipe(
416+
Effect.andThen(TestConsole.logLines),
417+
Effect.map((lines) => lines.join("\n")),
418+
Effect.provide(
419+
Layer.mergeAll(
420+
service,
421+
Layer.succeed(ProcessRunner.ProcessRunner, runner),
422+
ManagedPolicy.layerTest(),
423+
Layer.succeed(
424+
HttpClient.HttpClient,
425+
HttpClient.make(() => Effect.die("unexpected release lookup")),
426+
),
427+
Layer.fresh(TestConsole.layer),
428+
),
429+
),
430+
);
431+
432+
assert.include(
433+
output,
434+
`Background service still running the version before ${version}. Run \`t3 service restart\` when you are ready to switch it to ${version}.`,
435+
);
436+
}).pipe(
437+
Effect.scoped,
438+
Effect.provideService(HostProcess.Platform, "linux"),
439+
Effect.provideService(HostProcess.Environment, { PATH: "" }),
440+
),
441+
);
442+
});

‎apps/server/src/cli/update.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -557,8 +557,15 @@ export const runUpdate = Effect.fn("cli.update.run")(function* (input: {
557557
} else if (serviceInstalled && serviceCurrent) {
558558
yield* Console.log(` Background service already on ${targetVersion}`);
559559
} else if (serviceInstalled) {
560+
// A pending restart means the service already points at serviceVersion but runs an older one.
561+
const running =
562+
serviceVersion === undefined
563+
? "an unknown version"
564+
: restartPending
565+
? `the version before ${serviceVersion}`
566+
: serviceVersion;
560567
yield* Console.log(
561-
` Background service still running ${serviceVersion ?? "an unknown version"}. Run \`t3 service restart\` when you are ready to switch it to ${targetVersion}.`,
568+
` Background service still running ${running}. Run \`t3 service restart\` when you are ready to switch it to ${targetVersion}.`,
562569
);
563570
} else if (status.installed && !servesThisHome) {
564571
yield* Console.log(

0 commit comments

Comments
 (0)