Update files

hotlong · hotlong · commit 13747e3ccacc · 2026-05-15T21:30:52.000+08:00
diff --git a/apps/account/src/hooks/useSession.ts b/apps/account/src/hooks/useSession.ts
@@ -57,6 +57,13 @@ export interface SessionState {
   setActiveOrganization: (organizationId: string) => Promise<void>;
   organizations: Organization[];
   organizationsLoading: boolean;
+  /**
+   * `true` once `organizations` has been fetched at least once for the
+   * current user. Useful for callers that need to distinguish "user has no
+   * orgs" from "we haven't asked the server yet" (e.g. the post-login
+   * redirect flow).
+   */
+  organizationsFetched: boolean;
   reloadOrganizations: () => Promise<void>;
 }
 
@@ -93,6 +100,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
   const [error, setError] = useState<Error | null>(null);
   const [organizations, setOrganizations] = useState<Organization[]>([]);
   const [organizationsLoading, setOrganizationsLoading] = useState(false);
+  const [organizationsFetched, setOrganizationsFetched] = useState(false);
 
   const reloadOrganizations = useCallback(async () => {
     if (!client?.organizations) return;
@@ -104,6 +112,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
       setOrganizations([]);
     } finally {
       setOrganizationsLoading(false);
+      setOrganizationsFetched(true);
     }
   }, [client]);
 
@@ -134,6 +143,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
       reloadOrganizations();
     } else {
       setOrganizations([]);
+      setOrganizationsFetched(false);
     }
   }, [user, reloadOrganizations]);
 
@@ -145,6 +155,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
       setUser(null);
       setSession(null);
       setOrganizations([]);
+      setOrganizationsFetched(false);
     }
   }, [client]);
 
@@ -168,6 +179,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
       setActiveOrganization,
       organizations,
       organizationsLoading,
+      organizationsFetched,
       reloadOrganizations,
     }),
     [
@@ -180,6 +192,7 @@ export function SessionProvider({ children }: { children: ReactNode }) {
       setActiveOrganization,
       organizations,
       organizationsLoading,
+      organizationsFetched,
       reloadOrganizations,
     ],
   );
