zcode-acp-server 0.65.1 → 0.67.0
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.
- package/README.md +27 -2
- package/dist/backend/resolve.js +3 -3
- package/dist/backend/resolve.js.map +1 -1
- package/dist/bin/quota.js +2 -2
- package/dist/code-fingerprint.json +2 -2
- package/dist/config/settings.d.ts +2 -0
- package/dist/config/settings.d.ts.map +1 -1
- package/dist/config/settings.js +7 -0
- package/dist/config/settings.js.map +1 -1
- package/dist/config/user-config.d.ts +3 -1
- package/dist/config/user-config.d.ts.map +1 -1
- package/dist/config/user-config.js +7 -0
- package/dist/config/user-config.js.map +1 -1
- package/dist/goal-loop/driver.d.ts.map +1 -1
- package/dist/goal-loop/driver.js +3 -13
- package/dist/goal-loop/driver.js.map +1 -1
- package/dist/handlers/account.d.ts +20 -0
- package/dist/handlers/account.d.ts.map +1 -1
- package/dist/handlers/account.js +18 -3
- package/dist/handlers/account.js.map +1 -1
- package/dist/handlers/dispatch.d.ts.map +1 -1
- package/dist/handlers/dispatch.js +5 -0
- package/dist/handlers/dispatch.js.map +1 -1
- package/dist/handlers/io.d.ts +14 -1
- package/dist/handlers/io.d.ts.map +1 -1
- package/dist/handlers/io.js +15 -2
- package/dist/handlers/io.js.map +1 -1
- package/dist/handlers/prompt-content.d.ts +22 -0
- package/dist/handlers/prompt-content.d.ts.map +1 -0
- package/dist/handlers/prompt-content.js +193 -0
- package/dist/handlers/prompt-content.js.map +1 -0
- package/dist/handlers/session.d.ts +3 -2
- package/dist/handlers/session.d.ts.map +1 -1
- package/dist/handlers/session.js +50 -17
- package/dist/handlers/session.js.map +1 -1
- package/dist/quota/ollama-cloud/client.d.ts +13 -4
- package/dist/quota/ollama-cloud/client.d.ts.map +1 -1
- package/dist/quota/ollama-cloud/client.js +14 -5
- package/dist/quota/ollama-cloud/client.js.map +1 -1
- package/dist/quota/ollama-cloud/format.d.ts +3 -2
- package/dist/quota/ollama-cloud/format.d.ts.map +1 -1
- package/dist/quota/ollama-cloud/format.js +22 -2
- package/dist/quota/ollama-cloud/format.js.map +1 -1
- package/dist/quota/ollama-cloud/index.d.ts +17 -1
- package/dist/quota/ollama-cloud/index.d.ts.map +1 -1
- package/dist/quota/ollama-cloud/index.js +92 -43
- package/dist/quota/ollama-cloud/index.js.map +1 -1
- package/dist/quota/ollama-cloud/types.d.ts +32 -8
- package/dist/quota/ollama-cloud/types.d.ts.map +1 -1
- package/dist/quota/ollama-cloud/types.js +13 -5
- package/dist/quota/ollama-cloud/types.js.map +1 -1
- package/dist/server.d.ts.map +1 -1
- package/dist/server.js +5 -3
- package/dist/server.js.map +1 -1
- package/docs/ARCHITECTURE.md +1 -1
- package/docs/CLI.md +15 -12
- package/docs/PROTOCOL.md +9 -0
- package/docs/REMOTE-CLIENTS.md +17 -9
- package/docs/REPLAY-GUIDE.md +16 -5
- package/package.json +1 -1
|
@@ -20,8 +20,9 @@ export interface RenderedSection {
|
|
|
20
20
|
* Render the Ollama Cloud section.
|
|
21
21
|
*
|
|
22
22
|
* Used by the combined formatter. The header is always `Ollama Cloud`; body
|
|
23
|
-
* has one bar line per window
|
|
24
|
-
*
|
|
23
|
+
* has one bar line per window, plus (2026-10 API) a spend detail line under
|
|
24
|
+
* the bars when the result carries `usageUsd`. Non-success kinds return a
|
|
25
|
+
* header + a single explanatory line.
|
|
25
26
|
*
|
|
26
27
|
* When `color` is true the bar is a heat-colored 24-bit ANSI bar with the
|
|
27
28
|
* percent overlaid inside, mirroring the other providers' color layout.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAehD,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED
|
|
1
|
+
{"version":3,"file":"format.d.ts","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAKH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAehD,qEAAqE;AACrE,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,EAAE,CAAC;CAChB;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,aAAa,EAAE,KAAK,UAAQ,GAAG,eAAe,CA6BrF"}
|
|
@@ -25,8 +25,9 @@ const WINDOW_META = [
|
|
|
25
25
|
* Render the Ollama Cloud section.
|
|
26
26
|
*
|
|
27
27
|
* Used by the combined formatter. The header is always `Ollama Cloud`; body
|
|
28
|
-
* has one bar line per window
|
|
29
|
-
*
|
|
28
|
+
* has one bar line per window, plus (2026-10 API) a spend detail line under
|
|
29
|
+
* the bars when the result carries `usageUsd`. Non-success kinds return a
|
|
30
|
+
* header + a single explanatory line.
|
|
30
31
|
*
|
|
31
32
|
* When `color` is true the bar is a heat-colored 24-bit ANSI bar with the
|
|
32
33
|
* percent overlaid inside, mirroring the other providers' color layout.
|
|
@@ -52,6 +53,25 @@ export function formatOcSection(result, color = false) {
|
|
|
52
53
|
}
|
|
53
54
|
return `${m.label.padEnd(5)} ${renderBar(pct)} ${String(pct).padStart(2)}%${trailing}`;
|
|
54
55
|
});
|
|
56
|
+
const detail = formatOcSpendLine(result);
|
|
57
|
+
if (detail)
|
|
58
|
+
body.push(detail);
|
|
55
59
|
return { header, body };
|
|
56
60
|
}
|
|
61
|
+
/**
|
|
62
|
+
* Spend detail line for the analytics API (2026-10+): `usage` spend over the
|
|
63
|
+
* rolling 30d window, with the plan credit as context when known. Indented to
|
|
64
|
+
* sit under the window bars. `null` when the result carries no spend (legacy
|
|
65
|
+
* response shape) — the card then stays exactly as before.
|
|
66
|
+
*/
|
|
67
|
+
function formatOcSpendLine(result) {
|
|
68
|
+
if (result.usageUsd === undefined)
|
|
69
|
+
return null;
|
|
70
|
+
const spend = `$${result.usageUsd.toFixed(2)}`;
|
|
71
|
+
const of = result.creditUsd !== undefined ? ` of $${result.creditUsd}` : " spent";
|
|
72
|
+
const req = result.requestCount !== undefined
|
|
73
|
+
? ` · ${result.requestCount.toLocaleString("en-US")} req`
|
|
74
|
+
: "";
|
|
75
|
+
return ` ${spend}${of}${req} (30d)`;
|
|
76
|
+
}
|
|
57
77
|
//# sourceMappingURL=format.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/format.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAG5C;;uCAEuC;AACvC,MAAM,WAAW,GAIZ;IACH,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE;IAC3D,EAAE,GAAG,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,eAAe,EAAE;IAC3D,EAAE,GAAG,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE;CAC/D,CAAC;AAQF
|
|
1
|
+
{"version":3,"file":"format.js","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/format.ts"],"names":[],"mappings":"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"}
|
|
@@ -23,6 +23,15 @@ export declare const WEEK_ANCHOR_MS: number;
|
|
|
23
23
|
export declare function nextSessionReset(t: number): number;
|
|
24
24
|
/** Next Monday 00:00 UTC strictly after `t` (the weekly window reset). */
|
|
25
25
|
export declare function nextWeeklyReset(t: number): number;
|
|
26
|
+
/**
|
|
27
|
+
* Monthly usage credit per plan (USD) — ollama.com/pricing as of 2026-10-10
|
|
28
|
+
* (Pro $60, Max $300, Team $1000). The usage API no longer reports any limit,
|
|
29
|
+
* so the plan id from POST /api/me keys this table to derive the monthly
|
|
30
|
+
* percent (30d spend ÷ credit). Free's "starter credits" amount is unlisted
|
|
31
|
+
* → no percent for unknown plans, spend only. Prices can drift when Ollama
|
|
32
|
+
* reprices — re-check the pricing page when the percent looks wrong.
|
|
33
|
+
*/
|
|
34
|
+
export declare const PLAN_CREDIT_USD: Record<string, number>;
|
|
26
35
|
/**
|
|
27
36
|
* Next monthly anniversary of `createdMs` strictly after `now` — new credit
|
|
28
37
|
* plans reset monthly on the subscription day, so the anchor keeps the
|
|
@@ -37,10 +46,17 @@ export declare function nextMonthlyAnniversary(createdMs: number, now: number):
|
|
|
37
46
|
* - Serves a cached result when fresh (< 10s).
|
|
38
47
|
* - HTTP 401/403 → `auth_error` (bad or revoked key).
|
|
39
48
|
* - Network/timeout/parse failure → `unavailable`.
|
|
49
|
+
*
|
|
50
|
+
* Response shapes (first match wins):
|
|
51
|
+
* - analytics (2026-10+): `totals.usage_usd` over the requested 30d window →
|
|
52
|
+
* spend detail + derived `monthly` fraction (spend ÷ plan credit; the /api/me
|
|
53
|
+
* lookup supplies both the plan and the reset moment);
|
|
54
|
+
* - legacy limits (pre-2026-10): `limits.{session,weekly,monthly}.usage`
|
|
55
|
+
* fractions as-is.
|
|
40
56
|
*/
|
|
41
57
|
export declare function queryOcUsage(): Promise<OcQueryResult>;
|
|
42
58
|
export { clearCache, clearCache as clearOcCache } from "./cache.js";
|
|
43
|
-
export { fetchOcMe, fetchOcUsage, ME_URL, USAGE_URL } from "./client.js";
|
|
59
|
+
export { fetchOcMe, fetchOcUsage, ME_URL, USAGE_RANGE, USAGE_URL } from "./client.js";
|
|
44
60
|
export { formatOcSection } from "./format.js";
|
|
45
61
|
export { loadApiKey, ENV_API_KEY } from "./config.js";
|
|
46
62
|
export type { OcQueryResult, OcUsageResponse } from "./types.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,6EAA6E;AAC7E,eAAO,MAAM,iBAAiB,QAAgB,CAAC;AAC/C;;wBAEwB;AACxB,eAAO,MAAM,cAAc,QAAiB,CAAC;AAG7C;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAGjD;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAMH,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEhD,6EAA6E;AAC7E,eAAO,MAAM,iBAAiB,QAAgB,CAAC;AAC/C;;wBAEwB;AACxB,eAAO,MAAM,cAAc,QAAiB,CAAC;AAG7C;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAElD;AAED,0EAA0E;AAC1E,wBAAgB,eAAe,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAGjD;AAsDD;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAIlD,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,sBAAsB,CAAC,SAAS,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAqB7E;AAoBD;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,YAAY,IAAI,OAAO,CAAC,aAAa,CAAC,CAuF3D;AAGD,OAAO,EAAE,UAAU,EAAE,UAAU,IAAI,YAAY,EAAE,MAAM,YAAY,CAAC;AACpE,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACtF,OAAO,EAAE,eAAe,EAAE,MAAM,aAAa,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACtD,YAAY,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC"}
|
|
@@ -32,23 +32,16 @@ export function nextWeeklyReset(t) {
|
|
|
32
32
|
const next = WEEK_ANCHOR_MS + (Math.floor((t - WEEK_ANCHOR_MS) / WEEK_MS) + 1) * WEEK_MS;
|
|
33
33
|
return next > t ? next : next + WEEK_MS;
|
|
34
34
|
}
|
|
35
|
-
|
|
36
|
-
* Best-effort monthly reset lookup via POST /api/me. Two shapes exist:
|
|
37
|
-
* - `SubscriptionPeriodEnd` (Go `sql.NullTime` `{Time, Valid}`) — the billing
|
|
38
|
-
* period end, when the account carries one;
|
|
39
|
-
* - `CreatedAt` — the subscription start. New credit plans (live-verified
|
|
40
|
-
* 2026-09-17: a Pro account returns only ID/CreatedAt/Email/Plan, no
|
|
41
|
-
* SubscriptionPeriodEnd) reset monthly on the subscription day, so the
|
|
42
|
-
* reset is the next monthly anniversary of that timestamp.
|
|
43
|
-
* Any failure (network, auth, shape) yields undefined — the caller then
|
|
44
|
-
* renders the monthly window without a reset stamp.
|
|
45
|
-
*/
|
|
46
|
-
async function lookupMonthlyReset(apiKey) {
|
|
35
|
+
async function lookupAccountInfo(apiKey) {
|
|
47
36
|
try {
|
|
48
37
|
const resp = await fetchOcMe(apiKey);
|
|
49
38
|
if (resp.status !== 200)
|
|
50
|
-
return
|
|
39
|
+
return {};
|
|
51
40
|
const parsed = JSON.parse(resp.text);
|
|
41
|
+
const info = {};
|
|
42
|
+
const planRaw = parsed.Plan ?? parsed.plan;
|
|
43
|
+
if (typeof planRaw === "string" && planRaw.length > 0)
|
|
44
|
+
info.plan = planRaw;
|
|
52
45
|
const period = parsed.SubscriptionPeriodEnd ?? parsed.subscriptionPeriodEnd;
|
|
53
46
|
if (period !== undefined) {
|
|
54
47
|
const raw = period.Time ?? period.time;
|
|
@@ -57,21 +50,37 @@ async function lookupMonthlyReset(apiKey) {
|
|
|
57
50
|
if (valid !== false && typeof raw === "string") {
|
|
58
51
|
const ms = Date.parse(raw);
|
|
59
52
|
if (Number.isFinite(ms))
|
|
60
|
-
|
|
53
|
+
info.monthlyResetAt = ms;
|
|
61
54
|
}
|
|
62
55
|
}
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
56
|
+
if (info.monthlyResetAt === undefined) {
|
|
57
|
+
const createdRaw = parsed.CreatedAt ?? parsed.createdAt;
|
|
58
|
+
if (typeof createdRaw === "string") {
|
|
59
|
+
const created = Date.parse(createdRaw);
|
|
60
|
+
if (Number.isFinite(created)) {
|
|
61
|
+
info.monthlyResetAt = nextMonthlyAnniversary(created, Date.now());
|
|
62
|
+
}
|
|
63
|
+
}
|
|
68
64
|
}
|
|
69
|
-
return
|
|
65
|
+
return info;
|
|
70
66
|
}
|
|
71
67
|
catch {
|
|
72
|
-
return
|
|
68
|
+
return {};
|
|
73
69
|
}
|
|
74
70
|
}
|
|
71
|
+
/**
|
|
72
|
+
* Monthly usage credit per plan (USD) — ollama.com/pricing as of 2026-10-10
|
|
73
|
+
* (Pro $60, Max $300, Team $1000). The usage API no longer reports any limit,
|
|
74
|
+
* so the plan id from POST /api/me keys this table to derive the monthly
|
|
75
|
+
* percent (30d spend ÷ credit). Free's "starter credits" amount is unlisted
|
|
76
|
+
* → no percent for unknown plans, spend only. Prices can drift when Ollama
|
|
77
|
+
* reprices — re-check the pricing page when the percent looks wrong.
|
|
78
|
+
*/
|
|
79
|
+
export const PLAN_CREDIT_USD = {
|
|
80
|
+
pro: 60,
|
|
81
|
+
max: 300,
|
|
82
|
+
team: 1000,
|
|
83
|
+
};
|
|
75
84
|
/**
|
|
76
85
|
* Next monthly anniversary of `createdMs` strictly after `now` — new credit
|
|
77
86
|
* plans reset monthly on the subscription day, so the anchor keeps the
|
|
@@ -98,7 +107,8 @@ export function nextMonthlyAnniversary(createdMs, now) {
|
|
|
98
107
|
return Number.NaN;
|
|
99
108
|
}
|
|
100
109
|
/**
|
|
101
|
-
* Validate a usage value from the response body: a finite number in
|
|
110
|
+
* Validate a usage value from the legacy response body: a finite number in
|
|
111
|
+
* [0, 1].
|
|
102
112
|
*
|
|
103
113
|
* Values > 1 are rejected on purpose: the endpoint is undocumented, and if
|
|
104
114
|
* Ollama ever switches to percent-valued numbers, silently treating 42 as a
|
|
@@ -108,6 +118,10 @@ export function nextMonthlyAnniversary(createdMs, now) {
|
|
|
108
118
|
function validFraction(v) {
|
|
109
119
|
return typeof v === "number" && Number.isFinite(v) && v >= 0 && v <= 1;
|
|
110
120
|
}
|
|
121
|
+
/** A finite non-negative counter/money value from the analytics `totals`. */
|
|
122
|
+
function validCount(v) {
|
|
123
|
+
return typeof v === "number" && Number.isFinite(v) && v >= 0;
|
|
124
|
+
}
|
|
111
125
|
/**
|
|
112
126
|
* Query Ollama Cloud usage and return a normalised {@link OcQueryResult}.
|
|
113
127
|
*
|
|
@@ -115,6 +129,13 @@ function validFraction(v) {
|
|
|
115
129
|
* - Serves a cached result when fresh (< 10s).
|
|
116
130
|
* - HTTP 401/403 → `auth_error` (bad or revoked key).
|
|
117
131
|
* - Network/timeout/parse failure → `unavailable`.
|
|
132
|
+
*
|
|
133
|
+
* Response shapes (first match wins):
|
|
134
|
+
* - analytics (2026-10+): `totals.usage_usd` over the requested 30d window →
|
|
135
|
+
* spend detail + derived `monthly` fraction (spend ÷ plan credit; the /api/me
|
|
136
|
+
* lookup supplies both the plan and the reset moment);
|
|
137
|
+
* - legacy limits (pre-2026-10): `limits.{session,weekly,monthly}.usage`
|
|
138
|
+
* fractions as-is.
|
|
118
139
|
*/
|
|
119
140
|
export async function queryOcUsage() {
|
|
120
141
|
const cached = getCached();
|
|
@@ -138,33 +159,61 @@ export async function queryOcUsage() {
|
|
|
138
159
|
}
|
|
139
160
|
else {
|
|
140
161
|
const parsed = JSON.parse(resp.text);
|
|
141
|
-
const
|
|
142
|
-
const
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
if (session !== undefined || weekly !== undefined || monthly !== undefined) {
|
|
147
|
-
// At least one recognised window — legacy plans carry session+weekly,
|
|
148
|
-
// current credit plans carry monthly only. Reset moments: session and
|
|
149
|
-
// weekly derive from the window anchoring; monthly needs the separate
|
|
150
|
-
// /api/me billing-period lookup.
|
|
162
|
+
const totals = parsed.totals ?? {};
|
|
163
|
+
const usageUsd = validCount(totals.usage_usd) ? totals.usage_usd : undefined;
|
|
164
|
+
if (usageUsd !== undefined) {
|
|
165
|
+
// Analytics shape: spend over the rolling 30d window. The percent is
|
|
166
|
+
// derived (spend ÷ plan credit) because the API reports no limit.
|
|
151
167
|
const fetchedAt = Date.now();
|
|
168
|
+
const { plan, monthlyResetAt } = await lookupAccountInfo(apiKey);
|
|
169
|
+
const creditUsd = plan !== undefined ? PLAN_CREDIT_USD[plan.toLowerCase()] : undefined;
|
|
152
170
|
result = {
|
|
153
171
|
kind: "success",
|
|
154
|
-
...(
|
|
155
|
-
...(
|
|
156
|
-
|
|
172
|
+
...(creditUsd !== undefined && { monthly: Math.min(1, usageUsd / creditUsd) }),
|
|
173
|
+
...(monthlyResetAt !== undefined && { monthlyResetAt }),
|
|
174
|
+
usageUsd,
|
|
175
|
+
...(plan !== undefined && { plan }),
|
|
176
|
+
...(creditUsd !== undefined && { creditUsd }),
|
|
177
|
+
...(validCount(totals.request_count) && { requestCount: totals.request_count }),
|
|
178
|
+
...(validCount(totals.input_tokens) && { inputTokens: totals.input_tokens }),
|
|
179
|
+
...(validCount(totals.cached_input_tokens) && {
|
|
180
|
+
cachedInputTokens: totals.cached_input_tokens,
|
|
181
|
+
}),
|
|
182
|
+
...(validCount(totals.output_tokens) && { outputTokens: totals.output_tokens }),
|
|
157
183
|
fetchedAt,
|
|
158
184
|
};
|
|
159
|
-
if (monthly !== undefined) {
|
|
160
|
-
const monthlyResetAt = await lookupMonthlyReset(apiKey);
|
|
161
|
-
if (monthlyResetAt !== undefined)
|
|
162
|
-
result.monthlyResetAt = monthlyResetAt;
|
|
163
|
-
}
|
|
164
185
|
}
|
|
165
186
|
else {
|
|
166
|
-
|
|
167
|
-
|
|
187
|
+
// Legacy pre-2026-10 shape: `limits.{session,weekly,monthly}.usage`
|
|
188
|
+
// fractions (rollback guard — the endpoint switched shapes wholesale).
|
|
189
|
+
const limits = parsed.limits ?? {};
|
|
190
|
+
const window = (key) => validFraction(limits[key]?.usage) ? limits[key].usage : undefined;
|
|
191
|
+
const session = window("session");
|
|
192
|
+
const weekly = window("weekly");
|
|
193
|
+
const monthly = window("monthly");
|
|
194
|
+
if (session !== undefined || weekly !== undefined || monthly !== undefined) {
|
|
195
|
+
// At least one recognised window — legacy plans carry session+weekly,
|
|
196
|
+
// current credit plans carry monthly only. Reset moments: session and
|
|
197
|
+
// weekly derive from the window anchoring; monthly needs the separate
|
|
198
|
+
// /api/me billing-period lookup.
|
|
199
|
+
const fetchedAt = Date.now();
|
|
200
|
+
result = {
|
|
201
|
+
kind: "success",
|
|
202
|
+
...(session !== undefined && { session, sessionResetAt: nextSessionReset(fetchedAt) }),
|
|
203
|
+
...(weekly !== undefined && { weekly, weeklyResetAt: nextWeeklyReset(fetchedAt) }),
|
|
204
|
+
...(monthly !== undefined && { monthly }),
|
|
205
|
+
fetchedAt,
|
|
206
|
+
};
|
|
207
|
+
if (monthly !== undefined) {
|
|
208
|
+
const { monthlyResetAt } = await lookupAccountInfo(apiKey);
|
|
209
|
+
if (monthlyResetAt !== undefined)
|
|
210
|
+
result.monthlyResetAt = monthlyResetAt;
|
|
211
|
+
}
|
|
212
|
+
}
|
|
213
|
+
else {
|
|
214
|
+
log("ollama-cloud: response shape not recognised (endpoint may have changed)");
|
|
215
|
+
result = { kind: "unavailable" };
|
|
216
|
+
}
|
|
168
217
|
}
|
|
169
218
|
}
|
|
170
219
|
}
|
|
@@ -177,7 +226,7 @@ export async function queryOcUsage() {
|
|
|
177
226
|
}
|
|
178
227
|
// Re-exports for consumers (CLI + tests).
|
|
179
228
|
export { clearCache, clearCache as clearOcCache } from "./cache.js";
|
|
180
|
-
export { fetchOcMe, fetchOcUsage, ME_URL, USAGE_URL } from "./client.js";
|
|
229
|
+
export { fetchOcMe, fetchOcUsage, ME_URL, USAGE_RANGE, USAGE_URL } from "./client.js";
|
|
181
230
|
export { formatOcSection } from "./format.js";
|
|
182
231
|
export { loadApiKey, ENV_API_KEY } from "./config.js";
|
|
183
232
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AACzC,OAAO,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAGtD,6EAA6E;AAC7E,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,GAAG,SAAS,CAAC;AAC/C;;wBAEwB;AACxB,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,GAAG,UAAU,CAAC;AAC7C,MAAM,OAAO,GAAG,CAAC,GAAG,UAAU,CAAC;AAE/B;;;GAGG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAS;IACxC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,iBAAiB,CAAC,GAAG,CAAC,CAAC,GAAG,iBAAiB,CAAC;AACrE,CAAC;AAED,0EAA0E;AAC1E,MAAM,UAAU,eAAe,CAAC,CAAS;IACvC,MAAM,IAAI,GAAG,cAAc,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,cAAc,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,OAAO,CAAC;IACzF,OAAO,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,GAAG,OAAO,CAAC;AAC1C,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,11 +2,19 @@
|
|
|
2
2
|
* Type definitions for the Ollama Cloud subscription usage feature.
|
|
3
3
|
*
|
|
4
4
|
* `zcode-acp quota` queries the undocumented-but-live
|
|
5
|
-
* `GET https://ollama.com/api/usage` endpoint with the user's API
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
5
|
+
* `GET https://ollama.com/api/usage?range=30d` endpoint with the user's API
|
|
6
|
+
* key. The API was rewritten (observed 2026-10-10) from a quota-fractions
|
|
7
|
+
* shape (`{limits:{session,weekly,monthly}}`) to a usage-analytics shape
|
|
8
|
+
* (`{range, totals:{usage_usd, request_count, …}, buckets}`) — it now reports
|
|
9
|
+
* SPEND in USD, not usage fractions, and exposes no plan limit. The percent
|
|
10
|
+
* windows on the success variant are therefore DERIVED:
|
|
11
|
+
* - `monthly` = 30d `usage_usd` ÷ the plan's monthly credit (pricing table
|
|
12
|
+
* in index.js, keyed by POST /api/me's `Plan`); absent when the plan's
|
|
13
|
+
* credit is unknown (e.g. the Free tier's starter credit is unlisted).
|
|
14
|
+
* - resets from the /api/me billing-period lookup (SubscriptionPeriodEnd,
|
|
15
|
+
* else the CreatedAt monthly anniversary).
|
|
16
|
+
* The pre-2026-10 `limits` shape is still parsed when the server returns it,
|
|
17
|
+
* as a rollback guard.
|
|
10
18
|
*
|
|
11
19
|
* Shape verified against live probes + the pi-multi-account reference client
|
|
12
20
|
* (2026-09); see `.zcode/scratch/research-ollama-cloud-usage.md`. Undocumented
|
|
@@ -22,9 +30,10 @@
|
|
|
22
30
|
*/
|
|
23
31
|
export type OcQueryResult = {
|
|
24
32
|
kind: "success";
|
|
25
|
-
/** Present windows only
|
|
26
|
-
*
|
|
27
|
-
* credit
|
|
33
|
+
/** Present windows only. Fractions in [0, 1]. `monthly` is derived from
|
|
34
|
+
* 30d spend ÷ plan credit (see the module header) — undefined when the
|
|
35
|
+
* plan's credit is unknown. `session`/`weekly` only ever come from the
|
|
36
|
+
* pre-2026-10 legacy response shape. */
|
|
28
37
|
session?: number;
|
|
29
38
|
weekly?: number;
|
|
30
39
|
monthly?: number;
|
|
@@ -36,6 +45,21 @@ export type OcQueryResult = {
|
|
|
36
45
|
sessionResetAt?: number;
|
|
37
46
|
weeklyResetAt?: number;
|
|
38
47
|
monthlyResetAt?: number;
|
|
48
|
+
/** Spend over the rolling 30d window (USD) — the API's own numerator
|
|
49
|
+
* for the derived `monthly` fraction. */
|
|
50
|
+
usageUsd?: number;
|
|
51
|
+
/** Plan id from POST /api/me ("pro" / "max" / "team" / …). */
|
|
52
|
+
plan?: string;
|
|
53
|
+
/** The plan's monthly usage credit (USD) — the denominator of the
|
|
54
|
+
* derived `monthly` fraction; present only for plans in the pricing
|
|
55
|
+
* table. */
|
|
56
|
+
creditUsd?: number;
|
|
57
|
+
/** Rolling-30d request count and token totals, when the API reports
|
|
58
|
+
* them (additive detail for future clients). */
|
|
59
|
+
requestCount?: number;
|
|
60
|
+
inputTokens?: number;
|
|
61
|
+
cachedInputTokens?: number;
|
|
62
|
+
outputTokens?: number;
|
|
39
63
|
/** Epoch ms of the fetch (kept for symmetry with the other providers). */
|
|
40
64
|
fetchedAt: number;
|
|
41
65
|
} | {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/types.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG;AAEH;;;;;;;GAOG;AACH,MAAM,MAAM,aAAa,GACrB;IACE,IAAI,EAAE,SAAS,CAAC;IAChB;;;6CAGyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB;;;;4BAIwB;IACxB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB;8CAC0C;IAC1C,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,8DAA8D;IAC9D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd;;iBAEa;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB;qDACiD;IACjD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0EAA0E;IAC1E,SAAS,EAAE,MAAM,CAAC;CACnB,GACD;IAAE,IAAI,EAAE,gBAAgB,CAAA;CAAE,GAC1B;IAAE,IAAI,EAAE,YAAY,CAAA;CAAE,GACtB;IAAE,IAAI,EAAE,aAAa,CAAA;CAAE,CAAC;AAE5B,wDAAwD;AACxD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;CACd"}
|
|
@@ -2,11 +2,19 @@
|
|
|
2
2
|
* Type definitions for the Ollama Cloud subscription usage feature.
|
|
3
3
|
*
|
|
4
4
|
* `zcode-acp quota` queries the undocumented-but-live
|
|
5
|
-
* `GET https://ollama.com/api/usage` endpoint with the user's API
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
9
|
-
*
|
|
5
|
+
* `GET https://ollama.com/api/usage?range=30d` endpoint with the user's API
|
|
6
|
+
* key. The API was rewritten (observed 2026-10-10) from a quota-fractions
|
|
7
|
+
* shape (`{limits:{session,weekly,monthly}}`) to a usage-analytics shape
|
|
8
|
+
* (`{range, totals:{usage_usd, request_count, …}, buckets}`) — it now reports
|
|
9
|
+
* SPEND in USD, not usage fractions, and exposes no plan limit. The percent
|
|
10
|
+
* windows on the success variant are therefore DERIVED:
|
|
11
|
+
* - `monthly` = 30d `usage_usd` ÷ the plan's monthly credit (pricing table
|
|
12
|
+
* in index.js, keyed by POST /api/me's `Plan`); absent when the plan's
|
|
13
|
+
* credit is unknown (e.g. the Free tier's starter credit is unlisted).
|
|
14
|
+
* - resets from the /api/me billing-period lookup (SubscriptionPeriodEnd,
|
|
15
|
+
* else the CreatedAt monthly anniversary).
|
|
16
|
+
* The pre-2026-10 `limits` shape is still parsed when the server returns it,
|
|
17
|
+
* as a rollback guard.
|
|
10
18
|
*
|
|
11
19
|
* Shape verified against live probes + the pi-multi-account reference client
|
|
12
20
|
* (2026-09); see `.zcode/scratch/research-ollama-cloud-usage.md`. Undocumented
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/types.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/quota/ollama-cloud/types.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;;GAqBG"}
|
package/dist/server.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/dist/server.js
CHANGED
|
@@ -10,7 +10,7 @@ import { builtinProviderEnv, loadZcodeCredentials, mergeEnvWithCreds, resolveZco
|
|
|
10
10
|
import { armSandboxArgv, collectSandboxWorkspaces, sandboxActive } from "./backend/sandbox.js";
|
|
11
11
|
import { captureGate, ensureWorkflowPolicyPushed, resolveWorkflowGate, } from "./config/workflow-gate.js";
|
|
12
12
|
import { BackgroundTaskListener } from "./handlers/background-tasks.js";
|
|
13
|
-
import { enqueueSessionSend } from "./handlers/io.js";
|
|
13
|
+
import { enqueueSessionSend, TURN_STATE_METHODS } from "./handlers/io.js";
|
|
14
14
|
import { SandboxRestartBatcher, flushSandboxGrants } from "./handlers/sandbox-allow.js";
|
|
15
15
|
import { answerProviderRuntimeHeaders, sweepOrphanedServerRequests, } from "./handlers/server-requests.js";
|
|
16
16
|
import { SessionTitleListener } from "./handlers/session-titles.js";
|
|
@@ -1007,7 +1007,7 @@ export class ZcodeAcpServer {
|
|
|
1007
1007
|
agentInfo: { ...AGENT_INFO },
|
|
1008
1008
|
agentCapabilities: {
|
|
1009
1009
|
loadSession: true,
|
|
1010
|
-
promptCapabilities: { image: true, audio: false, embeddedContext:
|
|
1010
|
+
promptCapabilities: { image: true, audio: false, embeddedContext: true },
|
|
1011
1011
|
// http MCP configs are forwarded verbatim to the backend (session/
|
|
1012
1012
|
// create + resume), which mounts them fine — the declaration was the
|
|
1013
1013
|
// only blocker keeping clients from sending http servers (#180).
|
|
@@ -1015,7 +1015,9 @@ export class ZcodeAcpServer {
|
|
|
1015
1015
|
sessionCapabilities: { list: {}, resume: {}, fork: {} },
|
|
1016
1016
|
// Read-only session file access lives on the bridge's loopback /fs
|
|
1017
1017
|
// endpoint, hub-proxied at /api/instances/{id}/fs/* (ADR-0004).
|
|
1018
|
-
|
|
1018
|
+
// turnState: the out-of-band running notifications this bridge emits,
|
|
1019
|
+
// old and new spellings (#311) — see TURN_STATE_METHODS.
|
|
1020
|
+
_meta: { zcode: { fs: true, turnState: [...TURN_STATE_METHODS] } },
|
|
1019
1021
|
},
|
|
1020
1022
|
// The GLM API key is read from ~/.zcode/v2/config.json by the ZCode
|
|
1021
1023
|
// backend subprocess; the editor never needs to supply credentials.
|
package/dist/server.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../src/server.ts"],"names":[],"mappings":"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"}
|
package/docs/ARCHITECTURE.md
CHANGED
|
@@ -146,7 +146,7 @@ API only because the ZCode backend itself sends them for inference.
|
|
|
146
146
|
| ----------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------- |
|
|
147
147
|
| Network | One outbound request in the whole codebase — `src/quota/client.ts` GET to the quota API, Bearer token only, no body |
|
|
148
148
|
| Credentials | API key from `~/.zcode/v2/config.json` (authenticates the subprocess + quota request), never logged. OAuth handled by the ZCode subprocess, not this server |
|
|
149
|
-
| Disk |
|
|
149
|
+
| Disk | Updates `~/.zcode/v2/tasks-index.sqlite` for history/search. Embedded generic binaries are staged privately in `$ZCODE_HOME/v2/acp-attachments` and retained for native reads/resume; see [retention](../README.md#prompt-attachments). |
|
|
150
150
|
| Logging | `log()`/`warn()` → stderr only for troubleshooting; even with `ZCODE_ACP_DEBUG=1`, no prompts/code/keys are logged |
|
|
151
151
|
|
|
152
152
|
## Module Responsibilities
|