@simplysf/simply-cicd-core 0.5.0 → 0.9.1

package/lib/index.d.ts

@@ -6,6 +6,7 @@ export * from './logger.js';
 export * from './sfApex.js';
 export * from './sfAuth.js';
 export * from './sfConfig.js';
+export * from './sfDeploy.js';
 export * from './sfOrg.js';
 export * from './sfPackages.js';
 export * from './sfPlugins.js';

package/lib/index.js

@@ -32,6 +32,7 @@ export * from './logger.js';
 export * from './sfApex.js';
 export * from './sfAuth.js';
 export * from './sfConfig.js';
+export * from './sfDeploy.js';
 export * from './sfOrg.js';
 export * from './sfPackages.js';
 export * from './sfPlugins.js';

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,mGAAmG;AACnG,iGAAiG;AACjG,qGAAqG;AACrG,qGAAqG;AACrG,wGAAwG;AACxG,6DAA6D;AAC7D,EAAE;AACF,gGAAgG;AAChG,iGAAiG;AACjG,uEAAuE;AAEvE,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAE/B,gBAAgB;AAChB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAE/B,SAAS;AACT,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAE5C,UAAU;AACV,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AAErC,QAAQ;AACR,cAAc,iBAAiB,CAAC;AAEhC,SAAS;AACT,cAAc,gBAAgB,CAAC;AAE/B,aAAa;AACb,cAAc,qCAAqC,CAAC;AAEpD,UAAU;AACV,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AAEtC,WAAW;AACX,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AAEzC,kBAAkB;AAClB,cAAc,mCAAmC,CAAC;AAClD,cAAc,6BAA6B,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AACH,mGAAmG;AACnG,iGAAiG;AACjG,qGAAqG;AACrG,qGAAqG;AACrG,wGAAwG;AACxG,6DAA6D;AAC7D,EAAE;AACF,gGAAgG;AAChG,iGAAiG;AACjG,uEAAuE;AAEvE,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAE/B,gBAAgB;AAChB,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,iBAAiB,CAAC;AAChC,cAAc,gBAAgB,CAAC;AAE/B,SAAS;AACT,cAAc,gCAAgC,CAAC;AAC/C,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,iCAAiC,CAAC;AAChD,cAAc,6BAA6B,CAAC;AAC5C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,oCAAoC,CAAC;AACnD,cAAc,oBAAoB,CAAC;AACnC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,gCAAgC,CAAC;AAC/C,cAAc,oBAAoB,CAAC;AACnC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wBAAwB,CAAC;AACvC,cAAc,2BAA2B,CAAC;AAC1C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,sBAAsB,CAAC;AACrC,cAAc,wBAAwB,CAAC;AACvC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,6BAA6B,CAAC;AAE5C,UAAU;AACV,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,0BAA0B,CAAC;AACzC,cAAc,sBAAsB,CAAC;AAErC,QAAQ;AACR,cAAc,iBAAiB,CAAC;AAEhC,SAAS;AACT,cAAc,gBAAgB,CAAC;AAE/B,aAAa;AACb,cAAc,qCAAqC,CAAC;AAEpD,UAAU;AACV,cAAc,+BAA+B,CAAC;AAC9C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,oCAAoC,CAAC;AACnD,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC;AAChD,cAAc,4BAA4B,CAAC;AAC3C,cAAc,8BAA8B,CAAC;AAC7C,cAAc,uBAAuB,CAAC;AAEtC,WAAW;AACX,cAAc,2BAA2B,CAAC;AAC1C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,0BAA0B,CAAC;AAEzC,kBAAkB;AAClB,cAAc,mCAAmC,CAAC;AAClD,cAAc,6BAA6B,CAAC"}

package/lib/resolveOrg.d.ts

