@midscene/cli 1.16.2 → 1.16.5

package/dist/lib/index.js

@@ -3342,7 +3342,7 @@ var __webpack_modules__ = {
             return lines.join('\n');
         };
         const printer_formatYamlProgressSnapshot = (message, attempt, totalAttempts)=>totalAttempts > 1 ? `Attempt ${attempt}/${totalAttempts}\n${message}` : message;
-        const external_node_util_namespaceObject = require("node:util");
+        var external_node_util_ = __webpack_require__("node:util");
         var external_node_process_ = __webpack_require__("node:process");
         const copyProperty = (to, from, property, ignoreNonConfigurable)=>{
             if ('length' === property || 'prototype' === property) return;
@@ -3683,7 +3683,7 @@ var __webpack_modules__ = {
             for (const content of contents){
                 const rows = content.split('\n');
                 for (const row of rows){
-                    const text = (0, external_node_util_namespaceObject.stripVTControlCharacters)(row);
+                    const text = (0, external_node_util_.stripVTControlCharacters)(row);
                     count += Math.max(1, Math.ceil(text.length / columns));
                 }
             }
@@ -4588,7 +4588,7 @@ defineYamlBatchTest(test, testOptions);
         var core_ = __webpack_require__("@midscene/core");
         const cli_namespaceObject = require("@midscene/shared/cli");
         var package_namespaceObject = {
-            rE: "1.16.2"
+            rE: "1.16.5"
         };
         var external_node_fs_ = __webpack_require__("node:fs");
         var external_node_fs_namespaceObject = /*#__PURE__*/ __webpack_require__.t(external_node_fs_, 2);
@@ -10273,7 +10273,7 @@ Usage:
                     type: 'boolean',
                     description: 'Whether to dismiss the HarmonyOS keyboard after text input'
                 }
-            }).version('version', 'Show version number', "1.16.2").help().epilogue(`For complete list of configuration options, please visit:
+            }).version('version', 'Show version number', "1.16.5").help().epilogue(`For complete list of configuration options, please visit:
   • Web options: https://midscenejs.com/automate-with-scripts-in-yaml#the-web-part
   • Android options: https://midscenejs.com/automate-with-scripts-in-yaml#the-android-part
   • HarmonyOS options: https://midscenejs.com/automate-with-scripts-in-yaml#the-harmony-part
@@ -12527,22 +12527,36 @@ Native cases/steps Test projects use the midscene-test command.`).wrap(yargs().t
         var framework = __webpack_require__("./src/framework/index.ts");
         const external_node_child_process_namespaceObject = require("node:child_process");
         var external_node_crypto_ = __webpack_require__("node:crypto");
+        const ai_model_namespaceObject = require("@midscene/core/ai-model");
         var chalk_source = __webpack_require__("../../node_modules/.pnpm/chalk@4.1.2/node_modules/chalk/source/index.js");
         var source_default = /*#__PURE__*/ __webpack_require__.n(chalk_source);
         const external_node_os_namespaceObject = require("node:os");
+        var external_node_util_ = __webpack_require__("node:util");
+        function describeSiwcError(error) {
+            return (0, external_node_util_.inspect)(error, {
+                depth: null,
+                colors: false,
+                maxArrayLength: null,
+                maxStringLength: null
+            });
+        }
         const defaultCredentialsPath = ()=>(0, external_node_path_.join)((0, external_node_os_namespaceObject.homedir)(), '.midscene', 'siwc.json');
         async function readCredentialsFile(path) {
             const content = await (0, promises_namespaceObject.readFile)(path, 'utf8').catch((error)=>{
                 if ('ENOENT' === error.code) return;
-                throw new Error('Unable to read the local SIWC credentials file.');
+                throw new ai_model_namespaceObject.SiwcError('Unable to read the local SIWC credentials file.', {
+                    cause: error
+                });
             });
             if (void 0 === content) return;
             try {
                 const value = JSON.parse(content);
-                if (!value || 'string' != typeof value.credentials?.ext_agent_host_id || !value.credentials.ext_agent_host_id) throw new Error('Invalid SIWC credentials record.');
+                if (!value || 'string' != typeof value.credentials?.ext_agent_host_id || !value.credentials.ext_agent_host_id) throw new ai_model_namespaceObject.SiwcError('Invalid SIWC credentials record.');
                 return value;
-            } catch  {
-                throw new Error('Invalid local SIWC credentials file.');
+            } catch (error) {
+                throw new ai_model_namespaceObject.SiwcError('Invalid local SIWC credentials file.', {
+                    cause: error
+                });
             }
         }
         async function readRegistration(path) {
@@ -12581,8 +12595,10 @@ Native cases/steps Test projects use the midscene-test command.`).wrap(yargs().t
                     mode: 448
                 });
             } catch (error) {
-                if ('EEXIST' === error.code) throw new Error(`Another SIWC command holds ${lockPath}. If it was interrupted, remove this lock only after confirming that no SIWC command is running.`);
-                throw new Error('Unable to lock the local SIWC credentials file.');
+                if ('EEXIST' === error.code) throw new ai_model_namespaceObject.SiwcError(`Another SIWC command holds ${lockPath}. If it was interrupted, remove this lock only after confirming that no SIWC command is running.`);
+                throw new ai_model_namespaceObject.SiwcError('Unable to lock the local SIWC credentials file.', {
+                    cause: error
+                });
             }
             return ()=>(0, promises_namespaceObject.rm)(lockPath, {
                     recursive: true,
@@ -12597,20 +12613,14 @@ Native cases/steps Test projects use the midscene-test command.`).wrap(yargs().t
                 'access_token',
                 'refresh_token',
                 'id_token'
-            ].some((key)=>'string' != typeof value[key] || !value[key]) || !Array.isArray(value.scopes) || !value.scopes.every((scope)=>'string' == typeof scope) || !Number.isFinite(value.expires_at)) throw new Error('No valid SIWC credentials. Run midscene model siwc login first.');
+            ].some((key)=>'string' != typeof value[key] || !value[key]) || !Array.isArray(value.scopes) || !value.scopes.every((scope)=>'string' == typeof scope) || !Number.isFinite(value.expires_at)) throw new ai_model_namespaceObject.SiwcError('No valid SIWC credentials. Run midscene model siwc login first.');
             return value;
         }
         const external_node_http_namespaceObject = require("node:http");
-        const external_jose_namespaceObject = require("jose");
-        const ISSUER = 'https://auth.openai.com';
-        const RESOURCE = 'https://api.openai.com/v1';
-        const SCOPES = 'openid profile email offline_access resource.invoke chatgpt.tokens.use.direct';
         async function loginWithOpenAI(options, dependencies) {
             const hostId = options.hostId ?? `urn:uuid:${(0, external_node_crypto_.randomUUID)()}`;
             const existingClientId = options.clientId;
-            const state = (0, external_node_crypto_.randomBytes)(32).toString('base64url');
-            const nonce = (0, external_node_crypto_.randomBytes)(32).toString('base64url');
-            const verifier = (0, external_node_crypto_.randomBytes)(32).toString('base64url');
+            const context = {};
             const signal = options.signal;
             signal.throwIfAborted();
             const server = (0, external_node_http_namespaceObject.createServer)();
@@ -12624,17 +12634,24 @@ Native cases/steps Test projects use the midscene-test command.`).wrap(yargs().t
                     response.setHeader('Referrer-Policy', 'no-referrer');
                     const url = new URL(request.url || '/', 'http://127.0.0.1');
                     if ('GET' !== request.method || '/auth/callback' !== url.pathname) return void response.writeHead(404).end('Not found');
-                    if (1 !== url.searchParams.getAll('state').length || url.searchParams.get('state') !== state) return void response.writeHead(400).end('Invalid login state. Use the original authorization link.');
+                    if (!context.attempt) return void response.writeHead(400).end('Authorization has not started.');
                     if (consumed.value) return void response.writeHead(409).end('Authorization already received.');
-                    if (url.searchParams.has('error')) {
-                        consumed.value = true;
-                        response.writeHead(400).end('Authorization was not granted. Return to the terminal.');
-                        reject(new Error('OpenAI authorization was denied or failed.'));
+                    const parsed = (()=>{
+                        try {
+                            return (0, ai_model_namespaceObject.parseSiwcCallback)(new URL(request.url || '/', context.attempt.redirectUri).toString(), context.attempt);
+                        } catch (error) {
+                            response.writeHead(400).end('Invalid authorization callback.');
+                            if (url.searchParams.has('error')) {
+                                consumed.value = true;
+                                reject(error);
+                            }
+                            return;
+                        }
+                    })();
+                    if (!parsed) {
+                        if (!response.writableEnded) response.writeHead(400).end('Invalid login state. Use the original authorization link.');
                         return;
                     }
-                    const code = url.searchParams.get('code');
-                    const clientId = url.searchParams.get('client_id') || existingClientId;
-                    if (!code || !clientId || 'dynamic_agent_client' === clientId || existingClientId && clientId !== existingClientId || 1 !== url.searchParams.getAll('code').length || url.searchParams.getAll('client_id').length > 1) return void response.writeHead(400).end('Invalid authorization callback.');
                     consumed.value = true;
                     response.setHeader('Content-Type', 'text/html; charset=utf-8');
                     response.end(`<!doctype html>
@@ -12660,10 +12677,7 @@ Native cases/steps Test projects use the midscene-test command.`).wrap(yargs().t
   </main>
 </body>
 </html>`);
-                    resolve({
-                        code,
-                        clientId
-                    });
+                    resolve(parsed);
                 });
                 server.on('error', reject);
             });
@@ -12682,132 +12696,22 @@ Native cases/steps Test projects use the midscene-test command.`).wrap(yargs().t
                 });
                 signal.throwIfAborted();
                 const redirectUri = `http://127.0.0.1:${server.address().port}/auth/callback`;
-                const authorization = new URL(`${ISSUER}/api/accounts/authorize`);
-                authorization.search = new URLSearchParams({
-                    client_id: existingClientId ?? 'dynamic_agent_client',
-                    ...existingClientId ? {} : {
-                        agent_name_hint: 'Midscene'
-                    },
-                    ext_agent_host_id: hostId,
-                    response_type: 'code',
-                    redirect_uri: redirectUri,
-                    scope: SCOPES,
-                    resource: RESOURCE,
-                    state,
-                    nonce,
-                    code_challenge_method: 'S256',
-                    code_challenge: (0, external_node_crypto_.createHash)('sha256').update(verifier).digest('base64url')
-                }).toString();
-                await options.onAuthorization(authorization.toString());
-                const { code, clientId } = await callback;
-                signal.throwIfAborted();
-                const request = dependencies?.fetch ?? fetch;
-                const result = await request(`${ISSUER}/api/accounts/oauth/token`, {
-                    method: 'POST',
-                    headers: {
-                        'Content-Type': 'application/x-www-form-urlencoded'
-                    },
-                    body: new URLSearchParams({
-                        grant_type: 'authorization_code',
-                        client_id: clientId,
-                        code,
-                        code_verifier: verifier,
-                        redirect_uri: redirectUri,
-                        resource: RESOURCE
-                    }),
-                    signal,
-                    redirect: 'error'
+                const { attempt, url } = await (0, ai_model_namespaceObject.createSiwcAuthorization)({
+                    hostId,
+                    clientId: existingClientId,
+                    redirectUri,
+                    agentName: 'Midscene'
                 });
-                if (!result.ok) throw new Error(`OpenAI token exchange failed (HTTP ${result.status}). Run midscene model siwc login again.`);
-                const tokens = await result.json();
-                if (!tokens || 'string' != typeof tokens.access_token || !tokens.access_token || 'string' != typeof tokens.refresh_token || !tokens.refresh_token || 'string' != typeof tokens.id_token || 'string' != typeof tokens.scope || 'number' != typeof tokens.expires_in || !Number.isFinite(tokens.expires_in) || tokens.expires_in <= 0 || 'string' != typeof tokens.token_type || 'bearer' !== tokens.token_type.toLowerCase()) throw new Error('OpenAI returned an invalid token response.');
-                const scopes = tokens.scope.split(/\s+/);
-                if (!scopes.includes('chatgpt.tokens.use.direct')) throw new Error('ChatGPT plan usage was not authorized. Run midscene model siwc login again and grant access.');
-                const keys = dependencies?.keys ?? (0, external_jose_namespaceObject.createRemoteJWKSet)(new URL(`${ISSUER}/.well-known/jwks.json`));
-                const { payload } = await (0, external_jose_namespaceObject.jwtVerify)(tokens.id_token, keys, {
-                    issuer: ISSUER,
-                    audience: clientId,
-                    algorithms: [
-                        'RS256'
-                    ],
-                    requiredClaims: [
-                        'sub',
-                        'exp',
-                        'iat',
-                        'nonce'
-                    ]
-                });
-                if (payload.nonce !== nonce || !payload.sub) throw new Error('OpenAI login identity or nonce did not match.');
-                signal.throwIfAborted();
-                return {
-                    ext_agent_host_id: hostId,
-                    client_id: clientId,
-                    subject: payload.sub,
-                    issuer: ISSUER,
-                    ...'string' == typeof payload.email ? {
-                        email: payload.email
-                    } : {},
-                    access_token: tokens.access_token,
-                    refresh_token: tokens.refresh_token,
-                    id_token: tokens.id_token,
-                    scopes,
-                    expires_at: Date.now() + 1000 * tokens.expires_in
-                };
+                context.attempt = attempt;
+                await options.onAuthorization(url);
+                const result = await (0, ai_model_namespaceObject.withSiwcStage)('Authorization callback', ()=>callback);
+                return await (0, ai_model_namespaceObject.exchangeSiwcCode)(attempt, result, signal, dependencies);
             } finally{
                 signal.removeEventListener('abort', abort);
                 server.closeAllConnections();
                 await new Promise((resolve)=>server.close(()=>resolve()));
             }
         }
-        async function refreshOpenAICredentials(saved, signal, dependencies) {
-            const issuer = 'https://auth.openai.com';
-            signal.throwIfAborted();
-            const response = await (dependencies?.fetch ?? fetch)(`${issuer}/api/accounts/oauth/token`, {
-                method: 'POST',
-                headers: {
-                    'Content-Type': 'application/x-www-form-urlencoded'
-                },
-                body: new URLSearchParams({
-                    grant_type: 'refresh_token',
-                    client_id: saved.client_id,
-                    refresh_token: saved.refresh_token,
-                    resource: 'https://api.openai.com/v1'
-                }),
-                signal,
-                redirect: 'error'
-            });
-            if (!response.ok) throw new Error('OpenAI refresh failed.');
-            const tokens = await response.json();
-            if (!tokens || 'string' != typeof tokens.access_token || !tokens.access_token || 'string' != typeof tokens.refresh_token || !tokens.refresh_token || 'number' != typeof tokens.expires_in || !Number.isFinite(tokens.expires_in) || tokens.expires_in <= 0 || 'string' != typeof tokens.token_type || 'bearer' !== tokens.token_type.toLowerCase() || 'string' != typeof tokens.scope) throw new Error('OpenAI returned an invalid refresh response.');
-            const scopes = tokens.scope.split(/\s+/);
-            if (!scopes.includes('chatgpt.tokens.use.direct')) throw new Error('ChatGPT plan usage is no longer authorized.');
-            if (void 0 !== tokens.id_token) {
-                if ('string' != typeof tokens.id_token || !tokens.id_token) throw new Error('Invalid refreshed ID token.');
-                const keys = dependencies?.keys ?? (0, external_jose_namespaceObject.createRemoteJWKSet)(new URL(`${issuer}/.well-known/jwks.json`));
-                const { payload } = await (0, external_jose_namespaceObject.jwtVerify)(tokens.id_token, keys, {
-                    issuer,
-                    audience: saved.client_id,
-                    algorithms: [
-                        'RS256'
-                    ],
-                    requiredClaims: [
-                        'sub',
-                        'exp',
-                        'iat'
-                    ]
-                });
-                if (payload.sub !== saved.subject) throw new Error('Refreshed identity does not match the saved account.');
-            }
-            signal.throwIfAborted();
-            return {
-                ...saved,
-                access_token: tokens.access_token,
-                refresh_token: tokens.refresh_token,
-                id_token: tokens.id_token ?? saved.id_token,
-                scopes,
-                expires_at: Date.now() + 1000 * tokens.expires_in
-            };
-        }
         const USAGE = `Usage:
   midscene model siwc login [--no-open] [--port <port>]
   midscene model siwc refresh
@@ -12880,7 +12784,7 @@ Options (login):
                 }
             }
             const unlock = await lockCredentials(credentialsPath).catch((error)=>{
-                io.stderr(error.message);
+                io.stderr(describeSiwcError(error));
             });
             if (!unlock) return 1;
             const controller = new AbortController();
@@ -12890,31 +12794,31 @@ Options (login):
             process.once('SIGTERM', cancel);
             try {
                 io.stderr(source_default().cyan.bold(`🔄 Starting OpenAI SIWC ${action}...`));
-                const saved = await readRegistration(credentialsPath);
+                const saved = await (0, ai_model_namespaceObject.withSiwcStage)('Read credentials', ()=>readRegistration(credentialsPath));
                 const credentials = await (async ()=>{
-                    if ('refresh' === action) return refreshOpenAICredentials(requireCredentials(saved), controller.signal);
+                    if ('refresh' === action) return (0, ai_model_namespaceObject.withSiwcStage)('Refresh', ()=>(0, ai_model_namespaceObject.refreshSiwcCredentials)(requireCredentials(saved), controller.signal));
                     const registration = saved ?? {
                         ext_agent_host_id: `urn:uuid:${(0, external_node_crypto_.randomUUID)()}`
                     };
-                    if (!saved) await saveRegistration(credentialsPath, registration);
-                    const result = await loginWithOpenAI({
-                        port: portOptions.port,
-                        hostId: registration.ext_agent_host_id,
-                        clientId: registration.client_id,
-                        signal: controller.signal,
-                        onAuthorization: async (url)=>{
-                            io.stderr(`\n${source_default().bold('Continue with ChatGPT:')}\n${url}\n\n${source_default().gray('Waiting for authorization...')}`);
-                            if (!portOptions.noOpen) try {
-                                await openBrowser(url);
-                            } catch  {
-                                io.stderr('Open the URL above in your browser to continue.');
+                    if (!saved) await (0, ai_model_namespaceObject.withSiwcStage)('Save registration', ()=>saveRegistration(credentialsPath, registration));
+                    const result = await (0, ai_model_namespaceObject.withSiwcStage)('Login', ()=>loginWithOpenAI({
+                            port: portOptions.port,
+                            hostId: registration.ext_agent_host_id,
+                            clientId: registration.client_id,
+                            signal: controller.signal,
+                            onAuthorization: async (url)=>{
+                                io.stderr(`\n${source_default().bold('Continue with ChatGPT:')}\n${url}\n\n${source_default().gray('Waiting for authorization...')}`);
+                                if (!portOptions.noOpen) try {
+                                    await openBrowser(url);
+                                } catch  {
+                                    io.stderr('Open the URL above in your browser to continue.');
+                                }
                             }
-                        }
-                    });
-                    if (registration.subject && result.subject !== registration.subject) throw new Error('Login identity does not match the saved account.');
+                        }));
+                    if (registration.subject && result.subject !== registration.subject) throw new ai_model_namespaceObject.SiwcError('Login identity does not match the saved account.');
                     return result;
                 })();
-                await saveRegistration(credentialsPath, credentials);
+                await (0, ai_model_namespaceObject.withSiwcStage)('Save credentials', ()=>saveRegistration(credentialsPath, credentials));
                 io.stderr('\n🔑 your Access token:');
                 io.stdout(credentials.access_token);
                 const expiresAt = new Intl.DateTimeFormat('en-GB', {
@@ -12928,8 +12832,8 @@ Options (login):
                 io.stderr(`\nExpires at: ${expiresAt} (${expiresIn})`);
                 io.stderr(`\n${source_default().green(`✅ SIWC ${action} succeeded.`)}\n\nYou can use this access token as your model API Key in Midscene by setting MIDSCENE_MODEL_API_KEY.\n\nFull credentials are saved locally to:\n${source_default().cyan(credentialsPath)}\n\n${source_default().gray('Midscene does not collect your credentials.')}`);
                 return 0;
-            } catch  {
-                io.stderr(source_default().red(controller.signal.aborted ? `OpenAI ${action} cancelled or timed out.` : `OpenAI ${action} failed. Check the local credentials file permissions or run midscene model siwc login to authorize again.`));
+            } catch (error) {
+                io.stderr(source_default().red(controller.signal.aborted ? `OpenAI ${action} cancelled or timed out.\n${describeSiwcError(error)}` : `OpenAI ${action} failed.\n${describeSiwcError(error)}`));
                 return 1;
             } finally{
                 clearTimeout(timer);
@@ -13123,6 +13027,10 @@ Options (login):
         "use strict";
         module.exports = require("node:url");
     },
+    "node:util" (module) {
+        "use strict";
+        module.exports = require("node:util");
+    },
     os (module) {
         "use strict";
         module.exports = require("os");