feat(cli): add t3 update for self-contained installs #11451
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,6 +17,7 @@ import { isEntrypoint } from "./entrypoint.ts"; | |
| import { projectCommand } from "./cli/project.ts"; | ||
| import { runServerCommand, serveCommand, startCommand } from "./cli/server.ts"; | ||
| import { serviceCommand } from "./cli/service.ts"; | ||
| import { updateCommand } from "./cli/update.ts"; | ||
| import { claudeHistoryCommand } from "./cli/claudeHistory.ts"; | ||
| import { serviceLauncherCommand } from "./cli/serviceLauncher.ts"; | ||
| import { servicePreflightCommand } from "./cli/servicePreflight.ts"; | ||
|
|
@@ -62,6 +63,7 @@ export const makeCli = ({ cloudEnabled = hasCloudPublicConfig } = {}) => | |
| authCommand, | ||
| projectCommand, | ||
| serviceCommand, | ||
| updateCommand, | ||
|
macroscopeapp[bot] marked this conversation as resolved.
|
||
| serviceLauncherCommand, | ||
| claudeHistoryCommand, | ||
| servicePreflightCommand, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -140,7 +140,7 @@ const serviceInstallCommand = Command.make("install", serviceReconcileFlags).pip | |
|
|
||
| const serviceUpdateCommand = Command.make("update", serviceReconcileFlags).pipe( | ||
| Command.withDescription( | ||
| "Update or repair the background service using this CLI version. Use `t3 update` to move to a newer release first.", | ||
| ), | ||
| Command.withHandler((flags) => | ||
| runServiceCommand( | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,109 @@ | ||
| import * as NodeServices from "@effect/platform-node/NodeServices"; | ||
| import { assert, it } from "@effect/vitest"; | ||
| import * as Effect from "effect/Effect"; | ||
| import * as FileSystem from "effect/FileSystem"; | ||
| import * as Option from "effect/Option"; | ||
| import * as Path from "effect/Path"; | ||
| import { | ||
| HostProcessEnvironment, | ||
| HostProcessInvokedAs, | ||
| HostProcessPlatform, | ||
| HostProcessWorkingDirectory, | ||
| } from "@t3tools/shared/hostProcess"; | ||
|
|
||
| import { repointLauncher, resolveLauncherPath } from "./update.ts"; | ||
|
|
||
| it.layer(NodeServices.layer)("t3 update launcher", (it) => { | ||
| it.effect("repoints a symlink that lives in a runtime versions tree", () => | ||
| Effect.gen(function* () { | ||
| const fs = yield* FileSystem.FileSystem; | ||
| const path = yield* Path.Path; | ||
| const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-update-" }); | ||
| const oldExe = path.join(root, "runtime/versions/1.0.0/t3"); | ||
| const newExe = path.join(root, "runtime/versions/2.0.0/t3"); | ||
| const launcher = path.join(root, "bin/t3"); | ||
| for (const file of [oldExe, newExe]) { | ||
| yield* fs.makeDirectory(path.dirname(file), { recursive: true }); | ||
| yield* fs.writeFileString(file, ""); | ||
| } | ||
| yield* fs.makeDirectory(path.dirname(launcher), { recursive: true }); | ||
| yield* fs.symlink(oldExe, launcher); | ||
|
|
||
| const repointed = yield* repointLauncher({ | ||
| launchedAs: launcher, | ||
| versionsDir: path.join(root, "runtime/versions"), | ||
| targetEntryPath: newExe, | ||
| }); | ||
|
|
||
| assert.deepStrictEqual(Option.getOrUndefined(repointed), launcher); | ||
| assert.equal(yield* fs.readLink(launcher), newExe); | ||
| }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | ||
| ); | ||
|
|
||
| it.effect("leaves a plain copy or a foreign symlink alone", () => | ||
| Effect.gen(function* () { | ||
| const fs = yield* FileSystem.FileSystem; | ||
| const path = yield* Path.Path; | ||
| const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-update-" }); | ||
| const newExe = path.join(root, "runtime/versions/2.0.0/t3"); | ||
| const copy = path.join(root, "copy/t3"); | ||
| const foreign = path.join(root, "foreign/t3"); | ||
| const elsewhere = path.join(root, "elsewhere/t3"); | ||
| // Another install's versions tree: same shape, different home. | ||
| const otherHome = path.join(root, "other/runtime/versions/1.0.0/t3"); | ||
| const otherLauncher = path.join(root, "other/bin/t3"); | ||
| for (const file of [newExe, copy, elsewhere, otherHome]) { | ||
| yield* fs.makeDirectory(path.dirname(file), { recursive: true }); | ||
| yield* fs.writeFileString(file, ""); | ||
| } | ||
| yield* fs.makeDirectory(path.dirname(foreign), { recursive: true }); | ||
| yield* fs.symlink(elsewhere, foreign); | ||
| yield* fs.makeDirectory(path.dirname(otherLauncher), { recursive: true }); | ||
| yield* fs.symlink(otherHome, otherLauncher); | ||
|
|
||
| for (const launchedAs of [copy, foreign, otherLauncher, undefined]) { | ||
| const repointed = yield* repointLauncher({ | ||
| launchedAs, | ||
| versionsDir: path.join(root, "runtime/versions"), | ||
| targetEntryPath: newExe, | ||
| }); | ||
| assert.equal(repointed._tag, "None", launchedAs ?? "undefined"); | ||
| } | ||
| assert.equal(yield* fs.readLink(foreign), elsewhere); | ||
| assert.equal(yield* fs.readLink(otherLauncher), otherHome); | ||
| }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | ||
| ); | ||
|
|
||
| it.effect("finds the launcher a bare command name resolved to on PATH", () => | ||
| Effect.gen(function* () { | ||
| const fs = yield* FileSystem.FileSystem; | ||
| const path = yield* Path.Path; | ||
| const root = yield* fs.makeTempDirectoryScoped({ prefix: "t3-update-" }); | ||
| const launcher = path.join(root, "bin/t3"); | ||
| yield* fs.makeDirectory(path.dirname(launcher), { recursive: true }); | ||
| yield* fs.writeFileString(launcher, ""); | ||
|
|
||
| const bare = yield* resolveLauncherPath.pipe( | ||
| Effect.provideService(HostProcessInvokedAs, "t3"), | ||
| Effect.provideService(HostProcessEnvironment, { | ||
| PATH: `${path.join(root, "missing")}:${path.join(root, "bin")}`, | ||
| }), | ||
| Effect.provideService(HostProcessWorkingDirectory, root), | ||
| ); | ||
| const relative = yield* resolveLauncherPath.pipe( | ||
| Effect.provideService(HostProcessInvokedAs, "./bin/t3"), | ||
| Effect.provideService(HostProcessEnvironment, { PATH: "" }), | ||
| Effect.provideService(HostProcessWorkingDirectory, root), | ||
| ); | ||
| const absent = yield* resolveLauncherPath.pipe( | ||
| Effect.provideService(HostProcessInvokedAs, "t3"), | ||
| Effect.provideService(HostProcessEnvironment, { PATH: path.join(root, "missing") }), | ||
| Effect.provideService(HostProcessWorkingDirectory, root), | ||
| ); | ||
|
|
||
| assert.equal(bare, launcher); | ||
| assert.equal(relative, launcher); | ||
| assert.equal(absent, undefined); | ||
| }).pipe(Effect.scoped, Effect.provideService(HostProcessPlatform, "linux")), | ||
| ); | ||
| }); |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.