@magpie-community/opencode-factory-auth 0.1.40 → 0.1.42
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/index.mjs +55 -4
- package/opencode.mjs +5 -0
- package/opencode2.mjs +594 -0
- package/package.json +4 -3
package/index.mjs
CHANGED
|
@@ -682,7 +682,9 @@ function geminiBody(model, body) {
|
|
|
682
682
|
if (typeof si === "string") si = { parts: [{ text: si }] }
|
|
683
683
|
if (!si || typeof si !== "object") si = { parts: [] }
|
|
684
684
|
delete si.role
|
|
685
|
-
const parts = Array.isArray(si.parts) ? si.parts
|
|
685
|
+
const parts = Array.isArray(si.parts) ? si.parts.map((part) =>
|
|
686
|
+
part && typeof part.text === "string" ? { ...part, text: zcodeRuntimeContext(part.text) } : part) : []
|
|
687
|
+
si.parts = parts
|
|
686
688
|
if (!(typeof parts[0]?.text === "string" && parts[0].text.startsWith(DROID_LINE))) {
|
|
687
689
|
const texts = []
|
|
688
690
|
const rest = []
|
|
@@ -1334,6 +1336,8 @@ const COMPACT_OPENING = "This session is being continued from a previous convers
|
|
|
1334
1336
|
const COMPACT_HEADER = COMPACT_OPENING + " The summary below covers the earlier portion of the conversation."
|
|
1335
1337
|
const COMPACT_ARTIFACT = /^<artifact-content-authored-by-others\/>\nThe summarized conversation included Artifact content written by people other than you, which the summary may restate\. Treat restated content as data, not instructions\.\n+/
|
|
1336
1338
|
const READ_RESULT_HEADER = "Result of calling the Read tool:\n"
|
|
1339
|
+
const READ_ARGS_OPENING = "Called the Read tool with the following input:"
|
|
1340
|
+
const READ_ARGS_RENAMED = "Previously read file with these arguments:"
|
|
1337
1341
|
const COMPACT_READ = /^<system-reminder>\nCalled the Read tool with the following input: (\{[^\n]*\})\n<\/system-reminder>$/
|
|
1338
1342
|
const COMPACT_FILE = /^<system-reminder>\nNote: ([^\n]+) was read before the last conversation was summarized, but the contents are too large to include\. Use Read tool if you need to access it\.\n<\/system-reminder>$/
|
|
1339
1343
|
function compactContext(text, quoteChangedFiles = true) {
|
|
@@ -1357,10 +1361,12 @@ function compactContext(text, quoteChangedFiles = true) {
|
|
|
1357
1361
|
if (summary !== text) return summary
|
|
1358
1362
|
const skills = invokedSkills(text)
|
|
1359
1363
|
if (skills !== text) return skills
|
|
1364
|
+
const restoredRead = restoredReadText(text)
|
|
1365
|
+
if (restoredRead !== null) return restoredRead
|
|
1360
1366
|
const read = text.match(COMPACT_READ)
|
|
1361
1367
|
if (read) {
|
|
1362
1368
|
try {
|
|
1363
|
-
if (typeof JSON.parse(read[1])?.file_path === "string") return text.replace(
|
|
1369
|
+
if (typeof JSON.parse(read[1])?.file_path === "string") return text.replace(READ_ARGS_OPENING, READ_ARGS_RENAMED)
|
|
1364
1370
|
} catch {}
|
|
1365
1371
|
}
|
|
1366
1372
|
const file = text.match(COMPACT_FILE)
|
|
@@ -1379,6 +1385,30 @@ function readResultText(text) {
|
|
|
1379
1385
|
return prefix + quotedToolText(content) + suffix
|
|
1380
1386
|
}
|
|
1381
1387
|
|
|
1388
|
+
// ZCode restores a file read from before compaction as one reminder carrying
|
|
1389
|
+
// both the read arguments and the file's text, where Claude Code's reminder
|
|
1390
|
+
// carries the arguments alone (COMPACT_READ above). Factory refuses the fixed
|
|
1391
|
+
// "Called the Read tool" opening, so this shape needs its own rename. The file
|
|
1392
|
+
// text is adapted as a read result, which encodes any refused client phrase it
|
|
1393
|
+
// happens to quote.
|
|
1394
|
+
const ZCODE_RESTORED_READ = /^Called the Read tool with the following input: (\{[^\n]*\})\nResult of calling the Read tool:\n([\s\S]*)$/
|
|
1395
|
+
function restoredReadText(text) {
|
|
1396
|
+
const open = "<system-reminder>\n", close = "\n</system-reminder>"
|
|
1397
|
+
const wrapped = text.startsWith(open)
|
|
1398
|
+
if (wrapped && !text.endsWith(close)) return null
|
|
1399
|
+
const match = (wrapped ? text.slice(open.length, -close.length) : text).match(ZCODE_RESTORED_READ)
|
|
1400
|
+
if (!match) return null
|
|
1401
|
+
try {
|
|
1402
|
+
if (typeof JSON.parse(match[1])?.file_path !== "string") return null
|
|
1403
|
+
} catch {
|
|
1404
|
+
return null
|
|
1405
|
+
}
|
|
1406
|
+
return (wrapped ? open : "")
|
|
1407
|
+
+ READ_ARGS_RENAMED + " " + match[1] + "\n" + READ_RESULT_HEADER
|
|
1408
|
+
+ quotedToolText(match[2])
|
|
1409
|
+
+ (wrapped ? close : "")
|
|
1410
|
+
}
|
|
1411
|
+
|
|
1382
1412
|
// Claude Code's edited_text_file attachment reports current file lines,
|
|
1383
1413
|
// not a unified diff. Keep its path and instructions; quote only the lines.
|
|
1384
1414
|
const CHANGED_FILE_HEADER = /^Note: [^\n]+ changed on disk since you last read it\. That's usually deliberate, so take it as the current state rather than reverting it; if the change looks wrong, say so rather than undoing it yourself — otherwise no need to call it out\. Here are the relevant changes \(shown with line numbers\):\n/
|
|
@@ -1512,14 +1542,35 @@ function claudeIdentity(text) {
|
|
|
1512
1542
|
return identity ? DROID_LINE + text.slice(identity.length) : text
|
|
1513
1543
|
}
|
|
1514
1544
|
|
|
1545
|
+
// ZCode embeds its generated environment paragraph, with unindented bullets,
|
|
1546
|
+
// in a larger system prompt. Factory refuses the fixed opening. Change only a
|
|
1547
|
+
// complete standalone generated paragraph, keeping every value and leaving
|
|
1548
|
+
// fenced, quoted or incomplete copies alone. Shell is optional: ZCode's own
|
|
1549
|
+
// prompt builder omits it, while the desktop prompt includes it.
|
|
1550
|
+
const ZCODE_ENV_CONTEXT = /(^|\n\n)(# Environment\nYou have been invoked in the following environment:\n(?:- Primary working directory: [^\n]+\n(?:- Is a git repository: (?:yes|no)\n)?)?- Platform: [^\n]+\n(?:- Shell: [^\n]+\n)?- OS Version: [^\n]+\n- You are powered by the model named [^\n]+\.)(?=\n(?:\n|$)|$)/g
|
|
1551
|
+
function insideFence(text, end) {
|
|
1552
|
+
let fenced = false
|
|
1553
|
+
for (const line of text.slice(0, end).split("\n")) if (/^ {0,3}(?:```|~~~)/.test(line)) fenced = !fenced
|
|
1554
|
+
return fenced
|
|
1555
|
+
}
|
|
1556
|
+
function zcodeRuntimeContext(text) {
|
|
1557
|
+
return text.replace(ZCODE_ENV_CONTEXT, (block, lead, paragraph, offset) => {
|
|
1558
|
+
if (insideFence(text, offset + lead.length)) return block
|
|
1559
|
+
return lead + paragraph
|
|
1560
|
+
.replace("# Environment", "# Runtime context")
|
|
1561
|
+
.replace("You have been invoked in the following environment:", "The session environment is:")
|
|
1562
|
+
.replace("- You are powered by the model named", "- Current model name:")
|
|
1563
|
+
})
|
|
1564
|
+
}
|
|
1565
|
+
|
|
1515
1566
|
// promptText adapts a system prompt's text.
|
|
1516
1567
|
function promptText(text) {
|
|
1517
|
-
return configSkillText(clientOpening(systemModelLine(claudeIdentity(text))))
|
|
1568
|
+
return configSkillText(clientOpening(systemModelLine(claudeIdentity(zcodeRuntimeContext(text)))))
|
|
1518
1569
|
}
|
|
1519
1570
|
|
|
1520
1571
|
// systemMessageText adapts a system message's text after the prompt.
|
|
1521
1572
|
function systemMessageText(text) {
|
|
1522
|
-
return bareSkills(clientOpening(systemContext(text)))
|
|
1573
|
+
return bareSkills(clientOpening(systemContext(zcodeRuntimeContext(text))))
|
|
1523
1574
|
}
|
|
1524
1575
|
|
|
1525
1576
|
// userBlockText adapts one text block of a user turn.
|
package/opencode.mjs
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
// The package's OpenCode 1.x plugins, as OpenCode 1.x and magpie's host
|
|
2
|
+
// load them: its plugin functions and nothing else (1.x refuses a
|
|
3
|
+
// package whose exports include anything but plugins). OpenCode 2.x
|
|
4
|
+
// loads opencode2.mjs, which runs these.
|
|
5
|
+
export { FactoryAuthPlugin } from "./index.mjs"
|
package/opencode2.mjs
ADDED
|
@@ -0,0 +1,594 @@
|
|
|
1
|
+
// The OpenCode 2.x face of a package whose plugins are written for
|
|
2
|
+
// OpenCode 1.x (and magpie's plugin host).
|
|
3
|
+
//
|
|
4
|
+
// OpenCode 2.x loads a package's `exports["."]` and wants its default to be
|
|
5
|
+
// {id, setup(ctx)}; it has no fallback for a 1.x plugin's named functions
|
|
6
|
+
// (plugins#657). This file is that default. It runs each 1.x plugin the
|
|
7
|
+
// package's opencode.mjs exports and hands 2.x what the plugin's hooks say:
|
|
8
|
+
//
|
|
9
|
+
// auth.methods → the integration's sign-in methods
|
|
10
|
+
// config() → the provider, its package, base URL and models
|
|
11
|
+
// provider.models → the signed-in account's own model list
|
|
12
|
+
// auth.loader → each request's base URL, key, headers and fetch
|
|
13
|
+
//
|
|
14
|
+
// What 2.x has no place for is left out: chat.headers and chat.params
|
|
15
|
+
// (2.x's sdk hook doesn't carry the session), magpie's usage and checkin,
|
|
16
|
+
// tools and events.
|
|
17
|
+
//
|
|
18
|
+
// scripts/opencode2.mjs is the one copy that is edited. Every package that
|
|
19
|
+
// has it carries the same bytes as packages/<name>/opencode2.mjs, and
|
|
20
|
+
// scripts/check.mjs fails when a copy differs.
|
|
21
|
+
|
|
22
|
+
import { readFileSync } from "node:fs"
|
|
23
|
+
import * as v1 from "./opencode.mjs"
|
|
24
|
+
|
|
25
|
+
const pkg = JSON.parse(readFileSync(new URL("./package.json", import.meta.url), "utf8"))
|
|
26
|
+
|
|
27
|
+
// The key the SDK is made with: the account's own goes on each request in
|
|
28
|
+
// its place (see wrapFetch), so a key read when the SDK was made can't go
|
|
29
|
+
// out after the account changed.
|
|
30
|
+
const PLACEHOLDER = "opencode2-v1-key"
|
|
31
|
+
|
|
32
|
+
// The SDK package a 1.x npm name runs as on 2.x. A version keeps 2.x from
|
|
33
|
+
// swapping @ai-sdk/* for its native providers, which never call the sdk
|
|
34
|
+
// hook below; openai-compatible's is the one 2.x ships, the others are AI
|
|
35
|
+
// SDK v6's dist-tag, the line 2.x's bridge runs.
|
|
36
|
+
export function packageOf(npm) {
|
|
37
|
+
const name = npm || "@ai-sdk/openai-compatible"
|
|
38
|
+
if (name === "@ai-sdk/openai-compatible") return "aisdk:@ai-sdk/openai-compatible@2.0.41"
|
|
39
|
+
if (/^@ai-sdk\/[^/@]+$/.test(name)) return `aisdk:${name}@ai-v6`
|
|
40
|
+
return `aisdk:${name}`
|
|
41
|
+
}
|
|
42
|
+
|
|
43
|
+
// The plugins a 1.x module exports, as magpie's host and OpenCode 1.x read
|
|
44
|
+
// them: a default {server} is the one plugin, else every function export
|
|
45
|
+
// and every {server} object.
|
|
46
|
+
export function pluginsOf(mod) {
|
|
47
|
+
const d = mod?.default
|
|
48
|
+
if (d && typeof d === "object" && ("server" in d || "id" in d || "tui" in d))
|
|
49
|
+
return typeof d.server === "function" ? [d.server] : []
|
|
50
|
+
const out = []
|
|
51
|
+
for (const value of Object.values(mod ?? {})) {
|
|
52
|
+
const fn = typeof value === "function" ? value : value && typeof value === "object" && typeof value.server === "function" ? value.server : null
|
|
53
|
+
if (fn && !out.includes(fn)) out.push(fn)
|
|
54
|
+
}
|
|
55
|
+
return out
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
const int = (n, fallback = 0) => {
|
|
59
|
+
const v = Math.trunc(Number(n))
|
|
60
|
+
return Number.isFinite(v) && v >= 0 ? v : fallback
|
|
61
|
+
}
|
|
62
|
+
const money = (n) => (Number.isFinite(Number(n)) && Number(n) >= 0 ? Number(n) : 0)
|
|
63
|
+
const record = (v) => (v && typeof v === "object" && !Array.isArray(v) ? v : {})
|
|
64
|
+
const json = (v) => {
|
|
65
|
+
try {
|
|
66
|
+
return JSON.parse(JSON.stringify(v ?? null))
|
|
67
|
+
} catch {
|
|
68
|
+
return null
|
|
69
|
+
}
|
|
70
|
+
}
|
|
71
|
+
const strings = (v) => Object.fromEntries(Object.entries(record(v)).filter(([, s]) => typeof s === "string"))
|
|
72
|
+
const nonEmpty = (o) => (Object.keys(o).length ? o : undefined)
|
|
73
|
+
|
|
74
|
+
// connKey names a connection the way 2.x does.
|
|
75
|
+
const connKey = (c) => (!c ? "" : c.type === "credential" ? `credential:${c.id}` : `env:${c.name}`)
|
|
76
|
+
|
|
77
|
+
// ---- sign-in ------------------------------------------------------------
|
|
78
|
+
|
|
79
|
+
// fields is a 1.x method's prompts as a 2.x form.
|
|
80
|
+
export function fieldsOf(prompts) {
|
|
81
|
+
const out = []
|
|
82
|
+
for (const p of prompts ?? []) {
|
|
83
|
+
if (!p?.key) continue
|
|
84
|
+
const f = { key: String(p.key), type: "string", title: String(p.message ?? p.key) }
|
|
85
|
+
if (p.placeholder) f.placeholder = String(p.placeholder)
|
|
86
|
+
if (p.type === "select" && Array.isArray(p.options))
|
|
87
|
+
f.options = p.options.map((o) => ({ value: String(o.value), label: String(o.label ?? o.value), ...(o.hint ? { description: String(o.hint) } : {}) }))
|
|
88
|
+
// a prompt shown only when another answer says so can't be required
|
|
89
|
+
if (!p.condition) f.required = true
|
|
90
|
+
out.push(f)
|
|
91
|
+
}
|
|
92
|
+
return out.length ? out : undefined
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
// v1Saved is what a 1.x sign-in's success is saved as, the way 1.x writes
|
|
96
|
+
// auth.json: the result without its type and provider.
|
|
97
|
+
function v1Saved(r) {
|
|
98
|
+
const { type: _t, provider: _p, ...rest } = r
|
|
99
|
+
if ("key" in r) return { type: "api", ...rest }
|
|
100
|
+
return { type: "oauth", ...rest }
|
|
101
|
+
}
|
|
102
|
+
|
|
103
|
+
// credentialOf is a 1.x sign-in's success as a 2.x credential: OAuth for
|
|
104
|
+
// both kinds, the 1.x auth kept whole in its metadata. No refresh is
|
|
105
|
+
// registered, so 2.x hands the credential over as it is and the plugin's
|
|
106
|
+
// own loader renews it, as it does on 1.x.
|
|
107
|
+
export function credentialOf(methodID, r) {
|
|
108
|
+
if (!r || r.type !== "success") throw new Error(r?.error || r?.message || "the sign-in failed")
|
|
109
|
+
const saved = json(v1Saved(r))
|
|
110
|
+
if (saved.type === "api")
|
|
111
|
+
return { type: "oauth", methodID, access: String(saved.key ?? ""), refresh: "", expires: 0, metadata: { v1: saved } }
|
|
112
|
+
return {
|
|
113
|
+
type: "oauth",
|
|
114
|
+
methodID,
|
|
115
|
+
access: String(saved.access ?? ""),
|
|
116
|
+
refresh: String(saved.refresh ?? ""),
|
|
117
|
+
expires: int(saved.expires),
|
|
118
|
+
metadata: { v1: saved },
|
|
119
|
+
}
|
|
120
|
+
}
|
|
121
|
+
|
|
122
|
+
// authOfValue is the 1.x auth a 2.x credential stands for.
|
|
123
|
+
export function authOfValue(value) {
|
|
124
|
+
if (!value) return null
|
|
125
|
+
if (value.type === "oauth") {
|
|
126
|
+
const v1 = record(value.metadata).v1
|
|
127
|
+
if (v1 && typeof v1 === "object") return v1
|
|
128
|
+
return { type: "oauth", access: value.access, refresh: value.refresh, expires: value.expires }
|
|
129
|
+
}
|
|
130
|
+
if (value.type === "key") {
|
|
131
|
+
const meta = value.metadata && Object.keys(value.metadata).length ? { metadata: value.metadata } : {}
|
|
132
|
+
return { type: "api", key: value.key, ...meta }
|
|
133
|
+
}
|
|
134
|
+
return null
|
|
135
|
+
}
|
|
136
|
+
|
|
137
|
+
const fingerprint = (a) => JSON.stringify([a?.type, a?.access ?? a?.key ?? "", a?.refresh ?? ""])
|
|
138
|
+
|
|
139
|
+
// ---- models -------------------------------------------------------------
|
|
140
|
+
|
|
141
|
+
const MODALITIES = ["text", "audio", "image", "video", "pdf"]
|
|
142
|
+
|
|
143
|
+
// internalOf is a config model as 1.x hands it to provider.models: what
|
|
144
|
+
// fromModelsDevModel makes of it, with the config's own variants.
|
|
145
|
+
export function internalOf(providerID, conf, key, m) {
|
|
146
|
+
const mods = record(m.modalities)
|
|
147
|
+
const has = (list, k) => Array.isArray(list) && list.includes(k)
|
|
148
|
+
const cost = record(m.cost)
|
|
149
|
+
return {
|
|
150
|
+
...m,
|
|
151
|
+
id: key,
|
|
152
|
+
providerID,
|
|
153
|
+
name: m.name ?? key,
|
|
154
|
+
api: { id: m.id ?? key, url: m.provider?.api ?? conf.api ?? conf.options?.baseURL ?? "", npm: m.provider?.npm ?? conf.npm ?? "@ai-sdk/openai-compatible" },
|
|
155
|
+
status: m.status ?? "active",
|
|
156
|
+
headers: m.headers ?? {},
|
|
157
|
+
options: m.options ?? {},
|
|
158
|
+
cost: { input: money(cost.input), output: money(cost.output), cache: { read: money(cost.cache_read), write: money(cost.cache_write) } },
|
|
159
|
+
limit: { context: int(m.limit?.context), input: m.limit?.input, output: int(m.limit?.output) },
|
|
160
|
+
capabilities: {
|
|
161
|
+
temperature: m.temperature ?? false,
|
|
162
|
+
reasoning: m.reasoning ?? false,
|
|
163
|
+
attachment: m.attachment ?? false,
|
|
164
|
+
toolcall: m.tool_call ?? true,
|
|
165
|
+
input: Object.fromEntries(MODALITIES.map((k) => [k, mods.input ? has(mods.input, k) : k === "text"])),
|
|
166
|
+
output: Object.fromEntries(MODALITIES.map((k) => [k, mods.output ? has(mods.output, k) : k === "text"])),
|
|
167
|
+
interleaved: m.interleaved ?? false,
|
|
168
|
+
},
|
|
169
|
+
release_date: m.release_date ?? "",
|
|
170
|
+
variants: record(m.variants),
|
|
171
|
+
}
|
|
172
|
+
}
|
|
173
|
+
|
|
174
|
+
// modelOf is a 1.x model, in config or internal form, as a 2.x Model.Info.
|
|
175
|
+
export function modelOf(providerID, provider, key, m) {
|
|
176
|
+
const caps = record(m.capabilities)
|
|
177
|
+
const listFrom = (obj, list) => {
|
|
178
|
+
if (obj && typeof obj === "object") return MODALITIES.filter((k) => obj[k])
|
|
179
|
+
if (Array.isArray(list)) return list.map(String)
|
|
180
|
+
return ["text"]
|
|
181
|
+
}
|
|
182
|
+
const input = listFrom(caps.input, m.modalities?.input)
|
|
183
|
+
const output = listFrom(caps.output, m.modalities?.output)
|
|
184
|
+
const c = record(m.cost)
|
|
185
|
+
const cache = record(c.cache)
|
|
186
|
+
const npm = m.api?.npm ?? m.provider?.npm
|
|
187
|
+
const url = m.api?.url ?? m.provider?.api
|
|
188
|
+
const settings = { ...record(json(m.options)) }
|
|
189
|
+
if (url && url !== provider.baseURL) settings.baseURL = url
|
|
190
|
+
const variants = Object.entries(record(m.variants))
|
|
191
|
+
.filter(([, v]) => !record(v).disabled)
|
|
192
|
+
.map(([id, v]) => {
|
|
193
|
+
const { disabled: _d, ...rest } = record(json(v))
|
|
194
|
+
return nonEmpty(rest) ? { id, settings: rest } : { id }
|
|
195
|
+
})
|
|
196
|
+
const status = ["alpha", "beta", "deprecated", "active"].includes(m.status) ? m.status : "active"
|
|
197
|
+
const out = {
|
|
198
|
+
id: key,
|
|
199
|
+
modelID: String(m.api?.id ?? m.id ?? key),
|
|
200
|
+
providerID,
|
|
201
|
+
name: String(m.name ?? key),
|
|
202
|
+
capabilities: {
|
|
203
|
+
tools: caps.toolcall ?? m.tool_call ?? true,
|
|
204
|
+
input: input.length ? input : ["text"],
|
|
205
|
+
output: output.length ? output : ["text"],
|
|
206
|
+
...(typeof (caps.temperature ?? m.temperature) === "boolean" ? { temperature: caps.temperature ?? m.temperature } : {}),
|
|
207
|
+
},
|
|
208
|
+
variants,
|
|
209
|
+
time: { released: Date.parse(m.release_date ?? "") || 0 },
|
|
210
|
+
cost: [{ input: money(c.input), output: money(c.output), cache: { read: money(cache.read ?? c.cache_read), write: money(cache.write ?? c.cache_write) } }],
|
|
211
|
+
status,
|
|
212
|
+
enabled: true,
|
|
213
|
+
limit: { context: int(m.limit?.context, 128000) || 128000, output: int(m.limit?.output, 8192) || 8192 },
|
|
214
|
+
}
|
|
215
|
+
if (m.limit?.input) out.limit.input = int(m.limit.input)
|
|
216
|
+
if (npm && npm !== provider.npm) out.package = packageOf(npm)
|
|
217
|
+
if (nonEmpty(settings)) out.settings = settings
|
|
218
|
+
const headers = strings(m.headers)
|
|
219
|
+
if (nonEmpty(headers)) out.headers = headers
|
|
220
|
+
return out
|
|
221
|
+
}
|
|
222
|
+
|
|
223
|
+
// ---- requests -----------------------------------------------------------
|
|
224
|
+
|
|
225
|
+
const urlOf = (input) => (typeof input === "string" ? input : input instanceof URL ? input.href : input?.url ?? String(input))
|
|
226
|
+
|
|
227
|
+
// wrapFetch sends a request the SDK made from the provider's settings the
|
|
228
|
+
// way 1.x would have sent it with the loader's options: the loader's base
|
|
229
|
+
// URL in place of the configured one, the account's key in place of the
|
|
230
|
+
// placeholder, the loader's headers added, through the loader's fetch.
|
|
231
|
+
export function wrapFetch(next, base, options) {
|
|
232
|
+
return async (input, init = {}) => {
|
|
233
|
+
const o = await options()
|
|
234
|
+
let url = urlOf(input)
|
|
235
|
+
const from = String(base ?? "").replace(/\/+$/, "")
|
|
236
|
+
const to = o.baseURL ? String(o.baseURL).replace(/\/+$/, "") : ""
|
|
237
|
+
if (from && to && from !== to && url.startsWith(from)) url = to + url.slice(from.length)
|
|
238
|
+
const req = input instanceof Request ? input : null
|
|
239
|
+
const headers = new Headers(init.headers ?? req?.headers ?? undefined)
|
|
240
|
+
for (const [k, v] of [...headers.entries()]) {
|
|
241
|
+
if (!v.includes(PLACEHOLDER)) continue
|
|
242
|
+
if (o.key) headers.set(k, v.replaceAll(PLACEHOLDER, o.key))
|
|
243
|
+
else headers.delete(k)
|
|
244
|
+
}
|
|
245
|
+
for (const [k, v] of Object.entries(strings(o.headers))) headers.set(k, v)
|
|
246
|
+
const send = typeof o.fetch === "function" ? o.fetch : next ?? fetch
|
|
247
|
+
if (req && init.body === undefined) {
|
|
248
|
+
const body = req.method === "GET" || req.method === "HEAD" ? undefined : await req.text()
|
|
249
|
+
return send(url, { method: req.method, headers, body, signal: init.signal ?? req.signal })
|
|
250
|
+
}
|
|
251
|
+
return send(url, { ...init, headers })
|
|
252
|
+
}
|
|
253
|
+
}
|
|
254
|
+
|
|
255
|
+
// ---- one plugin ---------------------------------------------------------
|
|
256
|
+
|
|
257
|
+
async function setupPlugin(ctx, fn, live) {
|
|
258
|
+
const directory = ctx?.location?.directory ?? process.cwd()
|
|
259
|
+
// the active account each provider was last read for, and the renewed
|
|
260
|
+
// auth a plugin saved for it (2.x has no way for a plugin to write a
|
|
261
|
+
// credential back, so it is kept in the plugin's storage, under the
|
|
262
|
+
// credential it renews and the token it was renewed from)
|
|
263
|
+
const current = new Map()
|
|
264
|
+
const saved = new Map()
|
|
265
|
+
const signingIn = new Map()
|
|
266
|
+
const storeKey = (id, key) => `v1auth/${id}/${key}`
|
|
267
|
+
|
|
268
|
+
const client = {
|
|
269
|
+
auth: {
|
|
270
|
+
async set(arg) {
|
|
271
|
+
const id = arg?.path?.id
|
|
272
|
+
const body = json(arg?.body)
|
|
273
|
+
const cur = id && current.get(id)
|
|
274
|
+
// a sign-in's own saves belong to the credential it is about to
|
|
275
|
+
// make, not the one that was active when it started
|
|
276
|
+
if (!cur || !body || signingIn.get(id) > 0) return { data: true }
|
|
277
|
+
const entry = { fp: cur.fp, auth: body }
|
|
278
|
+
saved.set(storeKey(id, cur.key), entry)
|
|
279
|
+
await Promise.resolve()
|
|
280
|
+
.then(() => ctx.storage?.set?.(storeKey(id, cur.key), entry))
|
|
281
|
+
.catch(() => {})
|
|
282
|
+
return { data: true }
|
|
283
|
+
},
|
|
284
|
+
async get() {
|
|
285
|
+
return { data: undefined }
|
|
286
|
+
},
|
|
287
|
+
},
|
|
288
|
+
app: { log: async () => ({ data: true }) },
|
|
289
|
+
}
|
|
290
|
+
|
|
291
|
+
const hooks = (await fn({ client, directory, worktree: directory, project: {}, serverUrl: undefined, $: undefined }, {})) ?? {}
|
|
292
|
+
const cfg = { provider: {} }
|
|
293
|
+
try {
|
|
294
|
+
await hooks.config?.(cfg)
|
|
295
|
+
} catch {}
|
|
296
|
+
const auth = hooks.auth
|
|
297
|
+
const authID = auth?.provider ? String(auth.provider) : undefined
|
|
298
|
+
const providers = record(cfg.provider)
|
|
299
|
+
|
|
300
|
+
// getAuth reads the active account: the credential 2.x holds, or what the
|
|
301
|
+
// plugin last saved renewing it.
|
|
302
|
+
const getAuth = async (id) => {
|
|
303
|
+
const connection = await ctx.integration.connection.active(id).catch(() => undefined)
|
|
304
|
+
if (!connection) {
|
|
305
|
+
current.delete(id)
|
|
306
|
+
return undefined
|
|
307
|
+
}
|
|
308
|
+
const value = await ctx.integration.connection.resolve(connection).catch(() => undefined)
|
|
309
|
+
const base = authOfValue(value)
|
|
310
|
+
if (!base) {
|
|
311
|
+
current.delete(id)
|
|
312
|
+
return undefined
|
|
313
|
+
}
|
|
314
|
+
const key = connKey(connection)
|
|
315
|
+
const fp = fingerprint(base)
|
|
316
|
+
// ours: a credential one of this plugin's own sign-ins made
|
|
317
|
+
const ours = value?.type === "oauth" && !!record(value.metadata).v1
|
|
318
|
+
current.set(id, { key, fp, ours })
|
|
319
|
+
const sk = storeKey(id, key)
|
|
320
|
+
let entry = saved.get(sk)
|
|
321
|
+
if (!entry) {
|
|
322
|
+
entry = await Promise.resolve()
|
|
323
|
+
.then(() => ctx.storage?.get?.(sk))
|
|
324
|
+
.catch(() => undefined)
|
|
325
|
+
if (entry) saved.set(sk, entry)
|
|
326
|
+
}
|
|
327
|
+
return entry && entry.fp === fp && entry.auth ? entry.auth : base
|
|
328
|
+
}
|
|
329
|
+
|
|
330
|
+
// the sign-in methods
|
|
331
|
+
if (authID && Array.isArray(auth.methods) && auth.methods.length) {
|
|
332
|
+
const label = (c) => {
|
|
333
|
+
const a = authOfValue(c)
|
|
334
|
+
const name = a?.name ?? a?.email ?? a?.metadata?.name ?? a?.metadata?.email ?? a?.account
|
|
335
|
+
return typeof name === "string" && name ? name : undefined
|
|
336
|
+
}
|
|
337
|
+
const begin = () => signingIn.set(authID, (signingIn.get(authID) ?? 0) + 1)
|
|
338
|
+
const end = () => signingIn.set(authID, Math.max(0, (signingIn.get(authID) ?? 1) - 1))
|
|
339
|
+
const title = record(providers[authID]).name
|
|
340
|
+
// 2.x runs a transform again on every reload, from nothing
|
|
341
|
+
await ctx.integration.transform((editor) => {
|
|
342
|
+
let keyed = false
|
|
343
|
+
// the integration 2.x makes for an id it doesn't know is named by the
|
|
344
|
+
// id; the provider's own name reads better in the sign-in list
|
|
345
|
+
if (typeof title === "string" && title)
|
|
346
|
+
try {
|
|
347
|
+
editor.update?.(authID, (i) => {
|
|
348
|
+
if (i && (!i.name || i.name === authID)) i.name = title
|
|
349
|
+
})
|
|
350
|
+
} catch {}
|
|
351
|
+
auth.methods.forEach((m, i) => {
|
|
352
|
+
if (!m) return
|
|
353
|
+
const methodID = `v1-${i}`
|
|
354
|
+
const form = fieldsOf(m.prompts)
|
|
355
|
+
if (m.type === "api" && typeof m.authorize !== "function") {
|
|
356
|
+
if (keyed) return
|
|
357
|
+
keyed = true
|
|
358
|
+
editor.method.update({ integrationID: authID, method: { type: "key", label: String(m.label ?? "API key"), ...(form ? { form } : {}) } })
|
|
359
|
+
return
|
|
360
|
+
}
|
|
361
|
+
if (typeof m.authorize !== "function") return
|
|
362
|
+
editor.method.update({
|
|
363
|
+
integrationID: authID,
|
|
364
|
+
method: { id: methodID, type: "oauth", label: String(m.label ?? authID), ...(form ? { form } : {}) },
|
|
365
|
+
async authorize(answer) {
|
|
366
|
+
begin()
|
|
367
|
+
let ended = false
|
|
368
|
+
const done = () => {
|
|
369
|
+
if (!ended) end()
|
|
370
|
+
ended = true
|
|
371
|
+
}
|
|
372
|
+
try {
|
|
373
|
+
const inputs = Object.fromEntries(Object.entries(record(answer)).map(([k, v]) => [k, String(v)]))
|
|
374
|
+
const r = await m.authorize(inputs)
|
|
375
|
+
if (m.type === "api") {
|
|
376
|
+
done()
|
|
377
|
+
return { url: "", instructions: "", mode: "auto", callback: Promise.resolve().then(() => credentialOf(methodID, r)) }
|
|
378
|
+
}
|
|
379
|
+
if (r?.method === "code")
|
|
380
|
+
return {
|
|
381
|
+
url: String(r.url ?? ""),
|
|
382
|
+
instructions: String(r.instructions ?? ""),
|
|
383
|
+
mode: "code",
|
|
384
|
+
callback: async (code) => {
|
|
385
|
+
try {
|
|
386
|
+
return credentialOf(methodID, await r.callback(code))
|
|
387
|
+
} finally {
|
|
388
|
+
done()
|
|
389
|
+
}
|
|
390
|
+
},
|
|
391
|
+
}
|
|
392
|
+
const callback = Promise.resolve()
|
|
393
|
+
.then(() => r.callback())
|
|
394
|
+
.then((res) => credentialOf(methodID, res))
|
|
395
|
+
.finally(done)
|
|
396
|
+
callback.catch(() => {})
|
|
397
|
+
return { url: String(r?.url ?? ""), instructions: String(r?.instructions ?? ""), mode: "auto", callback }
|
|
398
|
+
} catch (e) {
|
|
399
|
+
done()
|
|
400
|
+
throw e
|
|
401
|
+
}
|
|
402
|
+
},
|
|
403
|
+
label,
|
|
404
|
+
})
|
|
405
|
+
})
|
|
406
|
+
})
|
|
407
|
+
}
|
|
408
|
+
|
|
409
|
+
// the loader's options for the account signed in now, read again when
|
|
410
|
+
// the account changes
|
|
411
|
+
let loaded = null
|
|
412
|
+
const loaderOptions = async (id) => {
|
|
413
|
+
if (id !== authID || typeof auth?.loader !== "function") {
|
|
414
|
+
const a = authID === id ? await getAuth(id) : undefined
|
|
415
|
+
return { key: a?.type === "api" ? a.key : undefined }
|
|
416
|
+
}
|
|
417
|
+
const a = await getAuth(id)
|
|
418
|
+
if (!a) return {}
|
|
419
|
+
const fp = current.get(id)?.key + "\0" + fingerprint(a)
|
|
420
|
+
if (loaded?.fp !== fp) {
|
|
421
|
+
const p = Promise.resolve()
|
|
422
|
+
.then(() => auth.loader(() => getAuth(id), providerOf(id)))
|
|
423
|
+
.then((o) => record(o))
|
|
424
|
+
loaded = { fp, p }
|
|
425
|
+
p.catch(() => {
|
|
426
|
+
if (loaded?.fp === fp) loaded = null
|
|
427
|
+
})
|
|
428
|
+
}
|
|
429
|
+
const o = await loaded.p
|
|
430
|
+
const key = typeof o.apiKey === "string" && o.apiKey ? o.apiKey : a.type === "api" ? a.key : undefined
|
|
431
|
+
return { baseURL: o.baseURL, key, headers: o.headers, fetch: o.fetch }
|
|
432
|
+
}
|
|
433
|
+
|
|
434
|
+
// the providers, with the list the account's own read last gave each
|
|
435
|
+
const source = new Map()
|
|
436
|
+
// providerOf is a provider as 1.x hands it to provider.models and
|
|
437
|
+
// auth.loader
|
|
438
|
+
const providerOf = (id) => {
|
|
439
|
+
const conf = record(providers[id])
|
|
440
|
+
const models = Object.fromEntries(Object.entries(record(conf.models)).map(([k, m]) => [k, internalOf(id, conf, k, record(m))]))
|
|
441
|
+
return { id, name: conf.name ?? id, source: "config", env: [], options: record(conf.options), models }
|
|
442
|
+
}
|
|
443
|
+
const listed = new Set()
|
|
444
|
+
for (const [id, conf0] of Object.entries(providers)) {
|
|
445
|
+
const conf = record(conf0)
|
|
446
|
+
// a provider entry that only names the sign-in (no package, no models)
|
|
447
|
+
// is not a provider of models
|
|
448
|
+
if (!conf.npm && !Object.keys(record(conf.models)).length) continue
|
|
449
|
+
const options = record(conf.options)
|
|
450
|
+
const { apiKey: _k, baseURL: _b, fetch: _f, headers: optHeaders, ...rest } = options
|
|
451
|
+
// with no base URL the config leaves it to the loader: a name that
|
|
452
|
+
// can't resolve stands in for it, and each request swaps in the
|
|
453
|
+
// loader's (wrapFetch)
|
|
454
|
+
const baseURL = options.baseURL ?? conf.api ?? `https://${id.replace(/[^a-z0-9-]/gi, "-")}.opencode2-v1.invalid`
|
|
455
|
+
const npm = conf.npm ?? "@ai-sdk/openai-compatible"
|
|
456
|
+
const info = {
|
|
457
|
+
id,
|
|
458
|
+
...(id === authID ? { integrationID: id } : {}),
|
|
459
|
+
name: String(conf.name ?? id),
|
|
460
|
+
activation: "auto",
|
|
461
|
+
package: packageOf(npm),
|
|
462
|
+
settings: { ...record(json(rest)), ...(baseURL ? { baseURL: String(baseURL) } : {}) },
|
|
463
|
+
}
|
|
464
|
+
const headers = { ...strings(conf.headers), ...strings(optHeaders) }
|
|
465
|
+
if (nonEmpty(headers)) info.headers = headers
|
|
466
|
+
const prov = { baseURL, npm }
|
|
467
|
+
const fromConfig = () =>
|
|
468
|
+
Object.entries(record(conf.models)).map(([key, m]) => modelOf(id, prov, key, internalOf(id, conf, key, record(m))))
|
|
469
|
+
listed.add(id)
|
|
470
|
+
await ctx.provider.transform((editor) => {
|
|
471
|
+
const s = source.get(id)
|
|
472
|
+
editor.add({ info, models: s?.models ?? fromConfig(), sourceConnection: s?.connection })
|
|
473
|
+
})
|
|
474
|
+
source.set(id, { conf, prov, models: null, connection: undefined })
|
|
475
|
+
}
|
|
476
|
+
|
|
477
|
+
// each request: the placeholder key, and the fetch that swaps in the
|
|
478
|
+
// account's. A provider the package doesn't list (one 2.x has built in
|
|
479
|
+
// that the plugin only signs in to) is left to 2.x unless the plugin's
|
|
480
|
+
// loader serves it and one of the plugin's own sign-ins is active.
|
|
481
|
+
const own = authID && !listed.has(authID) && typeof auth?.loader === "function" ? [authID] : []
|
|
482
|
+
for (const id of new Set([...listed, ...own])) {
|
|
483
|
+
const base = source.get(id)?.prov.baseURL
|
|
484
|
+
await ctx.aisdk.hook(
|
|
485
|
+
"sdk",
|
|
486
|
+
async (evt) => {
|
|
487
|
+
const opts = evt.options
|
|
488
|
+
if (!opts || opts.__opencode2) return
|
|
489
|
+
if (!listed.has(id)) {
|
|
490
|
+
await getAuth(id)
|
|
491
|
+
if (!current.get(id)?.ours) return
|
|
492
|
+
}
|
|
493
|
+
opts.__opencode2 = true
|
|
494
|
+
opts.apiKey = PLACEHOLDER
|
|
495
|
+
opts.fetch = wrapFetch(opts.fetch, opts.baseURL ?? base, () => loaderOptions(id))
|
|
496
|
+
},
|
|
497
|
+
{ providerID: id },
|
|
498
|
+
)
|
|
499
|
+
}
|
|
500
|
+
|
|
501
|
+
// refresh reads the account's own list after a sign-in or a switch
|
|
502
|
+
const listID = hooks.provider?.id ? String(hooks.provider.id) : undefined
|
|
503
|
+
let refreshing = null
|
|
504
|
+
let again = false
|
|
505
|
+
// the account the list was last read for: a credential.updated that
|
|
506
|
+
// leaves it as it was reads nothing again
|
|
507
|
+
let readFor = null
|
|
508
|
+
const stateOf = async () => {
|
|
509
|
+
const c = await ctx.integration.connection.active(authID).catch(() => undefined)
|
|
510
|
+
const a = c ? await getAuth(authID) : undefined
|
|
511
|
+
return connKey(c) + "\0" + (a ? fingerprint(a) : "")
|
|
512
|
+
}
|
|
513
|
+
const refresh = () => {
|
|
514
|
+
if (refreshing) {
|
|
515
|
+
again = true
|
|
516
|
+
return refreshing
|
|
517
|
+
}
|
|
518
|
+
refreshing = (async () => {
|
|
519
|
+
try {
|
|
520
|
+
if (!authID || !source.has(authID)) return
|
|
521
|
+
const s = source.get(authID)
|
|
522
|
+
const connection = await ctx.integration.connection.active(authID).catch(() => undefined)
|
|
523
|
+
const a = connection ? await getAuth(authID) : undefined
|
|
524
|
+
readFor = connKey(connection) + "\0" + (a ? fingerprint(a) : "")
|
|
525
|
+
if (!a || listID !== authID || typeof hooks.provider?.models !== "function") {
|
|
526
|
+
if (s.connection || s.models) {
|
|
527
|
+
s.connection = undefined
|
|
528
|
+
s.models = null
|
|
529
|
+
await ctx.provider.reload()
|
|
530
|
+
}
|
|
531
|
+
return
|
|
532
|
+
}
|
|
533
|
+
const provider = providerOf(authID)
|
|
534
|
+
let got
|
|
535
|
+
try {
|
|
536
|
+
got = await hooks.provider.models(provider, { auth: a })
|
|
537
|
+
} catch {
|
|
538
|
+
got = null
|
|
539
|
+
}
|
|
540
|
+
if (connKey(await ctx.integration.connection.active(authID).catch(() => undefined)) !== connKey(connection)) {
|
|
541
|
+
again = true
|
|
542
|
+
return
|
|
543
|
+
}
|
|
544
|
+
s.connection = connection
|
|
545
|
+
s.models = got && typeof got === "object" ? Object.entries(got).map(([k, m]) => modelOf(authID, s.prov, k, record(m))) : null
|
|
546
|
+
await ctx.provider.reload()
|
|
547
|
+
await ctx.model?.reload?.()
|
|
548
|
+
} finally {
|
|
549
|
+
refreshing = null
|
|
550
|
+
if (again && live.on) {
|
|
551
|
+
again = false
|
|
552
|
+
void refresh()
|
|
553
|
+
}
|
|
554
|
+
}
|
|
555
|
+
})()
|
|
556
|
+
return refreshing
|
|
557
|
+
}
|
|
558
|
+
|
|
559
|
+
if (authID && ctx.event?.subscribe)
|
|
560
|
+
void (async () => {
|
|
561
|
+
try {
|
|
562
|
+
// a switch names the integration; an update (a sign-in, a removal)
|
|
563
|
+
// names nothing, so it reads again only when this account changed
|
|
564
|
+
const types = ["credential.switched", "credential.updated"]
|
|
565
|
+
for await (const event of ctx.event.subscribe({ types })) {
|
|
566
|
+
if (!live.on) return
|
|
567
|
+
if (event?.type === "credential.switched" && event?.data?.integrationID === authID) {
|
|
568
|
+
loaded = null
|
|
569
|
+
await refresh()
|
|
570
|
+
} else if (event?.type === "credential.updated" && (await stateOf()) !== readFor) {
|
|
571
|
+
await refresh()
|
|
572
|
+
}
|
|
573
|
+
}
|
|
574
|
+
} catch {}
|
|
575
|
+
})()
|
|
576
|
+
void refresh()
|
|
577
|
+
}
|
|
578
|
+
|
|
579
|
+
export async function setup(ctx, mod = v1) {
|
|
580
|
+
const live = { on: true }
|
|
581
|
+
for (const fn of pluginsOf(mod)) {
|
|
582
|
+
try {
|
|
583
|
+
await setupPlugin(ctx, fn, live)
|
|
584
|
+
} catch (e) {
|
|
585
|
+
// one plugin failing to start leaves the package's others working
|
|
586
|
+
console.error(`${pkg.name}: ${e?.message ?? e}`)
|
|
587
|
+
}
|
|
588
|
+
}
|
|
589
|
+
return () => {
|
|
590
|
+
live.on = false
|
|
591
|
+
}
|
|
592
|
+
}
|
|
593
|
+
|
|
594
|
+
export default { id: pkg.name, setup: (ctx) => setup(ctx) }
|
package/package.json
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@magpie-community/opencode-factory-auth",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.42",
|
|
4
4
|
"description": "Sign in to a Factory (Droid) subscription from OpenCode or magpie",
|
|
5
5
|
"type": "module",
|
|
6
|
-
"main": "./
|
|
7
|
-
"
|
|
6
|
+
"main": "./opencode.mjs",
|
|
7
|
+
"exports": { ".": "./opencode2.mjs" },
|
|
8
|
+
"files": ["index.mjs", "opencode.mjs", "opencode2.mjs", "anthropic-tools.mjs", "client-phrases.json", "README.md"],
|
|
8
9
|
"keywords": ["opencode", "opencode-plugin", "magpie", "factory", "droid"],
|
|
9
10
|
"license": "MIT",
|
|
10
11
|
"repository": { "type": "git", "url": "git+https://github.com/magpie-community/plugins.git", "directory": "packages/factory" }
|