@xfey/tutti 0.1.26 → 0.1.27

package/dist/server-shell/cli/host-runtime-endpoint.d.ts

@@ -3,6 +3,9 @@ import type { MachineRuntimeEndpointRecord } from "./machine-local.js";
 export type FetchLike = (input: string | URL, init?: RequestInit) => Promise<Response>;
 export type HostRuntimeEndpointProbeResult = {
     kind: "alive";
+    readiness?: {
+        relay?: "not_connected" | "connected";
+    };
 } | {
     kind: "stale";
     reason: string;

package/dist/server-shell/cli/host-runtime-endpoint.js

@@ -5,12 +5,23 @@ function delay(ms) {
         setTimeout(resolve, ms);
     });
 }
-function isHostHealthPayload(value) {
+function parseHostHealthPayload(value) {
     if (typeof value !== "object" || value === null || Array.isArray(value)) {
-        return false;
+        return null;
     }
     const record = value;
-    return record.service === "tutti-host" && record.status === "ok";
+    if (record.service !== "tutti-host" || record.status !== "ok") {
+        return null;
+    }
+    if (typeof record.readiness !== "object" ||
+        record.readiness === null ||
+        Array.isArray(record.readiness)) {
+        return {};
+    }
+    const readiness = record.readiness;
+    return readiness.relay === "connected" || readiness.relay === "not_connected"
+        ? { relay: readiness.relay }
+        : {};
 }
 async function fetchWithTimeout(fetchImpl, url, init = {}, timeoutMs = DEFAULT_PROBE_TIMEOUT_MS) {
     const controller = new AbortController();
@@ -38,11 +49,14 @@ export function createRuntimeEndpointProbe(fetchImpl = fetch) {
             if (!response.ok) {
                 return { kind: "stale", reason: `health returned HTTP ${response.status}` };
             }
-            const payload = await response.json();
-            if (!isHostHealthPayload(payload)) {
+            const readiness = parseHostHealthPayload(await response.json());
+            if (readiness === null) {
                 return { kind: "stale", reason: "health response is not a Tutti host" };
             }
-            return { kind: "alive" };
+            return {
+                kind: "alive",
+                ...(readiness.relay === undefined ? {} : { readiness }),
+            };
         }
         catch (error) {
             const reason = error instanceof Error ? error.message : "health check failed";

package/dist/server-shell/cli/runtime-commands.d.ts

@@ -4,7 +4,7 @@ import { type MachineRuntimeEndpointRecord } from "./machine-local.js";
 import type { LocalControlFetch } from "./local-control-client.js";
 export type RuntimeProjectRow = {
     project_id: ProjectId;
-    status: "online" | "stale";
+    status: "online" | "offline" | "stale";
     display_name: string;
     workspace_root: string;
     endpoint?: string;

package/dist/server-shell/cli/runtime-commands.js

@@ -11,6 +11,7 @@ import { resolveManagedProjectContext } from "./project-resolver.js";
 import { formatJoinLinkValidity, renderTerminalQr } from "./terminal-qr.js";
 import { resolveTuttiHome } from "../../providers/openai/index.js";
 import { readCliVersion } from "./version.js";
+import { readProjectIdentity } from "./project-identity.js";
 const PROJECT_ID_DISPLAY_MIN_LENGTH = 12;
 function resolveProject(target, options = {}) {
     return resolveManagedProjectContext({
@@ -45,6 +46,30 @@ function readBindingFile(tuttiHome, projectId) {
         return null;
     }
 }
+function workspaceBelongsToProject(workspaceRoot, projectId) {
+    if (!existsSync(workspaceRoot)) {
+        return false;
+    }
+    try {
+        const identity = readProjectIdentity(workspaceRoot);
+        return identity.kind === "present" && identity.project_id === projectId;
+    }
+    catch {
+        return false;
+    }
+}
+async function cleanupOrphanedRuntimeProject(options) {
+    if (options.hostAlive) {
+        await requestHostLocalShutdown({
+            endpoint: options.endpoint,
+            ...(options.fetchImpl === undefined ? {} : { fetchImpl: options.fetchImpl }),
+        }).catch(() => undefined);
+    }
+    deleteMachineProjectLocalState({
+        tuttiHome: options.tuttiHome,
+        projectId: options.projectId,
+    });
+}
 export function formatProjectIdForDisplay(projectId, projectIds) {
     for (let length = Math.min(PROJECT_ID_DISPLAY_MIN_LENGTH, projectId.length); length <= projectId.length; length += 1) {
         const prefix = projectId.slice(0, length);
@@ -65,13 +90,27 @@ export async function listRuntimeProjects(options = {}) {
             continue;
         }
         const binding = readBindingFile(tuttiHome, projectId);
+        const workspaceRoot = binding?.workspace_root ?? endpoint.workspace_root;
+        const displayName = binding?.workspace_root === undefined
+            ? projectId
+            : binding.workspace_root.split(/[\\/]/u).pop() ?? projectId;
         const health = await probe(endpoint);
+        if (!workspaceBelongsToProject(workspaceRoot, projectId)) {
+            await cleanupOrphanedRuntimeProject({
+                tuttiHome,
+                projectId,
+                endpoint,
+                hostAlive: health.kind === "alive",
+                ...(options.fetchImpl === undefined ? {} : { fetchImpl: options.fetchImpl }),
+            });
+            continue;
+        }
         if (health.kind === "stale") {
             rows.push({
                 project_id: projectId,
                 status: "stale",
-                display_name: binding?.workspace_root === undefined ? projectId : binding.workspace_root.split(/[\\/]/u).pop() ?? projectId,
-                workspace_root: binding?.workspace_root ?? endpoint.workspace_root,
+                display_name: displayName,
+                workspace_root: workspaceRoot,
                 endpoint: endpoint.base_url,
             });
             continue;
@@ -84,9 +123,9 @@ export async function listRuntimeProjects(options = {}) {
         ]);
         const row = {
             project_id: projectId,
-            status: "online",
-            display_name: project.status === "fulfilled" ? project.value.display_name : binding?.workspace_root.split(/[\\/]/u).pop() ?? projectId,
-            workspace_root: binding?.workspace_root ?? endpoint.workspace_root,
+            status: health.readiness?.relay === "connected" ? "online" : "offline",
+            display_name: project.status === "fulfilled" ? project.value.display_name : displayName,
+            workspace_root: workspaceRoot,
             endpoint: endpoint.base_url,
         };
         if (provider.status === "fulfilled") {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xfey/tutti",
-  "version": "0.1.26",
+  "version": "0.1.27",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",