paseo-plugin-zcode-provider 0.1.0 → 0.3.0

package/client/diagnostics.tsx

@@ -11,25 +11,7 @@ import {
   zcodeDiagnostics,
   type DiagnosticsResult,
 } from "../shared/diagnostics";
-
-function Value({
-  children,
-  color,
-  compact,
-}: {
-  children: string;
-  color: string;
-  compact: boolean;
-}) {
-  return (
-    <Text
-      selectable
-      style={{ color, fontSize: compact ? 13 : 14, lineHeight: 20 }}
-    >
-      {children}
-    </Text>
-  );
-}
+import { Value } from "./value";
 
 function Installation({ result, theme, compact }: SectionProps) {
   return (
@@ -39,7 +21,7 @@ function Installation({ result, theme, compact }: SectionProps) {
           label="Install root"
           hint={
             result.source === "managed"
-              ? "Managed runtime installed from the Setup screen"
+              ? "Managed runtime installed from the Settings screen"
               : "PASEO_ZCODE_RUNTIME"
           }
         >

package/client/{setup.tsx → runtime.tsx}

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from "react";
-import { Platform, Text, View } from "react-native";
+import { Text, View } from "react-native";
 import { type PluginSurfaceProps, useRpc } from "@getpaseo/plugin/client";
 import {
   SettingsAction,
@@ -13,29 +13,11 @@ import {
   zcodeRuntimeStatus,
   type RuntimeSetupStatus,
 } from "../shared/runtime-setup";
+import { Value } from "./value";
 
 type Theme = PluginSurfaceProps["theme"];
 type Job = RuntimeSetupStatus["job"];
 
-function Value({
-  children,
-  color,
-  compact,
-}: {
-  children: string;
-  color: string;
-  compact: boolean;
-}) {
-  return (
-    <Text
-      selectable
-      style={{ color, fontSize: compact ? 13 : 14, lineHeight: 20 }}
-    >
-      {children}
-    </Text>
-  );
-}
-
 const megabytes = (bytes: number) => `${(bytes / 1_000_000).toFixed(1)} MB`;
 
 function jobLabel(job: Job): string {
@@ -109,7 +91,7 @@ function Components({
   );
 }
 
-export function SetupScreen({ theme, layout }: PluginSurfaceProps) {
+export function RuntimeTab({ theme, layout }: PluginSurfaceProps) {
   const fetchStatus = useRpc(zcodeRuntimeStatus);
   const install = useRpc(zcodeRuntimeInstall);
   const remove = useRpc(zcodeRuntimeRemove);
@@ -191,7 +173,7 @@ export function SetupScreen({ theme, layout }: PluginSurfaceProps) {
           </SettingsRow>
           <SettingsRow
             label="ZCode build"
-            hint="ZCode does not publish its CLI; CI builds the unmodified source."
+            hint="ZCode does not publish its CLI; CI builds the public source with this plugin's published patches."
           >
             <Value color={theme.colors.foreground} compact={compact}>
               Unofficial, not endorsed by ZCode or Z.ai
@@ -270,39 +252,6 @@ export function SetupScreen({ theme, layout }: PluginSurfaceProps) {
         ) : null}
       </SettingsSection>
       <Components status={status} theme={theme} compact={compact} />
-      {status.loginCommand === undefined ? null : (
-        <SettingsSection title="Sign in to ZCode">
-          <SettingsCard>
-            <SettingsRow label="Run it">
-              <Value color={theme.colors.foreground} compact={compact}>
-                In a terminal on the daemon machine
-              </Value>
-            </SettingsRow>
-            <SettingsRow label="Authorization">
-              <Value color={theme.colors.foreground} compact={compact}>
-                Opens a browser; add --no-browser to print the URL
-              </Value>
-            </SettingsRow>
-            {/* A full-width block: a row value would squeeze the label column. */}
-            <View style={{ padding: compact ? 12 : 16 }}>
-              <Text
-                selectable
-                style={{
-                  color: theme.colors.foreground,
-                  fontFamily: Platform.select({
-                    ios: "Menlo",
-                    default: "monospace",
-                  }),
-                  fontSize: compact ? 12 : 13,
-                  lineHeight: 20,
-                }}
-              >
-                {status.loginCommand}
-              </Text>
-            </View>
-          </SettingsCard>
-        </SettingsSection>
-      )}
       <SettingsSection title="Remove">
         <SettingsAction
           label="Managed runtime"

package/client/settings.tsx

@@ -0,0 +1,84 @@
+import { useState } from "react";
+import { Pressable, Text, View } from "react-native";
+import type { PluginSurfaceProps } from "@getpaseo/plugin/client";
+import { AccountTab } from "./account";
+import { RuntimeTab } from "./runtime";
+
+const TABS = [
+  { id: "runtime", label: "Runtime" },
+  { id: "account", label: "Account" },
+] as const;
+type Tab = (typeof TABS)[number]["id"];
+
+// Plugin settings screens have no host tab control; this follows the look of
+// the host's small segmented control.
+function Tabs({
+  value,
+  onChange,
+  theme,
+}: {
+  value: Tab;
+  onChange: (tab: Tab) => void;
+  theme: PluginSurfaceProps["theme"];
+}) {
+  return (
+    <View
+      accessibilityRole="tablist"
+      style={{
+        flexDirection: "row",
+        alignSelf: "flex-start",
+        gap: 4,
+        padding: 2,
+        borderRadius: 12,
+        borderWidth: 1,
+        borderColor: theme.colors.border,
+        backgroundColor: theme.colors.surface1,
+      }}
+    >
+      {TABS.map((tab) => {
+        const selected = tab.id === value;
+        return (
+          <Pressable
+            key={tab.id}
+            accessibilityRole="tab"
+            accessibilityState={{ selected }}
+            onPress={() => onChange(tab.id)}
+            style={({ pressed }) => ({
+              minHeight: 28,
+              justifyContent: "center",
+              paddingHorizontal: 12,
+              borderRadius: 10,
+              backgroundColor:
+                selected || pressed ? theme.colors.surface2 : "transparent",
+            })}
+          >
+            <Text
+              style={{
+                color: selected
+                  ? theme.colors.foreground
+                  : theme.colors.foregroundMuted,
+                fontSize: 14,
+              }}
+            >
+              {tab.label}
+            </Text>
+          </Pressable>
+        );
+      })}
+    </View>
+  );
+}
+
+export function SettingsScreen(props: PluginSurfaceProps) {
+  const [tab, setTab] = useState<Tab>("runtime");
+  return (
+    <View style={{ gap: props.layout.compact ? 16 : 24 }}>
+      <Tabs value={tab} onChange={setTab} theme={props.theme} />
+      {tab === "runtime" ? (
+        <RuntimeTab {...props} />
+      ) : (
+        <AccountTab {...props} onOpenRuntime={() => setTab("runtime")} />
+      )}
+    </View>
+  );
+}

package/client/value.tsx

@@ -0,0 +1,20 @@
+import { Text } from "react-native";
+
+export function Value({
+  children,
+  color,
+  compact,
+}: {
+  children: string;
+  color: string;
+  compact: boolean;
+}) {
+  return (
+    <Text
+      selectable
+      style={{ color, fontSize: compact ? 13 : 14, lineHeight: 20 }}
+    >
+      {children}
+    </Text>
+  );
+}

package/index.client.tsx

@@ -1,13 +1,13 @@
 import type { PluginClientContext } from "@getpaseo/plugin/client";
 import { DiagnosticsScreen } from "./client/diagnostics";
-import { SetupScreen } from "./client/setup";
+import { SettingsScreen } from "./client/settings";
 
 export default function contribute(client: PluginClientContext): () => void {
-  const removeSetup = client.addSettingsScreen({
-    id: "setup",
-    title: "Setup",
-    icon: "Download",
-    Component: SetupScreen,
+  const removeSettings = client.addSettingsScreen({
+    id: "settings",
+    title: "Settings",
+    icon: "Settings",
+    Component: SettingsScreen,
   });
   const removeDiagnostics = client.addSettingsScreen({
     id: "diagnostics",
@@ -16,7 +16,7 @@ export default function contribute(client: PluginClientContext): () => void {
     Component: DiagnosticsScreen,
   });
   return () => {
-    removeSetup();
+    removeSettings();
     removeDiagnostics();
   };
 }

package/index.server.ts

@@ -1,8 +1,12 @@
+import { homedir } from "node:os";
 import type { PluginServerContext } from "@getpaseo/plugin/server";
-import { createZCodeProvider } from "./server/provider.js";
+import { AccountService } from "./server/account.js";
+import { createHost, createZCodeProvider } from "./server/provider.js";
 import { ManagedRuntimeInstaller } from "./server/runtime/managed.js";
 import { createRuntimeSetupHandlers } from "./server/runtime-setup.js";
 import { createDiagnosticsHandler } from "./server/status.js";
+import { createUsageSource } from "./server/usage.js";
+import { zcodeAccountChange, zcodeAccountView } from "./shared/account.js";
 import { zcodeDiagnostics } from "./shared/diagnostics.js";
 import {
   zcodeRuntimeInstall,
@@ -17,5 +21,19 @@ export default function contribute(server: PluginServerContext): () => void {
   server.handle(zcodeRuntimeStatus, setup.status);
   server.handle(zcodeRuntimeInstall, setup.install);
   server.handle(zcodeRuntimeRemove, setup.remove);
-  return () => {};
+  const abort = new AbortController();
+  const account = new AccountService(() =>
+    createHost({}, abort.signal, homedir()),
+  );
+  server.handle(zcodeAccountView, () => account.view());
+  server.handle(zcodeAccountChange, (input) => account.change(input));
+  // Usage sources arrived in Paseo 0.11; older daemons do not offer them.
+  const usage = createUsageSource(account);
+  if (typeof server.registerUsageSource === "function")
+    server.registerUsageSource(usage.source);
+  return () => {
+    usage.dispose();
+    abort.abort();
+    void account.close();
+  };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "paseo-plugin-zcode-provider",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "description": "Unofficial Paseo provider plugin for ZCode, using the official stdio Services Server of the integrated ZCode CLI.",
   "keywords": [
     "paseo",
@@ -37,10 +37,11 @@
     "test": "vitest run",
     "test:upstream": "node scripts/check-upstream.mjs",
     "test:runtime": "node scripts/check-runtime.mjs",
+    "test:usage-runtime": "node scripts/check-usage-runtime.mjs",
     "test:steering-runtime": "node scripts/check-steering-runtime.mjs",
     "build": "node scripts/build.mjs",
-    "format": "prettier --write index.client.tsx index.server.ts client server shared scripts test docs README.md NOTICE.md package.json tsconfig.json tsconfig.client.json vitest.config.ts paseo-plugin.json .github/workflows",
-    "format:check": "prettier --check index.client.tsx index.server.ts client server shared scripts test docs README.md NOTICE.md package.json tsconfig.json tsconfig.client.json vitest.config.ts paseo-plugin.json .github/workflows",
+    "format": "prettier --write index.client.tsx index.server.ts client server shared scripts test docs README.md NOTICE.md package.json tsconfig.json tsconfig.client.json vitest.config.ts paseo-plugin.json .github/workflows .github/actions",
+    "format:check": "prettier --check index.client.tsx index.server.ts client server shared scripts test docs README.md NOTICE.md package.json tsconfig.json tsconfig.client.json vitest.config.ts paseo-plugin.json .github/workflows .github/actions",
     "check:zcode-releases": "node scripts/check-zcode-releases.mjs",
     "check:paseo-releases": "node scripts/check-paseo-releases.mjs",
     "prepare": "node scripts/generate-build-info.mjs",
@@ -48,6 +49,7 @@
     "test:model-plan-runtime": "node scripts/check-model-plan-runtime.mjs",
     "test:e2e": "node scripts/check-e2e.mjs",
     "check:zcode-source": "node scripts/sync-zcode-source.mjs",
+    "check:zcode-patches": "node scripts/apply-zcode-patches.mjs check --source",
     "test:stdio-runtime": "node scripts/check-stdio-runtime.mjs",
     "test:native-restore": "node scripts/check-stdio-runtime.mjs --check-native-restore",
     "setup:managed-runtime": "node scripts/install-managed-runtime.mjs",
@@ -58,9 +60,9 @@
     "semver": "7.8.5"
   },
   "devDependencies": {
-    "@getpaseo/client": "0.9.0-beta.1",
-    "@getpaseo/plugin": "0.9.0-beta.1",
-    "@getpaseo/protocol": "0.9.0-beta.1",
+    "@getpaseo/client": "0.11.0-beta.5",
+    "@getpaseo/plugin": "0.11.0-beta.5",
+    "@getpaseo/protocol": "0.11.0-beta.5",
     "@types/node": "22.18.3",
     "@types/react": "~19.2.0",
     "@types/semver": "7.8.0",
@@ -72,6 +74,7 @@
     "turndown": "7.2.4",
     "typescript": "5.9.2",
     "vitest": "3.2.7",
+    "which": "5.0.0",
     "zod": "4.4.3"
   }
 }