@chiwanpark/pi-squared-agent 0.1.0 → 0.2.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/dist/cli.js +4 -4
- package/dist/cli.js.map +1 -1
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/dist/runtime/auth-store.d.ts +10 -4
- package/dist/runtime/auth-store.d.ts.map +1 -1
- package/dist/runtime/auth-store.js +52 -2
- package/dist/runtime/auth-store.js.map +1 -1
- package/dist/runtime/model-resolver.d.ts +2 -2
- package/dist/runtime/model-resolver.d.ts.map +1 -1
- package/dist/runtime/model-resolver.js +72 -41
- package/dist/runtime/model-resolver.js.map +1 -1
- package/dist/runtime/pi-agent.d.ts +2 -9
- package/dist/runtime/pi-agent.d.ts.map +1 -1
- package/dist/runtime/pi-agent.js +26 -62
- package/dist/runtime/pi-agent.js.map +1 -1
- package/dist/tui/chat-screen.d.ts +1 -0
- package/dist/tui/chat-screen.d.ts.map +1 -1
- package/dist/tui/chat-screen.js +5 -0
- package/dist/tui/chat-screen.js.map +1 -1
- package/dist/tui/commands.d.ts +2 -0
- package/dist/tui/commands.d.ts.map +1 -1
- package/dist/tui/commands.js +86 -68
- package/dist/tui/commands.js.map +1 -1
- package/dist/tui/overlays.d.ts +12 -2
- package/dist/tui/overlays.d.ts.map +1 -1
- package/dist/tui/overlays.js +26 -7
- package/dist/tui/overlays.js.map +1 -1
- package/package.json +12 -5
package/dist/cli.js
CHANGED
|
@@ -21,7 +21,7 @@ async function main() {
|
|
|
21
21
|
const configStore = new ConfigStore();
|
|
22
22
|
await configStore.load();
|
|
23
23
|
const config = configStore.getConfig();
|
|
24
|
-
const resolved = resolveConfiguredModel(authStore, config.model);
|
|
24
|
+
const resolved = await resolveConfiguredModel(authStore, config.model);
|
|
25
25
|
const requestedThinking = options.thinking ?? config.thinking ?? "off";
|
|
26
26
|
const thinkingLevel = normalizeThinkingLevel(resolved.model, requestedThinking);
|
|
27
27
|
// Use INIT_CWD (set by pnpm) to preserve the directory where the command was invoked,
|
|
@@ -41,11 +41,11 @@ async function main() {
|
|
|
41
41
|
interactiveOptions.initialMessage = options.initialMessage;
|
|
42
42
|
await runInteractive(interactiveOptions);
|
|
43
43
|
}
|
|
44
|
-
function resolveConfiguredModel(authStore, modelConfig) {
|
|
44
|
+
async function resolveConfiguredModel(authStore, modelConfig) {
|
|
45
45
|
if (!modelConfig)
|
|
46
46
|
return resolveModel({ authStore });
|
|
47
47
|
try {
|
|
48
|
-
return resolveModel({ authStore, provider: modelConfig.provider, model: modelConfig.id });
|
|
48
|
+
return await resolveModel({ authStore, provider: modelConfig.provider, model: modelConfig.id });
|
|
49
49
|
}
|
|
50
50
|
catch (error) {
|
|
51
51
|
const message = error instanceof Error ? error.message : String(error);
|
|
@@ -134,7 +134,7 @@ The provider and model are selected automatically from available credentials:
|
|
|
134
134
|
Saved preferences are stored in ~/.pi-squared/config.json (override: PI_SQUARED_CONFIG_FILE).
|
|
135
135
|
|
|
136
136
|
Inside the TUI, type / to open the command menu. Useful commands:
|
|
137
|
-
/model, /thinking, /continue, /login, /logout, /
|
|
137
|
+
/model, /thinking, /continue, /login, /logout, /quit
|
|
138
138
|
`);
|
|
139
139
|
}
|
|
140
140
|
main().catch((error) => {
|
package/dist/cli.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":";AAGA,OAAO,EAAE,SAAS,EAAE,MAAM,yBAAyB,CAAC;AACpD,OAAO,EAAE,WAAW,EAA6B,MAAM,2BAA2B,CAAC;AACnF,OAAO,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,MAAM,OAAO,GAAG,OAAO,CAAC;AACxB,MAAM,eAAe,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,CAAU,CAAC;AAUtF,KAAK,UAAU,IAAI;IACjB,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjD,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;QACjB,SAAS,EAAE,CAAC;QACZ,OAAO;IACT,CAAC;IAED,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC;QACpB,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACrB,OAAO;IACT,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,SAAS,EAAE,CAAC;IAClC,MAAM,SAAS,CAAC,IAAI,EAAE,CAAC;IAEvB,MAAM,WAAW,GAAG,IAAI,WAAW,EAAE,CAAC;IACtC,MAAM,WAAW,CAAC,IAAI,EAAE,CAAC;IACzB,MAAM,MAAM,GAAG,WAAW,CAAC,SAAS,EAAE,CAAC;IAEvC,MAAM,QAAQ,GAAG,sBAAsB,CAAC,SAAS,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"cli.js","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"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"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export { PiSquaredAgentRuntime, type PiSquaredAgentRuntimeOptions } from "./runtime/pi-agent.js";
|
|
2
|
+
export type { AgentMessage } from "@chiwanpark/pi-squared-protocol";
|
|
2
3
|
export { createUserMessage, messageRole, messageToText, contentToText } from "./runtime/messages.js";
|
|
3
4
|
export { AgentStatusStore, createInitialStatus, modelToStatus, type AgentNotice, type AgentPhase, type AgentStatusListener, type AgentStatusSnapshot, type ModelStatus, type NoticeLevel, } from "./runtime/status-store.js";
|
|
4
5
|
export { findModelByReference, getDefaultModelForProvider, listKnownProviders, listModelsForProvider, listApiKeyProviders, listOAuthProviders, listProvidersForSelection, normalizeThinkingLevel, parseModelReference, resolveModel, type ModelListEntry, type ApiKeyProviderEntry, type OAuthProviderEntry, type ParsedModelReference, type ProviderListEntry, type ResolveModelOptions, type ResolvedModel, } from "./runtime/model-resolver.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,KAAK,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACjG,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrG,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,EACb,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,WAAW,GACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACtB,mBAAmB,EACnB,YAAY,EACZ,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,aAAa,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACpH,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,aAAa,GACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACd,cAAc,EACd,YAAY,EACZ,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,cAAc,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,KAAK,4BAA4B,EAAE,MAAM,uBAAuB,CAAC;AACjG,YAAY,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrG,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,EACb,KAAK,WAAW,EAChB,KAAK,UAAU,EACf,KAAK,mBAAmB,EACxB,KAAK,mBAAmB,EACxB,KAAK,WAAW,EAChB,KAAK,WAAW,GACjB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACtB,mBAAmB,EACnB,YAAY,EACZ,KAAK,cAAc,EACnB,KAAK,mBAAmB,EACxB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,iBAAiB,EACtB,KAAK,mBAAmB,EACxB,KAAK,aAAa,GACnB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AACpH,OAAO,EACL,WAAW,EACX,qBAAqB,EACrB,KAAK,eAAe,EACpB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,EACzB,KAAK,qBAAqB,GAC3B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,KAAK,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,EACjB,KAAK,cAAc,EACnB,KAAK,iBAAiB,EACtB,KAAK,eAAe,EACpB,KAAK,aAAa,GACnB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACd,cAAc,EACd,YAAY,EACZ,eAAe,EACf,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,aAAa,EAClB,KAAK,WAAW,EAChB,KAAK,cAAc,GACpB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,mBAAmB,EACnB,KAAK,aAAa,EAClB,KAAK,eAAe,EACpB,KAAK,mBAAmB,EACxB,KAAK,oBAAoB,EACzB,KAAK,kBAAkB,EACvB,KAAK,oBAAoB,GAC1B,MAAM,sBAAsB,CAAC"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqC,MAAM,uBAAuB,CAAC;AAEjG,OAAO,EAAE,iBAAiB,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAC;AACrG,OAAO,EACL,gBAAgB,EAChB,mBAAmB,EACnB,aAAa,GAOd,MAAM,2BAA2B,CAAC;AACnC,OAAO,EACL,oBAAoB,EACpB,0BAA0B,EAC1B,kBAAkB,EAClB,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,yBAAyB,EACzB,sBAAsB,EACtB,mBAAmB,EACnB,YAAY,GAQb,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,SAAS,EAAE,mBAAmB,EAA6C,MAAM,yBAAyB,CAAC;AACpH,OAAO,EACL,WAAW,EACX,qBAAqB,GAKtB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAA2B,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,iBAAiB,GAKlB,MAAM,mBAAmB,CAAC;AAE3B,OAAO,EACL,cAAc,EACd,cAAc,EACd,cAAc,EACd,cAAc,EACd,YAAY,EACZ,eAAe,GAOhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EACL,mBAAmB,GAOpB,MAAM,sBAAsB,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { OAuthCredentials } from "@earendil-works/pi-ai";
|
|
1
|
+
import type { Credential, CredentialStore, OAuthCredentials } from "@earendil-works/pi-ai";
|
|
2
2
|
export interface AuthFileShape {
|
|
3
3
|
oauth?: Record<string, OAuthCredentials>;
|
|
4
4
|
apiKeys?: Record<string, string>;
|
|
@@ -11,10 +11,11 @@ export interface AuthStoreOptions {
|
|
|
11
11
|
* Persisted credential store for pi-squared.
|
|
12
12
|
*
|
|
13
13
|
* Layout: ~/.pi-squared/auth.json (override via PI_SQUARED_AUTH_FILE).
|
|
14
|
-
*
|
|
15
|
-
*
|
|
14
|
+
* OAuth and API key credentials are stored here. The class also implements
|
|
15
|
+
* pi-ai's CredentialStore interface so provider auth can resolve credentials
|
|
16
|
+
* through the new Models API.
|
|
16
17
|
*/
|
|
17
|
-
export declare class AuthStore {
|
|
18
|
+
export declare class AuthStore implements CredentialStore {
|
|
18
19
|
private readonly filePath;
|
|
19
20
|
private cache;
|
|
20
21
|
private loaded;
|
|
@@ -30,6 +31,11 @@ export declare class AuthStore {
|
|
|
30
31
|
setApiKey(providerId: string, key: string): Promise<void>;
|
|
31
32
|
removeApiKey(providerId: string): Promise<boolean>;
|
|
32
33
|
listApiKeyProviderIds(): string[];
|
|
34
|
+
read(providerId: string): Promise<Credential | undefined>;
|
|
35
|
+
modify(providerId: string, fn: (current: Credential | undefined) => Promise<Credential | undefined>): Promise<Credential | undefined>;
|
|
36
|
+
delete(providerId: string): Promise<void>;
|
|
37
|
+
private getCredentialFromCache;
|
|
38
|
+
private setCredentialInCache;
|
|
33
39
|
private persist;
|
|
34
40
|
}
|
|
35
41
|
export declare function defaultAuthFilePath(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../src/runtime/auth-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../../src/runtime/auth-store.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAEV,UAAU,EACV,eAAe,EAEf,gBAAgB,EACjB,MAAM,uBAAuB,CAAC;AAI/B,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAClC;AAED,MAAM,WAAW,gBAAgB;IAC/B,qDAAqD;IACrD,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED;;;;;;;GAOG;AACH,qBAAa,SAAU,YAAW,eAAe;IAC/C,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAS;IAClC,OAAO,CAAC,KAAK,CAAqB;IAClC,OAAO,CAAC,MAAM,CAAS;gBAEX,OAAO,GAAE,gBAAqB;IAI1C,WAAW,IAAI,MAAM;IAIf,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;IAkB3B,WAAW,IAAI,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC;IAI/C,QAAQ,CAAC,UAAU,EAAE,MAAM,GAAG,gBAAgB,GAAG,SAAS;IAIpD,QAAQ,CAAC,UAAU,EAAE,MAAM,EAAE,WAAW,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1E,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUvD,oBAAoB,IAAI,MAAM,EAAE;IAIhC,SAAS,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;IAI3C,SAAS,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAQzD,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAUxD,qBAAqB,IAAI,MAAM,EAAE;IAI3B,IAAI,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAKzD,MAAM,CACV,UAAU,EAAE,MAAM,EAClB,EAAE,EAAE,CAAC,OAAO,EAAE,UAAU,GAAG,SAAS,KAAK,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC,GACvE,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;IAU5B,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAU/C,OAAO,CAAC,sBAAsB;IAQ9B,OAAO,CAAC,oBAAoB;YAed,OAAO;CAOtB;AAED,wBAAgB,mBAAmB,IAAI,MAAM,CAI5C"}
|
|
@@ -6,8 +6,9 @@ const AUTH_FILE_ENV = "PI_SQUARED_AUTH_FILE";
|
|
|
6
6
|
* Persisted credential store for pi-squared.
|
|
7
7
|
*
|
|
8
8
|
* Layout: ~/.pi-squared/auth.json (override via PI_SQUARED_AUTH_FILE).
|
|
9
|
-
*
|
|
10
|
-
*
|
|
9
|
+
* OAuth and API key credentials are stored here. The class also implements
|
|
10
|
+
* pi-ai's CredentialStore interface so provider auth can resolve credentials
|
|
11
|
+
* through the new Models API.
|
|
11
12
|
*/
|
|
12
13
|
export class AuthStore {
|
|
13
14
|
filePath;
|
|
@@ -85,6 +86,55 @@ export class AuthStore {
|
|
|
85
86
|
listApiKeyProviderIds() {
|
|
86
87
|
return Object.keys(this.cache.apiKeys ?? {});
|
|
87
88
|
}
|
|
89
|
+
async read(providerId) {
|
|
90
|
+
await this.load();
|
|
91
|
+
return this.getCredentialFromCache(providerId);
|
|
92
|
+
}
|
|
93
|
+
async modify(providerId, fn) {
|
|
94
|
+
await this.load();
|
|
95
|
+
const current = this.getCredentialFromCache(providerId);
|
|
96
|
+
const next = await fn(current);
|
|
97
|
+
if (next === undefined)
|
|
98
|
+
return current;
|
|
99
|
+
this.setCredentialInCache(providerId, next);
|
|
100
|
+
await this.persist();
|
|
101
|
+
return next;
|
|
102
|
+
}
|
|
103
|
+
async delete(providerId) {
|
|
104
|
+
await this.load();
|
|
105
|
+
const oauth = { ...(this.cache.oauth ?? {}) };
|
|
106
|
+
const apiKeys = { ...(this.cache.apiKeys ?? {}) };
|
|
107
|
+
delete oauth[providerId];
|
|
108
|
+
delete apiKeys[providerId];
|
|
109
|
+
this.cache = { ...this.cache, oauth, apiKeys };
|
|
110
|
+
await this.persist();
|
|
111
|
+
}
|
|
112
|
+
getCredentialFromCache(providerId) {
|
|
113
|
+
const oauth = this.cache.oauth?.[providerId];
|
|
114
|
+
if (oauth)
|
|
115
|
+
return { ...oauth, type: "oauth" };
|
|
116
|
+
const key = this.cache.apiKeys?.[providerId];
|
|
117
|
+
if (key)
|
|
118
|
+
return { type: "api_key", key };
|
|
119
|
+
return undefined;
|
|
120
|
+
}
|
|
121
|
+
setCredentialInCache(providerId, credential) {
|
|
122
|
+
const oauth = { ...(this.cache.oauth ?? {}) };
|
|
123
|
+
const apiKeys = { ...(this.cache.apiKeys ?? {}) };
|
|
124
|
+
if (credential.type === "oauth") {
|
|
125
|
+
const { type: _type, ...stored } = credential;
|
|
126
|
+
oauth[providerId] = stored;
|
|
127
|
+
delete apiKeys[providerId];
|
|
128
|
+
}
|
|
129
|
+
else {
|
|
130
|
+
if (credential.key)
|
|
131
|
+
apiKeys[providerId] = credential.key;
|
|
132
|
+
else
|
|
133
|
+
delete apiKeys[providerId];
|
|
134
|
+
delete oauth[providerId];
|
|
135
|
+
}
|
|
136
|
+
this.cache = { ...this.cache, oauth, apiKeys };
|
|
137
|
+
}
|
|
88
138
|
async persist() {
|
|
89
139
|
const data = JSON.stringify(this.cache, null, 2);
|
|
90
140
|
await mkdir(dirname(this.filePath), { recursive: true });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../../src/runtime/auth-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../../src/runtime/auth-store.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,10 +40,10 @@ export interface ParsedModelReference {
|
|
|
40
40
|
model: string;
|
|
41
41
|
}
|
|
42
42
|
export declare function parseModelReference(options: ResolveModelOptions): ParsedModelReference;
|
|
43
|
-
export declare function resolveModel(options: ResolveModelOptions): ResolvedModel
|
|
43
|
+
export declare function resolveModel(options: ResolveModelOptions): Promise<ResolvedModel>;
|
|
44
44
|
export declare function normalizeThinkingLevel(model: Model<any>, requested: ThinkingLevel): ThinkingLevel;
|
|
45
45
|
export declare function listKnownProviders(): string[];
|
|
46
|
-
export declare function listProvidersForSelection(authStore?: AuthStore): ProviderListEntry[]
|
|
46
|
+
export declare function listProvidersForSelection(authStore?: AuthStore): Promise<ProviderListEntry[]>;
|
|
47
47
|
export declare function listApiKeyProviders(authStore?: AuthStore): ApiKeyProviderEntry[];
|
|
48
48
|
export declare function listModelsForProvider(provider: string): ModelListEntry[];
|
|
49
49
|
export declare function listOAuthProviders(authStore?: AuthStore): OAuthProviderEntry[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/runtime/model-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"model-resolver.d.ts","sourceRoot":"","sources":["../../src/runtime/model-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAA8B,KAAK,aAAa,EAAE,KAAK,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAGnG,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AAEnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AA+BjD,MAAM,WAAW,mBAAmB;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,iEAAiE;IACjE,SAAS,CAAC,EAAE,SAAS,CAAC;CACvB;AAED,MAAM,WAAW,aAAa;IAC5B,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC;IAClB,mBAAmB,EAAE,OAAO,CAAC;IAC7B,gBAAgB,EAAE,OAAO,CAAC;IAC1B,eAAe,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,iBAAiB;IAChC,EAAE,EAAE,aAAa,CAAC;IAClB,SAAS,EAAE,OAAO,CAAC;IACnB,GAAG,EAAE,KAAK,GAAG,OAAO,GAAG,YAAY,GAAG,MAAM,CAAC;IAC7C,aAAa,EAAE,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,mBAAmB;IAClC,EAAE,EAAE,aAAa,CAAC;IAClB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,MAAM,WAAW,cAAc;IAC7B,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,aAAa,CAAC;IACxB,SAAS,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,kBAAkB;IACjC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED,MAAM,WAAW,oBAAoB;IACnC,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,wBAAgB,mBAAmB,CAAC,OAAO,EAAE,mBAAmB,GAAG,oBAAoB,CAWtF;AAED,wBAAsB,YAAY,CAAC,OAAO,EAAE,mBAAmB,GAAG,OAAO,CAAC,aAAa,CAAC,CAiBvF;AAED,wBAAgB,sBAAsB,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,SAAS,EAAE,aAAa,GAAG,aAAa,CAIjG;AAED,wBAAgB,kBAAkB,IAAI,MAAM,EAAE,CAE7C;AAED,wBAAsB,yBAAyB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC,CAwBnG;AAED,wBAAgB,mBAAmB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,mBAAmB,EAAE,CAKhF;AAED,wBAAgB,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,cAAc,EAAE,CAQxE;AAED,wBAAgB,kBAAkB,CAAC,SAAS,CAAC,EAAE,SAAS,GAAG,kBAAkB,EAAE,CAO9E;AAED,wBAAgB,0BAA0B,CAAC,QAAQ,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAGvE;AAED,wBAAgB,oBAAoB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAGlF"}
|
|
@@ -1,5 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getSupportedThinkingLevels } from "@earendil-works/pi-ai";
|
|
2
|
+
import { builtinModels } from "@earendil-works/pi-ai/providers/all";
|
|
2
3
|
import { getOAuthProvider, getOAuthProviders } from "@earendil-works/pi-ai/oauth";
|
|
4
|
+
const MODEL_CATALOG = builtinModels();
|
|
3
5
|
const PROVIDER_PREFERENCE = [
|
|
4
6
|
"anthropic",
|
|
5
7
|
"openai",
|
|
@@ -35,12 +37,12 @@ export function parseModelReference(options) {
|
|
|
35
37
|
}
|
|
36
38
|
return { provider, model };
|
|
37
39
|
}
|
|
38
|
-
export function resolveModel(options) {
|
|
40
|
+
export async function resolveModel(options) {
|
|
39
41
|
const parsed = parseModelReference(options);
|
|
40
42
|
const providerWasInferred = parsed.provider.length === 0;
|
|
41
|
-
const provider = providerWasInferred ? inferProvider(options.authStore) : parsed.provider;
|
|
43
|
+
const provider = providerWasInferred ? await inferProvider(options.authStore) : parsed.provider;
|
|
42
44
|
const knownProvider = toKnownProvider(provider);
|
|
43
|
-
const models =
|
|
45
|
+
const models = getCatalogModels(knownProvider);
|
|
44
46
|
const modelWasInferred = parsed.model.length === 0;
|
|
45
47
|
const model = modelWasInferred
|
|
46
48
|
? pickDefaultModel(knownProvider, models)
|
|
@@ -49,7 +51,7 @@ export function resolveModel(options) {
|
|
|
49
51
|
model,
|
|
50
52
|
providerWasInferred,
|
|
51
53
|
modelWasInferred,
|
|
52
|
-
apiKeyAvailable:
|
|
54
|
+
apiKeyAvailable: await isModelCredentialed(model, options.authStore),
|
|
53
55
|
};
|
|
54
56
|
}
|
|
55
57
|
export function normalizeThinkingLevel(model, requested) {
|
|
@@ -59,39 +61,40 @@ export function normalizeThinkingLevel(model, requested) {
|
|
|
59
61
|
return supported.includes(requested) ? requested : "off";
|
|
60
62
|
}
|
|
61
63
|
export function listKnownProviders() {
|
|
62
|
-
return
|
|
64
|
+
return getCatalogProviders();
|
|
63
65
|
}
|
|
64
|
-
export function listProvidersForSelection(authStore) {
|
|
65
|
-
|
|
66
|
-
const
|
|
67
|
-
const
|
|
68
|
-
const
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
const
|
|
75
|
-
const
|
|
76
|
-
const
|
|
77
|
-
|
|
78
|
-
|
|
66
|
+
export async function listProvidersForSelection(authStore) {
|
|
67
|
+
await authStore?.load();
|
|
68
|
+
const providers = getCatalogProviders();
|
|
69
|
+
const ordered = orderProviders(providers);
|
|
70
|
+
const modelRegistry = createModelRegistry(authStore);
|
|
71
|
+
const entries = await Promise.all(ordered.map(async (id) => {
|
|
72
|
+
const provider = MODEL_CATALOG.getProvider(id);
|
|
73
|
+
const supportsOAuth = provider?.auth.oauth !== undefined || getOAuthProvider(id) !== undefined;
|
|
74
|
+
const credential = await authStore?.read(id);
|
|
75
|
+
const hasOAuth = credential?.type === "oauth";
|
|
76
|
+
const hasStoredKey = credential?.type === "api_key";
|
|
77
|
+
const hasAmbientAuth = !credential && (await hasProviderAmbientAuth(id, modelRegistry).catch(() => false));
|
|
78
|
+
const via = hasOAuth
|
|
79
|
+
? "oauth"
|
|
80
|
+
: hasStoredKey
|
|
81
|
+
? "stored-key"
|
|
82
|
+
: hasAmbientAuth
|
|
83
|
+
? "env"
|
|
84
|
+
: "none";
|
|
79
85
|
return { id, supportsOAuth, available: via !== "none", via };
|
|
80
|
-
})
|
|
81
|
-
|
|
86
|
+
}));
|
|
87
|
+
return entries.filter((entry) => entry.available);
|
|
82
88
|
}
|
|
83
89
|
export function listApiKeyProviders(authStore) {
|
|
84
90
|
const storedKeys = new Set(authStore?.listApiKeyProviderIds() ?? []);
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
...providers.filter((entry) => !PROVIDER_PREFERENCE.includes(entry)),
|
|
89
|
-
];
|
|
90
|
-
return ordered.map((id) => ({ id, name: id, hasKey: storedKeys.has(id) }));
|
|
91
|
+
return orderProviders(getCatalogProviders())
|
|
92
|
+
.filter((id) => MODEL_CATALOG.getProvider(id)?.auth.apiKey !== undefined)
|
|
93
|
+
.map((id) => ({ id, name: id, hasKey: storedKeys.has(id) }));
|
|
91
94
|
}
|
|
92
95
|
export function listModelsForProvider(provider) {
|
|
93
96
|
const known = toKnownProvider(provider);
|
|
94
|
-
return
|
|
97
|
+
return getCatalogModels(known).map((model) => ({
|
|
95
98
|
id: model.id,
|
|
96
99
|
name: model.name,
|
|
97
100
|
provider: known,
|
|
@@ -108,20 +111,27 @@ export function listOAuthProviders(authStore) {
|
|
|
108
111
|
}
|
|
109
112
|
export function getDefaultModelForProvider(provider) {
|
|
110
113
|
const known = toKnownProvider(provider);
|
|
111
|
-
return pickDefaultModel(known,
|
|
114
|
+
return pickDefaultModel(known, getCatalogModels(known));
|
|
112
115
|
}
|
|
113
116
|
export function findModelByReference(provider, modelId) {
|
|
114
117
|
const known = toKnownProvider(provider);
|
|
115
|
-
return findModel(known,
|
|
118
|
+
return findModel(known, getCatalogModels(known), modelId);
|
|
116
119
|
}
|
|
117
|
-
function
|
|
118
|
-
|
|
120
|
+
async function isModelCredentialed(model, authStore) {
|
|
121
|
+
await authStore?.load();
|
|
122
|
+
const credential = await authStore?.read(model.provider);
|
|
123
|
+
if (credential)
|
|
119
124
|
return true;
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
125
|
+
const modelRegistry = createModelRegistry(authStore);
|
|
126
|
+
try {
|
|
127
|
+
return (await modelRegistry.getAuth(model)) !== undefined;
|
|
128
|
+
}
|
|
129
|
+
catch {
|
|
130
|
+
return false;
|
|
131
|
+
}
|
|
123
132
|
}
|
|
124
|
-
function inferProvider(authStore) {
|
|
133
|
+
async function inferProvider(authStore) {
|
|
134
|
+
await authStore?.load();
|
|
125
135
|
if (authStore) {
|
|
126
136
|
for (const provider of PROVIDER_PREFERENCE) {
|
|
127
137
|
if (authStore.getOAuth(provider))
|
|
@@ -132,16 +142,37 @@ function inferProvider(authStore) {
|
|
|
132
142
|
return provider;
|
|
133
143
|
}
|
|
134
144
|
}
|
|
145
|
+
const modelRegistry = createModelRegistry(authStore);
|
|
135
146
|
for (const provider of PROVIDER_PREFERENCE) {
|
|
136
|
-
if (
|
|
147
|
+
if (await hasProviderAmbientAuth(provider, modelRegistry).catch(() => false))
|
|
137
148
|
return provider;
|
|
138
149
|
}
|
|
139
150
|
return "anthropic";
|
|
140
151
|
}
|
|
152
|
+
async function hasProviderAmbientAuth(provider, modelRegistry) {
|
|
153
|
+
const model = pickDefaultModel(provider, getCatalogModels(provider));
|
|
154
|
+
return (await modelRegistry.getAuth(model)) !== undefined;
|
|
155
|
+
}
|
|
156
|
+
function createModelRegistry(authStore) {
|
|
157
|
+
return authStore ? builtinModels({ credentials: authStore }) : builtinModels();
|
|
158
|
+
}
|
|
159
|
+
function getCatalogProviders() {
|
|
160
|
+
return MODEL_CATALOG.getProviders().map((provider) => provider.id);
|
|
161
|
+
}
|
|
162
|
+
function getCatalogModels(provider) {
|
|
163
|
+
return [...MODEL_CATALOG.getModels(provider)];
|
|
164
|
+
}
|
|
165
|
+
function orderProviders(providers) {
|
|
166
|
+
return [
|
|
167
|
+
...PROVIDER_PREFERENCE.filter((entry) => providers.includes(entry)),
|
|
168
|
+
...providers.filter((entry) => !PROVIDER_PREFERENCE.includes(entry)),
|
|
169
|
+
];
|
|
170
|
+
}
|
|
141
171
|
function toKnownProvider(provider) {
|
|
142
|
-
const
|
|
172
|
+
const knownProviders = getCatalogProviders();
|
|
173
|
+
const knownProvider = knownProviders.find((candidate) => candidate === provider);
|
|
143
174
|
if (!knownProvider) {
|
|
144
|
-
throw new Error(`Unknown provider '${provider}'. Known providers: ${
|
|
175
|
+
throw new Error(`Unknown provider '${provider}'. Known providers: ${knownProviders.join(", ")}`);
|
|
145
176
|
}
|
|
146
177
|
return knownProvider;
|
|
147
178
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/runtime/model-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"model-resolver.js","sourceRoot":"","sources":["../../src/runtime/model-resolver.ts"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ export declare class PiSquaredAgentRuntime {
|
|
|
27
27
|
private model;
|
|
28
28
|
private apiKey;
|
|
29
29
|
private sessionId;
|
|
30
|
+
private readonly models;
|
|
30
31
|
private readonly transportOverride;
|
|
31
32
|
private readonly tools;
|
|
32
33
|
private webSearchConfig;
|
|
@@ -58,19 +59,11 @@ export declare class PiSquaredAgentRuntime {
|
|
|
58
59
|
setLastError(error: string | undefined): void;
|
|
59
60
|
setNotice(message: string, level?: NoticeLevel): void;
|
|
60
61
|
clearNotice(): void;
|
|
61
|
-
/**
|
|
62
|
-
* Resolve an API key for a provider, preferring OAuth credentials from the
|
|
63
|
-
* auth store (refreshing if expired), then the runtime override, then env.
|
|
64
|
-
*/
|
|
65
|
-
resolveApiKey(provider: string): Promise<string | undefined>;
|
|
66
62
|
private createSearchWebRuntimeTool;
|
|
67
63
|
/** Resolve ChatGPT/Codex OAuth credentials used by the search_web tool. */
|
|
68
64
|
private resolveSearchWebAuth;
|
|
69
65
|
private resolveTransportForModel;
|
|
70
|
-
|
|
71
|
-
* Apply OAuth-driven model transformations (e.g. github-copilot baseUrl).
|
|
72
|
-
*/
|
|
73
|
-
private applyOAuthModelTransforms;
|
|
66
|
+
private withRuntimeStreamOptions;
|
|
74
67
|
/**
|
|
75
68
|
* Copy externally mutable status fields back into the core Agent before a run.
|
|
76
69
|
* A future HTTP server can update the status store, then call this method to
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pi-agent.d.ts","sourceRoot":"","sources":["../../src/runtime/pi-agent.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,KAAK,EAEL,KAAK,YAAY,EAEjB,KAAK,aAAa,EACnB,MAAM,+BAA+B,CAAC;AACvC,OAAO,
|
|
1
|
+
{"version":3,"file":"pi-agent.d.ts","sourceRoot":"","sources":["../../src/runtime/pi-agent.ts"],"names":[],"mappings":"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"}
|