@@ -0,0 +1,25 @@
+import { AuthInfo, Org } from '@salesforce/core';
+export type ResolveOrgOptions = {
+    /** Fall back to the default Dev Hub (`target-dev-hub`) instead of the default target org. */
+    isDevHub?: boolean;
+};
+/**
+ * The authenticated org that an `--alias`/`--target-org`-style value names, resolved the way `sf`
+ * resolves `--target-org`: an alias or the username of an existing auth, with a blank value meaning
+ * the default target org (or, with `isDevHub`, the default Dev Hub).
+ *
+ * The default is re-read from disk on every call. `@salesforce/core` caches config per process, so
+ * without that a default set earlier in the same run (`setDefault` on a login or a scratch org
+ * create) would be missed, and the previous default org used instead.
+ *
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username;
+ * `NoUsernameFoundError` if the value is blank and no default is set.
+ */
+export declare function resolveOrg(aliasOrUsername?: string, options?: ResolveOrgOptions): Promise<Org>;
+/**
+ * The saved auth for an alias or username, without connecting to the org. `AuthInfo.create` only
+ * accepts a username, so an alias is resolved to its username first.
+ *
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username.
+ */
+export declare function resolveAuthInfo(aliasOrUsername: string): Promise<AuthInfo>;

package/lib/resolveOrg.js

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2026, SimplySF.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { AuthInfo, ConfigAggregator, Org, StateAggregator } from '@salesforce/core';
+/**
+ * The authenticated org that an `--alias`/`--target-org`-style value names, resolved the way `sf`
+ * resolves `--target-org`: an alias or the username of an existing auth, with a blank value meaning
+ * the default target org (or, with `isDevHub`, the default Dev Hub).
+ *
+ * The default is re-read from disk on every call. `@salesforce/core` caches config per process, so
+ * without that a default set earlier in the same run (`setDefault` on a login or a scratch org
+ * create) would be missed, and the previous default org used instead.
+ *
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username;
+ * `NoUsernameFoundError` if the value is blank and no default is set.
+ */
+export async function resolveOrg(aliasOrUsername, options = {}) {
+    const { isDevHub } = options;
+    const name = aliasOrUsername?.trim();
+    if (name) {
+        return Org.create({ aliasOrUsername: name, isDevHub });
+    }
+    const aggregator = await (await ConfigAggregator.create()).reload();
+    return Org.create({ aggregator, isDevHub });
+}
+/**
+ * The saved auth for an alias or username, without connecting to the org. `AuthInfo.create` only
+ * accepts a username, so an alias is resolved to its username first.
+ *
+ * @throws {SfError} `NamedOrgNotFoundError` if no auth exists for the alias/username.
+ */
+export async function resolveAuthInfo(aliasOrUsername) {
+    const stateAggregator = await StateAggregator.getInstance();
+    return AuthInfo.create({ username: stateAggregator.aliases.resolveUsername(aliasOrUsername.trim()) });
+}
+//# sourceMappingURL=resolveOrg.js.map

package/lib/resolveOrg.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolveOrg.js","sourceRoot":"","sources":["../src/resolveOrg.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAOpF;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,UAAU,CAAC,eAAwB,EAAE,UAA6B,EAAE;IACxF,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IAC7B,MAAM,IAAI,GAAG,eAAe,EAAE,IAAI,EAAE,CAAC;IACrC,IAAI,IAAI,EAAE,CAAC;QACT,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,eAAe,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;IACzD,CAAC;IACD,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;IACpE,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC9C,CAAC;AAED;;;;;GAKG;AACH,MAAM,CAAC,KAAK,UAAU,eAAe,CAAC,eAAuB;IAC3D,MAAM,eAAe,GAAG,MAAM,eAAe,CAAC,WAAW,EAAE,CAAC;IAC5D,OAAO,QAAQ,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,CAAC;AACxG,CAAC"}

package/lib/sfApex.js

@@ -15,10 +15,11 @@
  */
 import { promises as fs } from 'node:fs';
 import path from 'node:path';
