rivet-design 0.10.8 → 0.11.0

package/dist/services/ConfigManager.js

@@ -32,6 +32,13 @@ class ConfigManager {
         // Load existing config or create empty one
         this.config = this.loadConfig();
     }
+    /**
+     * Confirms that request-scoped credentials refer to the stored local login
+     * before filling missing metadata from disk.
+     */
+    canUseStoredAuthForRequest(requestToken) {
+        return !!requestToken && requestToken === this.config.authToken;
+    }
     /**
      * Load configuration from disk
      */
@@ -77,6 +84,12 @@ class ConfigManager {
             this.config.userId = userId;
         }
         this.saveConfig();
+        (0, RequestAuthContext_1.updateRequestAuthContext)({
+            token,
+            refreshToken,
+            email,
+            userId: this.config.userId,
+        });
         log.debug(`Saved auth tokens for ${email}`);
     }
     /**
@@ -95,7 +108,10 @@ class ConfigManager {
     getRefreshToken() {
         const requestContext = (0, RequestAuthContext_1.getRequestAuthContext)();
         if (requestContext) {
-            return requestContext.refreshToken;
+            return (requestContext.refreshToken ??
+                (this.canUseStoredAuthForRequest(requestContext.token)
+                    ? this.config.refreshToken
+                    : undefined));
         }
         return this.config.refreshToken;
     }
@@ -105,7 +121,10 @@ class ConfigManager {
     getEmail() {
         const requestContext = (0, RequestAuthContext_1.getRequestAuthContext)();
         if (requestContext) {
-            return requestContext.email;
+            return (requestContext.email ??
+                (this.canUseStoredAuthForRequest(requestContext.token)
+                    ? this.config.email
+                    : undefined));
         }
         return this.config.email;
     }
@@ -118,7 +137,10 @@ class ConfigManager {
     getUserId() {
         const requestContext = (0, RequestAuthContext_1.getRequestAuthContext)();
         if (requestContext) {
-            return requestContext.userId;
+            return (requestContext.userId ??
+                (this.canUseStoredAuthForRequest(requestContext.token)
+                    ? this.config.userId
+                    : undefined));
         }
         if (this.config.userId) {
             return this.config.userId;

package/dist/services/ConfigManager.js.map

@@ -1 +1 @@
-{"version":3,"file":"ConfigManager.js","sourceRoot":"","sources":["../../src/services/ConfigManager.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,4CAAoB;AACpB,mCAAoC;AACpC,4CAA+C;AAC/C,2CAA4C;AAC5C,6DAA6D;AAC7D,6DAAoE;AAEpE,MAAM,GAAG,GAAG,IAAA,qBAAY,EAAC,eAAe,CAAC,CAAC;AAa1C;;;GAGG;AACH,MAAM,aAAa;IACT,UAAU,CAAS;IACnB,MAAM,CAAc;IAE5B;QACE,MAAM,OAAO,GAAG,YAAE,CAAC,OAAO,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAI,CAAC,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,CAAC;QAErD,iCAAiC;QACjC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,YAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;YACzD,GAAG,CAAC,KAAK,CAAC,mCAAmC,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;QAED,2CAA2C;QAC3C,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAClC,CAAC;IAED;;OAEG;IACK,UAAU;QAChB,IAAI,CAAC;YACH,IAAI,YAAE,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC;gBACnC,MAAM,IAAI,GAAG,YAAE,CAAC,YAAY,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBACtD,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAChC,OAAO,MAAM,CAAC;YAChB,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,IAAI,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;QAC5C,CAAC;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED;;OAEG;IACK,UAAU;QAChB,IAAI,CAAC;YACH,YAAE,CAAC,aAAa,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE;gBACtE,IAAI,EAAE,KAAK;aACZ,CAAC,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC;QAClD,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,GAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,KAAK,CAAC,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;QAClD,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACH,OAAO,CACL,KAAa,EACb,KAAa,EACb,YAAqB,EACrB,MAAe;QAEf,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC;QACxC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,KAAK,CAAC;QAC1B,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC;QAC9B,CAAC;QACD,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,GAAG,CAAC,KAAK,CAAC,yBAAyB,KAAK,EAAE,CAAC,CAAC;IAC9C,CAAC;IAED;;OAEG;IACH,YAAY;QACV,MAAM,cAAc,GAAG,IAAA,0CAAqB,GAAE,CAAC;QAC/C,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC,KAAK,CAAC;QAC9B,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,eAAe;QACb,MAAM,cAAc,GAAG,IAAA,0CAAqB,GAAE,CAAC;QAC/C,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC,YAAY,CAAC;QACrC,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,QAAQ;QACN,MAAM,cAAc,GAAG,IAAA,0CAAqB,GAAE,CAAC;QAC/C,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC,KAAK,CAAC;QAC9B,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;IAC3B,CAAC;IAED;;;;;OAKG;IACH,SAAS;QACP,MAAM,cAAc,GAAG,IAAA,0CAAqB,GAAE,CAAC;QAC/C,IAAI,cAAc,EAAE,CAAC;YACnB,OAAO,cAAc,CAAC,MAAM,CAAC;QAC/B,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC;YACvB,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC5B,CAAC;QACD,IAAI,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;YAC1B,MAAM,GAAG,GAAG,IAAA,8BAAS,EAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;YAC7C,IAAI,GAAG,EAAE,CAAC;gBACR,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC;gBACzB,IAAI,CAAC,UAAU,EAAE,CAAC;gBAClB,OAAO,GAAG,CAAC;YACb,CAAC;QACH,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IAED;;;;;OAKG;IACH,cAAc;QACZ,MAAM,KAAK,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAClC,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,IAAA,sCAAiB,EAAC,KAAK,CAAC,IAAI,SAAS,CAAC;IAC/C,CAAC;IAED;;OAEG;IACH,eAAe;QACb,OAAO,CAAC,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;IAC/B,CAAC;IAED;;OAEG;IACH,SAAS;QACP,IAAI,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,YAAY,GAAG,SAAS,CAAC;QACrC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,SAAS,CAAC;QAC9B,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,SAAS,CAAC;QAC/B,IAAI,CAAC,MAAM,CAAC,wBAAwB,GAAG,SAAS,CAAC;QACjD,IAAI,CAAC,MAAM,CAAC,yBAAyB,GAAG,SAAS,CAAC;QAClD,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,GAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;IACtC,CAAC;IAED;;OAEG;IACH,WAAW,CAAC,GAAW;QACrB,IAAI,CAAC,MAAM,CAAC,QAAQ,GAAG,GAAG,CAAC;QAC3B,IAAI,CAAC,UAAU,EAAE,CAAC;QAClB,GAAG,CAAC,KAAK,CAAC,kBAAkB,GAAG,EAAE,CAAC,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,cAAc;QACZ,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC7B,IAAI,CAAC,MAAM,CAAC,WAAW,GAAG,QAAQ,IAAA,mBAAU,GAAE,EAAE,CAAC;YACjD,IAAI,CAAC,UAAU,EAAE,CAAC;YAClB,GAAG,CAAC,KAAK,CAAC,2BAA2B,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC;QAClE,CAAC;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC;IACjC,CAAC;IAED;;;;OAIG;IACH,2BAA2B;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,wBAAwB,CAAC;IAC9C,CAAC;IAED,2BAA2B,CAAC,KAAa;QACvC,IAAI,CAAC,MAAM,CAAC,wBAAwB,GAAG,KAAK,CAAC;QAC7C,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED;;;OAGG;IACH,4BAA4B;QAC1B,OAAO,IAAI,CAAC,MAAM,CAAC,yBAAyB,CAAC;IAC/C,CAAC;IAED,4BAA4B,CAAC,MAAc;QACzC,IAAI,CAAC,MAAM,CAAC,yBAAyB,GAAG,MAAM,CAAC;QAC/C,IAAI,CAAC,UAAU,EAAE,CAAC;IACpB,CAAC;IAED;;OAEG;IACH,WAAW;QACT,OAAO,IAAI,CAAC,MAAM,CAAC,QAAQ,IAAI,iBAAS,CAAC;IAC3C,CAAC;IAED;;OAEG;IACH,SAAS;QACP,OAAO,EAAE,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IAC5B,CAAC;IAED;;OAEG;IACH,aAAa;QACX,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;CACF;AAED,qBAAqB;AACrB,IAAI,aAAa,GAAyB,IAAI,CAAC;AAExC,MAAM,gBAAgB,GAAG,GAAkB,EAAE;IAClD,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,aAAa,GAAG,IAAI,aAAa,EAAE,CAAC;IACtC,CAAC;IACD,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AALW,QAAA,gBAAgB,oBAK3B"}
+{"version":3,"file":"ConfigManager.js","sourceRoot":"","sources":["../../src/services/ConfigManager.ts"],"names":[],"mappings":"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"}

package/dist/services/DevServerRuntimeService.d.ts

@@ -0,0 +1,119 @@
+import { type ChildProcess, spawn } from 'child_process';
+import type { Framework } from './ProjectDetectionService';
+export type MissingTool = 'git' | 'node' | 'yarn';
+export type StartupCommandCacheEntry = {
+    startCommand: string;
+    installCommand?: string;
+    lastFailureAt?: string;
+};
+export type StartupCommandCache = {
+    read: (projectPath: string) => Promise<StartupCommandCacheEntry | null>;
+    write: (projectPath: string, entry: StartupCommandCacheEntry) => Promise<void>;
+    markFailed: (projectPath: string, reason?: string) => Promise<void>;
+};
+export type StartupCommandResolution = StartupCommandCacheEntry & {
+    source: 'cache' | 'discovered' | 'deterministic';
+};
+type PortBindingMode = 'npm_flag' | 'yarn_flag' | 'pnpm_flag' | 'cra_env' | 'placeholder' | 'fallback_flag' | 'none';
+export type StartDevServerOptions = {
+    projectPath: string;
+    framework: Framework;
+    packageManager: 'npm' | 'yarn' | 'pnpm';
+    preferredPort: number;
+    startCommand?: string;
+    installCommand?: string;
+    onExit?: () => void;
+};
+export type StartDevServerResult = {
+    success: true;
+    host: string;
+    port: number;
+    pid?: number;
+    ownership: 'rivet_owned';
+    startedByRivet: true;
+    stop: () => Promise<void>;
+    process: ChildProcess;
+    commandSource: StartupCommandResolution['source'];
+    portBindingMode: PortBindingMode;
+} | {
+    success: false;
+    error: string;
+    missingTools?: MissingTool[];
+};
+export type DependencyInstallResult = {
+    success: true;
+} | {
+    success: false;
+    error: string;
+    missingTools?: MissingTool[];
+};
+export type DevServerRuntimeDeps = {
+    spawn: typeof spawn;
+    exec: (command: string, options?: {
+        cwd?: string;
+        env?: NodeJS.ProcessEnv;
+    }) => Promise<{
+        stdout: string;
+        stderr: string;
+    }>;
+    isPortResponding: (port: number) => Promise<boolean>;
+    findAvailablePort: (port: number) => Promise<number>;
+    sleep: (ms: number) => Promise<void>;
+    platform: NodeJS.Platform;
+    shell?: string;
+    cache: StartupCommandCache;
+    isToolAvailable?: (tool: MissingTool) => Promise<boolean>;
+    dependenciesInstalled?: (projectPath: string) => Promise<boolean>;
+    discoverStartupCommand?: (options: {
+        projectPath: string;
+        framework: Framework;
+        packageManager: 'npm' | 'yarn' | 'pnpm';
+    }) => Promise<StartupCommandCacheEntry | null>;
+};
+/**
+ * Extracts the last valid localhost/dev-server port from process output.
+ */
+export declare const parsePortFromDevServerOutput: (text: string) => number | null;
+/**
+ * Starts and owns a target project's dev server for local agent mode.
+ */
+export declare class DevServerRuntimeService {
+    private readonly deps;
+    private process;
+    private port;
+    private projectPath;
+    constructor(deps?: DevServerRuntimeDeps);
+    /**
+     * Resolves the startup command using cache, optional discovery, then framework fallback.
+     */
+    resolveStartupCommand(options: {
+        projectPath: string;
+        framework: Framework;
+        packageManager: 'npm' | 'yarn' | 'pnpm';
+        preferredPort: number;
+    }): Promise<StartupCommandResolution>;
+    /**
+     * Installs project dependencies when the startup path requires it.
+     */
+    installDependenciesIfNeeded(options: {
+        projectPath: string;
+        installCommand?: string;
+    }): Promise<DependencyInstallResult>;
+    /**
+     * Starts a target app dev server and returns an owner-safe cleanup handle.
+     */
+    start(options: StartDevServerOptions): Promise<StartDevServerResult>;
+    /**
+     * Stops the owned child and owner-matched listener processes.
+     */
+    stop(): Promise<void>;
+    private collectPreExistingPorts;
+    private waitForServerAndDetectPort;
+    private waitForStableServer;
+    private findMissingTools;
+    private killProjectListenerOnPort;
+    private getProcessCwd;
+}
+export declare const createDevServerRuntimeService: () => DevServerRuntimeService;
+export {};
+//# sourceMappingURL=DevServerRuntimeService.d.ts.map

package/dist/services/DevServerRuntimeService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"DevServerRuntimeService.d.ts","sourceRoot":"","sources":["../../src/services/DevServerRuntimeService.ts"],"names":[],"mappings":"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"}