codetyper-cli 0.4.5 → 0.4.7

package/dist/index.js

@@ -66304,6 +66304,84 @@ var stripMarkdown = (text) => {
   return result;
 };
 
+// src/providers/copilot/usage.ts
+var COPILOT_USER_URL = "https://api.github.com/copilot_internal/user", getCopilotUsage = async () => {
+  const oauthToken = await getOAuthToken();
+  if (!oauthToken) {
+    return null;
+  }
+  try {
+    const response2 = await source_default2.get(COPILOT_USER_URL, {
+      headers: {
+        Authorization: `token ${oauthToken}`,
+        Accept: "application/json",
+        "User-Agent": "CodeTyper-CLI/1.0"
+      }
+    }).json();
+    return response2;
+  } catch {
+    return null;
+  }
+};
+var init_usage = __esm(() => {
+  init_source4();
+  init_token();
+});
+
+// src/services/copilot/usage-refresh-manager.ts
+class UsageRefreshManager {
+  static instance = null;
+  intervalId = null;
+  lastManualRefreshTime = 0;
+  appStore = null;
+  constructor() {}
+  static getInstance() {
+    if (!UsageRefreshManager.instance) {
+      UsageRefreshManager.instance = new UsageRefreshManager;
+    }
+    return UsageRefreshManager.instance;
+  }
+  start(appStore) {
+    this.appStore = appStore;
+    this.stop();
+    if (appStore.provider() !== "copilot") {
+      return;
+    }
+    this.intervalId = setInterval(() => {
+      if (this.appStore && this.appStore.provider() === "copilot") {
+        this.appStore.fetchCopilotUsage();
+      } else {
+        this.stop();
+      }
+    }, REFRESH_INTERVAL_MS);
+  }
+  stop() {
+    if (this.intervalId) {
+      clearInterval(this.intervalId);
+      this.intervalId = null;
+    }
+  }
+  manualRefresh() {
+    const now = Date.now();
+    if (now - this.lastManualRefreshTime < DEBOUNCE_MS) {
+      return;
+    }
+    this.lastManualRefreshTime = now;
+    if (this.appStore) {
+      this.appStore.fetchCopilotUsage();
+    }
+  }
+  isRunning() {
+    return this.intervalId !== null;
+  }
+  getAppStore() {
+    return this.appStore;
+  }
+}
+var REFRESH_INTERVAL_MS = 60000, DEBOUNCE_MS = 2000, getUsageRefreshManager = () => {
+  return UsageRefreshManager.getInstance();
+};
+
 // src/tui-solid/context/app.tsx
 var logIdCounter = 0, generateLogId = () => `log-${++logIdCounter}-${Date.now()}`, createInitialSessionStats = () => ({
   startTime: Date.now(),
@@ -66333,6 +66411,8 @@ var logIdCounter = 0, generateLogId = () => `log-${++logIdCounter}-${Date.now()}
 var init_app = __esm(async () => {
   init_server();
   init_server2();
+  init_usage();
+  init_copilot();
   await init_helper();
   ({
     provider: AppStoreProvider,
@@ -66378,7 +66458,10 @@ var init_app = __esm(async () => {
           knowledgeCount: 0,
           memoryCount: 0,
           showBanner: true
-        }
+        },
+        copilotUsage: null,
+        copilotUsageLoading: false,
+        copilotUsageLastFetch: null
       });
       let inputInsertFn = null;
       const setInputInsertFn = (fn) => {
@@ -66423,6 +66506,9 @@ var init_app = __esm(async () => {
       const mcpServers = () => store.mcpServers;
       const modifiedFiles = () => store.modifiedFiles;
       const brain = () => store.brain;
+      const copilotUsage = () => store.copilotUsage;
+      const copilotUsageLoading = () => store.copilotUsageLoading;
+      const copilotUsageLastFetch = () => store.copilotUsageLastFetch;
       const setMode = (newMode) => {
         setStore("mode", newMode);
       };
@@ -66512,6 +66598,9 @@ var init_app = __esm(async () => {
           setStore("provider", newProvider);
           setStore("model", newModel);
         });
+        if (newProvider === COPILOT_DISPLAY_NAME) {
+          fetchCopilotUsage();
+        }
       };
       const setVersion = (newVersion) => {
         setStore("version", newVersion);
@@ -66605,6 +66694,33 @@ var init_app = __esm(async () => {
           showBanner: false
         });
       };
+      const setCopilotUsage = (usage) => {
+        batch(() => {
+          setStore("copilotUsage", usage);
+          setStore("copilotUsageLastFetch", Date.now());
+        });
+      };
+      const setCopilotUsageLoading = (loading) => {
+        setStore("copilotUsageLoading", loading);
+      };
+      const fetchCopilotUsage = async () => {
+        if (store.provider !== COPILOT_DISPLAY_NAME) {
+          return;
+        }
+        const now = Date.now();
+        if (store.copilotUsageLastFetch && now - store.copilotUsageLastFetch < 5000) {
+          return;
+        }
+        setCopilotUsageLoading(true);
+        try {
+          const usage = await getCopilotUsage();
+          setCopilotUsage(usage);
+        } catch (error2) {
+          console.error("[fetchCopilotUsage] Failed to fetch Copilot usage:", error2);
+        } finally {
+          setCopilotUsageLoading(false);
+        }
+      };
       const setMcpServers = (servers) => {
         setStore("mcpServers", servers);
       };
@@ -66802,6 +66918,10 @@ var init_app = __esm(async () => {
             });
           }
         });
+        if (store.provider === "copilot") {
+          const refreshManager = getUsageRefreshManager();
+          refreshManager.manualRefresh();
+        }
       };
       const cancelStreaming = () => {
         if (!store.streamingLog.logId) {
@@ -66894,6 +67014,9 @@ var init_app = __esm(async () => {
         mcpServers,
         modifiedFiles,
         brain,
+        copilotUsage,
+        copilotUsageLoading,
+        copilotUsageLastFetch,
         setMode,
         setScreenMode,
         setInteractionMode,
@@ -66931,6 +67054,9 @@ var init_app = __esm(async () => {
         setBrainCounts,
         setBrainShowBanner,
         dismissBrainBanner,
+        setCopilotUsage,
+        setCopilotUsageLoading,
+        fetchCopilotUsage,
         setMcpServers,
         addMcpServer,
         updateMcpServerStatus,
@@ -67003,7 +67129,10 @@ var init_app = __esm(async () => {
       knowledgeCount: 0,
       memoryCount: 0,
       showBanner: true
-    }
+    },
+    copilotUsage: null,
+    copilotUsageLoading: false,
+    copilotUsageLastFetch: null
   };
   appStore = {
     getState: () => {
@@ -67039,7 +67168,10 @@ var init_app = __esm(async () => {
         mcpServers: storeRef.mcpServers(),
         pastedImages: storeRef.pastedImages(),
         modifiedFiles: storeRef.modifiedFiles(),
-        brain: storeRef.brain()
+        brain: storeRef.brain(),
+        copilotUsage: storeRef.copilotUsage(),
+        copilotUsageLoading: storeRef.copilotUsageLoading(),
+        copilotUsageLastFetch: storeRef.copilotUsageLastFetch()
       };
     },
     addLog: (entry) => {
@@ -95644,7 +95776,7 @@ var init_semantic_search = __esm(() => {
 var version_default2;
 var init_version2 = __esm(() => {
   version_default2 = {
-    version: "0.4.5"
+    version: "0.4.7"
   };
 });
 
@@ -97984,31 +98116,7 @@ var listSessions2 = async () => {
 init_source();
 init_usage_store();
 init_credentials();
-
-// src/providers/copilot/usage.ts
-init_source4();
-init_token();
-var COPILOT_USER_URL = "https://api.github.com/copilot_internal/user";
-var getCopilotUsage = async () => {
-  const oauthToken = await getOAuthToken();
-  if (!oauthToken) {
-    return null;
-  }
-  try {
-    const response2 = await source_default2.get(COPILOT_USER_URL, {
-      headers: {
-        Authorization: `token ${oauthToken}`,
-        Accept: "application/json",
-        "User-Agent": "CodeTyper-CLI/1.0"
-      }
-    }).json();
-    return response2;
-  } catch {
-    return null;
-  }
-};
-
-// src/commands/components/chat/usage/show-usage.ts
+init_usage();
 await init_registry();
 
 // src/utils/menu/progress-bar.ts
@@ -110768,7 +110876,33 @@ var showWhoami = async (state4, callbacks) => {
 // src/services/chat-tui/usage.ts
 init_usage_store();
 init_credentials();
+init_usage();
 init_ui();
+
+// src/constants/quota-colors.ts
+function getQuotaStatus(percentRemaining) {
+  if (percentRemaining >= 100) {
+    return { status: "healthy", color: "success" };
+  }
+  if (percentRemaining <= 5) {
+    return { status: "critical", color: "error" };
+  }
+  if (percentRemaining <= 40) {
+    return { status: "warning", color: "warning" };
+  }
+  return { status: "healthy", color: "success" };
+}
+function calculatePercentRemaining(remaining, entitlement, unlimited) {
+  if (unlimited) {
+    return 100;
+  }
+  if (entitlement === 0) {
+    return 0;
+  }
+  return Math.max(0, Math.min(100, remaining / entitlement * 100));
+}
+
+// src/services/chat-tui/usage.ts
 var formatNumber2 = (num) => {
   return num.toLocaleString();
 };
@@ -110784,11 +110918,16 @@ var formatDuration2 = (ms) => {
   }
   return `${seconds}s`;
 };
-var renderBar = (percent) => {
+var renderBar = (percent, color) => {
   const clampedPercent = Math.max(0, Math.min(100, percent));
   const filledWidth = Math.round(clampedPercent / 100 * PROGRESS_BAR.WIDTH);
   const emptyWidth = PROGRESS_BAR.WIDTH - filledWidth;
-  return PROGRESS_BAR.FILLED_CHAR.repeat(filledWidth) + PROGRESS_BAR.EMPTY_CHAR.repeat(emptyWidth);
+  const filled = PROGRESS_BAR.FILLED_CHAR.repeat(filledWidth);
+  const empty = PROGRESS_BAR.EMPTY_CHAR.repeat(emptyWidth);
+  if (color) {
+    return `${color}${filled}\x1B[2m${empty}\x1B[0m`;
+  }
+  return filled + empty;
 };
 var formatQuotaBar = (name, quota, resetInfo) => {
   const lines = [];
@@ -110799,13 +110938,22 @@ var formatQuotaBar = (name, quota, resetInfo) => {
   }
   if (quota.unlimited) {
     lines.push(name);
-    lines.push(PROGRESS_BAR.FILLED_CHAR.repeat(PROGRESS_BAR.WIDTH) + " Unlimited");
+    const greenColor = "\x1B[32m";
+    lines.push(`${greenColor}${PROGRESS_BAR.FILLED_CHAR.repeat(PROGRESS_BAR.WIDTH)}\x1B[0m Unlimited`);
     return lines;
   }
   const used = quota.entitlement - quota.remaining;
   const percentUsed = quota.entitlement > 0 ? used / quota.entitlement * 100 : 0;
+  const percentRemaining = calculatePercentRemaining(quota.remaining, quota.entitlement, quota.unlimited);
+  const statusInfo = getQuotaStatus(percentRemaining);
+  let ansiColor = "\x1B[32m";
+  if (statusInfo.color === "warning") {
+    ansiColor = "\x1B[33m";
+  } else if (statusInfo.color === "error") {
+    ansiColor = "\x1B[31m";
+  }
   lines.push(name);
-  lines.push(`${renderBar(percentUsed)} ${percentUsed.toFixed(0)}% used`);
+  lines.push(`${renderBar(percentUsed, ansiColor)} ${percentUsed.toFixed(0)}% used`);
   if (resetInfo) {
     lines.push(resetInfo);
   }
@@ -117875,6 +118023,264 @@ await __promiseAll([
   init_theme2(),
   init_app()
 ]);
+
+// src/tui-solid/components/panels/copilot-usage.tsx
+init_server();
+init_ui();
+await __promiseAll([
+  init_solid(),
+  init_solid(),
+  init_solid(),
+  init_solid(),
+  init_solid(),
+  init_solid(),
+  init_solid(),
+  init_solid(),
+  init_core2(),
+  init_theme2(),
+  init_app()
+]);
+init_copilot();
+var QUOTA_BAR_WIDTH = 30;
+var formatResetDate = (dateStr) => {
+  try {
+    const date5 = new Date(dateStr);
+    const month = date5.toLocaleString("en-US", {
+      month: "short"
+    });
+    const day = date5.getDate();
+    return `${month} ${day}`;
+  } catch {
+    return dateStr;
+  }
+};
+var renderProgressBar2 = (percent, color) => {
+  const clampedPercent = Math.max(0, Math.min(100, percent));
+  const filledWidth = Math.round(clampedPercent / 100 * QUOTA_BAR_WIDTH);
+  const emptyWidth = QUOTA_BAR_WIDTH - filledWidth;
+  return [(() => {
+    var _el$ = createElement("text");
+    setProp(_el$, "fg", color);
+    insert(_el$, () => PROGRESS_BAR.FILLED_CHAR.repeat(filledWidth));
+    return _el$;
+  })(), (() => {
+    var _el$2 = createElement("text");
+    setProp(_el$2, "fg", color);
+    insert(_el$2, () => PROGRESS_BAR.EMPTY_CHAR.repeat(emptyWidth));
+    effect((_$p) => setProp(_el$2, "attributes", TextAttributes.DIM, _$p));
+    return _el$2;
+  })()];
+};
+function CopilotQuotaBar(props) {
+  const theme = useTheme();
+  const quotaInfo = createMemo(() => {
+    if (!props.quota) {
+      return {
+        percentRemaining: 0,
+        percentUsed: 0,
+        status: getQuotaStatus(0),
+        unlimited: false,
+        remaining: 0,
+        total: 0
+      };
+    }
+    if (props.quota.unlimited) {
+      return {
+        percentRemaining: 100,
+        percentUsed: 0,
+        status: getQuotaStatus(100),
+        unlimited: true,
+        remaining: 0,
+        total: 0
+      };
+    }
+    const percentRemaining = calculatePercentRemaining(props.quota.remaining, props.quota.entitlement, props.quota.unlimited);
+    const percentUsed = 100 - percentRemaining;
+    return {
+      percentRemaining,
+      percentUsed,
+      status: getQuotaStatus(percentRemaining),
+      unlimited: false,
+      remaining: props.quota.remaining,
+      total: props.quota.entitlement
+    };
+  });
+  const barColor = createMemo(() => {
+    const status = quotaInfo().status.color;
+    if (status === "error")
+      return theme.colors.error;
+    if (status === "warning")
+      return theme.colors.warning;
+    return theme.colors.success;
+  });
+  return (() => {
+    var _el$3 = createElement("box"), _el$4 = createElement("text"), _el$5 = createElement("box"), _el$6 = createElement("box");
+    insertNode(_el$3, _el$4);
+    insertNode(_el$3, _el$5);
+    insertNode(_el$3, _el$6);
+    setProp(_el$3, "flexDirection", "column");
+    setProp(_el$3, "marginBottom", 1);
+    insert(_el$4, () => props.label);
+    setProp(_el$5, "flexDirection", "row");
+    setProp(_el$5, "marginTop", 0);
+    insert(_el$5, createComponent2(Show, {
+      get when() {
+        return !quotaInfo().unlimited;
+      },
+      get fallback() {
+        return (() => {
+          var _el$9 = createElement("text");
+          insert(_el$9, () => PROGRESS_BAR.FILLED_CHAR.repeat(QUOTA_BAR_WIDTH));
+          effect((_$p) => setProp(_el$9, "fg", theme.colors.success, _$p));
+          return _el$9;
+        })();
+      },
+      get children() {
+        return renderProgressBar2(quotaInfo().percentUsed, barColor());
+      }
+    }));
+    setProp(_el$6, "flexDirection", "row");
+    setProp(_el$6, "marginTop", 0);
+    insert(_el$6, createComponent2(Show, {
+      get when() {
+        return quotaInfo().unlimited;
+      },
+      get fallback() {
+        return [(() => {
+          var _el$0 = createElement("text"), _el$1 = createTextNode(`% left`);
+          insertNode(_el$0, _el$1);
+          insert(_el$0, () => Math.round(quotaInfo().percentRemaining), _el$1);
+          effect((_$p) => setProp(_el$0, "fg", barColor(), _$p));
+          return _el$0;
+        })(), createComponent2(Show, {
+          get when() {
+            return props.showPercentage;
+          },
+          get children() {
+            var _el$10 = createElement("text"), _el$11 = createTextNode(` (`), _el$13 = createTextNode(`/`), _el$14 = createTextNode(`)`);
+            insertNode(_el$10, _el$11);
+            insertNode(_el$10, _el$13);
+            insertNode(_el$10, _el$14);
+            insert(_el$10, () => quotaInfo().remaining, _el$13);
+            insert(_el$10, () => quotaInfo().total, _el$14);
+            effect((_$p) => setProp(_el$10, "fg", theme.colors.textDim, _$p));
+            return _el$10;
+          }
+        })];
+      },
+      get children() {
+        var _el$7 = createElement("text");
+        insertNode(_el$7, createTextNode(`Unlimited`));
+        effect((_$p) => setProp(_el$7, "fg", theme.colors.success, _$p));
+        return _el$7;
+      }
+    }));
+    effect((_$p) => setProp(_el$4, "fg", theme.colors.textDim, _$p));
+    return _el$3;
+  })();
+}
+function CopilotUsageSection() {
+  const theme = useTheme();
+  const app = useAppStore();
+  const usage = createMemo(() => app.copilotUsage());
+  const loading = createMemo(() => app.copilotUsageLoading());
+  const resetDate = createMemo(() => {
+    const u3 = usage();
+    return u3 ? formatResetDate(u3.quota_reset_date) : "";
+  });
+  return createComponent2(Show, {
+    get when() {
+      return app.provider() === COPILOT_DISPLAY_NAME;
+    },
+    get children() {
+      return [(() => {
+        var _el$15 = createElement("box"), _el$16 = createElement("box"), _el$17 = createElement("text");
+        insertNode(_el$15, _el$16);
+        setProp(_el$15, "flexDirection", "column");
+        setProp(_el$15, "marginBottom", 1);
+        insertNode(_el$16, _el$17);
+        setProp(_el$16, "flexDirection", "row");
+        setProp(_el$16, "justifyContent", "space-between");
+        insertNode(_el$17, createTextNode(`Copilot Usage`));
+        insert(_el$16, createComponent2(Show, {
+          get when() {
+            return loading();
+          },
+          get children() {
+            var _el$19 = createElement("text");
+            insertNode(_el$19, createTextNode(`...`));
+            effect((_$p) => setProp(_el$19, "fg", theme.colors.textDim, _$p));
+            return _el$19;
+          }
+        }), null);
+        insert(_el$15, createComponent2(Show, {
+          get when() {
+            return memo2(() => !!!loading())() && usage();
+          },
+          get fallback() {
+            return (() => {
+              var _el$28 = createElement("box"), _el$29 = createElement("text");
+              insertNode(_el$28, _el$29);
+              setProp(_el$28, "marginTop", 1);
+              insert(_el$29, () => loading() ? "Loading quota..." : "Unable to fetch quota");
+              effect((_$p) => setProp(_el$29, "fg", theme.colors.textDim, _$p));
+              return _el$28;
+            })();
+          },
+          get children() {
+            var _el$21 = createElement("box"), _el$22 = createElement("box"), _el$23 = createElement("text"), _el$24 = createTextNode(`Resets `);
+            insertNode(_el$21, _el$22);
+            setProp(_el$21, "flexDirection", "column");
+            setProp(_el$21, "marginTop", 1);
+            insert(_el$21, createComponent2(CopilotQuotaBar, {
+              label: "Premium Requests",
+              get quota() {
+                return usage()?.quota_snapshots.premium_interactions;
+              }
+            }), _el$22);
+            insert(_el$21, createComponent2(CopilotQuotaBar, {
+              label: "Chat",
+              get quota() {
+                return usage()?.quota_snapshots.chat;
+              }
+            }), _el$22);
+            insert(_el$21, createComponent2(CopilotQuotaBar, {
+              label: "Completions",
+              get quota() {
+                return usage()?.quota_snapshots.completions;
+              }
+            }), _el$22);
+            insertNode(_el$22, _el$23);
+            setProp(_el$22, "marginTop", 0);
+            insertNode(_el$23, _el$24);
+            insert(_el$23, resetDate, null);
+            effect((_$p) => setProp(_el$23, "fg", theme.colors.textDim, _$p));
+            return _el$21;
+          }
+        }), null);
+        effect((_p$) => {
+          var _v$ = theme.colors.text, _v$2 = TextAttributes.BOLD;
+          _v$ !== _p$.e && (_p$.e = setProp(_el$17, "fg", _v$, _p$.e));
+          _v$2 !== _p$.t && (_p$.t = setProp(_el$17, "attributes", _v$2, _p$.t));
+          return _p$;
+        }, {
+          e: undefined,
+          t: undefined
+        });
+        return _el$15;
+      })(), (() => {
+        var _el$25 = createElement("box"), _el$26 = createElement("text");
+        insertNode(_el$25, _el$26);
+        setProp(_el$25, "marginBottom", 1);
+        insertNode(_el$26, createTextNode(`──────────────────────────────────`));
+        effect((_$p) => setProp(_el$26, "fg", theme.colors.border, _$p));
+        return _el$25;
+      })()];
+    }
+  });
+}
+
+// src/tui-solid/components/panels/activity-panel.tsx
 var getFileName = (filePath2) => {
   const parts = filePath2.split("/");
   return parts[parts.length - 1] ?? filePath2;
@@ -117938,6 +118344,7 @@ function ActivityPanel() {
     setProp(_el$, "paddingRight", 1);
     setProp(_el$, "paddingTop", 1);
     setProp(_el$, "flexShrink", 0);
+    insert(_el$, createComponent2(CopilotUsageSection, {}), _el$2);
     insertNode(_el$2, _el$3);
     insertNode(_el$2, _el$5);
     insertNode(_el$2, _el$10);
@@ -119157,6 +119564,7 @@ function Session(props) {
 }
 
 // src/tui-solid/app.tsx
+init_copilot();
 function ErrorFallback(props) {
   const theme = useTheme();
   return (() => {
@@ -119203,7 +119611,7 @@ function AppContent(props) {
   createEffect(() => {
     const state4 = appStore.getState();
     const summary = generateSessionSummary({
-      sessionId: props.sessionId ?? "unknown",
+      sessionId: state4.sessionId ?? "unknown",
       sessionStats: state4.sessionStats,
       modifiedFiles: state4.modifiedFiles,
       modelName: state4.model,
@@ -119256,6 +119664,18 @@ function AppContent(props) {
       await props.onSubmit(props.initialPrompt);
     }, 100);
   }
+  createEffect(() => {
+    const refreshManager = getUsageRefreshManager();
+    const currentProvider = app.provider();
+    if (currentProvider === COPILOT_DISPLAY_NAME) {
+      refreshManager.start(app);
+    } else {
+      refreshManager.stop();
+    }
+    onCleanup(() => {
+      refreshManager.stop();
+    });
+  });
   useKeyboard((evt) => {
     if (matchesAction(evt, "clipboard_copy")) {
       copySelectionToClipboard();
@@ -120179,10 +120599,9 @@ var execute3 = async (options2) => {
   const handleCascadeToggleFn = createHandleCascadeToggle();
   const handleCommand3 = createHandleCommand(ctx, handleExit);
   const handleSubmit2 = createHandleSubmit(ctx, handleCommand3);
-  const isResuming = options2.continueSession || options2.resumeSession;
   const savedCascadeEnabled = config2.get("cascadeEnabled");
   const renderProps = {
-    sessionId: isResuming ? session.id : undefined,
+    sessionId: session.id,
     handleSubmit: handleSubmit2,
     handleCommand: handleCommand3,
     handleModelSelect: handleModelSelectFn,
@@ -120849,4 +121268,4 @@ ${plan.steps.map((s) => `${s.id}. ${s.description}`).join(`
 });
 program2.parse(process.argv);
 
-//# debugId=850267EE3A1DD43B64756E2164756E21
+//# debugId=DB45223ABEBC370864756E2164756E21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codetyper-cli",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "description": "CodeTyper AI Agent - Standalone CLI for autonomous code generation",
   "main": "dist/index.js",
   "bin": {

package/src/version.json

@@ -1,3 +1,3 @@
 {
-  "version": "0.4.5"
+  "version": "0.4.7"
 }