-import { execa } from 'execa';
+import { Duration } from '@salesforce/kit';
+import { runApexTestsWithResults } from '@simplysf/simply-apex-core';
 import { readSfdxProject } from '@simplysf/simply-core';
-import { runSf } from './exec/sfCli.js';
 import { logger } from './logger.js';
+import { getOrgConnection } from './sfOrg.js';
 /**
  * Checks if there are any Apex test classes defined in the package directories, by reading
  * `sfdx-project.json` to identify the package directories and searching each recursively
@@ -38,24 +39,40 @@ export async function hasApexTests(options) {
     for (const dir of packageDirs) {
         try {
             // eslint-disable-next-line no-await-in-loop -- stops at the first directory with a match
-            await execa('grep', ['-q', '-r', '-i', '--include=*.cls', '@isTest\\b', dir]);
-            return true;
+            if (await directoryHasApexTests(dir)) {
+                return true;
+            }
+            if (options?.debugMode) {
+                logger.log(`No Apex tests found in ${dir}.`);
+            }
         }
         catch (error) {
             if (options?.debugMode) {
-                const err = error;
-                logger.log(`No Apex tests found in ${dir} or an error occurred during search.`, err.shortMessage);
+                logger.log(`No Apex tests found in ${dir} or an error occurred during search.`, error.message);
+            }
+        }
+    }
+    return false;
+}
+/** What `grep -q -r -i --include=*.cls '@isTest\b' <dir>` checked, without depending on grep. */
+async function directoryHasApexTests(dir) {
+    const entries = await fs.readdir(dir, { recursive: true, withFileTypes: true });
+    for (const entry of entries) {
+        if (entry.isFile() && entry.name.endsWith('.cls')) {
+            // eslint-disable-next-line no-await-in-loop -- stops at the first match
+            const source = await fs.readFile(path.join(entry.parentPath, entry.name), 'utf-8');
+            if (/@isTest\b/i.test(source)) {
+                return true;
             }
         }
     }
     return false;
 }
