opencode-qoder-bridge 0.1.8 → 0.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. package/CHANGELOG.md +57 -1
  2. package/README.md +110 -37
  3. package/bin/statusline.mjs +30 -6
  4. package/bin/usage.mjs +6 -5
  5. package/dist/async-utils.d.ts +8 -0
  6. package/dist/async-utils.d.ts.map +1 -0
  7. package/dist/async-utils.js +27 -0
  8. package/dist/async-utils.js.map +1 -0
  9. package/dist/auth.d.ts +2 -1
  10. package/dist/auth.d.ts.map +1 -1
  11. package/dist/auth.js +26 -7
  12. package/dist/auth.js.map +1 -1
  13. package/dist/cost.d.ts +2 -1
  14. package/dist/cost.d.ts.map +1 -1
  15. package/dist/cost.js +163 -63
  16. package/dist/cost.js.map +1 -1
  17. package/dist/errors.d.ts.map +1 -1
  18. package/dist/errors.js +5 -2
  19. package/dist/errors.js.map +1 -1
  20. package/dist/index.d.ts +1 -1
  21. package/dist/index.d.ts.map +1 -1
  22. package/dist/index.js +152 -37
  23. package/dist/index.js.map +1 -1
  24. package/dist/language-model.d.ts +22 -0
  25. package/dist/language-model.d.ts.map +1 -1
  26. package/dist/language-model.js +931 -183
  27. package/dist/language-model.js.map +1 -1
  28. package/dist/logger.d.ts +1 -0
  29. package/dist/logger.d.ts.map +1 -1
  30. package/dist/logger.js +35 -5
  31. package/dist/logger.js.map +1 -1
  32. package/dist/mcp-bridge.d.ts.map +1 -1
  33. package/dist/mcp-bridge.js +71 -7
  34. package/dist/mcp-bridge.js.map +1 -1
  35. package/dist/models.d.ts +8 -1
  36. package/dist/models.d.ts.map +1 -1
  37. package/dist/models.js +155 -44
  38. package/dist/models.js.map +1 -1
  39. package/dist/prompt-builder.d.ts.map +1 -1
  40. package/dist/prompt-builder.js +241 -43
  41. package/dist/prompt-builder.js.map +1 -1
  42. package/dist/sdk-auth.d.ts +3 -3
  43. package/dist/sdk-auth.d.ts.map +1 -1
  44. package/dist/sdk-auth.js +13 -9
  45. package/dist/sdk-auth.js.map +1 -1
  46. package/dist/sdk-session.d.ts.map +1 -1
  47. package/dist/sdk-session.js +26 -2
  48. package/dist/sdk-session.js.map +1 -1
  49. package/dist/session-store.d.ts +14 -3
  50. package/dist/session-store.d.ts.map +1 -1
  51. package/dist/session-store.js +451 -46
  52. package/dist/session-store.js.map +1 -1
  53. package/dist/state-dir.d.ts.map +1 -1
  54. package/dist/state-dir.js +2 -1
  55. package/dist/state-dir.js.map +1 -1
  56. package/dist/tool-normalizer.d.ts.map +1 -1
  57. package/dist/tool-normalizer.js +11 -2
  58. package/dist/tool-normalizer.js.map +1 -1
  59. package/dist/tui-register.d.ts.map +1 -1
  60. package/dist/tui-register.js +88 -37
  61. package/dist/tui-register.js.map +1 -1
  62. package/dist/tui.d.ts.map +1 -1
  63. package/dist/tui.js +42 -17
  64. package/dist/tui.js.map +1 -1
  65. package/dist/types.d.ts +14 -4
  66. package/dist/types.d.ts.map +1 -1
  67. package/dist/usage.d.ts.map +1 -1
  68. package/dist/usage.js +54 -29
  69. package/dist/usage.js.map +1 -1
  70. package/package.json +12 -4
@@ -10,13 +10,22 @@ const NAME_MAP = {
10
10
  agent: "task",
11
11
  exitplanmode: "plan_exit",
12
12
  str_replace_based_edit_tool: "edit",
13
+ execute_command: "bash",
14
+ executecommand: "bash",
15
+ run_command: "bash",
16
+ runcommand: "bash",
13
17
  };
