@xfey/tutti 0.1.33 → 0.1.35

package/dist/server-shell/local-console/project-service.js

@@ -1,12 +1,16 @@
 import { existsSync, statSync } from "node:fs";
 import { resolve } from "node:path";
-import { configureProjectOpenAiProvider, discoverOpenAiModels, readOpenAiProviderConfigProjection, resolveTuttiHome, } from "../../providers/openai/index.js";
+import { relayProjectRouteSegment } from "@tutti/shared/ids";
+import { configureProjectOpenAiProvider, discoverOpenAiModels, readOpenAiProviderConfigProjection, } from "../../providers/openai/index.js";
 import { formatCliErrorReason, LaunchError } from "../cli/errors.js";
-import { prepareLaunchProject } from "../cli/launch.js";
+import { prepareLaunchProject, resolveRelayUrl } from "../cli/launch.js";
 import { rotateHostLocalInvite } from "../cli/local-control-client.js";
+import { readHostRegistrationSecret, readMachineProjectBinding, readMachineRuntimeEndpoint, } from "../cli/machine-local.js";
 import { spawnDetachedHost, waitForManagedHostReady } from "../cli/managed-host.js";
 import { resolveManagedProjectContext } from "../cli/project-resolver.js";
 import { listRuntimeProjects, runStopCommand, } from "../cli/runtime-commands.js";
+import { readCliVersion } from "../cli/version.js";
+import { createLocalConsoleOperationEnvironment, } from "./invocation-context.js";
 export class LocalConsoleProjectError extends Error {
     code;
     statusCode;
@@ -44,7 +48,9 @@ function validateProvider(input) {
     }
     return provider;
 }
