@magnitudedev/pi-extension 0.0.1-alpha.2 → 0.0.1-alpha.3

package/README.md

@@ -17,8 +17,9 @@ are needed. If Magnitude is missing, accepting setup installs the CLI with
 `npm install --global @magnitudedev/cli` before opening onboarding. Pi stays visible with its native
 spinner: “Installing Magnitude…”. Installer output is suppressed; failures
 show a concise diagnostic. Escape cancels preparation, and `/magnitude-setup` retries.
-An existing CLI is preserved and must support hosted setup; an incompatible version reports an
-update requirement rather than being silently replaced.
+An existing CLI is preserved. The extension invokes `magnitude setup --host pi`; `--host` is hidden from help.
+If an older CLI does not recognize that option, update it explicitly and retry; it is never silently
+replaced.
 
 No or Escape leaves “You can set up local models anytime with `/magnitude-setup`.” in the conversation.
 The offer is remembered per Pi profile across restarts, reloads, and package updates. Existing

package/dist/magnitude-plugin.json

@@ -1,11 +1,11 @@
 {
   "name": "@magnitudedev/pi-extension",
-  "version": "0.0.1-alpha.2",
+  "version": "0.0.1-alpha.3",
   "rpcVersion": 1,
-  "contentFingerprint": "5661646da7080511725cdef888b7ce04148c99b56fbe6454619754ebc5235718",
+  "contentFingerprint": "5d348e366e4c95b29edba024aae7756e7e941695537923bd3e82b1ddc54b9566",
   "files": {
-    "README.md": "0334364928717efd1b146486d6dc2d9ff0f28b77ff28b162d04351738170b581",
-    "dist/magnitude.js": "915f1d6bb080180a774b1bd009b3d7bc6c5cbab94fd7ab067dd3345d638538ad",
+    "README.md": "c4536c32bc79ddaee7d09536f79c845c2189e8ddc721e583836eb399d9322053",
+    "dist/magnitude.js": "14723faa27101270992397f22fcef2ca0f8cd55753e717250f0c92f921653e07",
     "dist/skills/magnitude/SKILL.md": "37de67f0c7b831415f6298c8785b7ae97d5cfe454dc778651d96114840d2ace2"
   }
 }

package/dist/magnitude.js

@@ -5853,9 +5853,10 @@ import * as Command2 from "@effect/platform/Command";
 import * as CommandExecutor3 from "@effect/platform/CommandExecutor";
 import * as FileSystem from "@effect/platform/FileSystem";
 import * as NodeContext from "@effect/platform-node/NodeContext";
+import { FetchHttpClient as FetchHttpClient2 } from "@effect/platform";
 import { delimiter, join } from "node:path";
 import { stripVTControlCharacters } from "node:util";
-import { Context as Context7, Effect as Effect12, Exit as Exit3, Fiber as Fiber2, Layer as Layer6, ManagedRuntime as ManagedRuntime2, Schema as Schema53, Scope as Scope4, Stream as Stream7 } from "effect";
+import { Context as Context7, Effect as Effect12, Exit as Exit3, Fiber as Fiber2, Layer as Layer6, ManagedRuntime as ManagedRuntime2, Schema as Schema52, Scope as Scope4, Stream as Stream7 } from "effect";
 import { CancellableLoader } from "@earendil-works/pi-tui";
 
 // ../../packages/utils/src/process/interactive-process.ts
@@ -5962,22 +5963,9 @@ var terminateAndReap = ({ child, termination }) => Effect11.gen(function* () {
   yield* Deferred3.await(termination).pipe(Effect11.ignore, Effect11.timeout(Duration2.seconds(2)), Effect11.ignore);
 });
 var runInteractiveProcess = (input) => Effect11.acquireUseRelease(acquireInteractiveProcess(input), awaitWithSignalForwarding, terminateAndReap);
