@copado/agentia-cli 0.71.0-alpha.0 → 0.72.0-alpha.0

package/dist/hooks/init/migrate-user-config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"migrate-user-config.js","sourceRoot":"","sources":["../../../src/hooks/init/migrate-user-config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,oCAAoC,EAAC,MAAM,6BAA6B,CAAA;AAEhF,MAAM,IAAI,GAAiB,KAAK,WAAW,EAAC,EAAE,EAAC;IAC7C,IAAI,EAAE,KAAK,SAAS,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;QAC/C,OAAM;IACR,CAAC;IAED,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,oCAAoC,EAAE,CAAA;QAC3D,IAAI,MAAM,CAAC,QAAQ,EAAE,CAAC;YACpB,IAAI,CAAC,IAAI,CAAC,6EAA6E,CAAC,CAAA;QAC1F,CAAC;IACH,CAAC;IAAC,MAAM,CAAC;QACP,gEAAgE;IAClE,CAAC;AACH,CAAC,CAAA;AAED,eAAe,IAAI,CAAA"}

package/dist/lib/agentia-command.d.ts

@@ -1,9 +1,12 @@
 import { Command } from '@oclif/core';
+export declare function elapsedSecondsSince(startedAtMs: number, nowMs?: number): number;
+export declare function formatElapsedSecondsMessage(seconds: number): string;
 export declare abstract class AgentiaCommand extends Command {
     static enableJsonFlag: boolean;
     private commandTransactionId;
     protected _run<T>(): Promise<T>;
     protected display(render: () => void): void;
+    protected logElapsed(startedAtMs: number): void;
     protected finally(error: Error | undefined): Promise<unknown>;
     protected toErrorJson(err: unknown): unknown;
     protected toSuccessJson(result: unknown): unknown;

package/dist/lib/agentia-command.js

@@ -1,6 +1,12 @@
 import { Command, ux } from '@oclif/core';
 import { createTransactionId, runWithGatewayTransactionContext } from './cicd-gateway.js';
 import { rememberIdeCommandError } from './ide-command-events.js';
+export function elapsedSecondsSince(startedAtMs, nowMs = Date.now()) {
+    return Math.max(0, Math.floor((nowMs - startedAtMs) / 1000));
+}
+export function formatElapsedSecondsMessage(seconds) {
+    return `Elapsed: ${seconds}s`;
+}
 export class AgentiaCommand extends Command {
     static enableJsonFlag = true;
     commandTransactionId;
@@ -14,6 +20,11 @@ export class AgentiaCommand extends Command {
             render();
         }
     }
+    logElapsed(startedAtMs) {
+        this.display(() => {
+            this.log(formatElapsedSecondsMessage(elapsedSecondsSince(startedAtMs)));
+        });
+    }
     async finally(error) {
         rememberIdeCommandError(error);
         return super.finally(error);

package/dist/lib/agentia-command.js.map

@@ -1 +1 @@
-{"version":3,"file":"agentia-command.js","sourceRoot":"","sources":["../../src/lib/agentia-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,EAAE,EAAC,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAC,mBAAmB,EAAE,gCAAgC,EAAC,MAAM,mBAAmB,CAAA;AACvF,OAAO,EAAC,uBAAuB,EAAC,MAAM,yBAAyB,CAAA;AAE/D,MAAM,OAAgB,cAAe,SAAQ,OAAO;IAClD,MAAM,CAAU,cAAc,GAAG,IAAI,CAAA;IAC7B,oBAAoB,CAAS;IAElB,KAAK,CAAC,IAAI;QAC3B,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAC3C,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAA;QACzC,OAAO,gCAAgC,CAAC,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,aAAa,EAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAK,CAAC,CAAA;IACnG,CAAC;IAES,OAAO,CAAC,MAAkB;QAClC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,EAAE,CAAA;QACV,CAAC;IACH,CAAC;IAEkB,KAAK,CAAC,OAAO,CAAC,KAAwB;QACvD,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAEkB,WAAW,CAAC,GAAY;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAA4B,CAAA;QAC9D,OAAO,EAAC,GAAG,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAC,CAAA;IAC5D,CAAC;IAEkB,aAAa,CAAC,MAAe;QAC9C,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAC,CAAA;IACtE,CAAC;IAES,KAAK,CAAC,WAAW,CAAI,OAAe,EAAE,MAAwB;QACtE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,OAAO,MAAM,EAAE,CAAA;QACjB,CAAC;QAED,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAExB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAA;YAC7B,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YAChB,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;YAC5C,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC"}
+{"version":3,"file":"agentia-command.js","sourceRoot":"","sources":["../../src/lib/agentia-command.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,OAAO,EAAE,EAAE,EAAC,MAAM,aAAa,CAAA;AAEvC,OAAO,EAAC,mBAAmB,EAAE,gCAAgC,EAAC,MAAM,mBAAmB,CAAA;AACvF,OAAO,EAAC,uBAAuB,EAAC,MAAM,yBAAyB,CAAA;AAE/D,MAAM,UAAU,mBAAmB,CAAC,WAAmB,EAAE,QAAgB,IAAI,CAAC,GAAG,EAAE;IACjF,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,WAAW,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;AAC9D,CAAC;AAED,MAAM,UAAU,2BAA2B,CAAC,OAAe;IACzD,OAAO,YAAY,OAAO,GAAG,CAAA;AAC/B,CAAC;AAED,MAAM,OAAgB,cAAe,SAAQ,OAAO;IAClD,MAAM,CAAU,cAAc,GAAG,IAAI,CAAA;IAC7B,oBAAoB,CAAS;IAElB,KAAK,CAAC,IAAI;QAC3B,MAAM,aAAa,GAAG,mBAAmB,EAAE,CAAA;QAC3C,IAAI,CAAC,oBAAoB,GAAG,aAAa,CAAA;QACzC,OAAO,gCAAgC,CAAC,EAAC,OAAO,EAAE,IAAI,CAAC,EAAE,EAAE,aAAa,EAAC,EAAE,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,EAAK,CAAC,CAAA;IACnG,CAAC;IAES,OAAO,CAAC,MAAkB;QAClC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACxB,MAAM,EAAE,CAAA;QACV,CAAC;IACH,CAAC;IAES,UAAU,CAAC,WAAmB;QACtC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE;YAChB,IAAI,CAAC,GAAG,CAAC,2BAA2B,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAC,CAAC,CAAA;QACzE,CAAC,CAAC,CAAA;IACJ,CAAC;IAEkB,KAAK,CAAC,OAAO,CAAC,KAAwB;QACvD,uBAAuB,CAAC,KAAK,CAAC,CAAA;QAC9B,OAAO,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAC7B,CAAC;IAEkB,WAAW,CAAC,GAAY;QACzC,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,CAAC,GAAG,CAA4B,CAAA;QAC9D,OAAO,EAAC,GAAG,IAAI,EAAE,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAC,CAAA;IAC5D,CAAC;IAEkB,aAAa,CAAC,MAAe;QAC9C,OAAO,EAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,oBAAoB,EAAC,CAAA;IACtE,CAAC;IAES,KAAK,CAAC,WAAW,CAAI,OAAe,EAAE,MAAwB;QACtE,IAAI,IAAI,CAAC,WAAW,EAAE,EAAE,CAAC;YACvB,OAAO,MAAM,EAAE,CAAA;QACjB,CAAC;QAED,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QAExB,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,EAAE,CAAA;YAC7B,EAAE,CAAC,MAAM,CAAC,IAAI,EAAE,CAAA;YAChB,OAAO,MAAM,CAAA;QACf,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAA;YAC5C,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC"}

package/dist/lib/defaults-store.d.ts

@@ -2,10 +2,23 @@ import { type ProjectDefaultKey, type ProjectDefaults, type ProjectDefaultScope,
 import { type CachedUserContext, type StoredUserContext } from './user-context-types.js';
 export declare const DEFAULT_WORK_PUSH_RETRY_TIMEOUT_SECONDS = 300;
 export type DefaultsStorePaths = {
+    /** Home-directory config (`~/.config/agentia-cli/config.json`). */
     globalPath: string;
+    /** Optional git-tracked project config (`.agentia/config.json`). */
     localPath: string;
+    /** Per-user local overrides and last* selection (`.agentia/config.user.json`). */
+    userPath: string;
+};
+export type UserConfigMigrationResult = {
+    migrated: boolean;
+    migratedKeys: string[];
 };
 export declare function isValidUserContext(value: unknown): value is StoredUserContext;
+/**
+ * Moves user-level keys (`last*`) from `.agentia/config.json` into
+ * `.agentia/config.user.json`. Idempotent; safe to call on every cicd command.
+ */
+export declare function migrateUserSettingsFromProjectConfig(): Promise<UserConfigMigrationResult>;
 export declare function readDefaults(scope: ProjectDefaultScope): Promise<ProjectDefaults>;
 export declare function readUserContext(): Promise<CachedUserContext | undefined>;
 export declare function writeUserContext(cached: CachedUserContext): Promise<CachedUserContext>;
@@ -13,11 +26,13 @@ export declare function clearUserContext(): Promise<void>;
 export declare function readLastWorkItem(): Promise<string | undefined>;
 export declare function readLastWorkItemId(): Promise<string | undefined>;
 export declare function readLastBaseBranch(): Promise<string | undefined>;
+export declare function readLastDevOrgBranch(): Promise<string | undefined>;
 export declare function readLastPullRequestBaseUrl(): Promise<string | undefined>;
 export declare function readSkipPullRequest(): Promise<boolean>;
 export declare function readWorkPushRetryTimeoutSeconds(): Promise<number>;
 export type LastWorkSelection = {
     lastBaseBranch: string;
+    lastDevOrgBranch?: string;
     lastPullRequestBaseUrl?: string;
     lastWorkItem: string;
     lastWorkItemId: string;

package/dist/lib/defaults-store.js

@@ -4,28 +4,43 @@ import path from 'node:path';
 import { PROJECT_DEFAULT_KEYS, } from './project-defaults.js';
 const DEFAULTS_SECTION = 'defaults';
 const LAST_BASE_BRANCH_KEY = 'lastBaseBranch';
+const LAST_DEV_ORG_BRANCH_KEY = 'lastDevOrgBranch';
 const LAST_PULL_REQUEST_BASE_URL_KEY = 'lastPullRequestBaseUrl';
 const LAST_WORK_ITEM_ID_KEY = 'lastWorkItemId';
 const LAST_WORK_ITEM_KEY = 'lastWorkItem';
 const SKIP_PULL_REQUEST_KEY = 'skipPullRequest';
 const USER_CONTEXT_SECTION = 'userContext';
 const WORK_PUSH_RETRY_TIMEOUT_SECONDS_KEY = 'workPushRetryTimeoutSeconds';
+/** Keys that belong in `.agentia/config.user.json`, not the shared project config. */
+const USER_SETTING_KEYS = [
+    LAST_BASE_BRANCH_KEY,
+    LAST_DEV_ORG_BRANCH_KEY,
+    LAST_PULL_REQUEST_BASE_URL_KEY,
+    LAST_WORK_ITEM_ID_KEY,
+    LAST_WORK_ITEM_KEY,
+];
 const OCLIF_CONFIG_DIR = 'agentia-cli';
 const LOCAL_CONFIG_DIR = '.agentia';
-const CONFIG_FILE_NAME = 'config.json';
+const PROJECT_CONFIG_FILE_NAME = 'config.json';
+const USER_CONFIG_FILE_NAME = 'config.user.json';
 export const DEFAULT_WORK_PUSH_RETRY_TIMEOUT_SECONDS = 300;
 const ENV_GLOBAL_CONFIG_PATH = 'AGENTIA_TEST_GLOBAL_CONFIG_PATH';
 const ENV_LOCAL_CONFIG_PATH = 'AGENTIA_TEST_LOCAL_CONFIG_PATH';
+const ENV_USER_CONFIG_PATH = 'AGENTIA_TEST_USER_CONFIG_PATH';
 const defaultPaths = {
-    globalPath: path.join(homedir(), '.config', OCLIF_CONFIG_DIR, CONFIG_FILE_NAME),
-    localPath: path.join(process.cwd(), LOCAL_CONFIG_DIR, CONFIG_FILE_NAME),
+    globalPath: path.join(homedir(), '.config', OCLIF_CONFIG_DIR, PROJECT_CONFIG_FILE_NAME),
+    localPath: path.join(process.cwd(), LOCAL_CONFIG_DIR, PROJECT_CONFIG_FILE_NAME),
+    userPath: path.join(process.cwd(), LOCAL_CONFIG_DIR, USER_CONFIG_FILE_NAME),
 };
 let paths = defaultPaths;
+let userSettingsMigration;
+let userSettingsMigrationCompleted = false;
 function resolvePaths() {
     const globalPath = process.env[ENV_GLOBAL_CONFIG_PATH];
     const localPath = process.env[ENV_LOCAL_CONFIG_PATH];
-    if (globalPath !== undefined && localPath !== undefined) {
-        return { globalPath, localPath };
+    const userPath = process.env[ENV_USER_CONFIG_PATH];
+    if (globalPath !== undefined && localPath !== undefined && userPath !== undefined) {
+        return { globalPath, localPath, userPath };
     }
     return paths;
 }
@@ -33,6 +48,12 @@ function configPathForScope(scope) {
     const resolvedPaths = resolvePaths();
     return scope === 'global' ? resolvedPaths.globalPath : resolvedPaths.localPath;
 }
+function projectConfigPath() {
+    return resolvePaths().localPath;
+}
+function userConfigPath() {
+    return resolvePaths().userPath;
+}
 function isRecord(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -128,6 +149,57 @@ async function writeConfigDocument(filePath, document) {
         throw error;
     }
 }
+function projectHasUserSettings(document) {
+    return USER_SETTING_KEYS.some((key) => document[key] !== undefined);
+}
+async function migrateUserSettingsFromProjectConfigOnce() {
+    const projectPath = projectConfigPath();
+    const userPath = userConfigPath();
+    const project = await readConfigDocument(projectPath);
+    if (!projectHasUserSettings(project)) {
+        return { migrated: false, migratedKeys: [] };
+    }
+    const user = await readConfigDocument(userPath);
+    const migratedKeys = [];
+    let cleanedProject = false;
+    for (const key of USER_SETTING_KEYS) {
+        if (project[key] === undefined) {
+            continue;
+        }
+        if (user[key] === undefined) {
+            user[key] = project[key];
+            migratedKeys.push(key);
+        }
+        delete project[key];
+        cleanedProject = true;
+    }
+    if (migratedKeys.length > 0) {
+        await writeConfigDocument(userPath, user);
+    }
+    if (cleanedProject) {
+        await writeConfigDocument(projectPath, project);
+    }
+    return { migrated: cleanedProject, migratedKeys };
+}
+/**
+ * Moves user-level keys (`last*`) from `.agentia/config.json` into
+ * `.agentia/config.user.json`. Idempotent; safe to call on every cicd command.
+ */
+export async function migrateUserSettingsFromProjectConfig() {
+    if (userSettingsMigrationCompleted) {
+        return { migrated: false, migratedKeys: [] };
+    }
+    userSettingsMigration ??= migrateUserSettingsFromProjectConfigOnce()
+        .then((result) => {
+        userSettingsMigrationCompleted = true;
+        return result;
+    })
+        .catch((error) => {
+        userSettingsMigration = undefined;
+        throw error;
+    });
+    return userSettingsMigration;
+}
 export async function readDefaults(scope) {
     const document = await readConfigDocument(configPathForScope(scope));
     return parseDefaultsSection(document[DEFAULTS_SECTION]);
@@ -156,21 +228,32 @@ function readLocalStringValue(document, key) {
     }
     return value;
 }
+/** Prefer user config; fall back to project config for pre-split `.agentia/config.json` values. */
+async function readUserThenProjectDocuments() {
+    const [user, project] = await Promise.all([
+        readConfigDocument(userConfigPath()),
+        readConfigDocument(projectConfigPath()),
+    ]);
+    return { project, user };
+}
+async function readLastStringValue(key) {
+    const { project, user } = await readUserThenProjectDocuments();
+    return readLocalStringValue(user, key) ?? readLocalStringValue(project, key);
+}
 export async function readLastWorkItem() {
-    const document = await readConfigDocument(configPathForScope('local'));
-    return readLocalStringValue(document, LAST_WORK_ITEM_KEY);
+    return readLastStringValue(LAST_WORK_ITEM_KEY);
 }
 export async function readLastWorkItemId() {
-    const document = await readConfigDocument(configPathForScope('local'));
-    return readLocalStringValue(document, LAST_WORK_ITEM_ID_KEY);
+    return readLastStringValue(LAST_WORK_ITEM_ID_KEY);
 }
 export async function readLastBaseBranch() {
-    const document = await readConfigDocument(configPathForScope('local'));
-    return readLocalStringValue(document, LAST_BASE_BRANCH_KEY);
+    return readLastStringValue(LAST_BASE_BRANCH_KEY);
+}
+export async function readLastDevOrgBranch() {
+    return readLastStringValue(LAST_DEV_ORG_BRANCH_KEY);
 }
 export async function readLastPullRequestBaseUrl() {
-    const document = await readConfigDocument(configPathForScope('local'));
-    return readLocalStringValue(document, LAST_PULL_REQUEST_BASE_URL_KEY);
+    return readLastStringValue(LAST_PULL_REQUEST_BASE_URL_KEY);
 }
 function readLocalBoolean(document, key) {
     const value = document[key];
@@ -180,8 +263,12 @@ function readLocalBoolean(document, key) {
     return undefined;
 }
 export async function readSkipPullRequest() {
-    const document = await readConfigDocument(configPathForScope('local'));
-    return readLocalBoolean(document, SKIP_PULL_REQUEST_KEY) === true;
+    const { project, user } = await readUserThenProjectDocuments();
+    const fromUser = readLocalBoolean(user, SKIP_PULL_REQUEST_KEY);
+    if (fromUser !== undefined) {
+        return fromUser;
+    }
+    return readLocalBoolean(project, SKIP_PULL_REQUEST_KEY) === true;
 }
 function readLocalPositiveInteger(document, key) {
     const value = document[key];
@@ -197,16 +284,27 @@ function readLocalPositiveInteger(document, key) {
     return undefined;
 }
 export async function readWorkPushRetryTimeoutSeconds() {
-    const document = await readConfigDocument(configPathForScope('local'));
-    return (readLocalPositiveInteger(document, WORK_PUSH_RETRY_TIMEOUT_SECONDS_KEY) ??
+    const { project, user } = await readUserThenProjectDocuments();
+    return (readLocalPositiveInteger(user, WORK_PUSH_RETRY_TIMEOUT_SECONDS_KEY) ??
+        readLocalPositiveInteger(project, WORK_PUSH_RETRY_TIMEOUT_SECONDS_KEY) ??
         DEFAULT_WORK_PUSH_RETRY_TIMEOUT_SECONDS);
 }
 export async function writeLastWorkSelection(selection) {
-    const filePath = configPathForScope('local');
+    const filePath = userConfigPath();
     const document = await readConfigDocument(filePath);
     document[LAST_BASE_BRANCH_KEY] = selection.lastBaseBranch;
     document[LAST_WORK_ITEM_ID_KEY] = selection.lastWorkItemId;
     document[LAST_WORK_ITEM_KEY] = selection.lastWorkItem;
+    // Preserve an existing lastDevOrgBranch when callers omit it (e.g. work set).
+    if (selection.lastDevOrgBranch !== undefined) {
+        const lastDevOrgBranch = selection.lastDevOrgBranch.trim();
+        if (lastDevOrgBranch.length > 0) {
+            document[LAST_DEV_ORG_BRANCH_KEY] = lastDevOrgBranch;
+        }
+        else {
+            delete document[LAST_DEV_ORG_BRANCH_KEY];
+        }
+    }
     const pullRequestBaseUrl = selection.lastPullRequestBaseUrl?.trim();
     if (pullRequestBaseUrl !== undefined && pullRequestBaseUrl.length > 0) {
         document[LAST_PULL_REQUEST_BASE_URL_KEY] = pullRequestBaseUrl;
@@ -262,13 +360,22 @@ export function getDefaultsStorePaths() {
 }
 // Test-only hook
 export function setDefaultsStorePathsForTests(nextPaths) {
-    paths = { ...paths, ...nextPaths };
+    const merged = { ...paths, ...nextPaths };
+    if (nextPaths.userPath === undefined && nextPaths.localPath !== undefined) {
+        merged.userPath = path.join(path.dirname(nextPaths.localPath), USER_CONFIG_FILE_NAME);
+    }
+    paths = merged;
+    userSettingsMigration = undefined;
+    userSettingsMigrationCompleted = false;
 }
 // Test-only hook
 export function resetDefaultsStorePathsForTests() {
     paths = {
-        globalPath: path.join(homedir(), '.config', OCLIF_CONFIG_DIR, CONFIG_FILE_NAME),
-        localPath: path.join(process.cwd(), LOCAL_CONFIG_DIR, CONFIG_FILE_NAME),
+        globalPath: path.join(homedir(), '.config', OCLIF_CONFIG_DIR, PROJECT_CONFIG_FILE_NAME),
+        localPath: path.join(process.cwd(), LOCAL_CONFIG_DIR, PROJECT_CONFIG_FILE_NAME),
+        userPath: path.join(process.cwd(), LOCAL_CONFIG_DIR, USER_CONFIG_FILE_NAME),
     };
+    userSettingsMigration = undefined;
+    userSettingsMigrationCompleted = false;
 }
 //# sourceMappingURL=defaults-store.js.map

package/dist/lib/defaults-store.js.map

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

package/dist/lib/format.js

@@ -1,6 +1,5 @@
 import createTtyTable from 'tty-table';
 const TABLE_PADDING = 2;
-const TABLE_GUTTER = 1;
 const TABLE_MARGIN_LEFT = 2;
 export function cellValue(value) {
     return value === null || value === undefined ? '' : String(value);
@@ -23,39 +22,87 @@ function terminalColumns() {
     const envColumns = Number(process.env.COLUMNS);
     return Number.isFinite(envColumns) && envColumns > 0 ? envColumns : 80;
 }
-function headersForWrapColumn(columns, rows) {
+function minColumnWidth(column) {
+    return column.alias.length + TABLE_PADDING;
+}
+function maxWidthSum(columnCount) {
+    // tty-table adds a left margin and n+1 vertical borders around n cells.
+    return Math.max(0, terminalColumns() - TABLE_MARGIN_LEFT - (columnCount + 1));
+}
+function truncateToWidth(value, contentWidth) {
+    if (contentWidth <= 0) {
+        return '';
+    }
+    if (value.length <= contentWidth) {
+        return value;
+    }
+    if (contentWidth === 1) {
+        return value.slice(0, 1);
+    }
+    return `${value.slice(0, contentWidth - 1)}…`;
+}
+function shrinkWidths(natural, mins, budget) {
+    const widths = natural.map((width, index) => Math.max(width, mins[index]));
+    let overflow = widths.reduce((sum, width) => sum + width, 0) - budget;
+    while (overflow > 0) {
+        let candidate = -1;
+        let spare = 0;
+        for (const [index, width] of widths.entries()) {
+            const available = width - mins[index];
+            if (available > spare) {
+                spare = available;
+                candidate = index;
+            }
+        }
+        if (candidate === -1 || spare <= 0) {
+            break;
+        }
+        widths[candidate]--;
+        overflow--;
+    }
+    return widths;
+}
+function sizeWrapTable(columns, rows) {
     const wrapIndex = columns.findIndex((column) => column.wrap);
-    if (wrapIndex === -1) {
-        return columns.map((column) => ({
-            ...column,
-            width: columnContentWidth(column, rows) + TABLE_PADDING,
-        }));
-    }
-    const availableWidth = terminalColumns() - TABLE_MARGIN_LEFT;
-    let usedWidth = 0;
-    const widths = columns.map((column, index) => {
-        if (index === wrapIndex) {
-            return 0;
+    const naturals = columns.map((column) => columnContentWidth(column, rows) + TABLE_PADDING);
+    const mins = columns.map((column) => minColumnWidth(column));
+    const nonWrapIndexes = columns.map((_, index) => index).filter((index) => index !== wrapIndex);
+    const maxSum = maxWidthSum(columns.length);
+    const wrapMin = mins[wrapIndex];
+    const naturalNonWrap = nonWrapIndexes.map((index) => naturals[index]);
+    const nonWrapMins = nonWrapIndexes.map((index) => mins[index]);
+    const nonWrapBudget = Math.min(naturalNonWrap.reduce((sum, width) => sum + width, 0), Math.max(0, maxSum - wrapMin));
+    const nonWrapWidths = shrinkWidths(naturalNonWrap, nonWrapMins, nonWrapBudget);
+    const usedNonWrap = nonWrapWidths.reduce((sum, width) => sum + width, 0);
+    const widths = columns.map(() => 0);
+    for (const [offset, index] of nonWrapIndexes.entries()) {
+        widths[index] = nonWrapWidths[offset];
+    }
+    widths[wrapIndex] = Math.max(wrapMin, Math.min(naturals[wrapIndex], maxSum - usedNonWrap));
+    const sizedRows = rows.map((row) => {
+        const next = { ...row };
+        for (const [offset, index] of nonWrapIndexes.entries()) {
+            const column = columns[index];
+            next[column.value] = truncateToWidth(cellValue(row[column.value]), Math.max(0, nonWrapWidths[offset] - TABLE_PADDING));
         }
-        const width = columnContentWidth(column, rows) + TABLE_PADDING;
-        usedWidth += width + TABLE_GUTTER;
-        return width;
+        return next;
     });
-    const naturalWrapWidth = columnContentWidth(columns[wrapIndex], rows) + TABLE_PADDING;
-    const maxWrapWidth = Math.max(columns[wrapIndex].alias.length + TABLE_PADDING, availableWidth - usedWidth - TABLE_GUTTER);
-    widths[wrapIndex] = Math.min(naturalWrapWidth, maxWrapWidth);
-    return columns.map((column, index) => ({
-        ...column,
-        align: column.align ?? (column.wrap ? 'left' : undefined),
-        headerAlign: column.headerAlign ?? (column.wrap ? 'left' : undefined),
-        width: widths[index],
-    }));
+    return {
+        columns: columns.map((column, index) => ({
+            ...column,
+            align: column.align ?? (column.wrap ? 'left' : undefined),
+            headerAlign: column.headerAlign ?? (column.wrap ? 'left' : undefined),
+            width: widths[index],
+        })),
+        rows: sizedRows,
+    };
 }
 export function table(headers, rows) {
     const hasWrapColumn = headers.some((header) => header.wrap);
     if (!hasWrapColumn) {
         return createTtyTable(headers, rows).render();
     }
-    return createTtyTable(headersForWrapColumn(headers, rows), rows).render();
+    const sized = sizeWrapTable(headers, rows);
+    return createTtyTable(sized.columns, sized.rows).render();
 }
 //# sourceMappingURL=format.js.map

package/dist/lib/format.js.map

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

package/dist/lib/git-worktree.d.ts

@@ -10,8 +10,26 @@ export declare function isInsideGitWorkTree(): Promise<boolean>;
 export declare function getGitRepoRoot(): Promise<string>;
 export declare function getRemoteUrl(remote?: string): Promise<string | undefined>;
 export declare function stageAndCommit(message: string, paths: string[]): Promise<void>;
+/** Commit all tracked modifications in the working tree (`git commit -am`). */
+export declare function commitAllTrackedChanges(message: string): Promise<void>;
 export declare function fetchOriginBranch(branch: string): Promise<void>;
+export declare function checkoutBranch(branch: string): Promise<void>;
 export declare function pushOriginBranch(branch: string): Promise<void>;
+export declare function pullOriginBranch(branch: string): Promise<void>;
+/**
+ * Merge `branch` into HEAD, preferring the merged branch on conflicts and ignoring space-only changes.
+ * Uses `-X theirs` (strategy option), not `-s theirs` — Git has no `theirs` merge strategy.
+ * When syncing into the dev-org branch, "theirs" is the feature branch being merged in.
+ */
+export declare function mergeTheirsIgnoreSpaceChange(branch: string): Promise<void>;
+/** Best-effort abort of an in-progress merge (no-op when none is in progress). */
+export declare function abortMerge(): Promise<void>;
+/** Discard uncommitted tracked changes in the working tree. */
+export declare function resetHardHead(): Promise<void>;
+/**
+ * After a failed work-push side effect, discard local changes and return to the feature branch.
+ */
+export declare function restoreFeatureBranch(branch: string): Promise<void>;
 /** True when origin/<branch> is missing or HEAD has commits not on the remote branch. */
 export declare function hasUnpushedCommits(branch: string): Promise<boolean>;
 /** Pretty format for name-status logs: hash, subject, committer name/email/date. */

package/dist/lib/git-worktree.js

@@ -54,12 +54,56 @@ export async function stageAndCommit(message, paths) {
     await gitExecFn(['add', '--', ...paths]);
     await gitExecFn(['commit', '-m', message]);
 }
+/** Commit all tracked modifications in the working tree (`git commit -am`). */
+export async function commitAllTrackedChanges(message) {
+    await gitExecFn(['commit', '-a', '-m', message]);
+}
 export async function fetchOriginBranch(branch) {
     await gitExecFn(['fetch', 'origin', branch]);
 }
+export async function checkoutBranch(branch) {
+    await gitExecFn(['checkout', branch]);
+}
 export async function pushOriginBranch(branch) {
     await gitExecFn(['push', 'origin', branch]);
 }
+export async function pullOriginBranch(branch) {
+    await gitExecFn(['pull', 'origin', branch]);
+}
+/**
+ * Merge `branch` into HEAD, preferring the merged branch on conflicts and ignoring space-only changes.
+ * Uses `-X theirs` (strategy option), not `-s theirs` — Git has no `theirs` merge strategy.
+ * When syncing into the dev-org branch, "theirs" is the feature branch being merged in.
+ */
+export async function mergeTheirsIgnoreSpaceChange(branch) {
+    await gitExecFn(['merge', '-X', 'theirs', '-X', 'ignore-space-change', branch]);
+}
+/** Best-effort abort of an in-progress merge (no-op when none is in progress). */
+export async function abortMerge() {
+    try {
+        await gitExecFn(['merge', '--abort']);
+    }
+    catch {
+        // No merge in progress (or abort unavailable); ignore.
+    }
+}
+/** Discard uncommitted tracked changes in the working tree. */
+export async function resetHardHead() {
+    await gitExecFn(['reset', '--hard', 'HEAD']);
+}
+/**
+ * After a failed work-push side effect, discard local changes and return to the feature branch.
+ */
+export async function restoreFeatureBranch(branch) {
+    await abortMerge();
+    try {
+        await resetHardHead();
+    }
+    catch {
+        // Ignore reset failures so checkout can still be attempted.
+    }
+    await checkoutBranch(branch);
+}
 /** True when origin/<branch> is missing or HEAD has commits not on the remote branch. */
 export async function hasUnpushedCommits(branch) {
     try {

package/dist/lib/git-worktree.js.map

@@ -1 +1 @@
-{"version":3,"file":"git-worktree.js","sourceRoot":"","sources":["../../src/lib/git-worktree.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,oBAAoB,CAAA;AAC3C,OAAO,EAAC,SAAS,EAAC,MAAM,WAAW,CAAA;AAEnC,MAAM,aAAa,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAA;AASzC,IAAI,SAAS,GAAc,cAAc,CAAA;AAEzC,KAAK,UAAU,cAAc,CAAC,IAAc;IAC1C,MAAM,EAAC,MAAM,EAAE,MAAM,EAAC,GAAG,MAAM,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,CAAA;IACzD,OAAO;QACL,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;QACzB,MAAM,EAAE,MAAM,CAAC,QAAQ,EAAE;KAC1B,CAAA;AACH,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,MAAc;IAChD,OAAO,MAAM;SACV,KAAK,CAAC,OAAO,CAAC;SACd,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,CAAC;SAC7B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC;SACjC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;AACjC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,kBAAkB;IACtC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC,CAAC,QAAQ,EAAE,aAAa,EAAE,sBAAsB,EAAE,cAAc,CAAC,CAAC,CAAA;IACnG,OAAO,mBAAmB,CAAC,MAAM,CAAC,CAAA;AACpC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB;IACpC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC,CAAC,WAAW,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC,CAAA;IACvE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB;IACvC,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC,CAAC,WAAW,EAAE,uBAAuB,CAAC,CAAC,CAAA;QACxE,OAAO,MAAM,CAAC,IAAI,EAAE,KAAK,MAAM,CAAA;IACjC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc;IAClC,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC,CAAA;IAClE,OAAO,MAAM,CAAC,IAAI,EAAE,CAAA;AACtB,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,MAAM,GAAG,QAAQ;IAClD,IAAI,CAAC;QACH,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;QAC/D,MAAM,GAAG,GAAG,MAAM,CAAC,IAAI,EAAE,CAAA;QACzB,OAAO,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;IACzC,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,SAAS,CAAA;IAClB,CAAC;AACH,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,KAAe;IACnE,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAA;IAC9D,CAAC;IAED,MAAM,SAAS,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,CAAA;IACxC,MAAM,SAAS,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC,CAAC,CAAA;AAC5C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,MAAc;IACpD,MAAM,SAAS,CAAC,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;AAC9C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,MAAc;IACnD,MAAM,SAAS,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;AAC7C,CAAC;AAED,yFAAyF;AACzF,MAAM,CAAC,KAAK,UAAU,kBAAkB,CAAC,MAAc;IACrD,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,CAAC,WAAW,EAAE,UAAU,EAAE,UAAU,MAAM,EAAE,CAAC,CAAC,CAAA;IAChE,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;IAED,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC,CAAC,UAAU,EAAE,SAAS,EAAE,UAAU,MAAM,QAAQ,CAAC,CAAC,CAAA;IACnF,MAAM,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,CAAA;IAChD,OAAO,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,GAAG,CAAC,CAAA;AAC5C,CAAC;AAED,oFAAoF;AACpF,MAAM,CAAC,MAAM,yBAAyB,GAAG,+BAA+B,CAAA;AAExE,MAAM,CAAC,KAAK,UAAU,oBAAoB,CAAC,UAAkB;IAC3D,MAAM,EAAC,MAAM,EAAC,GAAG,MAAM,SAAS,CAAC;QAC/B,KAAK;QACL,WAAW;QACX,eAAe;QACf,mBAAmB,yBAAyB,EAAE;QAC9C,GAAG,UAAU,QAAQ;KACtB,CAAC,CAAA;IACF,OAAO,MAAM,CAAA;AACf,CAAC;AAOD,SAAS,0BAA0B,CAAC,KAAc;IAChD,MAAM,OAAO,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAA;IACtE,MAAM,MAAM,GACV,OAAO,KAAK,KAAK,QAAQ;QACzB,KAAK,KAAK,IAAI;QACd,QAAQ,IAAI,KAAK;QACjB,OAAQ,KAA2B,CAAC,MAAM,KAAK,QAAQ;QACrD,CAAC,CAAE,KAA0B,CAAC,MAAM;QACpC,CAAC,CAAC,EAAE,CAAA;IACR,OAAO,iBAAiB,CAAC,IAAI,CAAC,GAAG,OAAO,KAAK,MAAM,EAAE,CAAC,CAAA;AACxD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,qBAAqB,CACzC,MAAc,EACd,UAAkB;IAElB,MAAM,UAAU,GAAG,UAAU,UAAU,EAAE,CAAA;IACzC,IAAI,CAAC;QACH,MAAM,SAAS,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC,CAAA;QACvD,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAC,CAAA;IAChC,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,KAAK,CAAA;QACb,CAAC;QAED,MAAM,SAAS,CAAC,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAA;QACrC,OAAO,EAAC,MAAM,EAAE,OAAO,EAAE,KAAK,EAAC,CAAA;IACjC,CAAC;AACH,CAAC;AAED,iBAAiB;AACjB,MAAM,UAAU,kBAAkB,CAAC,EAAa;IAC9C,SAAS,GAAG,EAAE,CAAA;AAChB,CAAC;AAED,iBAAiB;AACjB,MAAM,UAAU,oBAAoB;IAClC,SAAS,GAAG,cAAc,CAAA;AAC5B,CAAC"}
+{"version":3,"file":"git-worktree.js","sourceRoot":"","sources":["../../src/lib/git-worktree.ts"],"names":[],"mappings":"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"}