@agents-ensemble/core 0.7.0 → 0.9.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/conductor/conductor-auth.d.ts +36 -6
- package/dist/conductor/conductor-auth.d.ts.map +1 -1
- package/dist/conductor/conductor-auth.js +59 -7
- package/dist/conductor/conductor-auth.js.map +1 -1
- package/dist/conductor/conductor-pi-auth.d.ts +75 -0
- package/dist/conductor/conductor-pi-auth.d.ts.map +1 -0
- package/dist/conductor/conductor-pi-auth.js +656 -0
- package/dist/conductor/conductor-pi-auth.js.map +1 -0
- package/dist/conductor/conductor-session-driver.d.ts +2 -0
- package/dist/conductor/conductor-session-driver.d.ts.map +1 -1
- package/dist/conductor/conductor-session-driver.js +18 -1
- package/dist/conductor/conductor-session-driver.js.map +1 -1
- package/dist/conductor/conductor-session.d.ts.map +1 -1
- package/dist/conductor/conductor-session.js +69 -7
- package/dist/conductor/conductor-session.js.map +1 -1
- package/dist/conductor/conductor-tool-pi-adapter.d.ts +6 -8
- package/dist/conductor/conductor-tool-pi-adapter.d.ts.map +1 -1
- package/dist/conductor/conductor-tool-pi-adapter.js +5 -8
- package/dist/conductor/conductor-tool-pi-adapter.js.map +1 -1
- package/dist/conductor/index.d.ts +7 -8
- package/dist/conductor/index.d.ts.map +1 -1
- package/dist/conductor/index.js +4 -4
- package/dist/conductor/index.js.map +1 -1
- package/dist/conductor/list-conductor-models.d.ts +7 -2
- package/dist/conductor/list-conductor-models.d.ts.map +1 -1
- package/dist/conductor/list-conductor-models.js +9 -1
- package/dist/conductor/list-conductor-models.js.map +1 -1
- package/dist/conductor/pi-conductor-agent.d.ts +23 -6
- package/dist/conductor/pi-conductor-agent.d.ts.map +1 -1
- package/dist/conductor/pi-conductor-agent.js +317 -130
- package/dist/conductor/pi-conductor-agent.js.map +1 -1
- package/dist/conductor/pi-resource-loader.d.ts +7 -4
- package/dist/conductor/pi-resource-loader.d.ts.map +1 -1
- package/dist/conductor/pi-resource-loader.js +6 -4
- package/dist/conductor/pi-resource-loader.js.map +1 -1
- package/dist/conductor/session/dispatch-hold.d.ts +14 -0
- package/dist/conductor/session/dispatch-hold.d.ts.map +1 -1
- package/dist/conductor/session/dispatch-hold.js +30 -0
- package/dist/conductor/session/dispatch-hold.js.map +1 -1
- package/dist/conductor/session/events/index.d.ts +1 -1
- package/dist/conductor/session/events/index.d.ts.map +1 -1
- package/dist/conductor/session/events/index.js.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.d.ts +2 -2
- package/dist/conductor/session/events/session-log-event-groups.d.ts.map +1 -1
- package/dist/conductor/session/events/session-log-event-groups.js +1 -0
- package/dist/conductor/session/events/session-log-event-groups.js.map +1 -1
- package/dist/conductor/session/events/session-log-event.d.ts +10 -1
- package/dist/conductor/session/events/session-log-event.d.ts.map +1 -1
- package/dist/conductor/session/format-session-event.js +3 -0
- package/dist/conductor/session/format-session-event.js.map +1 -1
- package/dist/conductor/session/session-logger.d.ts.map +1 -1
- package/dist/conductor/session/session-logger.js +1 -0
- package/dist/conductor/session/session-logger.js.map +1 -1
- package/dist/github/fetch-github-updates.d.ts.map +1 -1
- package/dist/github/fetch-github-updates.js +109 -80
- package/dist/github/fetch-github-updates.js.map +1 -1
- package/dist/github/github-client.d.ts.map +1 -1
- package/dist/github/github-client.js +8 -0
- package/dist/github/github-client.js.map +1 -1
- package/dist/github/github-monitor-cursor.d.ts +19 -8
- package/dist/github/github-monitor-cursor.d.ts.map +1 -1
- package/dist/github/github-monitor-cursor.js +8 -52
- package/dist/github/github-monitor-cursor.js.map +1 -1
- package/dist/github/github-monitor.d.ts +2 -0
- package/dist/github/github-monitor.d.ts.map +1 -1
- package/dist/github/github-monitor.js +13 -0
- package/dist/github/github-monitor.js.map +1 -1
- package/dist/github/github-test-fixtures.d.ts +9 -0
- package/dist/github/github-test-fixtures.d.ts.map +1 -1
- package/dist/github/github-test-fixtures.js +6 -0
- package/dist/github/github-test-fixtures.js.map +1 -1
- package/dist/github/github-update-types.d.ts +10 -0
- package/dist/github/github-update-types.d.ts.map +1 -1
- package/dist/github/index.d.ts +3 -1
- package/dist/github/index.d.ts.map +1 -1
- package/dist/github/index.js +1 -0
- package/dist/github/index.js.map +1 -1
- package/dist/github/register-github-watch-tool.d.ts +5 -0
- package/dist/github/register-github-watch-tool.d.ts.map +1 -1
- package/dist/github/register-github-watch-tool.js +30 -24
- package/dist/github/register-github-watch-tool.js.map +1 -1
- package/dist/github/unregister-github-watch-tool.d.ts +11 -0
- package/dist/github/unregister-github-watch-tool.d.ts.map +1 -0
- package/dist/github/unregister-github-watch-tool.js +52 -0
- package/dist/github/unregister-github-watch-tool.js.map +1 -0
- package/dist/mcp/load-mcp-config.d.ts +8 -0
- package/dist/mcp/load-mcp-config.d.ts.map +1 -1
- package/dist/mcp/load-mcp-config.js +24 -0
- package/dist/mcp/load-mcp-config.js.map +1 -1
- package/dist/prompt/modules/ensemble/base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/base-module.js +2 -1
- package/dist/prompt/modules/ensemble/base-module.js.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.d.ts.map +1 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.js +4 -1
- package/dist/prompt/modules/ensemble/conductor-base-module.js.map +1 -1
- package/dist/runtime/worker-session.d.ts +5 -0
- package/dist/runtime/worker-session.d.ts.map +1 -1
- package/dist/runtime/worker-session.js +5 -1
- package/dist/runtime/worker-session.js.map +1 -1
- package/dist/session/session-sidecar.d.ts +6 -0
- package/dist/session/session-sidecar.d.ts.map +1 -1
- package/dist/session/session-sidecar.js +17 -0
- package/dist/session/session-sidecar.js.map +1 -1
- package/package.json +4 -4
- package/dist/conductor/pi-conductor-session.d.ts +0 -20
- package/dist/conductor/pi-conductor-session.d.ts.map +0 -1
- package/dist/conductor/pi-conductor-session.js +0 -60
- package/dist/conductor/pi-conductor-session.js.map +0 -1
- package/dist/conductor/pi-mcp-bridge.d.ts +0 -65
- package/dist/conductor/pi-mcp-bridge.d.ts.map +0 -1
- package/dist/conductor/pi-mcp-bridge.js +0 -259
- package/dist/conductor/pi-mcp-bridge.js.map +0 -1
|
@@ -1,10 +1,40 @@
|
|
|
1
1
|
import type { SdkAuthStatus, SdkLoginResult } from '@cursor/sdk';
|
|
2
|
+
import type { OAuthLoginCallbacks } from '@earendil-works/pi-ai/compat';
|
|
3
|
+
import { type PiConductorAuthOptions, type PiConductorAuthStatus, type PiConductorLoginResult, type PiConductorLogoutResult } from './conductor-pi-auth.js';
|
|
4
|
+
import type { ConductorBackend, EnsembleConfig } from '../config/types.js';
|
|
2
5
|
import type { ConductorSendResult } from './conductor-agent.js';
|
|
3
6
|
/**
|
|
4
7
|
* SDK の認証解決順に沿ったヒント。
|
|
5
8
|
* `agent login` は ACP(worker)向けで、SDK(conductor)には自動では渡らない。
|
|
6
9
|
*/
|
|
7
10
|
export declare const CONDUCTOR_AUTH_HINT: string;
|
|
11
|
+
export interface ConductorAuthOptions {
|
|
12
|
+
/** Explicit backend selection. If omitted, profile/config resolution is used. */
|
|
13
|
+
backend?: ConductorBackend;
|
|
14
|
+
profile?: {
|
|
15
|
+
conductor?: {
|
|
16
|
+
backend?: ConductorBackend;
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
config?: EnsembleConfig;
|
|
20
|
+
pi?: PiConductorAuthOptions;
|
|
21
|
+
provider?: string;
|
|
22
|
+
modelId?: string;
|
|
23
|
+
apiKey?: string;
|
|
24
|
+
oauthCallbacks?: OAuthLoginCallbacks;
|
|
25
|
+
}
|
|
26
|
+
export type ConductorAuthStatus = SdkAuthStatus | PiConductorAuthStatus;
|
|
27
|
+
export type ConductorLoginResult = SdkLoginResult | PiConductorLoginResult;
|
|
28
|
+
export type ConductorLogoutResult = void | PiConductorLogoutResult;
|
|
29
|
+
export interface ConductorAuthRecoveryOptions {
|
|
30
|
+
backend?: ConductorBackend;
|
|
31
|
+
pi?: {
|
|
32
|
+
agentDir?: string;
|
|
33
|
+
};
|
|
34
|
+
provider?: string;
|
|
35
|
+
}
|
|
36
|
+
/** Resolve the auth facade's backend using the same rule as conductor startup. */
|
|
37
|
+
export declare function resolveConductorAuthBackend(options?: Pick<ConductorAuthOptions, 'backend' | 'profile' | 'config'>): ConductorBackend;
|
|
8
38
|
/** RunResult.error 等の message が conductor 認証失敗か判定する。 */
|
|
9
39
|
export declare function isConductorAuthError(message: string): boolean;
|
|
10
40
|
/**
|
|
@@ -15,15 +45,15 @@ export declare function isBareConductorSendAuthError(result: ConductorSendResult
|
|
|
15
45
|
/** send 結果が auth-like(明示 message または保守的 bare error)か。 */
|
|
16
46
|
export declare function isConductorSendAuthError(result: ConductorSendResult): boolean;
|
|
17
47
|
/** auth エラー時に stderr へ出す短い復旧手順。 */
|
|
18
|
-
export declare function formatConductorAuthRecoveryHint(agentId?: string): string;
|
|
48
|
+
export declare function formatConductorAuthRecoveryHint(agentId?: string, options?: ConductorAuthRecoveryOptions): string;
|
|
19
49
|
/**
|
|
20
50
|
* Conductor 用 API key を明示指定のみ解決する。
|
|
21
51
|
* 未指定時は `Agent.create` に渡さず、SDK の stored login フォールバックに任せる。
|
|
22
52
|
*/
|
|
23
53
|
export declare function resolveConductorApiKey(explicit?: string): string | undefined;
|
|
24
|
-
/** SDK stored login または
|
|
25
|
-
export declare function hasConductorAuth(): boolean;
|
|
26
|
-
export declare function getConductorAuthStatus(): Promise<
|
|
27
|
-
export declare function loginConductor(): Promise<
|
|
28
|
-
export declare function logoutConductor(): Promise<
|
|
54
|
+
/** SDK stored login または Pi credential があるか(同期チェック)。 */
|
|
55
|
+
export declare function hasConductorAuth(options?: ConductorAuthOptions): boolean;
|
|
56
|
+
export declare function getConductorAuthStatus(options?: ConductorAuthOptions): Promise<ConductorAuthStatus>;
|
|
57
|
+
export declare function loginConductor(options?: ConductorAuthOptions): Promise<ConductorLoginResult>;
|
|
58
|
+
export declare function logoutConductor(options?: ConductorAuthOptions): Promise<ConductorLogoutResult>;
|
|
29
59
|
//# sourceMappingURL=conductor-auth.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-auth.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,
|
|
1
|
+
{"version":3,"file":"conductor-auth.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACxE,OAAO,EAML,KAAK,sBAAsB,EAC3B,KAAK,qBAAqB,EAC1B,KAAK,sBAAsB,EAC3B,KAAK,uBAAuB,EAC7B,MAAM,wBAAwB,CAAC;AAEhC,OAAO,KAAK,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAC3E,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAEhE;;;GAGG;AACH,eAAO,MAAM,mBAAmB,QAEiD,CAAC;AAElF,MAAM,WAAW,oBAAoB;IACnC,iFAAiF;IACjF,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,OAAO,CAAC,EAAE;QAAE,SAAS,CAAC,EAAE;YAAE,OAAO,CAAC,EAAE,gBAAgB,CAAA;SAAE,CAAA;KAAE,CAAC;IACzD,MAAM,CAAC,EAAE,cAAc,CAAC;IACxB,EAAE,CAAC,EAAE,sBAAsB,CAAC;IAC5B,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,cAAc,CAAC,EAAE,mBAAmB,CAAC;CACtC;AAED,MAAM,MAAM,mBAAmB,GAAG,aAAa,GAAG,qBAAqB,CAAC;AACxE,MAAM,MAAM,oBAAoB,GAAG,cAAc,GAAG,sBAAsB,CAAC;AAC3E,MAAM,MAAM,qBAAqB,GAAG,IAAI,GAAG,uBAAuB,CAAC;AAEnE,MAAM,WAAW,4BAA4B;IAC3C,OAAO,CAAC,EAAE,gBAAgB,CAAC;IAC3B,EAAE,CAAC,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,kFAAkF;AAClF,wBAAgB,2BAA2B,CACzC,OAAO,GAAE,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,CAAM,GACzE,gBAAgB,CASlB;AAED,wDAAwD;AACxD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAI7D;AAED;;;GAGG;AACH,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAejF;AAED,yDAAyD;AACzD,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,mBAAmB,GAAG,OAAO,CAQ7E;AAED,mCAAmC;AACnC,wBAAgB,+BAA+B,CAC7C,OAAO,CAAC,EAAE,MAAM,EAChB,OAAO,GAAE,4BAAiC,GACzC,MAAM,CAyBR;AAED;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAM5E;AAED,uDAAuD;AACvD,wBAAgB,gBAAgB,CAAC,OAAO,GAAE,oBAAyB,GAAG,OAAO,CAU5E;AAED,wBAAsB,sBAAsB,CAC1C,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,mBAAmB,CAAC,CAS9B;AAED,wBAAsB,cAAc,CAClC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,oBAAoB,CAAC,CAW/B;AAED,wBAAsB,eAAe,CACnC,OAAO,GAAE,oBAAyB,GACjC,OAAO,CAAC,qBAAqB,CAAC,CAShC"}
|
|
@@ -1,14 +1,28 @@
|
|
|
1
1
|
import { existsSync } from 'node:fs';
|
|
2
2
|
import { Cursor, getDefaultSdkAuthPath } from '@cursor/sdk';
|
|
3
|
+
import { getPiConductorAuthStatus, hasPiConductorAuth, loginPiConductor, logoutPiConductor, formatPiProviderEnvHint, } from './conductor-pi-auth.js';
|
|
4
|
+
import { resolveConductorBackendSetting } from '../config/resolve-settings.js';
|
|
3
5
|
/**
|
|
4
6
|
* SDK の認証解決順に沿ったヒント。
|
|
5
7
|
* `agent login` は ACP(worker)向けで、SDK(conductor)には自動では渡らない。
|
|
6
8
|
*/
|
|
7
9
|
export const CONDUCTOR_AUTH_HINT = 'Conductor の認証が見つかりません。`ensemble auth logout` の後 `ensemble auth login` を実行するか、`export CURSOR_API_KEY=...` を設定してください。' +
|
|
8
10
|
'(`agent login` だけでは conductor には足りません。worker の ACP には `agent login` で足ります。)';
|
|
11
|
+
/** Resolve the auth facade's backend using the same rule as conductor startup. */
|
|
12
|
+
export function resolveConductorAuthBackend(options = {}) {
|
|
13
|
+
if (options.backend)
|
|
14
|
+
return options.backend;
|
|
15
|
+
if (options.profile || options.config) {
|
|
16
|
+
return resolveConductorBackendSetting({
|
|
17
|
+
profile: options.profile,
|
|
18
|
+
config: options.config,
|
|
19
|
+
});
|
|
20
|
+
}
|
|
21
|
+
return 'cursor';
|
|
22
|
+
}
|
|
9
23
|
/** RunResult.error 等の message が conductor 認証失敗か判定する。 */
|
|
10
24
|
export function isConductorAuthError(message) {
|
|
11
|
-
return /authentication error|not logged in|invalid api key|unauthenticated|try logging out/i.test(message);
|
|
25
|
+
return /authentication error|not logged in|invalid api key|no api key(?: for provider)?\s*[: ]|unauthenticated|unauthorized|\b(?:http\s*)?401\b|try logging out/i.test(message);
|
|
12
26
|
}
|
|
13
27
|
/**
|
|
14
28
|
* SDK idle / stale 接続で message 欠落の bare `status: "error"` が返る既知ケース。
|
|
@@ -41,8 +55,16 @@ export function isConductorSendAuthError(result) {
|
|
|
41
55
|
return isBareConductorSendAuthError(result);
|
|
42
56
|
}
|
|
43
57
|
/** auth エラー時に stderr へ出す短い復旧手順。 */
|
|
44
|
-
export function formatConductorAuthRecoveryHint(agentId) {
|
|
58
|
+
export function formatConductorAuthRecoveryHint(agentId, options = {}) {
|
|
45
59
|
const resume = agentId ? `--resume ${agentId}` : '--resume <agentId>';
|
|
60
|
+
if (resolveConductorAuthBackend(options) === 'pi') {
|
|
61
|
+
const provider = options.provider ?? '<provider>';
|
|
62
|
+
const agentDir = options.pi?.agentDir ?? '~/.ensemble/pi';
|
|
63
|
+
return (`[auth] Pi 認証エラー(provider=${provider})。` +
|
|
64
|
+
`ensemble auth login --provider ${provider} を実行するか、${agentDir}/auth.json または ` +
|
|
65
|
+
`環境変数 ${formatPiProviderEnvHint(provider)} を確認してください。` +
|
|
66
|
+
`ensemble issue ... ${resume} で再試行できます。`);
|
|
67
|
+
}
|
|
46
68
|
if (process.env.CURSOR_API_KEY) {
|
|
47
69
|
return (`[auth] 認証エラー。unset CURSOR_API_KEY または Dashboard で key をローテーション後、` +
|
|
48
70
|
`ensemble issue ... ${resume}(agentId は終了 JSON 参照)`);
|
|
@@ -62,19 +84,49 @@ export function resolveConductorApiKey(explicit) {
|
|
|
62
84
|
}
|
|
63
85
|
return undefined;
|
|
64
86
|
}
|
|
65
|
-
/** SDK stored login または
|
|
66
|
-
export function hasConductorAuth() {
|
|
87
|
+
/** SDK stored login または Pi credential があるか(同期チェック)。 */
|
|
88
|
+
export function hasConductorAuth(options = {}) {
|
|
89
|
+
if (resolveConductorAuthBackend(options) === 'pi') {
|
|
90
|
+
return hasPiConductorAuth({
|
|
91
|
+
...(options.pi ?? { cwd: process.cwd() }),
|
|
92
|
+
...(options.provider ? { provider: options.provider } : {}),
|
|
93
|
+
...(options.modelId ? { modelId: options.modelId } : {}),
|
|
94
|
+
});
|
|
95
|
+
}
|
|
67
96
|
if (process.env.CURSOR_API_KEY)
|
|
68
97
|
return true;
|
|
69
98
|
return existsSync(getDefaultSdkAuthPath());
|
|
70
99
|
}
|
|
71
|
-
export async function getConductorAuthStatus() {
|
|
100
|
+
export async function getConductorAuthStatus(options = {}) {
|
|
101
|
+
if (resolveConductorAuthBackend(options) === 'pi') {
|
|
102
|
+
return getPiConductorAuthStatus({
|
|
103
|
+
...(options.pi ?? { cwd: process.cwd() }),
|
|
104
|
+
...(options.provider ? { provider: options.provider } : {}),
|
|
105
|
+
...(options.modelId ? { modelId: options.modelId } : {}),
|
|
106
|
+
});
|
|
107
|
+
}
|
|
72
108
|
return Cursor.auth.status();
|
|
73
109
|
}
|
|
74
|
-
export async function loginConductor() {
|
|
110
|
+
export async function loginConductor(options = {}) {
|
|
111
|
+
if (resolveConductorAuthBackend(options) === 'pi') {
|
|
112
|
+
return loginPiConductor({
|
|
113
|
+
...(options.pi ?? { cwd: process.cwd() }),
|
|
114
|
+
...(options.provider ? { provider: options.provider } : {}),
|
|
115
|
+
...(options.modelId ? { modelId: options.modelId } : {}),
|
|
116
|
+
...(options.apiKey !== undefined ? { apiKey: options.apiKey } : {}),
|
|
117
|
+
...(options.oauthCallbacks ? { oauthCallbacks: options.oauthCallbacks } : {}),
|
|
118
|
+
});
|
|
119
|
+
}
|
|
75
120
|
return Cursor.auth.login();
|
|
76
121
|
}
|
|
77
|
-
export async function logoutConductor() {
|
|
122
|
+
export async function logoutConductor(options = {}) {
|
|
123
|
+
if (resolveConductorAuthBackend(options) === 'pi') {
|
|
124
|
+
return logoutPiConductor({
|
|
125
|
+
...(options.pi ?? { cwd: process.cwd() }),
|
|
126
|
+
...(options.provider ? { provider: options.provider } : {}),
|
|
127
|
+
...(options.modelId ? { modelId: options.modelId } : {}),
|
|
128
|
+
});
|
|
129
|
+
}
|
|
78
130
|
return Cursor.auth.logout();
|
|
79
131
|
}
|
|
80
132
|
//# sourceMappingURL=conductor-auth.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"conductor-auth.js","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"conductor-auth.js","sourceRoot":"","sources":["../../src/conductor/conductor-auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,qBAAqB,EAAE,MAAM,aAAa,CAAC;AAG5D,OAAO,EACL,wBAAwB,EACxB,kBAAkB,EAClB,gBAAgB,EAChB,iBAAiB,EACjB,uBAAuB,GAKxB,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,8BAA8B,EAAE,MAAM,+BAA+B,CAAC;AAI/E;;;GAGG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAC9B,qHAAqH;IACnH,6EAA6E,CAAC;AAwBlF,kFAAkF;AAClF,MAAM,UAAU,2BAA2B,CACzC,UAAwE,EAAE;IAE1E,IAAI,OAAO,CAAC,OAAO;QAAE,OAAO,OAAO,CAAC,OAAO,CAAC;IAC5C,IAAI,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;QACtC,OAAO,8BAA8B,CAAC;YACpC,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,MAAM,EAAE,OAAO,CAAC,MAAM;SACvB,CAAC,CAAC;IACL,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,oBAAoB,CAAC,OAAe;IAClD,OAAO,0JAA0J,CAAC,IAAI,CACpK,OAAO,CACR,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,4BAA4B,CAAC,MAA2B;IACtE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,IAAI,GAAG,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAChD,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,yDAAyD;AACzD,MAAM,UAAU,wBAAwB,CAAC,MAA2B;IAClE,IAAI,MAAM,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,IAAI,oBAAoB,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,IAAI,EAAE,CAAC,EAAE,CAAC;QACtD,OAAO,IAAI,CAAC;IACd,CAAC;IACD,OAAO,4BAA4B,CAAC,MAAM,CAAC,CAAC;AAC9C,CAAC;AAED,mCAAmC;AACnC,MAAM,UAAU,+BAA+B,CAC7C,OAAgB,EAChB,UAAwC,EAAE;IAE1C,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,YAAY,OAAO,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC;IAEtE,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,IAAI,YAAY,CAAC;QAClD,MAAM,QAAQ,GAAG,OAAO,CAAC,EAAE,EAAE,QAAQ,IAAI,gBAAgB,CAAC;QAC1D,OAAO,CACL,4BAA4B,QAAQ,IAAI;YACxC,kCAAkC,QAAQ,WAAW,QAAQ,iBAAiB;YAC9E,QAAQ,uBAAuB,CAAC,QAAQ,CAAC,aAAa;YACtD,sBAAsB,MAAM,YAAY,CACzC,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;QAC/B,OAAO,CACL,kEAAkE;YAClE,sBAAsB,MAAM,uBAAuB,CACpD,CAAC;IACJ,CAAC;IAED,OAAO,CACL,4DAA4D;QAC5D,sBAAsB,MAAM,sCAAsC,CACnE,CAAC;AACJ,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,sBAAsB,CAAC,QAAiB;IACtD,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,QAAQ,CAAC;IAC5C,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC7C,OAAO,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC;IACpC,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,uDAAuD;AACvD,MAAM,UAAU,gBAAgB,CAAC,UAAgC,EAAE;IACjE,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,kBAAkB,CAAC;YACxB,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IACD,IAAI,OAAO,CAAC,GAAG,CAAC,cAAc;QAAE,OAAO,IAAI,CAAC;IAC5C,OAAO,UAAU,CAAC,qBAAqB,EAAE,CAAC,CAAC;AAC7C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,sBAAsB,CAC1C,UAAgC,EAAE;IAElC,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,wBAAwB,CAAC;YAC9B,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AAC9B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAClC,UAAgC,EAAE;IAElC,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,gBAAgB,CAAC;YACtB,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACxD,GAAG,CAAC,OAAO,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACnE,GAAG,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,OAAO,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC9E,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;AAC7B,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe,CACnC,UAAgC,EAAE;IAElC,IAAI,2BAA2B,CAAC,OAAO,CAAC,KAAK,IAAI,EAAE,CAAC;QAClD,OAAO,iBAAiB,CAAC;YACvB,GAAG,CAAC,OAAO,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACzC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;AAC9B,CAAC"}
|
|
@@ -0,0 +1,75 @@
|
|
|
1
|
+
import { ModelRegistry, ModelRuntime } from '@earendil-works/pi-coding-agent';
|
|
2
|
+
import { type OAuthLoginCallbacks } from '@earendil-works/pi-ai/compat';
|
|
3
|
+
import { type PiResourceLoaderOptions, type PiResources } from './pi-resource-loader.js';
|
|
4
|
+
/** Auth and model services for the Pi conductor's user resource layer. */
|
|
5
|
+
export interface PiConductorAuthContext {
|
|
6
|
+
agentDir: string;
|
|
7
|
+
authPath: string;
|
|
8
|
+
modelsPath: string;
|
|
9
|
+
modelRuntime: ModelRuntime;
|
|
10
|
+
modelRegistry: ModelRegistry;
|
|
11
|
+
}
|
|
12
|
+
export interface PiProviderAuthStatus {
|
|
13
|
+
provider: string;
|
|
14
|
+
configured: boolean;
|
|
15
|
+
source?: string;
|
|
16
|
+
label?: string;
|
|
17
|
+
}
|
|
18
|
+
export interface PiConductorAuthStatus {
|
|
19
|
+
backend: 'pi';
|
|
20
|
+
authPath: string;
|
|
21
|
+
providers: PiProviderAuthStatus[];
|
|
22
|
+
}
|
|
23
|
+
export interface PiConductorLoginResult {
|
|
24
|
+
backend: 'pi';
|
|
25
|
+
provider: string;
|
|
26
|
+
method: 'api_key' | 'oauth';
|
|
27
|
+
authPath: string;
|
|
28
|
+
}
|
|
29
|
+
export interface PiConductorLogoutResult {
|
|
30
|
+
backend: 'pi';
|
|
31
|
+
provider: string;
|
|
32
|
+
authPath: string;
|
|
33
|
+
}
|
|
34
|
+
export interface PiConductorModelListEntry {
|
|
35
|
+
id: string;
|
|
36
|
+
displayName: string;
|
|
37
|
+
provider: string;
|
|
38
|
+
description?: string;
|
|
39
|
+
}
|
|
40
|
+
export interface PiConductorAuthOptions extends PiResourceLoaderOptions {
|
|
41
|
+
provider?: string;
|
|
42
|
+
modelId?: string;
|
|
43
|
+
}
|
|
44
|
+
/** Create the Pi 1.x model runtime and registry for the resolved resource roots. */
|
|
45
|
+
export declare function createPiConductorAuthContext(options: PiResourceLoaderOptions, resources?: PiResources): Promise<PiConductorAuthContext>;
|
|
46
|
+
/** Resolve the provider used by `ensemble auth` from an explicit/default model. */
|
|
47
|
+
export declare function resolvePiConductorProvider(options: PiConductorAuthOptions): Promise<string>;
|
|
48
|
+
/** Login to a Pi provider. API-key login persists only in the user auth file. */
|
|
49
|
+
export declare function loginPiConductor(options: PiConductorAuthOptions & {
|
|
50
|
+
apiKey?: string;
|
|
51
|
+
oauthCallbacks?: OAuthLoginCallbacks;
|
|
52
|
+
}): Promise<PiConductorLoginResult>;
|
|
53
|
+
/** Whether the selected Pi provider exposes Pi's native OAuth login flow. */
|
|
54
|
+
export declare function isPiConductorOAuthProvider(options: PiConductorAuthOptions): Promise<boolean>;
|
|
55
|
+
/** Remove a Pi provider's user-layer credential. */
|
|
56
|
+
export declare function logoutPiConductor(options: PiConductorAuthOptions): Promise<PiConductorLogoutResult>;
|
|
57
|
+
/** Return non-secret Pi auth metadata for the selected/default provider. */
|
|
58
|
+
export declare function getPiConductorAuthStatus(options: PiConductorAuthOptions): Promise<PiConductorAuthStatus>;
|
|
59
|
+
/** List only Pi models whose provider has usable configured auth. */
|
|
60
|
+
export declare function listPiConductorModels(options?: PiConductorAuthOptions): Promise<PiConductorModelListEntry[]>;
|
|
61
|
+
/** Resolve a key while retaining project-over-user auth precedence. */
|
|
62
|
+
export declare function resolvePiConductorApiKey(options: {
|
|
63
|
+
modelRuntime: ModelRuntime;
|
|
64
|
+
resources: Pick<PiResources, 'roots' | 'authLayers' | 'settings' | 'models'>;
|
|
65
|
+
provider: string;
|
|
66
|
+
explicitApiKey?: string;
|
|
67
|
+
env?: NodeJS.ProcessEnv;
|
|
68
|
+
}): Promise<string | undefined>;
|
|
69
|
+
/** Return whether a provider has configured auth without exposing its value. */
|
|
70
|
+
export declare function hasPiProviderAuth(provider: string, context: PiConductorAuthContext, resources: Pick<PiResources, 'roots' | 'authLayers' | 'settings' | 'models'>, env?: NodeJS.ProcessEnv): boolean;
|
|
71
|
+
/** Synchronous readiness check used by CLI/e2e guards before async loading. */
|
|
72
|
+
export declare function hasPiConductorAuth(options: PiConductorAuthOptions): boolean;
|
|
73
|
+
/** Return the concrete environment variables recognised by Pi for a provider. */
|
|
74
|
+
export declare function formatPiProviderEnvHint(provider: string): string;
|
|
75
|
+
//# sourceMappingURL=conductor-pi-auth.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"conductor-pi-auth.d.ts","sourceRoot":"","sources":["../../src/conductor/conductor-pi-auth.ts"],"names":[],"mappings":"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"}
|