-// ../../packages/client-common/src/harness-connections/hosted-setup.ts
-import { Schema as Schema52 } from "effect";
-var HOSTED_SETUP_PROTOCOL_VERSION = 1;
-var HOSTED_SETUP_MAX_RESULT_BYTES = 16 * 1024;
-var HostedSetupCapability = Schema52.Struct({
-  protocolVersion: Schema52.Literal(HOSTED_SETUP_PROTOCOL_VERSION)
-});
-var version = Schema52.Literal(HOSTED_SETUP_PROTOCOL_VERSION);
-var HostedSetupResult = Schema52.Union(Schema52.TaggedStruct("Completed", { protocolVersion: version, modelId: ModelIdSchema }), Schema52.TaggedStruct("Cancelled", { protocolVersion: version }), Schema52.TaggedStruct("Failed", {
-  protocolVersion: version,
-  message: Schema52.String.pipe(Schema52.filter((message) => new TextEncoder().encode(message).length <= 4096))
-}));
-
 // extensions/setup.ts
-class PiSetupFailed extends Schema53.TaggedError()("PiSetupFailed", {
-  message: Schema53.String
+class PiSetupFailed extends Schema52.TaggedError()("PiSetupFailed", {
+  message: Schema52.String
 }) {
 }
 var failure = (message) => new PiSetupFailed({ message });
@@ -5986,17 +5974,16 @@ var prepareMagnitudeCli = (cwd, setMessage = () => Effect12.void) => Effect12.ge
   const override = process.env.MAGNITUDE_CLI?.trim();
   const executable = override || "magnitude";
   const probe = Effect12.scoped(Effect12.gen(function* () {
-    const child = yield* Command2.make(executable, "setup", "--host-protocol").pipe(Command2.start);
-    const [code, output, stderr] = yield* Effect12.all([
+    const child = yield* Command2.make(executable, "--version").pipe(Command2.start);
+    const [code, , stderr] = yield* Effect12.all([
       child.exitCode,
-      child.stdout.pipe(Stream7.decodeText(), Stream7.runFold("", (text2, part) => (text2 + part).slice(0, 4097))),
+      Stream7.runDrain(child.stdout),
       child.stderr.pipe(Stream7.decodeText(), Stream7.runFold("", (text2, part) => (text2 + part).slice(-4096)))
     ], { concurrency: "unbounded" });
-    if (code !== 0 || output.length > 4096)
-      return yield* failure(`Magnitude's setup capability check failed at ${executable} (exit ${code}). ${stripVTControlCharacters(stderr).trim().slice(-600)}${override ? " Check MAGNITUDE_CLI." : ""}`);
-    return output;
+    if (code !== 0)
+      return yield* failure(`Magnitude could not run at ${executable} (exit ${code}). ${stripVTControlCharacters(stderr).trim().slice(-600)}${override ? " Check MAGNITUDE_CLI." : ""}`);
   }));
-  const capability = yield* probe.pipe(Effect12.catchIf((error) => !override && error._tag === "SystemError" && error.reason === "NotFound", (error) => Effect12.gen(function* () {
+  yield* probe.pipe(Effect12.catchIf((error) => !override && error._tag === "SystemError" && error.reason === "NotFound", (error) => Effect12.gen(function* () {
     for (const directory of (process.env.PATH ?? "").split(delimiter)) {
       if (yield* fs.exists(join(directory || cwd, executable)))
         return yield* error;
@@ -6014,7 +6001,6 @@ var prepareMagnitudeCli = (cwd, setMessage = () => Effect12.void) => Effect12.ge
     }));
     return yield* probe;
   })), Effect12.timeout("10 minutes"), Effect12.mapError((error) => error instanceof PiSetupFailed ? error : failure(`Could not prepare Magnitude: ${String(error)}. Run /magnitude-setup to retry${override ? ", or check MAGNITUDE_CLI" : ""}.`)));
-  yield* Schema53.decodeUnknown(Schema53.parseJson(HostedSetupCapability))(capability).pipe(Effect12.mapError(() => failure(`The Magnitude CLI at ${executable} does not support hosted setup. Update @magnitudedev/cli${override ? ", or check MAGNITUDE_CLI" : ""}.`)));
   return executable;
 });
 var withPiPreparation = (ctx, work) => Effect12.acquireUseRelease(Effect12.async((resume, signal) => {
@@ -6060,39 +6046,38 @@ var withPiTerminal = (ctx, work) => Effect12.acquireUseRelease(Effect12.async((r
     finish();
   }
 }).pipe(Effect12.zipRight(Effect12.promise(closed))));
-var validateSetupTermination = (result, termination) => {
-  if (termination._tag !== "Exited" || termination.code === 0 !== (result._tag !== "Failed")) {
-    return Effect12.fail(failure("Magnitude setup exited without a consistent completion result. Run /magnitude-setup to retry."));
+var validateSetupTermination = (termination) => {
+  if (termination._tag === "Signaled") {
+    return termination.signal === "SIGINT" ? Effect12.succeed(false) : Effect12.fail(failure(`Magnitude setup stopped unexpectedly (${termination.signal}). Run /magnitude-setup to retry.`));
   }
-  return result._tag === "Failed" ? Effect12.fail(failure(result.message)) : Effect12.succeed(result);
+  if (termination.code === 130)
+    return Effect12.succeed(false);
+  return termination.code === 0 ? Effect12.succeed(true) : Effect12.fail(failure(`Magnitude setup failed (exit ${termination.code}). Check the terminal error above; if setup --host pi is unsupported, update @magnitudedev/cli. Run /magnitude-setup to retry.`));
 };
+var readSetupModel = Effect12.gen(function* () {
+  const client = yield* MagnitudeClient;
+  const { slots } = yield* client.models.getSlots({}).pipe(Effect12.mapError((error) => failure(`Magnitude setup completed, but the selected model could not be read: ${error._tag === "RpcClientError" ? error.message : formatConnectionError(error)}. Run /reload and select it with /model.`)));
+  if (slots.primary._tag !== "ConfiguredLocal")
+    return yield* failure("Magnitude setup completed, but no local primary model is configured. Run /reload and select a Magnitude model with /model.");
+  return slots.primary.selection.providerModelId;
+});
 var PiSetup = Context7.GenericTag("pi/PiSetup");
 var PiSetupLive = Layer6.effect(PiSetup, Effect12.gen(function* () {
   const fs = yield* FileSystem.FileSystem;
   const executor = yield* CommandExecutor3.CommandExecutor;
   return {
     run: (ctx) => Effect12.scoped(Effect12.gen(function* () {
-      const directory = yield* fs.makeTempDirectoryScoped({ prefix: "magnitude-pi-setup-" });
-      const resultPath = `${directory}/result.json`;
       const executable = yield* withPiPreparation(ctx, (setMessage) => prepareMagnitudeCli(ctx.cwd, setMessage));
       const termination = yield* withPiTerminal(ctx, runInteractiveProcess({
         executable,
-        args: ["setup", "--host", "pi", "--result-file", resultPath],
+        args: ["setup", "--host", "pi"],
         environment: process.env,
         workingDirectory: ctx.cwd
       }));
-      if (termination._tag === "Signaled" && termination.signal === "SIGINT") {
-        return { protocolVersion: HOSTED_SETUP_PROTOCOL_VERSION, _tag: "Cancelled" };
-      }
-      if (termination._tag === "Signaled") {
-        return yield* failure(`Magnitude setup stopped unexpectedly (${termination.signal}). Run /magnitude-setup to retry.`);
-      }
-      const stat = yield* fs.stat(resultPath).pipe(Effect12.mapError(() => failure("Magnitude setup exited without a completion result. Run /magnitude-setup to retry.")));
-      if (stat.type !== "File" || stat.size > BigInt(HOSTED_SETUP_MAX_RESULT_BYTES)) {
-        return yield* failure("Magnitude setup returned an invalid or oversized result");
-      }
-      const result = yield* fs.readFileString(resultPath).pipe(Effect12.flatMap(Schema53.decodeUnknown(Schema53.parseJson(HostedSetupResult))), Effect12.mapError(() => failure("Magnitude setup did not return a valid completion result. Run /magnitude-setup to retry.")));
-      return yield* validateSetupTermination(result, termination);
+      if (!(yield* validateSetupTermination(termination)))
+        return { _tag: "Cancelled" };
+      const modelId = yield* readSetupModel.pipe(Effect12.provide(MagnitudeClient.layer({ autoStart: false }).pipe(Layer6.provide(FetchHttpClient2.layer))));
+      return { _tag: "Completed", modelId };
     })).pipe(Effect12.provideService(CommandExecutor3.CommandExecutor, executor), Effect12.provideService(FileSystem.FileSystem, fs), Effect12.mapError((error) => error instanceof PiSetupFailed ? error : failure(`Magnitude setup could not finish: ${String(error)}`)))
   };
 }));
@@ -6198,15 +6183,15 @@ function registerMagnitudeOnboarding(pi) {
 }
 
 // extensions/observing-fetch.ts
-import { Effect as Effect14, Either as Either3, Schema as Schema55 } from "effect";
+import { Effect as Effect14, Either as Either3, Schema as Schema54 } from "effect";
 
 // extensions/protocol.ts
-import { Either as Either2, Schema as Schema54 } from "effect";
-var ProgressChunkSchema = Schema54.Struct({ progress: MagnitudeProgressSchema });
-var TimingsChunkSchema = Schema54.Struct({ timings: MagnitudeTimingsSchema });
+import { Either as Either2, Schema as Schema53 } from "effect";
+var ProgressChunkSchema = Schema53.Struct({ progress: MagnitudeProgressSchema });
+var TimingsChunkSchema = Schema53.Struct({ timings: MagnitudeTimingsSchema });
 var decodeMagnitudeObservation = (value) => {
-  const progress = Schema54.decodeUnknownEither(ProgressChunkSchema)(value);
-  const timings = Schema54.decodeUnknownEither(TimingsChunkSchema)(value);
+  const progress = Schema53.decodeUnknownEither(ProgressChunkSchema)(value);
+  const timings = Schema53.decodeUnknownEither(TimingsChunkSchema)(value);
   if (Either2.isLeft(progress) && Either2.isLeft(timings))
     return;
   return {
@@ -6217,7 +6202,7 @@ var decodeMagnitudeObservation = (value) => {
 
 // extensions/observing-fetch.ts
 var MAGNITUDE_PROGRESS_HEADER = "Magnitude-Include-Progress";
-var JsonDocumentSchema = Schema55.parseJson(Schema55.Unknown);
+var JsonDocumentSchema = Schema54.parseJson(Schema54.Unknown);
 
 class SseDataParser {
   #buffer = "";
@@ -6264,7 +6249,7 @@ class SseDataParser {
     this.#dataLines = [];
     if (data === "[DONE]")
       return;
-    const decoded = Schema55.decodeUnknownEither(JsonDocumentSchema)(data);
+    const decoded = Schema54.decodeUnknownEither(JsonDocumentSchema)(data);
     if (Either3.isRight(decoded))
       observe(decoded.right);
   }
@@ -6335,9 +6320,9 @@ var makeObservingFetch = (fetchImplementation, begin, scope) => {
 
 // extensions/progress.ts
 import { Text } from "@earendil-works/pi-tui";
-import { Data as Data3, Effect as Effect15, Fiber as Fiber3, Option as Option18, Queue, Schema as Schema56 } from "effect";
+import { Data as Data3, Effect as Effect15, Fiber as Fiber3, Option as Option18, Queue, Schema as Schema55 } from "effect";
 var MAGNITUDE_SUMMARY_WIDGET_KEY = "magnitude-inference-summary";
-var RequestId = Schema56.Number.pipe(Schema56.int(), Schema56.brand("ProgressRequestId"));
+var RequestId = Schema55.Number.pipe(Schema55.int(), Schema55.brand("ProgressRequestId"));
 
 class Observing extends Data3.TaggedClass("Observing") {
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magnitudedev/pi-extension",
-  "version": "0.0.1-alpha.2",
+  "version": "0.0.1-alpha.3",
   "description": "Magnitude model controls and inference progress for Pi",
   "type": "module",
   "license": "MIT",