@papert-code/papert-code 0.3.9 → 0.3.91

package/dist/cli.js

@@ -100711,7 +100711,7 @@ import { fileURLToPath as fileURLToPath5 } from "node:url";
 import path15 from "node:path";
 async function getVersion() {
   const pkgJson = await getPackageJson(__dirname3);
-  return "0.3.9";
+  return "0.3.91";
 }
 var __filename2, __dirname3;
 var init_version2 = __esm({
@@ -171503,7 +171503,7 @@ function createContentGeneratorConfig(config2, authType, generationConfig) {
   };
 }
 async function createContentGenerator(config2, gcConfig, isInitialAuth) {
-  const version3 = "0.3.9";
+  const version3 = "0.3.91";
   const userAgent2 = `PapertCode/${version3} (${process.platform}; ${process.arch})`;
   const baseHeaders = {
     "User-Agent": userAgent2
@@ -401856,60 +401856,14 @@ var require_prompts3 = __commonJS({
 // packages/cli/src/admin/adminClient.ts
 import path130 from "node:path";
 import fs108 from "node:fs/promises";
-function getAdminEnv() {
-  const rawBase = process.env["PAPERT_ADMIN_URL"];
-  const baseUrl = rawBase ? rawBase.replace(/\/$/, "") : void 0;
-  return {
-    baseUrl,
-    email: process.env["PAPERT_ADMIN_EMAIL"],
-    password: process.env["PAPERT_ADMIN_PASSWORD"],
-    token: process.env["PAPERT_ADMIN_TOKEN"]
-  };
-}
 function getAdminTokenPath() {
   return path130.join(Storage.getGlobalPapertDir(), "admin-token.json");
 }
-async function loadCachedToken(baseUrl) {
-  try {
-    const raw2 = await fs108.readFile(getAdminTokenPath(), "utf-8");
-    const parsed = JSON.parse(raw2);
-    if (!parsed.token || !parsed.baseUrl) return null;
-    if (parsed.baseUrl !== baseUrl) return null;
-    return { token: parsed.token, email: parsed.email };
-  } catch {
-    return null;
-  }
-}
 async function saveCachedToken(baseUrl, token2, email2) {
   const payload = { baseUrl, token: token2, email: email2, savedAt: (/* @__PURE__ */ new Date()).toISOString() };
   await fs108.mkdir(path130.dirname(getAdminTokenPath()), { recursive: true });
   await fs108.writeFile(getAdminTokenPath(), JSON.stringify(payload, null, 2));
 }
-async function promptForLogin() {
-  if (!process.stdin.isTTY) return null;
-  const response = await (0, import_prompts4.default)(
-    [
-      {
-        type: "text",
-        name: "email",
-        message: "Admin email",
-        validate: /* @__PURE__ */ __name((value) => value.includes("@") ? true : "Enter a valid email", "validate")
-      },
-      {
-        type: "password",
-        name: "password",
-        message: "Admin password"
-      }
-    ],
-    {
-      onCancel: /* @__PURE__ */ __name(() => true, "onCancel")
-    }
-  );
-  if (!response.email || !response.password) {
-    return null;
-  }
-  return { email: response.email, password: response.password };
-}
 async function requestJson(baseUrl, path157, options2 = {}) {
   const response = await fetch(`${baseUrl}${path157}`, options2);
   const payload = await response.json().catch(() => void 0);
@@ -401925,92 +401879,6 @@ async function requestJson(baseUrl, path157, options2 = {}) {
 function isFetchFailure(err) {
   return err instanceof TypeError && err.message === "fetch failed";
 }
-async function resolveAdminSession() {
-  const { baseUrl, email: email2, password, token: token2 } = getAdminEnv();
-  if (!baseUrl) return null;
-  let authToken = token2;
-  let loginResponse;
-  if (!authToken) {
-    const cached2 = await loadCachedToken(baseUrl);
-    if (cached2?.token) {
-      authToken = cached2.token;
-    }
-  }
-  let loginEmail = email2;
-  let loginPassword = password;
-  if (!authToken && (!loginEmail || !loginPassword)) {
-    const prompted = await promptForLogin();
-    if (prompted) {
-      loginEmail = prompted.email;
-      loginPassword = prompted.password;
-    }
-  }
-  if (!authToken && loginEmail && loginPassword) {
-    try {
-      loginResponse = await requestJson(baseUrl, "/api/v1/auth/login", {
-        method: "POST",
-        headers: { "Content-Type": "application/json" },
-        body: JSON.stringify({ email: loginEmail, password: loginPassword })
-      });
-      authToken = loginResponse.token;
-      if (authToken) {
-        await saveCachedToken(baseUrl, authToken, loginEmail);
-      }
-    } catch (err) {
-      if (isFetchFailure(err)) {
-        console.warn(
-          `Warning: unable to reach admin server at ${baseUrl}. Continuing without admin session.`
-        );
-        return null;
-      }
-      throw err;
-    }
-  }
-  if (!authToken) {
-    return null;
-  }
-  try {
-    const configResponse = await requestJson(baseUrl, "/api/v1/user/config", {
-      headers: {
-        Authorization: `Bearer ${authToken}`
-      }
-    });
-    const user = configResponse.user ?? loginResponse?.user;
-    const provider = configResponse.provider ?? loginResponse?.provider ?? loginResponse?.user?.provider ?? {};
-    return {
-      baseUrl,
-      token: authToken,
-      userId: user?.id || email2 || "unknown-user",
-      email: user?.email || email2 || "unknown",
-      selfManaged: Boolean(user?.selfManaged),
-      provider,
-      controls: configResponse.controls ?? loginResponse?.controls ?? {},
-      quota: configResponse.quota ?? loginResponse?.quota
-    };
-  } catch (err) {
-    if (isFetchFailure(err)) {
-      console.warn(
-        `Warning: unable to reach admin server at ${baseUrl}. Continuing without admin session.`
-      );
-      return null;
-    }
-    if (err.status === 401) {
-      try {
-        await fs108.unlink(getAdminTokenPath());
-      } catch {
-      }
-    }
-    const payload = err.payload;
-    if (payload?.error === "quota_exceeded") {
-      throw new AdminQuotaError(payload.message || "Token quota exceeded", {
-        quota: payload.quota,
-        token: authToken,
-        baseUrl
-      });
-    }
-    throw err;
-  }
-}
 async function resolveAdminSessionWithCredentials(options2) {
   const baseUrl = options2.baseUrl.replace(/\/$/, "");
   if (!baseUrl) return null;
@@ -402092,64 +401960,6 @@ function applyAdminSessionToEnv(session) {
     process.env["PAPERT_ADMIN_MODELS"] = JSON.stringify(models);
   }
 }
-async function reportAdminUsage(session, config2) {
-  const metrics2 = uiTelemetryService.getMetrics();
-  const usage2 = computeUsageFromMetrics(metrics2);
-  const totalTokens = usage2?.total_tokens ?? (typeof usage2?.input_tokens === "number" && typeof usage2?.output_tokens === "number" ? usage2.input_tokens + usage2.output_tokens : void 0);
-  if (!totalTokens) return;
-  await requestJson(session.baseUrl, "/api/v1/user/usage", {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${session.token}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      sessionId: config2.getSessionId(),
-      totalTokens,
-      promptTokens: usage2.input_tokens,
-      completionTokens: usage2.output_tokens,
-      model: config2.getModel(),
-      baseUrl: config2.getContentGeneratorConfig().baseUrl
-    })
-  });
-}
-async function uploadAdminSession(session, config2) {
-  const sessionId = config2.getSessionId();
-  const chatPath = path130.join(
-    config2.storage.getProjectTempDir(),
-    "chats",
-    `${sessionId}.jsonl`
-  );
-  let transcript;
-  try {
-    transcript = await fs108.readFile(chatPath, "utf-8");
-  } catch {
-    return;
-  }
-  await requestJson(session.baseUrl, "/api/v1/user/sessions", {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${session.token}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({
-      sessionId,
-      transcript,
-      model: config2.getModel(),
-      baseUrl: config2.getContentGeneratorConfig().baseUrl
-    })
-  });
-}
-async function requestQuotaIncrease(baseUrl, token2, reason) {
-  await requestJson(baseUrl, "/api/v1/user/quota-requests", {
-    method: "POST",
-    headers: {
-      Authorization: `Bearer ${token2}`,
-      "Content-Type": "application/json"
-    },
-    body: JSON.stringify({ reason })
-  });
-}
 var import_prompts4, AdminQuotaError;
 var init_adminClient = __esm({
   async "packages/cli/src/admin/adminClient.ts"() {
@@ -402173,19 +401983,12 @@ var init_adminClient = __esm({
         this.baseUrl = options2.baseUrl;
       }
     };
-    __name(getAdminEnv, "getAdminEnv");
     __name(getAdminTokenPath, "getAdminTokenPath");
-    __name(loadCachedToken, "loadCachedToken");
     __name(saveCachedToken, "saveCachedToken");
-    __name(promptForLogin, "promptForLogin");
     __name(requestJson, "requestJson");
     __name(isFetchFailure, "isFetchFailure");
-    __name(resolveAdminSession, "resolveAdminSession");
     __name(resolveAdminSessionWithCredentials, "resolveAdminSessionWithCredentials");
     __name(applyAdminSessionToEnv, "applyAdminSessionToEnv");
-    __name(reportAdminUsage, "reportAdminUsage");
-    __name(uploadAdminSession, "uploadAdminSession");
-    __name(requestQuotaIncrease, "requestQuotaIncrease");
   }
 });
 
@@ -433731,7 +433534,7 @@ var init_acpAgent = __esm({
           name: APPROVAL_MODE_INFO[mode].name,
           description: APPROVAL_MODE_INFO[mode].description
         }));
-        const version3 = "0.3.9";
+        const version3 = "0.3.91";
         return {
           protocolVersion: PROTOCOL_VERSION,
           agentInfo: {
@@ -434034,29 +433837,6 @@ async function main() {
   migrateDeprecatedSettings(settings);
   await cleanupCheckpoints();
   let argv = await parseArguments(settings.merged);
-  let adminSession = null;
-  try {
-    adminSession = await resolveAdminSession();
-    if (adminSession) {
-      applyAdminSessionToEnv(adminSession);
-    }
-  } catch (err) {
-    if (err instanceof AdminQuotaError) {
-      if (err.baseUrl && err.token) {
-        try {
-          await requestQuotaIncrease(
-            err.baseUrl,
-            err.token,
-            "User exceeded token quota during login."
-          );
-        } catch {
-        }
-      }
-      console.error(err.message);
-      process.exit(1);
-    }
-    throw err;
-  }
   const targetCwd = argv.cwd ? path156.resolve(argv.cwd) : process.cwd();
   if (argv.promptInteractive && !process.stdin.isTTY) {
     console.error(
@@ -434149,15 +433929,6 @@ ${finalArgs[promptIndex + 1]}`;
       argv,
       targetCwd
     );
-    if (adminSession) {
-      registerCleanup(async () => {
-        try {
-          await reportAdminUsage(adminSession, config2);
-          await uploadAdminSession(adminSession, config2);
-        } catch {
-        }
-      });
-    }
     if (config2.getListExtensions()) {
       console.log("Installed extensions:");
       for (const extension of extensions) {
@@ -434336,7 +434107,6 @@ var init_gemini = __esm({
     await init_validateNonInterActiveAuth();
     await init_ResumeSessionPicker();
     init_deferred();
-    await init_adminClient();
     init_extensionEnablement();
     init_sandboxConfig();
     await init_acpAgent();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papert-code/papert-code",
-  "version": "0.3.9",
+  "version": "0.3.91",
   "engines": {
     "node": ">=20.0.0"
   },
@@ -137,4 +137,4 @@
       "prettier --write"
     ]
   }
-}
+}