14
18
  const KEY_RENAMES = {
15
- read: { file_path: "filePath" },
16
- write: { file_path: "filePath" },
19
+ read: { file_path: "filePath", path: "filePath" },
20
+ write: { file_path: "filePath", path: "filePath" },
21
+ delete: { file_path: "filePath", path: "filePath" },
22
+ view: { file_path: "filePath", path: "filePath" },
23
+ apply_diff: { file_path: "filePath", path: "filePath" },
24
+ bash: { cmd: "command" },
17
25
  task: { subagentType: "subagent_type" },
18
26
  edit: {
19
27
  file_path: "filePath",
28
+ path: "filePath",
20
29
  old_string: "oldString",
21
30
  new_string: "newString",
22
31
  replace_all: "replaceAll",
@@ -1 +1 @@
1
- {"version":3,"file":"tool-normalizer.js","sourceRoot":"","sources":["../src/tool-normalizer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tool-normalizer.js","sourceRoot":"","sources":["../src/tool-normalizer.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"tui-register.d.ts","sourceRoot":"","sources":["../src/tui-register.ts"],"names":[],"mappings":"AA8BA,wBAAsB,mBAAmB,CACvC,UAAU,SAAwB,EAClC,KAAK,SAAY,GAChB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CA6C9B"}
1
+ {"version":3,"file":"tui-register.d.ts","sourceRoot":"","sources":["../src/tui-register.ts"],"names":[],"mappings":"AAiEA,wBAAsB,mBAAmB,CACvC,UAAU,SAAwB,EAClC,KAAK,SAAY,GAChB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CA+C9B"}
@@ -1,12 +1,15 @@
1
- import { mkdir, readFile, rename, unlink, writeFile } from "node:fs/promises";
1
+ import { chmod, lstat, mkdir, open, readFile, rename, unlink, writeFile } from "node:fs/promises";
2
2
  import { randomUUID } from "node:crypto";
3
3
  import { homedir } from "node:os";
4
4
  import { dirname, join } from "node:path";
5
5
  import { applyEdits, modify, parse } from "jsonc-parser";
6
6
  const TUI_ENTRY = new URL("./tui.js", import.meta.url).href;
7
+ const LOCK_STALE_MS = 120_000;
8
+ const LOCK_ATTEMPTS = 80;
7
9
  function globalTuiConfigPath() {
8
10
  const configHome = process.env.XDG_CONFIG_HOME?.trim();
9
- return join(configHome || join(homedir(), ".config"), "opencode", "tui.json");
11
+ const platformHome = process.platform === "win32" ? process.env.APPDATA?.trim() : undefined;
12
+ return join(configHome || platformHome || join(homedir(), ".config"), "opencode", "tui.json");
10
13
  }
11
14
  function isMissingFile(error) {
12
15
  return (error instanceof Error &&
@@ -23,45 +26,93 @@ async function readConfig(path) {
23
26
  throw error;
24
27
  }
25
28
  }
26
- export async function ensureTuiRegistered(configPath = globalTuiConfigPath(), entry = TUI_ENTRY) {
27
- const source = await readConfig(configPath);
28
- const errors = [];
29
- const current = source.trim()
30
- ? parse(source, errors, { allowTrailingComma: true })
31
- : {};
32
- if (errors.length > 0 || !current || Array.isArray(current)) {
33
- throw new Error(`Cannot update invalid OpenCode TUI configuration: ${configPath}`);
34
- }
35
- const configured = current.plugin;
36
- if (configured !== undefined && !Array.isArray(configured)) {
37
- throw new Error(`OpenCode TUI "plugin" must be an array: ${configPath}`);
29
+ async function withConfigLock(configPath, fn) {
30
+ const lockPath = `${configPath}.qoder-bridge.lock`;
31
+ await mkdir(dirname(configPath), { recursive: true, mode: 0o700 });
32
+ try {
33
+ await chmod(dirname(configPath), 0o700);
38
34
  }
39
- const plugins = (configured ?? []);
40
- if (plugins.includes(entry) || plugins.includes("opencode-qoder-bridge")) {
41
- return "present";
35
+ catch { /* best-effort */ }
36
+ let handle;
37
+ for (let attempt = 0; attempt < LOCK_ATTEMPTS; attempt++) {
38
+ try {
39
+ handle = await open(lockPath, "wx", 0o600);
40
+ break;
41
+ }
42
+ catch (error) {
43
+ if (error?.code !== "EEXIST")
44
+ throw error;
45
+ try {
46
+ const info = await lstat(lockPath);
47
+ if (info.isSymbolicLink())
48
+ throw new Error(`Invalid OpenCode TUI lock: ${lockPath}`);
49
+ if (Date.now() - info.mtimeMs > LOCK_STALE_MS)
50
+ await unlink(lockPath);
51
+ }
52
+ catch (lockError) {
53
+ if (lockError instanceof Error && !(lockError.code === "ENOENT"))
54
+ throw lockError;
55
+ }
56
+ await new Promise((resolveDelay) => setTimeout(resolveDelay, 25));
57
+ }
42
58
  }
43
- const base = source.trim()
44
- ? source
45
- : '{\n "$schema": "https://opencode.ai/tui.json"\n}\n';
46
- const eol = base.includes("\r\n") ? "\r\n" : "\n";
47
- const edits = modify(base, ["plugin"], [...plugins, entry], {
48
- formattingOptions: {
49
- insertSpaces: true,
50
- tabSize: 2,
51
- eol,
52
- },
53
- });
54
- const updated = applyEdits(base, edits);
55
- await mkdir(dirname(configPath), { recursive: true, mode: 0o700 });
56
- const temporary = `${configPath}.${process.pid}.${randomUUID()}.tmp`;
59
+ if (!handle)
60
+ throw new Error(`Could not acquire OpenCode TUI configuration lock: ${configPath}`);
57
61
  try {
58
- await writeFile(temporary, updated, { encoding: "utf8", mode: 0o600 });
59
- await rename(temporary, configPath);
62
+ return await fn();
60
63
  }
61
- catch (error) {
62
- await unlink(temporary).catch(() => undefined);
63
- throw error;
64
+ finally {
65
+ try {
66
+ await handle.close();
67
+ }
68
+ catch { /* best-effort */ }
69
+ try {
70
+ await unlink(lockPath);
71
+ }
72
+ catch { /* best-effort */ }
64
73
  }
65
- return "added";
74
+ }
75
+ export async function ensureTuiRegistered(configPath = globalTuiConfigPath(), entry = TUI_ENTRY) {
76
+ return withConfigLock(configPath, async () => {
77
+ const source = await readConfig(configPath);
78
+ const errors = [];
79
+ const current = source.trim()
80
+ ? parse(source, errors, { allowTrailingComma: true })
81
+ : {};
82
+ if (errors.length > 0 || !current || Array.isArray(current)) {
83
+ throw new Error(`Cannot update invalid OpenCode TUI configuration: ${configPath}`);
84
+ }
85
+ const configured = current.plugin;
86
+ if (configured !== undefined && !Array.isArray(configured)) {
87
+ throw new Error(`OpenCode TUI "plugin" must be an array: ${configPath}`);
88
+ }
89
+ const plugins = (configured ?? []);
90
+ if (plugins.includes(entry) || plugins.includes("opencode-qoder-bridge")) {
91
+ return "present";
92
+ }
93
+ const base = source.trim()
94
+ ? source
95
+ : '{\n "$schema": "https://opencode.ai/tui.json"\n}\n';
96
+ const eol = base.includes("\r\n") ? "\r\n" : "\n";
97
+ const edits = modify(base, ["plugin"], [...plugins, entry], {
98
+ formattingOptions: {
99
+ insertSpaces: true,
100
+ tabSize: 2,
101
+ eol,
102
+ },
103
+ });
104
+ const updated = applyEdits(base, edits);
105
+ await mkdir(dirname(configPath), { recursive: true, mode: 0o700 });
106
+ const temporary = `${configPath}.${process.pid}.${randomUUID()}.tmp`;
107
+ try {
108
+ await writeFile(temporary, updated, { encoding: "utf8", mode: 0o600 });
109
+ await rename(temporary, configPath);
110
+ }
111
+ catch (error) {
112
+ await unlink(temporary).catch(() => undefined);
113
+ throw error;
114
+ }
115
+ return "added";
116
+ });
66
117
  }
67
118
  //# sourceMappingURL=tui-register.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"tui-register.js","sourceRoot":"","sources":["../src/tui-register.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tui-register.js","sourceRoot":"","sources":["../src/tui-register.ts"],"names":[],"mappings":"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"}
package/dist/tui.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tui.d.ts","sourceRoot":"","sources":["../src/tui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,yBAAyB,CAAC;AAkF1E,eAAO,MAAM,EAAE,kCAAkC,CAAC;AAElD,eAAO,MAAM,GAAG,EAAE,SAkIjB,CAAC;;;;;AAEF,wBAAqD"}
1
+ {"version":3,"file":"tui.d.ts","sourceRoot":"","sources":["../src/tui.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAmB,MAAM,yBAAyB,CAAC;AAkG1E,eAAO,MAAM,EAAE,kCAAkC,CAAC;AAElD,eAAO,MAAM,GAAG,EAAE,SAuIjB,CAAC;;;;;AAEF,wBAAqD"}
package/dist/tui.js CHANGED
@@ -1,17 +1,21 @@
1
1
  import { jsx, jsxs } from "@opentui/solid/jsx-runtime";
2
2
  import { createEffect, Show, createSignal } from "solid-js";
3
3
  import { getLiveUsage } from "./usage.js";
4
+ import { debug, describeError } from "./logger.js";
4
5
  const REFRESH_MS = 30_000;
5
6
  const POST_TURN_REFRESH_MS = 5_000;
6
7
  function formatCredits(value) {
7
- return Number.isInteger(value)
8
- ? value.toString()
9
- : value.toLocaleString("en-US", { maximumFractionDigits: 2 });
8
+ const safe = Number.isFinite(value) && value >= 0 ? value : 0;
9
+ return Number.isInteger(safe)
10
+ ? safe.toString()
11
+ : safe.toLocaleString("en-US", { maximumFractionDigits: 2 });
10
12
  }
11
13
  function formatSessionCredits(value) {
12
- return value.toFixed(2);
14
+ return (Number.isFinite(value) && value >= 0 ? value : 0).toFixed(2);
13
15
  }
14
16
  function usesQoder(api, sessionID) {
17
+ if (!sessionID)
18
+ return false;
15
19
  const session = api.state.session.get(sessionID);
16
20
  if (session?.model)
17
21
  return session.model.providerID === "qoder";
@@ -20,44 +24,59 @@ function usesQoder(api, sessionID) {
20
24
  if (!latest)
21
25
  return false;
22
26
  return latest.role === "user"
23
- ? latest.model.providerID === "qoder"
27
+ ? latest.model?.providerID === "qoder"
24
28
  : latest.providerID === "qoder";
25
29
  }
26
30
  function formatQuota(usage) {
27
31
  const quota = usage?.userQuota;
28
- if (!usage || !quota || quota.total == null) {
32
+ if (!usage || !quota || typeof quota.total !== "number" || !Number.isFinite(quota.total) || quota.total < 0) {
29
33
  return {
30
34
  error: "usage unavailable",
31
35
  warning: true,
32
36
  };
33
37
  }
34
- const used = quota.used ?? Math.max(0, quota.total - (quota.remaining ?? quota.total));
35
- const remaining = quota.remaining ?? Math.max(0, quota.total - used);
36
- const percent = quota.percentage ??
37
- usage.totalUsagePercentage ??
38
- (quota.total > 0 ? (used / quota.total) * 100 : 0);
38
+ const total = quota.total;
39
+ const used = Math.min(total, Math.max(0, typeof quota.used === "number" && Number.isFinite(quota.used)
40
+ ? quota.used
41
+ : total - (typeof quota.remaining === "number" && Number.isFinite(quota.remaining) ? quota.remaining : total)));
42
+ const remaining = Math.max(0, total - used);
43
+ const percentValue = typeof quota.percentage === "number" && Number.isFinite(quota.percentage)
44
+ ? quota.percentage
45
+ : typeof usage.totalUsagePercentage === "number" && Number.isFinite(usage.totalUsagePercentage)
46
+ ? usage.totalUsagePercentage
47
+ : total > 0 ? (used / total) * 100 : 0;
48
+ const percent = Math.min(100, Math.max(0, percentValue));
39
49
  return {
40
50
  used,
41
- total: quota.total,
51
+ total,
42
52
  remaining,
43
53
  percent,
44
- warning: usage.isQuotaExceeded === true || remaining <= Math.max(10, quota.total * 0.1),
54
+ warning: usage.isQuotaExceeded === true || remaining <= Math.max(10, total * 0.1),
45
55
  };
46
56
  }
47
57
  function sessionSpent(api, sessionID) {
58
+ if (!sessionID)
59
+ return 0;
48
60
  const sessionCost = api.state.session.get(sessionID)?.cost;
49
- if (typeof sessionCost === "number")
61
+ if (typeof sessionCost === "number" && Number.isFinite(sessionCost))
50
62
  return sessionCost;
51
63
  return api.state.session
52
64
  .messages(sessionID)
53
- .reduce((total, message) => total + (message.role === "assistant" ? message.cost : 0), 0);
65
+ .reduce((total, message) => {
66
+ if (message.role === "assistant" && typeof message.cost === "number" && Number.isFinite(message.cost)) {
67
+ const next = total + message.cost;
68
+ return Number.isFinite(next) ? next : Number.MAX_SAFE_INTEGER;
69
+ }
70
+ return total;
71
+ }, 0);
54
72
  }
55
73
  function estimatedSessionCredits(api, sessionID) {
56
74
  // Qoder's Credits Log presents reference cost in dollars and Credits in
57
75
  // cent-denominated units. The personal-account SDK exposes only a rounded
58
76
  // whole-account quota, so session.cost * 100 is the best fractional signal
59
77
  // available until the SDK exposes per-request credit events.
60
- return sessionSpent(api, sessionID) * 100;
78
+ const estimate = sessionSpent(api, sessionID) * 100;
79
+ return Number.isFinite(estimate) ? estimate : Number.MAX_SAFE_INTEGER;
61
80
  }
62
81
  export const id = "opencode-qoder-bridge-sidebar";
63
82
  export const tui = async (api) => {
@@ -92,6 +111,11 @@ export const tui = async (api) => {
92
111
  setQuota(formatQuota(await getLiveUsage(true)));
93
112
  refreshedAt = Date.now();
94
113
  }
114
+ catch (error) {
115
+ refreshedAt = Date.now();
116
+ setQuota({ error: "usage unavailable", warning: true });
117
+ debug("TUI quota refresh failed:", describeError(error));
118
+ }
95
119
  finally {
96
120
  refreshing = false;
97
121
  }
@@ -115,7 +139,7 @@ export const tui = async (api) => {
115
139
  }, REFRESH_MS);
116
140
  let postTurnTimer;
117
141
  const stopIdleRefresh = api.event.on("session.idle", (event) => {
118
- if (!usesQoder(api, event.properties.sessionID))
142
+ if (!usesQoder(api, event?.properties?.sessionID))
119
143
  return;
120
144
  void refresh();
121
145
  clearTimeout(postTurnTimer);
@@ -124,6 +148,7 @@ export const tui = async (api) => {
124
148
  api.lifecycle.onDispose(() => {
125
149
  clearInterval(timer);
126
150
  clearTimeout(postTurnTimer);
151
+ sessionBaselines.clear();
127
152
  stopIdleRefresh();
128
153
  });
129
154
  api.slots.register({
package/dist/tui.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"tui.js","sourceRoot":"","sources":["../src/tui.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"tui.js","sourceRoot":"","sources":["../src/tui.ts"],"names":[],"mappings":"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"}
package/dist/types.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import type { EvolutionOptions } from "@qoder-ai/qoder-agent-sdk";
1
2
  export interface QoderModelDef {
2
3
  id: string;
3
4
  name: string;
@@ -20,7 +21,15 @@ export interface QoderModelDef {
20
21
  export interface QoderBridgeOptions {
21
22
  /** Force a transport mode. `sdk` (default) streams via the agent SDK. */
22
23
  mode?: "sdk";
23
- /** Extra CLI flags forwarded to qodercli, e.g. { "--experimental-mcp-load": null }. */
24
+ /** Working directory for the Qoder process and persisted session identity. */
25
+ cwd?: string;
26
+ /** Initial Plan Mode state for the main session, independent from tool permissions. */
27
+ planMode?: boolean;
28
+ /** Outbound proxy URL used by qodercli (e.g. http://, https://, socks5://). */
29
+ proxy?: string;
30
+ /** Opt-in skill evolution configuration for the session. */
31
+ evolution?: EvolutionOptions;
32
+ /** Extra CLI flags forwarded to qodercli; accepts bare or `--`-prefixed names. */
24
33
  extraArgs?: Record<string, string | null>;
25
34
  /** Bridged MCP server configs keyed by server name. */
26
35
  mcpServers?: Record<string, unknown>;
@@ -34,14 +43,15 @@ export interface QoderBridgeOptions {
34
43
  permissionMode?: "default" | "acceptEdits" | "bypassPermissions";
35
44
  /** Whether the SDK may skip permission checks when bypassPermissions is selected. */
36
45
  allowDangerouslySkipPermissions?: boolean;
46
+ /** Maximum duration of a chat turn in milliseconds; defaults to 30 minutes. */
47
+ timeoutMs?: number;
37
48
  /** Optional SDK tool allowlist. */
38
49
  allowedTools?: string[];
39
50
  /** Optional SDK tool denylist. */
40
51
  disallowedTools?: string[];
41
52
  /**
42
- * Extra environment variables for the qodercli child process. CLI-boot
43
- * catalog filters like QODER_SCENE must be set here (or in the host
44
- * environment) to take effect.
53
+ * Extra environment variables for the qodercli child process used for chat
54
+ * turns. Live model discovery reads QODER_SCENE from the host environment.
45
55
  */
46
56
  env?: Record<string, string | undefined>;
47
57
  }
@@ -1 +1 @@
1
- {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,8DAA8D;IAC9D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,yEAAyE;IACzE,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,uFAAuF;IACvF,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,mDAAmD;IACnD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,cAAc,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,mBAAmB,CAAC;IACjE,qFAAqF;IACrF,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,mCAAmC;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,kCAAkC;IAClC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B;;;;OAIG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB"}
1
+ {"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAElE,MAAM,WAAW,aAAa;IAC5B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,SAAS,EAAE,OAAO,CAAC;IACnB,QAAQ,EAAE,OAAO,CAAC;IAClB,8DAA8D;IAC9D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE;QACJ,KAAK,EAAE,MAAM,CAAC;QACd,MAAM,EAAE,MAAM,CAAC;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,KAAK,EAAE;QACL,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,EAAE,MAAM,CAAC;KAChB,CAAC;CACH;AAED,MAAM,WAAW,kBAAkB;IACjC,yEAAyE;IACzE,IAAI,CAAC,EAAE,KAAK,CAAC;IACb,8EAA8E;IAC9E,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,uFAAuF;IACvF,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,+EAA+E;IAC/E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,4DAA4D;IAC5D,SAAS,CAAC,EAAE,gBAAgB,CAAC;IAC7B,kFAAkF;IAClF,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,CAAC;IAC1C,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACrC,mDAAmD;IACnD,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,+DAA+D;IAC/D,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,iFAAiF;IACjF,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,8DAA8D;IAC9D,cAAc,CAAC,EAAE,SAAS,GAAG,aAAa,GAAG,mBAAmB,CAAC;IACjE,qFAAqF;IACrF,+BAA+B,CAAC,EAAE,OAAO,CAAC;IAC1C,+EAA+E;IAC/E,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,mCAAmC;IACnC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC;IACxB,kCAAkC;IAClC,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC;IAC3B;;;OAGG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;CACpB"}
@@ -1 +1 @@
1
- {"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAY3D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,UAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAuCrE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAG3C;AAQD,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CAsBtD"}
1
+ {"version":3,"file":"usage.d.ts","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAgB3D;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,KAAK,UAAQ,GAAG,OAAO,CAAC,SAAS,GAAG,IAAI,CAAC,CAiDrE;AAED,wBAAgB,oBAAoB,IAAI,IAAI,CAG3C;AAiBD,+DAA+D;AAC/D,wBAAgB,iBAAiB,CAAC,CAAC,EAAE,SAAS,GAAG,MAAM,CA4BtD"}
package/dist/usage.js CHANGED
@@ -3,7 +3,11 @@ import { findQoderCLI } from "./auth.js";
3
3
  import { idlePrompt } from "./sdk-session.js";
4
4
  import { hasQoderCredential, qoderAuth } from "./sdk-auth.js";
5
5
  import { debug, describeError } from "./logger.js";
6
+ import { closeAsyncIterator, withTimeout } from "./async-utils.js";
6
7
  const CACHE_TTL_MS = 60_000;
8
+ const FETCH_TIMEOUT_MS = 30_000;
9
+ const CLEANUP_GRACE_MS = 5_000;
10
+ const CONTROL_CHARS = /[\u0000-\u001f\u007f-\u009f]/g;
7
11
  let cached = null;
8
12
  let cacheExpiry = 0;
9
13
  let inflight = null;
@@ -18,74 +22,95 @@ export function getLiveUsage(force = false) {
18
22
  return Promise.resolve(cached);
19
23
  if (inflight)
20
24
  return inflight;
21
- inflight = (async () => {
22
- const cli = findQoderCLI();
23
- if (!hasQoderCredential())
24
- return null;
25
+ const request = (async () => {
25
26
  const abortController = new AbortController();
26
- const sdkOptions = {
27
- auth: qoderAuth(),
28
- abortController,
29
- maxTurns: 1,
30
- ...(cli ? { pathToQoderCLIExecutable: cli } : {}),
31
- };
32
- const q = query({
33
- prompt: idlePrompt(abortController.signal),
34
- options: sdkOptions,
35
- });
27
+ let q;
28
+ const timeout = setTimeout(() => abortController.abort(), FETCH_TIMEOUT_MS);
29
+ if (typeof timeout.unref === "function")
30
+ timeout.unref();
36
31
  try {
37
- const usage = await q.getUsageInfo();
32
+ if (!hasQoderCredential())
33
+ return null;
34
+ const cli = findQoderCLI();
35
+ q = query({
36
+ prompt: idlePrompt(abortController.signal),
37
+ options: {
38
+ auth: qoderAuth(),
39
+ abortController,
40
+ maxTurns: 1,
41
+ persistSession: false,
42
+ ...(cli ? { pathToQoderCLIExecutable: cli } : {}),
43
+ },
44
+ });
45
+ const usage = await withTimeout(q.getUsageInfo(), FETCH_TIMEOUT_MS, `Qoder usage request exceeded ${FETCH_TIMEOUT_MS}ms`);
38
46
  if (usage) {
39
47
  cached = usage;
40
48
  cacheExpiry = Date.now() + CACHE_TTL_MS;
41
49
  }
42
- return usage;
50
+ return usage ?? cached;
43
51
  }
44
52
  catch (error) {
45
53
  debug("Live usage fetch failed:", describeError(error));
46
54
  return cached;
47
55
  }
48
56
  finally {
57
+ clearTimeout(timeout);
49
58
  abortController.abort();
50
- void q.return(undefined).catch(() => { });
51
- inflight = null;
59
+ if (q)
60
+ await closeAsyncIterator(q, CLEANUP_GRACE_MS);
52
61
  }
53
62
  })();
54
- return inflight;
63
+ inflight = request;
64
+ request.then(() => { if (inflight === request)
65
+ inflight = null; }, () => { if (inflight === request)
66
+ inflight = null; });
67
+ return request;
55
68
  }
56
69
  export function invalidateUsageCache() {
57
70
  cached = null;
58
71
  cacheExpiry = 0;
59
72
  }
73
+ function finiteNonNegative(value) {
74
+ return typeof value === "number" && Number.isFinite(value) && value >= 0 ? value : 0;
75
+ }
76
+ function safeLabel(value, maxLength = 128) {
77
+ return typeof value === "string" ? value.replace(CONTROL_CHARS, " ").slice(0, maxLength) : "";
78
+ }
60
79
  function bucketLine(label, b) {
61
- if (!b || b.total == null)
80
+ if (!b || typeof b.total !== "number" || !Number.isFinite(b.total) || b.total < 0)
62
81
  return null;
63
- const unit = b.unit ?? "";
64
- return `${label}: ${b.used ?? 0}/${b.total} ${unit} (${b.remaining ?? 0} remaining)`;
82
+ const total = b.total;
83
+ const unit = safeLabel(b.unit);
84
+ return `${label}: ${finiteNonNegative(b.used)}/${total} ${unit} (${finiteNonNegative(b.remaining)} remaining)`;
65
85
  }
66
86
  /** Format a UsageInfo into a compact human-readable report. */
67
87
  export function formatUsageReport(u) {
68
88
  const lines = ["Qoder Account Usage"];
69
- if (u.userType)
70
- lines.push(` Plan: ${u.userType}`);
71
- if (typeof u.totalUsagePercentage === "number")
89
+ const userType = safeLabel(u.userType);
90
+ if (userType)
91
+ lines.push(` Plan: ${userType}`);
92
+ if (typeof u.totalUsagePercentage === "number" && Number.isFinite(u.totalUsagePercentage)) {
72
93
  lines.push(` Usage: ${u.totalUsagePercentage.toFixed(1)}%`);
94
+ }
73
95
  const quota = bucketLine(" Quota", u.userQuota);
74
96
  if (quota)
75
97
  lines.push(quota);
76
- if (u.addOnQuota && (u.addOnQuota.total ?? 0) > 0) {
98
+ if (u.addOnQuota && finiteNonNegative(u.addOnQuota.total) > 0) {
77
99
  const addOn = bucketLine(" Add-on", u.addOnQuota);
78
100
  if (addOn)
79
101
  lines.push(addOn);
80
102
  }
81
103
  if (u.orgResourcePackage?.available) {
82
104
  const org = u.orgResourcePackage;
83
- lines.push(` Org Package: ${org.used ?? 0}/${org.cap ?? 0} ${org.unit ?? ""} (${org.remaining ?? 0} remaining)`);
105
+ lines.push(` Org Package: ${finiteNonNegative(org.used)}/${finiteNonNegative(org.cap)} ${safeLabel(org.unit)} (${finiteNonNegative(org.remaining)} remaining)`);
84
106
  }
85
107
  if (u.isQuotaExceeded)
86
108
  lines.push(" WARNING: quota exceeded");
87
- if (u.expiresAt && u.expiresAt > 0)
88
- lines.push(` Expires: ${new Date(u.expiresAt).toISOString().slice(0, 10)}`);
109
+ if (typeof u.expiresAt === "number" && Number.isFinite(u.expiresAt) && u.expiresAt > 0) {
110
+ const expires = new Date(u.expiresAt);
111
+ if (!Number.isNaN(expires.getTime()))
112
+ lines.push(` Expires: ${expires.toISOString().slice(0, 10)}`);
113
+ }
89
114
  return lines.join("\n");
90
115
  }
91
116
  //# sourceMappingURL=usage.js.map
package/dist/usage.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC9D,OAAO,EAAE,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAEnD,MAAM,YAAY,GAAG,MAAM,CAAC;AAE5B,IAAI,MAAM,GAAqB,IAAI,CAAC;AACpC,IAAI,WAAW,GAAG,CAAC,CAAC;AACpB,IAAI,QAAQ,GAAqC,IAAI,CAAC;AAEtD;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,KAAK,GAAG,KAAK;IACxC,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;IACvB,IAAI,CAAC,KAAK,IAAI,MAAM,IAAI,GAAG,GAAG,WAAW;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1E,IAAI,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAE9B,QAAQ,GAAG,CAAC,KAAK,IAAI,EAAE;QACrB,MAAM,GAAG,GAAG,YAAY,EAAE,CAAC;QAC3B,IAAI,CAAC,kBAAkB,EAAE;YAAE,OAAO,IAAI,CAAC;QAEvC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;QAC9C,MAAM,UAAU,GAAG;YACjB,IAAI,EAAE,SAAS,EAAE;YACjB,eAAe;YACf,QAAQ,EAAE,CAAC;YACX,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,wBAAwB,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClD,CAAC;QACF,MAAM,CAAC,GAAG,KAAK,CAAC;YACd,MAAM,EAAE,UAAU,CAAC,eAAe,CAAC,MAAM,CAAC;YAC1C,OAAO,EAAE,UAAU;SACpB,CAAC,CAAC;QAEH,IAAI,CAAC;YACH,MAAM,KAAK,GAAG,MAAM,CAAC,CAAC,YAAY,EAAE,CAAC;YACrC,IAAI,KAAK,EAAE,CAAC;gBACV,MAAM,GAAG,KAAK,CAAC;gBACf,WAAW,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,YAAY,CAAC;YAC1C,CAAC;YACD,OAAO,KAAK,CAAC;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,KAAK,CAAC,0BAA0B,EAAE,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC;YACxD,OAAO,MAAM,CAAC;QAChB,CAAC;gBAAS,CAAC;YACT,eAAe,CAAC,KAAK,EAAE,CAAC;YACxB,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACzC,QAAQ,GAAG,IAAI,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,EAAE,CAAC;IAEL,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,UAAU,oBAAoB;IAClC,MAAM,GAAG,IAAI,CAAC;IACd,WAAW,GAAG,CAAC,CAAC;AAClB,CAAC;AAED,SAAS,UAAU,CAAC,KAAa,EAAE,CAAmF;IACpH,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IACvC,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC;IAC1B,OAAO,GAAG,KAAK,KAAK,CAAC,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,IAAI,KAAK,CAAC,CAAC,SAAS,IAAI,CAAC,aAAa,CAAC;AACvF,CAAC;AAED,+DAA+D;AAC/D,MAAM,UAAU,iBAAiB,CAAC,CAAY;IAC5C,MAAM,KAAK,GAAa,CAAC,qBAAqB,CAAC,CAAC;IAChD,IAAI,CAAC,CAAC,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;IACpD,IAAI,OAAO,CAAC,CAAC,oBAAoB,KAAK,QAAQ;QAAE,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;IAE7G,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC;IACjD,IAAI,KAAK;QAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAE7B,IAAI,CAAC,CAAC,UAAU,IAAI,CAAC,CAAC,CAAC,UAAU,CAAC,KAAK,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;QAClD,MAAM,KAAK,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC;QACnD,IAAI,KAAK;YAAE,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,CAAC,kBAAkB,EAAE,SAAS,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,CAAC,CAAC,kBAAkB,CAAC;QACjC,KAAK,CAAC,IAAI,CAAC,kBAAkB,GAAG,CAAC,IAAI,IAAI,CAAC,IAAI,GAAG,CAAC,GAAG,IAAI,CAAC,IAAI,GAAG,CAAC,IAAI,IAAI,EAAE,KAAK,GAAG,CAAC,SAAS,IAAI,CAAC,aAAa,CAAC,CAAC;IACpH,CAAC;IAED,IAAI,CAAC,CAAC,eAAe;QAAE,KAAK,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;IAC/D,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,CAAC,SAAS,GAAG,CAAC;QAAE,KAAK,CAAC,IAAI,CAAC,cAAc,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;IAEjH,OAAO,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC1B,CAAC"}
1
+ {"version":3,"file":"usage.js","sourceRoot":"","sources":["../src/usage.ts"],"names":[],"mappings":"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"}