diff --git a/apps/account/src/routes/login.tsx b/apps/account/src/routes/login.tsx
@@ -44,25 +44,69 @@ function LoginPage() {
   const navigate = useNavigate();
   const { redirect } = Route.useSearch();
   const client = useClient() as any;
-  const { session, user, refresh } = useSession();
+  const {
+    session,
+    user,
+    refresh,
+    organizations,
+    organizationsLoading,
+    organizationsFetched,
+    setActiveOrganization,
+  } = useSession();
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [submitting, setSubmitting] = useState(false);
+  const [autoSelectingOrg, setAutoSelectingOrg] = useState(false);
 
   useEffect(() => {
     if (!user) return;
-    if (isSafeRedirect(redirect)) {
-      window.location.assign(resolveRedirect(redirect));
-      return;
-    }
+
+    // If the user has organizations but no active one, auto-select the first
+    // org before navigating away. Otherwise consumers like the Console's
+    // `RequireOrganization` guard would bounce the user from the redirect
+    // target (e.g. `/_console/home`) to `/_console/organizations`, making
+    // the post-login redirect look like a back-and-forth jump.
     if (!session?.activeOrganizationId) {
+      // Wait for the org list to be fetched at least once before deciding.
+      if (!organizationsFetched || organizationsLoading || autoSelectingOrg) return;
+      if (organizations.length === 1) {
+        setAutoSelectingOrg(true);
+        setActiveOrganization(organizations[0].id)
+          .catch(() => undefined)
+          .finally(() => setAutoSelectingOrg(false));
+        return;
+      }
+      if (organizations.length === 0) {
+        // Brand-new account with no org yet — send to the org creation flow
+        // instead of the org picker (which would be empty).
+        navigate({ to: '/organizations/new' });
+        return;
+      }
+      // Multiple orgs and no active selection — let the user choose.
       navigate({ to: '/organizations' });
       return;
     }
+
+    if (autoSelectingOrg) return;
+
+    if (isSafeRedirect(redirect)) {
+      window.location.assign(resolveRedirect(redirect));
+      return;
+    }
     // Default landing after sign-in: the platform home, not the Account
     // profile page. Users can reach `/account` from the top-bar menu.
     window.location.assign('/');
-  }, [user, session, navigate, redirect]);
+  }, [
+    user,
+    session,
+    navigate,
+    redirect,
+    organizations,
+    organizationsLoading,
+    organizationsFetched,
+    autoSelectingOrg,
+    setActiveOrganization,
+  ]);
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
diff --git a/apps/account/src/routes/register.tsx b/apps/account/src/routes/register.tsx
@@ -36,27 +36,67 @@ function RegisterPage() {
   const navigate = useNavigate();
   const { redirect } = Route.useSearch();
   const client = useClient() as any;
-  const { session, user, refresh } = useSession();
+  const {
+    session,
+    user,
+    refresh,
+    organizations,
+    organizationsLoading,
+    organizationsFetched,
+    setActiveOrganization,
+  } = useSession();
   const [name, setName] = useState('');
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [submitting, setSubmitting] = useState(false);
+  const [autoSelectingOrg, setAutoSelectingOrg] = useState(false);
 
   useEffect(() => {
     if (!user) return;
-    if (isSafeRedirect(redirect)) {
-      window.location.assign(resolveRedirect(redirect));
+
+    // If the freshly-signed-up user already has organizations (the auth
+    // plugin auto-provisions a personal workspace, or they accepted an
+    // invitation), make sure one is active before navigating away. Without
+    // this the redirect target's `RequireOrganization` guard would bounce
+    // the user to `/_console/organizations`.
+    if (!session?.activeOrganizationId) {
+      // Wait until the org list has been fetched at least once before
+      // deciding — otherwise we'd race the post-signup org provisioning.
+      if (!organizationsFetched || organizationsLoading || autoSelectingOrg) return;
+      if (organizations.length === 1) {
+        setAutoSelectingOrg(true);
+        setActiveOrganization(organizations[0].id)
+          .catch(() => undefined)
+          .finally(() => setAutoSelectingOrg(false));
+        return;
+      }
+      if (organizations.length > 1) {
+        navigate({ to: '/organizations' });
+        return;
+      }
+      // No orgs at all — the user needs to create one.
+      navigate({ to: '/organizations/new' });
       return;
     }
-    // If the user already has an org (e.g. signed up via an invitation),
-    // hand off to the platform home. Otherwise, send them to the org
-    // creation page — they need an org before they can use the product.
-    if (session?.activeOrganizationId) {
-      window.location.assign('/');
+
+    if (autoSelectingOrg) return;
+
+    if (isSafeRedirect(redirect)) {
+      window.location.assign(resolveRedirect(redirect));
       return;
     }
-    navigate({ to: '/organizations/new' });
-  }, [user, session, navigate, redirect]);
+    window.location.assign('/');
+  }, [
+    user,
+    session,
+    navigate,
+    redirect,
+    organizations,
+    organizationsLoading,
+    organizationsFetched,
+    autoSelectingOrg,
+    setActiveOrganization,
+  ]);
 
   const handleSubmit = async (e: React.FormEvent) => {
     e.preventDefault();
diff --git a/apps/cloud/wrangler.toml b/apps/cloud/wrangler.toml
@@ -45,7 +45,7 @@ compatibility_flags = ["nodejs_compat"]
 # rebuild + re-push to ship a new version, then run `wrangler deploy`.
 [[containers]]
 class_name = "CloudContainer"
-image = "registry.cloudflare.com/2846eb40a60f4738e292b90dcd8cce10/objectstack-cloud:turso-token-v3"
+image = "registry.cloudflare.com/2846eb40a60f4738e292b90dcd8cce10/objectstack-cloud:publish-diag"
 max_instances = 3
 instance_type = "standard-1"
 
diff --git a/packages/services/service-cloud/src/multi-project-plugin.ts b/packages/services/service-cloud/src/multi-project-plugin.ts
@@ -90,7 +90,7 @@ function createTemplateSeeder(
     kernelManager: KernelManager,
     templates: Record<string, ProjectTemplate>,
     envRegistry: EnvironmentDriverRegistry,
-    publishCtx: { controlDriver: IDataDriver; getStorage: () => any | null; storageAdapter: string; keyPrefix: string },
+    publishCtx: { controlDriver: IDataDriver; getStorage: () => any | Promise<any> | null; storageAdapter: string; keyPrefix: string },
 ): TemplateSeeder {
     const seedBundleForProject = async (projectId: string, bundle: any): Promise<void> => {
         const items = bundle ? extractMetadataItems(bundle) : [];
@@ -275,14 +275,32 @@ function createTemplateSeeder(
         // step, the seeded data only lives in this project's metadata
         // DB on the cloud container's filesystem and is invisible to
         // any other process.
+        let publishStatus: { stage: string; ok: boolean; error?: string; detail?: any } = {
+            stage: 'start', ok: false,
+        };
         try {
-            const storage = publishCtx.getStorage();
-            if (storage) {
+            const storage = await Promise.resolve(publishCtx.getStorage());
+            publishStatus.stage = 'getStorage';
+            publishStatus.detail = {
+                hasStorage: !!storage,
+                storageType: storage ? (storage.constructor?.name ?? typeof storage) : 'null',
+                bundleHasObjects: Array.isArray(bundle?.objects) ? bundle.objects.length : 0,
+                bundleHasApps: Array.isArray(bundle?.apps) ? bundle.apps.length : 0,
+                bundleHasViews: Array.isArray(bundle?.views) ? bundle.views.length : 0,
+            };
+            if (!storage) {
+                publishStatus.error = 'no-file-storage-service';
+                console.warn(
+                    `[MultiProjectPlugin] No file-storage service registered; skipping artifact publish for project ${projectId}.`,
+                );
+            } else {
+                publishStatus.stage = 'findProject';
                 const projectRow = await (publishCtx.controlDriver as any).findOne(
                     'sys_project',
                     { where: { id: projectId } },
                 );
                 if (projectRow) {
+                    publishStatus.stage = 'publishProjectRevision';
                     const { publishProjectRevision } = await import('./cloud-artifact-helpers.js');
                     await publishProjectRevision({
                         driver: publishCtx.controlDriver,
@@ -293,15 +311,34 @@ function createTemplateSeeder(
                         bundle,
                         note: 'template-seed',
                     });
+                    publishStatus.ok = true;
+                    publishStatus.stage = 'done';
+                    console.log(`[MultiProjectPlugin] Published artifact bundle for project ${projectId}`);
+                } else {
+                    publishStatus.error = 'project-not-found';
                 }
             }
         } catch (err: any) {
-            // eslint-disable-next-line no-console
+            publishStatus.error = err?.message ?? String(err);
+            publishStatus.detail = { ...(publishStatus.detail ?? {}), stack: err?.stack };
             console.error(
                 `[MultiProjectPlugin] Failed to publish seeded artifact for project ${projectId}:`,
                 err?.stack ?? err?.message ?? err,
             );
         }
+        // Persist publish diagnostic into sys_project.metadata.publishStatus so
+        // operators can see why publish skipped without container logs.
+        try {
+            const cur = await (publishCtx.controlDriver as any).findOne('sys_project', { where: { id: projectId } });
+            const meta = cur && typeof cur.metadata === 'string'
+                ? JSON.parse(cur.metadata)
+                : (cur?.metadata ?? {});
+            await (publishCtx.controlDriver as any).update(
+                'sys_project',
+                { where: { id: projectId } },
+                { metadata: JSON.stringify({ ...meta, publishStatus, publishStatusAt: new Date().toISOString() }) },
+            );
+        } catch { /* best-effort diagnostic */ }
     };
 
     return {
@@ -486,14 +523,20 @@ export class MultiProjectPlugin implements Plugin {
                 controlDriver: this.config.controlDriver,
                 storageAdapter: (process.env.OS_STORAGE_ADAPTER ?? 'local').toLowerCase(),
                 keyPrefix: process.env.OS_STORAGE_KEY_PREFIX ?? 'artifacts',
-                getStorage: () => {
+                getStorage: async () => {
                     // Resolve once-per-call so the storage plugin (registered
                     // in parallel) is available even when MultiProjectPlugin
-                    // initialised first.
+                    // initialised first. Try sync getService first; fall back
+                    // to async getServiceAsync (StorageServicePlugin may register
+                    // via async lifecycle on cold start).
                     try {
                         const sync = (hostKernel as any).getService?.('file-storage');
                         if (sync && typeof sync.upload === 'function') return sync;
-                    } catch { /* async-only — fall through */ }
+                    } catch { /* fall through */ }
+                    try {
+                        const async = await (hostKernel as any).getServiceAsync?.('file-storage');
+                        if (async && typeof async.upload === 'function') return async;
+                    } catch { /* not registered yet */ }
                     return null;
                 },
             },
