cline 1.0.0-nightly.16 → 1.0.0-nightly.18

package/cline-core.js

@@ -533401,13 +533401,8 @@ var init_utils6 = __esm({
 });
 
 // src/core/storage/remote-config/fetch.ts
-async function fetchRemoteConfig(controller) {
+async function fetchRemoteConfigForOrganization(organizationId) {
   const authService = AuthService.getInstance();
-  const organizationId = authService.getActiveOrganizationId();
-  if (!organizationId) {
-    StateManager.get().clearRemoteConfig();
-    return void 0;
-  }
   try {
     const authToken = await authService.getAuthToken();
     if (!authToken) {
@@ -533442,32 +533437,68 @@ async function fetchRemoteConfig(controller) {
     }
     if (!configData.enabled) {
       await deleteRemoteConfigFromCache(organizationId);
-      StateManager.get().clearRemoteConfig();
       return void 0;
     }
     const parsedConfig = JSON.parse(configData.value);
     const validatedConfig = RemoteConfigSchema.parse(parsedConfig);
-    await writeRemoteConfigToCache(organizationId, validatedConfig);
-    applyRemoteConfig(validatedConfig);
-    controller.postStateToWebview();
     return validatedConfig;
   } catch (error) {
-    console.error("Failed to fetch remote config from API:", error);
+    console.error(`Failed to fetch remote config for organization ${organizationId}:`, error);
     const cachedConfig = await readRemoteConfigFromCache(organizationId);
     if (cachedConfig) {
       try {
         const validatedCachedConfig = RemoteConfigSchema.parse(cachedConfig);
-        applyRemoteConfig(validatedCachedConfig);
         return validatedCachedConfig;
       } catch (validationError) {
-        console.error("Cached config validation failed:", validationError);
+        console.error(`Cached config validation failed for organization ${organizationId}:`, validationError);
       }
     }
-    throw new Error(
-      `Failed to fetch remote config: ${error instanceof Error ? error.message : "Unknown error"}. No valid cached config available.`
-    );
+    return void 0;
+  }
+}
+async function findOrganizationWithRemoteConfig() {
+  const authService = AuthService.getInstance();
+  const userOrganizations = authService.getUserOrganizations();
+  if (!userOrganizations || userOrganizations.length === 0) {
+    return void 0;
+  }
+  for (const org of userOrganizations) {
+    const remoteConfig = await fetchRemoteConfigForOrganization(org.organizationId);
+    if (remoteConfig) {
+      return {
+        organizationId: org.organizationId,
+        config: remoteConfig
+      };
+    }
+  }
+  return void 0;
+}
+async function ensureUserInOrgWithRemoteConfig(controller) {
+  const authService = AuthService.getInstance();
+  try {
+    const result2 = await findOrganizationWithRemoteConfig();
+    if (!result2) {
+      StateManager.get().clearRemoteConfig();
+      controller.postStateToWebview();
+      return void 0;
+    }
+    const { organizationId, config: config6 } = result2;
+    const currentActiveOrgId = authService.getActiveOrganizationId();
+    if (currentActiveOrgId !== organizationId) {
+      await controller.accountService.switchAccount(organizationId);
+    }
+    await writeRemoteConfigToCache(organizationId, config6);
+    applyRemoteConfig(config6);
+    controller.postStateToWebview();
+    return config6;
+  } catch (error) {
+    console.error("Failed to ensure user in organization with remote config:", error);
+    return void 0;
   }
 }
+async function fetchRemoteConfig(controller) {
+  return ensureUserInOrgWithRemoteConfig(controller);
+}
 var init_fetch2 = __esm({
   "src/core/storage/remote-config/fetch.ts"() {
     "use strict";
@@ -784694,6 +784725,13 @@ var init_AuthService = __esm({
         const activeOrg = this._clineAuthInfo.userInfo.organizations.find((org) => org.active);
         return activeOrg?.organizationId ?? null;
       }
+      /**
+       * Gets all organizations from the authenticated user's info
+       * @returns Array of organizations, or undefined if not available
+       */
+      getUserOrganizations() {
+        return this._clineAuthInfo?.userInfo?.organizations;
+      }
       async internalGetAuthToken(provider) {
         try {
           let clineAccountAuthToken = this._clineAuthInfo?.idToken;
@@ -784701,7 +784739,6 @@ var init_AuthService = __esm({
             return null;
           }
           if (await provider.shouldRefreshIdToken(clineAccountAuthToken, this._clineAuthInfo.expiresAt)) {
-            console.log("Provider indicates token needs refresh");
             const updatedAuthInfo = await provider.retrieveClineAuthInfo(this._controller);
             if (updatedAuthInfo) {
               this._clineAuthInfo = updatedAuthInfo;
@@ -784856,7 +784893,6 @@ var init_AuthService = __esm({
        * @param requestId The ID of the request (passed by the gRPC handler)
        */
       async subscribeToAuthStatusUpdate(controller, _request, responseStream, requestId) {
-        console.log("Subscribing to authStatusUpdate");
         this._activeAuthStatusUpdateHandlers.add(responseStream);
         this._handlerToController.set(responseStream, controller);
         const cleanup = () => {

package/extension/package.json

@@ -295,7 +295,7 @@
 		"vscode:prepublish": "npm run package",
 		"compile": "npm run check-types && npm run lint && node esbuild.mjs",
 		"compile-standalone": "npm run check-types && npm run lint && node esbuild.mjs --standalone",
-		"compile-standalone-npm": "npm run check-types && npm run lint && node esbuild.mjs --standalone",
+		"compile-standalone-npm": "npm run protos && npm run protos-go && npm run check-types && npm run lint && node esbuild.mjs --standalone",
 		"compile-cli": "scripts/build-cli.sh",
 		"compile-cli-all-platforms": "scripts/build-cli-all-platforms.sh",
 		"compile-cli-man-page": "pandoc cli/man/cline.1.md -s -t man -o cli/man/cline.1",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "cline",
-    "version": "1.0.0-nightly.16",
+    "version": "1.0.0-nightly.18",
     "description": "Autonomous coding agent CLI - capable of creating/editing files, running commands, using the browser, and more",
     "main": "cline-core.js",
     "bin": {

package/test-startup.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+# Test script to check if cline-core starts without errors
+
+echo "Testing cline-core startup..."
+node cline-core.js &
+PID=$!
+
+# Wait for 3 seconds
+sleep 3
+
+# Kill the process
+kill $PID 2>/dev/null
+
+echo "Test complete"