-/** Kicks off the `sf apex test run`, swallowing any failure so the run's artifacts (namely the
- * test run ID file) can still be inspected afterward to distinguish an execution failure from a
- * genuine test failure. */
-async function executeTestRun(args) {
+/** Runs the tests, swallowing any failure so the run's artifacts (namely the test run ID file) can
+ * still be inspected afterward to distinguish an execution failure from a genuine test failure. */
+async function executeTestRun(alias, options) {
     try {
-        await runSf(args, { stdio: 'pipe' });
+        await runApexTestsWithResults({ ...options, connection: await getOrgConnection(alias) });
         return undefined;
     }
     catch (e) {
@@ -70,7 +87,7 @@ async function resolveTestRunId(testRunIdFile, execError) {
     }
     catch (readIdError) {
         if (execError) {
-            logger.error('Apex test run failed.', execError.shortMessage);
+            logger.error('Apex test run failed.', execError.message);
             throw execError;
         }
         logger.error(`Failed to read test run ID from ${testRunIdFile}.`, readIdError.message);
@@ -134,28 +151,16 @@ export async function runApexTests(options) {
     logger.info('Running Apex tests...');
     const testResultsDir = './test-results/apex';
     await fs.mkdir(testResultsDir, { recursive: true });
-    const args = [
-        'apex',
-        'test',
-        'run',
-        '--code-coverage',
-        '--result-format',
-        'junit',
-        '--output-dir',
-        testResultsDir,
-        '--wait',
-        wait,
-    ];
-    if (alias) {
-        args.push('--target-org', alias);
-    }
-    if (testSuite) {
-        args.push('--suite-names', testSuite);
-    }
-    else {
-        args.push('--test-level', testLevel);
-    }
-    const execError = await executeTestRun(args);
+    // What `sf apex test run --code-coverage --result-format junit --output-dir <dir> --wait <wait>
+    // [--suite-names <suite> | --test-level <level>]` ran and wrote.
+    const execError = await executeTestRun(alias, {
+        codeCoverage: true,
+        outputDir: testResultsDir,
+        wait: Duration.minutes(Number(wait)),
+        ...(testSuite
+            ? { suiteNames: [testSuite] }
+            : { testLevel: testLevel }),
+    });
     const testRunId = await resolveTestRunId(path.join(testResultsDir, 'test-run-id.txt'), execError);
     let testRunOutcome;
     if (testRunId) {

package/lib/sfApex.js.map

@@ -1 +1 @@
-{"version":3,"file":"sfApex.js","sourceRoot":"","sources":["../src/sfApex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sfApex.js","sourceRoot":"","sources":["../src/sfApex.ts"],"names":[],"mappings":"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"}

package/lib/sfAuth.d.ts

@@ -12,8 +12,15 @@ export type AuthenticateOrgOptions = {
 export type AuthenticateOrgResult = {
     success: boolean;
     username?: string;
+    /** The saved auth fields, as `sf org login … --json` returned them (tokens decrypted). */
     result?: unknown;
     message?: string;
 };
-/** Authenticates to a Salesforce organization using either a JWT flow or an SFDX auth URL. */
+/**
+ * Authenticates to a Salesforce org using either a JWT flow or an SFDX auth URL, in-process via
+ * `@salesforce/core`. The auth, alias and default-org settings are written to the same `~/.sf`
+ * state `sf org login jwt` / `sf org login sfdx-url` write, so later `sf` processes see them.
+ *
+ * @throws If authentication fails; the failure is logged first.
+ */
 export declare function authenticateOrg(options: AuthenticateOrgOptions): Promise<AuthenticateOrgResult>;

package/lib/sfAuth.js

@@ -13,61 +13,80 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { mkdtemp, writeFile } from 'node:fs/promises';
-import { tmpdir } from 'node:os';
-import { join } from 'node:path';
-import { runSf } from './exec/sfCli.js';
+import { AuthInfo, AuthRemover, SfdcUrl, SfError, SfProject } from '@salesforce/core';
 import { logger } from './logger.js';
-/** Authenticates to a Salesforce organization using either a JWT flow or an SFDX auth URL. */
+/**
+ * Where a JWT login goes: the given instance URL, else the project's `sfdcLoginUrl`, else
+ * production — the same resolution `sf org login jwt` applies, including its refusal of a
+ * Lightning domain (`*.lightning.force.com`), which can't serve OAuth.
+ */
+async function resolveLoginUrl(instanceUrl) {
+    let loginUrl = instanceUrl;
+    if (!loginUrl) {
+        try {
+            const projectJson = await (await SfProject.resolve()).resolveProjectConfig();
+            loginUrl = typeof projectJson.sfdcLoginUrl === 'string' ? projectJson.sfdcLoginUrl : SfdcUrl.PRODUCTION;
+        }
+        catch {
+            loginUrl = SfdcUrl.PRODUCTION;
+        }
+    }
+    const url = new SfdcUrl(loginUrl);
+    if (url.isLightningDomain() || (url.isInternalUrl() && url.origin.includes('.lightning.'))) {
+        throw new SfError('Use the "My Domain" URL (.my.salesforce.com) as the instance URL, not the Lightning domain (.lightning.force.com).', 'LightningDomain');
+    }
+    return loginUrl;
+}
+/** JWT bearer login, as `sf org login jwt`: an existing auth file for the user is replaced. */
+async function loginWithJwt(username, oauth2Options) {
+    try {
+        return await AuthInfo.create({ username, oauth2Options });
+    }
+    catch (error) {
+        if (error.name !== 'AuthInfoOverwriteError') {
+            throw error;
+        }
+        await (await AuthRemover.create()).removeAuth(username);
+        return AuthInfo.create({ username, oauth2Options });
+    }
+}
+/**
+ * Authenticates to a Salesforce org using either a JWT flow or an SFDX auth URL, in-process via
+ * `@salesforce/core`. The auth, alias and default-org settings are written to the same `~/.sf`
+ * state `sf org login jwt` / `sf org login sfdx-url` write, so later `sf` processes see them.
+ *
+ * @throws If authentication fails; the failure is logged first.
+ */
 export async function authenticateOrg(options) {
     const { alias, authUrl, clientId, instanceUrl, jwtKeyFile, username, setDefault, setDefaultDevHub, debug } = options;
     const authEntity = alias ?? username ?? 'unknown org';
     logger.info(`Authenticating to org: ${authEntity}`);
     try {
-        let authArgs;
-        if (authUrl) {
-            const tempDir = await mkdtemp(join(tmpdir(), 'sfdx-auth-'));
-            const authUrlFile = join(tempDir, 'auth-url.txt');
-            await writeFile(authUrlFile, authUrl);
-            authArgs = ['org', 'login', 'sfdx-url', '--sfdx-url-file', authUrlFile, '--json'];
-        }
-        else {
-            authArgs = [
-                'login',
-                'org',
-                'jwt',
-                '--username',
-                username ?? '',
-                '--jwt-key-file',
-                jwtKeyFile ?? '',
-                '--client-id',
-                clientId ?? '',
-                '--instance-url',
-                instanceUrl ?? '',
-                '--json',
-            ];
-        }
-        if (alias) {
-            authArgs.push('--alias', alias);
-        }
-        if (setDefault) {
-            authArgs.push('--set-default');
-        }
-        if (setDefaultDevHub) {
-            authArgs.push('--set-default-dev-hub');
-        }
-        const { stdout } = await runSf(authArgs);
+        const authInfo = authUrl
+            ? await AuthInfo.create({ oauth2Options: AuthInfo.parseSfdxAuthUrl(authUrl) })
+            : await loginWithJwt(username ?? '', {
+                clientId,
+                privateKeyFile: jwtKeyFile,
+                loginUrl: await resolveLoginUrl(instanceUrl),
+            });
+        await authInfo.save();
+        await authInfo.handleAliasAndDefaultSettings({
+            alias,
+            setDefault: setDefault ?? false,
+            setDefaultDevHub: setDefaultDevHub ?? false,
+        });
+        const fields = authUrl ? { clientSecret: '', ...authInfo.getFields(true) } : authInfo.getFields(true);
+        await AuthInfo.identifyPossibleScratchOrgs(fields, authInfo);
         if (debug) {
-            logger.raw(stdout);
-        }
-        const authResult = JSON.parse(stdout);
-        if (authResult.status > 0) {
-            logger.error(`Authentication failed for ${authEntity}: ${authResult.message ?? 'unknown error'}`);
-            // In cleanup, we don't want to exit the whole process.
-            return { success: false, message: authResult.message, username };
+            // Only identifying fields: the CLI's --json output this used to print included live tokens.
+            logger.debug('Authenticated:', {
+                username: fields.username,
+                orgId: fields.orgId,
+                instanceUrl: fields.instanceUrl,
+            });
         }
         logger.success(`Successfully authenticated to org: ${authEntity}`);
-        return { success: true, username, result: authResult.result };
+        return { success: true, username: fields.username ?? username, result: fields };
     }
     catch (error) {
         logger.error(`Authentication failed for ${authEntity}`);

package/lib/sfAuth.js.map

@@ -1 +1 @@
-{"version":3,"file":"sfAuth.js","sourceRoot":"","sources":["../src/sfAuth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sfAuth.js","sourceRoot":"","sources":["../src/sfAuth.ts"],"names":[],"mappings":"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"}

package/lib/sfDeploy.d.ts

@@ -0,0 +1,34 @@
+import type { Duration } from '@salesforce/kit';
+import { RequestStatus } from '@salesforce/source-deploy-retrieve';
+export type DeployProjectSourceOptions = {
+    /** The org to deploy to. Omit to use the default target org. */
+    aliasOrUsername?: string;
+    /**
+     * Deploy these directories instead of the tracked local changes (`--source-dir`). Source tracking
+     * still records what was deployed.
+     */
+    sourceDirs?: string[];
+    /** `--ignore-warnings`: don't fail the deploy on warnings. */
+    ignoreWarnings?: boolean;
+    /** How long to wait for the deploy to finish. */
+    wait: Duration;
+};
+export type DeployProjectSourceResult = {
+    /** `undefined` when there were no local changes to deploy. */
+    deployId?: string;
+    status: RequestStatus | 'NothingToDeploy';
+    componentCount: number;
+};
+/**
+ * Deploys project source to an org with source tracking, as
+ * `sf project deploy start --ignore-conflicts [--source-dir …] [--ignore-warnings] --wait <wait>` does:
+ * without `sourceDirs`, it deploys the tracked local changes (deletes included), and nothing to
+ * deploy is not an error; with `sourceDirs`, it deploys those, and an empty set is.
+ *
+ * Remote conflicts are ignored and tracking is updated after the deploy, as `--ignore-conflicts`
+ * does. Anything short of a full success (partial success, failure, cancellation, or still running
+ * at `wait`) throws, as the CLI exits non-zero for each of them.
+ *
+ * @throws {SfError} `NothingToDeploy` for empty `sourceDirs`; `DeployFailed` for any non-success.
+ */
+export declare function deployProjectSource(options: DeployProjectSourceOptions): Promise<DeployProjectSourceResult>;

package/lib/sfDeploy.js

@@ -0,0 +1,78 @@
+/*
+ * Copyright (c) 2026, SimplySF.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import { SfError, SfProject } from '@salesforce/core';
+import { ComponentSet, ComponentSetBuilder, ComponentStatus, RequestStatus } from '@salesforce/source-deploy-retrieve';
+import { SourceTracking } from '@salesforce/source-tracking';
+import { logger } from './logger.js';
+import { resolveOrg } from './resolveOrg.js';
+/**
+ * Deploys project source to an org with source tracking, as
+ * `sf project deploy start --ignore-conflicts [--source-dir …] [--ignore-warnings] --wait <wait>` does:
+ * without `sourceDirs`, it deploys the tracked local changes (deletes included), and nothing to
+ * deploy is not an error; with `sourceDirs`, it deploys those, and an empty set is.
+ *
+ * Remote conflicts are ignored and tracking is updated after the deploy, as `--ignore-conflicts`
+ * does. Anything short of a full success (partial success, failure, cancellation, or still running
+ * at `wait`) throws, as the CLI exits non-zero for each of them.
+ *
+ * @throws {SfError} `NothingToDeploy` for empty `sourceDirs`; `DeployFailed` for any non-success.
+ */
+export async function deployProjectSource(options) {
+    const { aliasOrUsername, sourceDirs, ignoreWarnings = false, wait } = options;
+    const org = await resolveOrg(aliasOrUsername);
+    const project = await SfProject.resolve();
+    const tracking = await SourceTracking.create({ org, project, subscribeSDREvents: true, ignoreConflicts: true });
+    const componentSet = sourceDirs?.length
+        ? await ComponentSetBuilder.build({
+            sourcepath: sourceDirs,
+            sourceapiversion: project.getSfProjectJson().getContents().sourceApiVersion,
+            projectDir: tracking.projectPath,
+        })
+        : ((await tracking.localChangesAsComponentSet(false))[0] ?? new ComponentSet(undefined, tracking.registry));
+    if (componentSet.size === 0) {
+        if (sourceDirs?.length) {
+            throw new SfError(`No local changes to deploy in ${sourceDirs.join(', ')}.`, 'NothingToDeploy');
+        }
+        logger.info('No local changes to deploy.');
+        return { status: 'NothingToDeploy', componentCount: 0 };
+    }
+    logger.info(`Deploying ${componentSet.size} components...`);
+    const deploy = await componentSet.deploy({
+        usernameOrConnection: org.getConnection(),
+        apiOptions: { checkOnly: false, ignoreWarnings, rest: false, rollbackOnError: true, purgeOnDelete: false },
+    });
+    let lastProgress = '';
+    deploy.onUpdate((response) => {
+        const progress = `Deploy ${response.id}: ${response.status} (${response.numberComponentsDeployed}/${response.numberComponentsTotal} components, ${response.numberTestsCompleted}/${response.numberTestsTotal} tests)`;
+        if (progress !== lastProgress) {
+            lastProgress = progress;
+            logger.info(progress);
+        }
+    });
+    const result = await deploy.pollStatus({ timeout: wait });
+    const { status } = result.response;
+    if (status !== RequestStatus.Succeeded) {
+        const failures = result.getFileResponses().filter((file) => file.state === ComponentStatus.Failed);
+        for (const failure of failures) {
+            const reason = 'error' in failure ? failure.error : '';
+            logger.error(`${failure.type} ${failure.fullName}: ${reason}`);
+        }
+        const errorMessage = result.response.errorMessage ? ` ${result.response.errorMessage}` : '';
+        throw new SfError(`Deploy ${deploy.id ?? ''} finished with status ${status} (${failures.length} component failures).${errorMessage}`, 'DeployFailed');
+    }
+    return { deployId: deploy.id, status, componentCount: componentSet.size };
+}
+//# sourceMappingURL=sfDeploy.js.map

package/lib/sfDeploy.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sfDeploy.js","sourceRoot":"","sources":["../src/sfDeploy.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,mBAAmB,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,oCAAoC,CAAC;AACvH,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAuB7C;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,OAAmC;IAC3E,MAAM,EAAE,eAAe,EAAE,UAAU,EAAE,cAAc,GAAG,KAAK,EAAE,IAAI,EAAE,GAAG,OAAO,CAAC;IAC9E,MAAM,GAAG,GAAG,MAAM,UAAU,CAAC,eAAe,CAAC,CAAC;IAC9C,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAC1C,MAAM,QAAQ,GAAG,MAAM,cAAc,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,kBAAkB,EAAE,IAAI,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAC;IAEhH,MAAM,YAAY,GAAG,UAAU,EAAE,MAAM;QACrC,CAAC,CAAC,MAAM,mBAAmB,CAAC,KAAK,CAAC;YAC9B,UAAU,EAAE,UAAU;YACtB,gBAAgB,EAAE,OAAO,CAAC,gBAAgB,EAAE,CAAC,WAAW,EAAE,CAAC,gBAAgB;YAC3E,UAAU,EAAE,QAAQ,CAAC,WAAW;SACjC,CAAC;QACJ,CAAC,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,0BAA0B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,YAAY,CAAC,SAAS,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE9G,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC5B,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;YACvB,MAAM,IAAI,OAAO,CAAC,iCAAiC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,iBAAiB,CAAC,CAAC;QAClG,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,6BAA6B,CAAC,CAAC;QAC3C,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,cAAc,EAAE,CAAC,EAAE,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,aAAa,YAAY,CAAC,IAAI,gBAAgB,CAAC,CAAC;IAC5D,MAAM,MAAM,GAAG,MAAM,YAAY,CAAC,MAAM,CAAC;QACvC,oBAAoB,EAAE,GAAG,CAAC,aAAa,EAAE;QACzC,UAAU,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,cAAc,EAAE,IAAI,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,aAAa,EAAE,KAAK,EAAE;KAC3G,CAAC,CAAC;IACH,IAAI,YAAY,GAAG,EAAE,CAAC;IACtB,MAAM,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3B,MAAM,QAAQ,GAAG,UAAU,QAAQ,CAAC,EAAE,KAAK,QAAQ,CAAC,MAAM,KAAK,QAAQ,CAAC,wBAAwB,IAAI,QAAQ,CAAC,qBAAqB,gBAAgB,QAAQ,CAAC,oBAAoB,IAAI,QAAQ,CAAC,gBAAgB,SAAS,CAAC;QACtN,IAAI,QAAQ,KAAK,YAAY,EAAE,CAAC;YAC9B,YAAY,GAAG,QAAQ,CAAC;YACxB,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACxB,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC;IAC1D,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,CAAC,QAAQ,CAAC;IACnC,IAAI,MAAM,KAAK,aAAa,CAAC,SAAS,EAAE,CAAC;QACvC,MAAM,QAAQ,GAAG,MAAM,CAAC,gBAAgB,EAAE,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,KAAK,eAAe,CAAC,MAAM,CAAC,CAAC;QACnG,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE,CAAC;YAC/B,MAAM,MAAM,GAAG,OAAO,IAAI,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;YACvD,MAAM,CAAC,KAAK,CAAC,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,QAAQ,KAAK,MAAM,EAAE,CAAC,CAAC;QACjE,CAAC;QACD,MAAM,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5F,MAAM,IAAI,OAAO,CACf,UAAU,MAAM,CAAC,EAAE,IAAI,EAAE,yBAAyB,MAAM,KAAK,QAAQ,CAAC,MAAM,wBAAwB,YAAY,EAAE,EAClH,cAAc,CACf,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC;AAC5E,CAAC"}

package/lib/sfOrg.d.ts

@@ -2,7 +2,8 @@ import { type Connection } from '@salesforce/core';
 /**
  * The org's instance URL, e.g. `https://my-domain.my.salesforce.com`.
  *
- * @param aliasOrUsername - The org to look up. Omit (or pass `''`) to use the default target org.
+ * @param aliasOrUsername - The org to look up: an alias or username of an existing auth. Omit (or
+ * pass `''`) to use the default target org.
  */
 export declare function getOrgInstanceUrl(aliasOrUsername?: string): Promise<string>;
 /**
@@ -48,3 +49,39 @@ export declare function assignPermissionSets(permissionSetNames: string[], alias
  * @throws {AssignmentError} If any assignment failed; the others are still attempted.
  */
 export declare function assignPermissionSetLicenses(licenseNames: string[], aliasOrUsername?: string): Promise<void>;
+/** What `sf org create scratch --json` returns: the fields `SCRATCH_ORG_INFO.json` is written from. */
+export type CreatedScratchOrg = {
+    username?: string;
+    scratchOrgInfo?: Record<string, unknown>;
+    authFields?: Record<string, unknown>;
+    warnings: string[];
+    orgId?: string;
+};
+export type CreateScratchOrgOnHubOptions = {
+    /** Path to the scratch org definition file. */
+    definitionFile: string;
+    durationDays: number;
+    /** Minutes to wait for the org to be ready. */
+    waitMinutes: number;
+    /** Make the new org the default target org (`--set-default`). */
+    setDefault?: boolean;
+};
+/**
+ * Creates a scratch org from a Dev Hub, as `sf org create scratch --definition-file … --json` does,
+ * and returns the same result shape. The org is authenticated and source tracking is enabled, as
+ * the CLI's defaults.
+ *
+ * @param hubAliasOrUsername - The Dev Hub. Must already be authenticated.
+ * @throws {SfError} If signup fails or doesn't finish within the wait.
+ */
+export declare function createScratchOrgOnHub(hubAliasOrUsername: string, options: CreateScratchOrgOnHubOptions): Promise<CreatedScratchOrg>;
+/**
+ * Deletes a scratch org, as `sf org delete scratch --no-prompt` does: refuses a non-scratch org,
+ * treats an already-deleted org as success, and removes the local auth for one whose domain no
+ * longer resolves.
+ *
+ * @param aliasOrUsername - The scratch org. Omit to use the default target org.
+ * @returns The deleted org's username.
+ * @throws {SfError} If the org isn't a scratch org, or the Dev Hub rejects the delete.
+ */
+export declare function deleteTargetScratchOrg(aliasOrUsername?: string): Promise<string>;