poe-code 2.0.36 → 2.0.38
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/commands/login.js +54 -2
- package/dist/cli/commands/login.js.map +1 -1
- package/dist/providers/claude-code.d.ts +11 -2
- package/dist/providers/claude-code.js +2 -12
- package/dist/providers/claude-code.js.map +1 -1
- package/dist/utils/json.js +3 -0
- package/dist/utils/json.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,7 @@
|
|
|
1
|
-
import { createExecutionResources, resolveCommandFlags } from "./shared.js";
|
|
2
|
-
import { saveCredentials } from "../../services/credentials.js";
|
|
1
|
+
import { buildProviderContext, createExecutionResources, resolveCommandFlags, applyIsolatedConfiguration } from "./shared.js";
|
|
2
|
+
import { loadConfiguredServices, saveCredentials } from "../../services/credentials.js";
|
|
3
3
|
import { ValidationError } from "../errors.js";
|
|
4
|
+
import { combineMutationObservers, createMutationReporter } from "../../services/mutation-events.js";
|
|
4
5
|
export function registerLoginCommand(program, container) {
|
|
5
6
|
program
|
|
6
7
|
.command("login")
|
|
@@ -12,11 +13,21 @@ export function registerLoginCommand(program, container) {
|
|
|
12
13
|
try {
|
|
13
14
|
const input = await resolveApiKeyInput(container, options);
|
|
14
15
|
const normalized = container.options.normalizeApiKey(input);
|
|
16
|
+
const configuredServices = await loadConfiguredServices({
|
|
17
|
+
fs: container.fs,
|
|
18
|
+
filePath: container.env.credentialsPath
|
|
19
|
+
});
|
|
15
20
|
await saveCredentials({
|
|
16
21
|
fs: resources.context.fs,
|
|
17
22
|
filePath: container.env.credentialsPath,
|
|
18
23
|
apiKey: normalized
|
|
19
24
|
});
|
|
25
|
+
await reconfigureServices({
|
|
26
|
+
program,
|
|
27
|
+
container,
|
|
28
|
+
apiKey: normalized,
|
|
29
|
+
configuredServices
|
|
30
|
+
});
|
|
20
31
|
resources.context.complete({
|
|
21
32
|
success: `Poe API key stored at ${container.env.credentialsPath}.`,
|
|
22
33
|
dry: `Dry run: would store Poe API key at ${container.env.credentialsPath}.`
|
|
@@ -48,4 +59,45 @@ async function resolveApiKeyInput(container, options) {
|
|
|
48
59
|
}
|
|
49
60
|
return value;
|
|
50
61
|
}
|
|
62
|
+
async function reconfigureServices(input) {
|
|
63
|
+
const { program, container, apiKey, configuredServices } = input;
|
|
64
|
+
const serviceNames = Object.keys(configuredServices);
|
|
65
|
+
for (const serviceName of serviceNames) {
|
|
66
|
+
const adapter = container.registry.get(serviceName);
|
|
67
|
+
if (!adapter) {
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
const flags = resolveCommandFlags(program);
|
|
71
|
+
const resources = createExecutionResources(container, flags, `login:reconfigure:${serviceName}`);
|
|
72
|
+
const providerContext = buildProviderContext(container, adapter, resources);
|
|
73
|
+
const payload = {
|
|
74
|
+
env: container.env,
|
|
75
|
+
apiKey
|
|
76
|
+
};
|
|
77
|
+
const mutationLogger = createMutationReporter(resources.logger);
|
|
78
|
+
const observers = combineMutationObservers(mutationLogger);
|
|
79
|
+
await container.registry.invoke(serviceName, "configure", async (entry) => {
|
|
80
|
+
if (!entry.configure) {
|
|
81
|
+
return;
|
|
82
|
+
}
|
|
83
|
+
await entry.configure({
|
|
84
|
+
fs: providerContext.command.fs,
|
|
85
|
+
env: providerContext.env,
|
|
86
|
+
command: providerContext.command,
|
|
87
|
+
options: payload
|
|
88
|
+
}, observers ? { observers } : undefined);
|
|
89
|
+
const isolated = adapter.isolatedEnv;
|
|
90
|
+
if (isolated && isolated.requiresConfig !== false) {
|
|
91
|
+
await applyIsolatedConfiguration({
|
|
92
|
+
adapter: entry,
|
|
93
|
+
providerContext,
|
|
94
|
+
payload,
|
|
95
|
+
isolated,
|
|
96
|
+
providerName: adapter.name,
|
|
97
|
+
observers
|
|
98
|
+
});
|
|
99
|
+
}
|
|
100
|
+
});
|
|
101
|
+
}
|
|
102
|
+
}
|
|
51
103
|
//# sourceMappingURL=login.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/cli/commands/login.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,wBAAwB,EACxB,mBAAmB,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../../src/cli/commands/login.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,13 @@
|
|
|
1
1
|
import { type ServiceInstallDefinition } from "../services/service-install.js";
|
|
2
|
-
import type {
|
|
2
|
+
import type { CliEnvironment } from "../cli/environment.js";
|
|
3
|
+
import type { ModelConfigureOptions, ProviderSpawnOptions } from "./spawn-options.js";
|
|
4
|
+
type ClaudeCodeConfigureContext = ModelConfigureOptions & {
|
|
5
|
+
env: CliEnvironment;
|
|
6
|
+
apiKey: string;
|
|
7
|
+
};
|
|
8
|
+
type ClaudeCodeUnconfigureContext = {
|
|
9
|
+
env: CliEnvironment;
|
|
10
|
+
};
|
|
3
11
|
export declare const CLAUDE_CODE_INSTALL_DEFINITION: ServiceInstallDefinition;
|
|
4
|
-
export declare const claudeCodeService: import("../cli/service-registry.js").ProviderService<
|
|
12
|
+
export declare const claudeCodeService: import("../cli/service-registry.js").ProviderService<ClaudeCodeConfigureContext, ClaudeCodeUnconfigureContext, ProviderSpawnOptions>;
|
|
13
|
+
export {};
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { createBinaryExistsCheck, createCommandExpectationCheck } from "../utils/command-checks.js";
|
|
2
|
-
import { ensureDirectory, jsonPruneMutation, jsonMergeMutation
|
|
2
|
+
import { ensureDirectory, jsonPruneMutation, jsonMergeMutation } from "../services/service-manifest.js";
|
|
3
3
|
import { CLAUDE_CODE_VARIANTS, DEFAULT_CLAUDE_CODE_MODEL } from "../cli/constants.js";
|
|
4
4
|
import { createProvider } from "./create-provider.js";
|
|
5
5
|
export const CLAUDE_CODE_INSTALL_DEFINITION = {
|
|
@@ -79,17 +79,11 @@ export const claudeCodeService = createProvider({
|
|
|
79
79
|
manifest: {
|
|
80
80
|
configure: [
|
|
81
81
|
ensureDirectory({ targetDirectory: "~/.claude" }),
|
|
82
|
-
jsonPruneMutation({
|
|
83
|
-
targetDirectory: "~/.claude",
|
|
84
|
-
targetFile: "settings.json",
|
|
85
|
-
shape: () => ({
|
|
86
|
-
apiKeyHelper: true
|
|
87
|
-
})
|
|
88
|
-
}),
|
|
89
82
|
jsonMergeMutation({
|
|
90
83
|
targetDirectory: "~/.claude",
|
|
91
84
|
targetFile: "settings.json",
|
|
92
85
|
value: ({ options }) => ({
|
|
86
|
+
apiKeyHelper: `echo ${options.apiKey}`,
|
|
93
87
|
env: {
|
|
94
88
|
ANTHROPIC_BASE_URL: "https://api.poe.com"
|
|
95
89
|
},
|
|
@@ -111,10 +105,6 @@ export const claudeCodeService = createProvider({
|
|
|
111
105
|
},
|
|
112
106
|
model: true
|
|
113
107
|
})
|
|
114
|
-
}),
|
|
115
|
-
removeFileMutation({
|
|
116
|
-
targetDirectory: "~/.claude",
|
|
117
|
-
targetFile: "anthropic_key.sh"
|
|
118
108
|
})
|
|
119
109
|
]
|
|
120
110
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/providers/claude-code.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,uBAAuB,EACvB,6BAA6B,EAC9B,MAAM,4BAA4B,CAAC;AACpC,OAAO,EACL,eAAe,EACf,iBAAiB,EACjB,iBAAiB,
|
|
1
|
+
{"version":3,"file":"claude-code.js","sourceRoot":"","sources":["../../src/providers/claude-code.ts"],"names":[],"mappings":"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"}
|
package/dist/utils/json.js
CHANGED
|
@@ -4,6 +4,9 @@ export function isJsonObject(value) {
|
|
|
4
4
|
export function deepMergeJson(target, source) {
|
|
5
5
|
const result = { ...target };
|
|
6
6
|
for (const [key, value] of Object.entries(source)) {
|
|
7
|
+
if (value === undefined) {
|
|
8
|
+
continue;
|
|
9
|
+
}
|
|
7
10
|
const existing = result[key];
|
|
8
11
|
if (isJsonObject(existing) && isJsonObject(value)) {
|
|
9
12
|
result[key] = deepMergeJson(existing, value);
|
package/dist/utils/json.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,MAAkB,EAClB,MAAkB;IAElB,MAAM,MAAM,GAAe,EAAE,GAAG,MAAM,EAAE,CAAC;IACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC7C,SAAS;QACX,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAkB,EAClB,KAAiB;IAEjB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,MAAM,GAAe,EAAE,GAAG,MAAM,EAAE,CAAC;IAEzC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE5B,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YACnD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CACrE,OAAO,EACP,OAAO,CACR,CAAC;YACF,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;YAC5B,CAAC;YACD,SAAS;QACX,CAAC;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC"}
|
|
1
|
+
{"version":3,"file":"json.js","sourceRoot":"","sources":["../../src/utils/json.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,YAAY,CAAC,KAAc;IACzC,OAAO,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,KAAK,IAAI,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;AAC9E,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,MAAkB,EAClB,MAAkB;IAElB,MAAM,MAAM,GAAe,EAAE,GAAG,MAAM,EAAE,CAAC;IACzC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACxB,SAAS;QACX,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,YAAY,CAAC,QAAQ,CAAC,IAAI,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;YAClD,MAAM,CAAC,GAAG,CAAC,GAAG,aAAa,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;YAC7C,SAAS;QACX,CAAC;QACD,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACtB,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,gBAAgB,CAC9B,MAAkB,EAClB,KAAiB;IAEjB,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,MAAM,MAAM,GAAe,EAAE,GAAG,MAAM,EAAE,CAAC;IAEzC,KAAK,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;QACnD,IAAI,CAAC,CAAC,GAAG,IAAI,MAAM,CAAC,EAAE,CAAC;YACrB,SAAS;QACX,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC;QAE5B,IAAI,YAAY,CAAC,OAAO,CAAC,IAAI,YAAY,CAAC,OAAO,CAAC,EAAE,CAAC;YACnD,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,EAAE,WAAW,EAAE,GAAG,gBAAgB,CACrE,OAAO,EACP,OAAO,CACR,CAAC;YACF,IAAI,YAAY,EAAE,CAAC;gBACjB,OAAO,GAAG,IAAI,CAAC;YACjB,CAAC;YACD,IAAI,MAAM,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1C,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;YACrB,CAAC;iBAAM,CAAC;gBACN,MAAM,CAAC,GAAG,CAAC,GAAG,WAAW,CAAC;YAC5B,CAAC;YACD,SAAS;QACX,CAAC;QAED,OAAO,MAAM,CAAC,GAAG,CAAC,CAAC;QACnB,OAAO,GAAG,IAAI,CAAC;IACjB,CAAC;IAED,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,CAAC;AAC7B,CAAC"}
|