-function projectFromRuntimeRow(row, providerStatus) {
+function projectFromRuntimeRow(row, providerStatus, metadata) {
+    const currentVersion = readCliVersion();
+    const openUrl = projectOpenUrl(metadata.relayUrl, row.relay_project_ref);
     return {
         project_id: row.project_id,
         display_name: row.display_name,
@@ -53,32 +59,118 @@ function projectFromRuntimeRow(row, providerStatus) {
         provider_status: providerStatus,
         ...(row.relay_project_ref === undefined ? {} : { relay_project_ref: row.relay_project_ref }),
         ...(row.join_url === undefined ? {} : { join_url: row.join_url }),
+        ...(openUrl === undefined ? {} : { open_url: openUrl }),
         ...(row.relay_connection_status === undefined
             ? {}
             : { relay_connection_status: row.relay_connection_status }),
+        ...(metadata.activityAt === undefined ? {} : { activity_at: metadata.activityAt }),
+        ...(metadata.createdAt === undefined ? {} : { created_at: metadata.createdAt }),
+        ...(row.host_version === undefined ? {} : { host_version: row.host_version }),
+        ...(row.host_version === undefined || row.host_version === currentVersion
+            ? {}
+            : { update_required: true }),
     };
 }
+function projectOpenUrl(relayUrl, relayProjectRef) {
+    if (relayUrl === undefined || relayProjectRef === undefined) {
+        return undefined;
+    }
+    try {
+        const url = new URL(`/projects?open=${encodeURIComponent(relayProjectRouteSegment(relayProjectRef))}`, relayUrl);
+        return url.protocol === "http:" || url.protocol === "https:" ? url.toString() : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
+function readProjectActivityAt(tuttiHome, row, binding) {
+    if (row.last_connected_at !== undefined) {
+        return row.last_connected_at;
+    }
+    try {
+        const endpoint = readMachineRuntimeEndpoint(tuttiHome, row.project_id);
+        if (endpoint !== null) {
+            return endpoint.updated_at;
+        }
+    }
+    catch {
+        // Invalid endpoint state is already represented by the project status.
+    }
+    try {
+        return binding?.updated_at;
+    }
+    catch {
+        return undefined;
+    }
+}
+function relayUrlFromJoinUrl(joinUrl) {
+    if (joinUrl === undefined) {
+        return undefined;
+    }
+    try {
+        return new URL(joinUrl).origin;
+    }
+    catch {
+        return undefined;
+    }
+}
 export class LocalConsoleProjectService {
-    #cwd;
-    #env;
+    #tuttiHome;
+    #serviceEnvironment;
     #launches = new Map();
-    constructor(options = {}) {
-        this.#cwd = resolve(options.cwd ?? process.cwd());
-        this.#env = options.env ?? process.env;
+    #mutationTail = Promise.resolve();
+    constructor(options) {
+        this.#tuttiHome = resolve(options.tuttiHome);
+        this.#serviceEnvironment = options.serviceEnvironment ?? process.env;
     }
-    async listProjects() {
-        const tuttiHome = resolveTuttiHome(this.#env.TUTTI_HOME, this.#cwd);
+    #operationOptions(context) {
+        return {
+            cwd: context.currentDirectory,
+            env: createLocalConsoleOperationEnvironment({
+                serviceEnvironment: this.#serviceEnvironment,
+                invocationEnvironment: context.environment,
+                tuttiHome: this.#tuttiHome,
+            }),
+        };
+    }
+    #runMutation(operation) {
+        const result = this.#mutationTail.then(operation, operation);
+        this.#mutationTail = result.then(() => undefined, () => undefined);
+        return result;
+    }
+    async listProjects(context) {
+        const operation = this.#operationOptions(context);
         const rows = await listRuntimeProjects({
             all: true,
-            cwd: this.#cwd,
-            env: this.#env,
+            ...operation,
         });
         return rows.map((row) => {
+            let binding = null;
+            try {
+                binding = readMachineProjectBinding(this.#tuttiHome, row.project_id);
+            }
+            catch {
+                // Invalid binding state is already represented by the project status.
+            }
+            let createdAt = binding?.created_at;
+            if (createdAt === undefined) {
+                try {
+                    createdAt = readHostRegistrationSecret(this.#tuttiHome, row.project_id).created_at;
+                }
+                catch {
+                    // Damaged legacy metadata remains visible without an invented creation date.
+                }
+            }
             const provider = readOpenAiProviderConfigProjection({
-                tuttiHome,
+                tuttiHome: this.#tuttiHome,
                 projectId: row.project_id,
             });
-            return projectFromRuntimeRow(row, provider.status);
+            const activityAt = readProjectActivityAt(this.#tuttiHome, row, binding);
+            return projectFromRuntimeRow(row, provider.status, {
+                ...(activityAt === undefined ? {} : { activityAt }),
+                ...(createdAt === undefined ? {} : { createdAt }),
+                relayUrl: binding?.relay_url ?? relayUrlFromJoinUrl(row.join_url) ?? resolveRelayUrl(operation.env),
+            });
         });
     }
     async discoverModels(input) {
@@ -92,29 +184,29 @@ export class LocalConsoleProjectService {
             apiKey: provider.api_key,
         });
     }
-    async launchProject(input) {
+    async launchProject(input, context) {
         const workspacePath = validateWorkspacePath(input.workspacePath);
         const active = this.#launches.get(workspacePath);
         if (active !== undefined) {
             return await active;
         }
-        const launch = this.#launchProject({
+        const launch = this.#runMutation(async () => await this.#launchProject({
             workspacePath,
             ...(input.provider === undefined ? {} : { provider: validateProvider(input.provider) }),
-        }).finally(() => {
+        }, context)).finally(() => {
             this.#launches.delete(workspacePath);
         });
         this.#launches.set(workspacePath, launch);
         return await launch;
     }
-    async #launchProject(input) {
+    async #launchProject(input, context) {
+        const operation = this.#operationOptions(context);
         let preparation;
         try {
             preparation = await prepareLaunchProject({
                 workspacePath: input.workspacePath,
                 yes: true,
-                cwd: this.#cwd,
-                env: this.#env,
+                ...operation,
             });
         }
         catch (error) {
@@ -138,7 +230,8 @@ export class LocalConsoleProjectService {
         try {
             spawnDetachedHost({
                 workspaceRoot: preparation.workspace_root,
-                env: this.#env,
+                env: operation.env,
+                inheritProcessEnv: false,
             });
             const ready = await waitForManagedHostReady({
                 tuttiHome: preparation.tutti_home,
@@ -148,13 +241,14 @@ export class LocalConsoleProjectService {
             if (ready.join_url === undefined) {
                 throw new LocalConsoleProjectError("relay_registration_failed", "The host started, but Relay did not return a visible join link.");
             }
-            const projects = await this.listProjects();
+            const projects = await this.listProjects(context);
             const project = projects.find((item) => item.project_id === preparation.project_id);
             if (project === undefined) {
                 throw new LocalConsoleProjectError("project_not_found", "The launched project could not be read from the machine project list.");
             }
             return {
                 project,
+                project_created: preparation.project_identity_created,
                 join_url: ready.join_url,
                 ...(ready.join_token_expires_at === undefined
                     ? {}
@@ -165,44 +259,44 @@ export class LocalConsoleProjectService {
             throw this.#normalizeError(error);
         }
     }
-    async refreshInvite(projectId) {
-        const project = resolveManagedProjectContext({
-            target: projectId,
-            cwd: this.#cwd,
-            env: this.#env,
-        });
-        if (project.runtime_endpoint === null) {
-            throw new LocalConsoleProjectError("host_not_running", "Launch this project before creating an invite link.");
-        }
-        try {
-            const status = await rotateHostLocalInvite({ endpoint: project.runtime_endpoint });
-            const joinUrl = status.relay?.join_url;
-            if (joinUrl === undefined) {
-                throw new LocalConsoleProjectError("relay_registration_failed", "Relay did not return a visible invite link.");
+    async refreshInvite(projectId, context) {
+        return await this.#runMutation(async () => {
+            const project = resolveManagedProjectContext({
+                target: projectId,
+                ...this.#operationOptions(context),
+            });
+            if (project.runtime_endpoint === null) {
+                throw new LocalConsoleProjectError("host_not_running", "Launch this project before creating an invite link.");
             }
-            return {
-                join_url: joinUrl,
-                ...(status.relay?.join_token_expires_at === undefined
-                    ? {}
-                    : { expires_at: status.relay.join_token_expires_at }),
-            };
-        }
-        catch (error) {
-            throw this.#normalizeError(error);
-        }
+            try {
+                const status = await rotateHostLocalInvite({ endpoint: project.runtime_endpoint });
+                const joinUrl = status.relay?.join_url;
+                if (joinUrl === undefined) {
+                    throw new LocalConsoleProjectError("relay_registration_failed", "Relay did not return a visible invite link.");
+                }
+                return {
+                    join_url: joinUrl,
+                    ...(status.relay?.join_token_expires_at === undefined
+                        ? {}
+                        : { expires_at: status.relay.join_token_expires_at }),
+                };
+            }
+            catch (error) {
+                throw this.#normalizeError(error);
+            }
+        });
     }
-    async stopProject(projectId) {
-        try {
-            return {
-                message: await runStopCommand(projectId, {
-                    cwd: this.#cwd,
-                    env: this.#env,
-                }),
-            };
-        }
-        catch (error) {
-            throw this.#normalizeError(error);
-        }
+    async stopProject(projectId, context) {
+        return await this.#runMutation(async () => {
+            try {
+                return {
+                    message: await runStopCommand(projectId, this.#operationOptions(context)),
+                };
+            }
+            catch (error) {
+                throw this.#normalizeError(error);
+            }
+        });
     }
     #normalizeError(error) {
         if (error instanceof LocalConsoleProjectError) {

package/dist/server-shell/local-console/runtime-endpoint.d.ts

@@ -1,17 +1,31 @@
 export type LocalConsoleRuntimeEndpoint = {
+    schema_version: 2;
+    instance_id: string;
+    pid: number;
+    base_url: string;
+    control_token: string;
+    version: string;
+    entrypoint: string;
+    started_at: string;
+};
+export type LegacyLocalConsoleRuntimeEndpoint = {
     schema_version: 1;
     pid: number;
     base_url: string;
     control_token: string;
     started_at: string;
 };
+export type ReadableLocalConsoleRuntimeEndpoint = LocalConsoleRuntimeEndpoint | LegacyLocalConsoleRuntimeEndpoint;
 export declare function createLocalConsoleSecret(): string;
-export declare function readLocalConsoleRuntimeEndpoint(tuttiHome: string): LocalConsoleRuntimeEndpoint | null;
+export declare function readLocalConsoleRuntimeEndpoint(tuttiHome: string): ReadableLocalConsoleRuntimeEndpoint | null;
 export declare function writeLocalConsoleRuntimeEndpoint(options: {
     tuttiHome: string;
+    instanceId: string;
     pid: number;
     baseUrl: string;
     controlToken: string;
+    version: string;
+    entrypoint: string;
     now?: () => Date;
 }): LocalConsoleRuntimeEndpoint;
 export declare function deleteLocalConsoleRuntimeEndpoint(options: {

package/dist/server-shell/local-console/runtime-endpoint.js

@@ -7,10 +7,8 @@ function endpointPath(tuttiHome) {
 function isRecord(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
 }
-function isEndpoint(value) {
-    return (isRecord(value) &&
-        value.schema_version === 1 &&
-        typeof value.pid === "number" &&
+function hasSharedEndpointFields(value) {
+    return (typeof value.pid === "number" &&
         Number.isInteger(value.pid) &&
         typeof value.base_url === "string" &&
         /^http:\/\/127\.0\.0\.1:\d+$/u.test(value.base_url) &&
@@ -18,6 +16,21 @@ function isEndpoint(value) {
         value.control_token.length >= 32 &&
         typeof value.started_at === "string");
 }
+function isEndpoint(value) {
+    if (!isRecord(value) || !hasSharedEndpointFields(value)) {
+        return false;
+    }
+    if (value.schema_version === 1) {
+        return true;
+    }
+    return (value.schema_version === 2 &&
+        typeof value.instance_id === "string" &&
+        value.instance_id.length >= 16 &&
+        typeof value.version === "string" &&
+        value.version.trim() !== "" &&
+        typeof value.entrypoint === "string" &&
+        value.entrypoint.trim() !== "");
+}
 export function createLocalConsoleSecret() {
     return randomBytes(32).toString("base64url");
 }
@@ -36,10 +49,13 @@ export function readLocalConsoleRuntimeEndpoint(tuttiHome) {
 }
 export function writeLocalConsoleRuntimeEndpoint(options) {
     const record = {
-        schema_version: 1,
+        schema_version: 2,
+        instance_id: options.instanceId,
         pid: options.pid,
         base_url: options.baseUrl,
         control_token: options.controlToken,
+        version: options.version,
+        entrypoint: options.entrypoint,
         started_at: (options.now ?? (() => new Date()))().toISOString(),
     };
     if (!isEndpoint(record)) {

package/dist/server-shell/local-console/server.d.ts

@@ -1,17 +1,29 @@
 import { type FastifyInstance } from "fastify";
 export declare const LOCAL_CONSOLE_API_BASE = "/local-console/v1";
+type LocalConsoleRuntimeMetadata = {
+    instanceId: string;
+    version: string;
+    entrypoint: string;
+    startedAt: string;
+    pid: number;
+};
 type LocalConsoleServerOptions = {
     controlToken: string;
     cwd: string;
+    tuttiHome?: string;
     env?: NodeJS.ProcessEnv;
     now?: () => Date;
     webStaticRoot?: string | false;
+    runtime?: LocalConsoleRuntimeMetadata;
+    onActivity?: () => void;
+    onShutdown?: () => void;
 };
 export declare function createLocalConsoleServer(options: LocalConsoleServerOptions): FastifyInstance;
 export declare function runLocalConsoleProcess(options?: {
     cwd?: string;
     env?: NodeJS.ProcessEnv;
     now?: () => Date;
+    idleTimeoutMs?: number;
 }): Promise<void>;
 export {};
 //# sourceMappingURL=server.d.ts.map