@detergent-software/atk 8.5.0-dev.7 → 8.5.0-dev.9
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/CHANGELOG.md +13 -0
- package/README.md +10 -16
- package/build/commands/_app.js +2 -2
- package/build/commands/_app.js.map +1 -1
- package/build/commands/index.js +1 -1
- package/build/commands/index.js.map +1 -1
- package/build/commands/login.js +1 -1
- package/build/commands/login.js.map +1 -1
- package/build/commands/logout.d.ts +1 -1
- package/build/commands/logout.d.ts.map +1 -1
- package/build/commands/logout.js +3 -4
- package/build/commands/logout.js.map +1 -1
- package/build/commands/schema.d.ts +1 -1
- package/build/commands/sync.d.ts.map +1 -1
- package/build/commands/sync.js +3 -3
- package/build/commands/sync.js.map +1 -1
- package/build/commands/update.d.ts.map +1 -1
- package/build/commands/update.js +20 -6
- package/build/commands/update.js.map +1 -1
- package/build/commands/whoami.d.ts.map +1 -1
- package/build/commands/whoami.js +2 -5
- package/build/commands/whoami.js.map +1 -1
- package/build/components/NoticeBanner.d.ts +1 -1
- package/build/components/NoticeBanner.d.ts.map +1 -1
- package/build/components/NoticeBanner.js +1 -2
- package/build/components/NoticeBanner.js.map +1 -1
- package/build/components/UndeclaredRemovedHint.d.ts +18 -0
- package/build/components/UndeclaredRemovedHint.d.ts.map +1 -0
- package/build/components/UndeclaredRemovedHint.js +15 -0
- package/build/components/UndeclaredRemovedHint.js.map +1 -0
- package/build/components/index.d.ts +1 -0
- package/build/components/index.d.ts.map +1 -1
- package/build/components/index.js +1 -0
- package/build/components/index.js.map +1 -1
- package/build/hooks/useListActions.d.ts.map +1 -1
- package/build/hooks/useListActions.js +32 -10
- package/build/hooks/useListActions.js.map +1 -1
- package/build/lib/api-client.d.ts +0 -1
- package/build/lib/api-client.d.ts.map +1 -1
- package/build/lib/api-client.js +2 -30
- package/build/lib/api-client.js.map +1 -1
- package/build/lib/auth.d.ts +6 -11
- package/build/lib/auth.d.ts.map +1 -1
- package/build/lib/auth.js +11 -68
- package/build/lib/auth.js.map +1 -1
- package/build/lib/config.d.ts.map +1 -1
- package/build/lib/config.js +3 -1
- package/build/lib/config.js.map +1 -1
- package/build/lib/diagnostics.js +3 -10
- package/build/lib/diagnostics.js.map +1 -1
- package/build/lib/entra.d.ts +2 -1
- package/build/lib/entra.d.ts.map +1 -1
- package/build/lib/entra.js +2 -1
- package/build/lib/entra.js.map +1 -1
- package/build/lib/notices.d.ts +14 -29
- package/build/lib/notices.d.ts.map +1 -1
- package/build/lib/notices.js +7 -31
- package/build/lib/notices.js.map +1 -1
- package/build/lib/owned-paths.d.ts +1 -1
- package/build/lib/owned-paths.d.ts.map +1 -1
- package/build/lib/owned-paths.js.map +1 -1
- package/build/lib/schemas/config.d.ts +0 -1
- package/build/lib/schemas/config.d.ts.map +1 -1
- package/build/lib/schemas/config.js +0 -1
- package/build/lib/schemas/config.js.map +1 -1
- package/build/lib/sync.d.ts +15 -1
- package/build/lib/sync.d.ts.map +1 -1
- package/build/lib/sync.js +55 -11
- package/build/lib/sync.js.map +1 -1
- package/build/lib/uninstaller.d.ts +22 -0
- package/build/lib/uninstaller.d.ts.map +1 -1
- package/build/lib/uninstaller.js +39 -1
- package/build/lib/uninstaller.js.map +1 -1
- package/build/lib/update-check.d.ts.map +1 -1
- package/build/lib/update-check.js +6 -1
- package/build/lib/update-check.js.map +1 -1
- package/build/lib/updater.d.ts +27 -0
- package/build/lib/updater.d.ts.map +1 -1
- package/build/lib/updater.js +53 -3
- package/build/lib/updater.js.map +1 -1
- package/package.json +1 -1
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx } from "react/jsx-runtime";
|
|
2
2
|
import { Box, Text } from 'ink';
|
|
3
|
-
import { noticeText } from '../lib/notices.js';
|
|
4
3
|
/**
|
|
5
4
|
* One dim line per once-per-run notice, rendered by the App shell under the
|
|
6
5
|
* header (and the update banner) in non-JSON mode.
|
|
@@ -9,6 +8,6 @@ export default function NoticeBanner({ notices }) {
|
|
|
9
8
|
if (notices.length === 0) {
|
|
10
9
|
return null;
|
|
11
10
|
}
|
|
12
|
-
return (_jsx(Box, { flexDirection: 'column', children: notices.map((notice) => (_jsx(Text, { dimColor: true, children:
|
|
11
|
+
return (_jsx(Box, { flexDirection: 'column', children: notices.map((notice) => (_jsx(Text, { dimColor: true, children: notice.text }, notice.kind))) }));
|
|
13
12
|
}
|
|
14
13
|
//# sourceMappingURL=NoticeBanner.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NoticeBanner.js","sourceRoot":"","sources":["../../src/components/NoticeBanner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"NoticeBanner.js","sourceRoot":"","sources":["../../src/components/NoticeBanner.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAQhC;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,OAAO,EAAqB;IACjE,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,KAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,YACxB,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,KAAC,IAAI,IAAC,QAAQ,kBACX,MAAM,CAAC,IAAI,IADM,MAAM,CAAC,IAAI,CAExB,CACR,CAAC,GACE,CACP,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
interface UndeclaredRemovedHintProps {
|
|
2
|
+
/** Hooks whose copy for the tool was removed (or, in a dry run, would be) */
|
|
3
|
+
assets: Array<{
|
|
4
|
+
name: string;
|
|
5
|
+
org?: string;
|
|
6
|
+
}>;
|
|
7
|
+
/** Whether the removal is only previewed */
|
|
8
|
+
dryRun?: boolean;
|
|
9
|
+
/** The tool name (e.g., "copilot-cli") */
|
|
10
|
+
tool: string;
|
|
11
|
+
}
|
|
12
|
+
/**
|
|
13
|
+
* Note under a sync or update naming the hooks whose copy was removed for a tool their version
|
|
14
|
+
* doesn't declare. Renders nothing when there are none.
|
|
15
|
+
*/
|
|
16
|
+
export default function UndeclaredRemovedHint({ assets, dryRun, tool }: UndeclaredRemovedHintProps): import("react/jsx-runtime").JSX.Element | null;
|
|
17
|
+
export {};
|
|
18
|
+
//# sourceMappingURL=UndeclaredRemovedHint.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UndeclaredRemovedHint.d.ts","sourceRoot":"","sources":["../../src/components/UndeclaredRemovedHint.tsx"],"names":[],"mappings":"AAIA,UAAU,0BAA0B;IAClC,6EAA6E;IAC7E,MAAM,EAAE,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,GAAG,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAC9C,4CAA4C;IAC5C,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,0CAA0C;IAC1C,IAAI,EAAE,MAAM,CAAC;CACd;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,EAAE,MAAM,EAAE,MAAc,EAAE,IAAI,EAAE,EAAE,0BAA0B,kDAUzG"}
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
import { jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
+
import { Text } from 'ink';
|
|
3
|
+
import { formatOrgName } from '../lib/org.js';
|
|
4
|
+
/**
|
|
5
|
+
* Note under a sync or update naming the hooks whose copy was removed for a tool their version
|
|
6
|
+
* doesn't declare. Renders nothing when there are none.
|
|
7
|
+
*/
|
|
8
|
+
export default function UndeclaredRemovedHint({ assets, dryRun = false, tool }) {
|
|
9
|
+
if (assets.length === 0)
|
|
10
|
+
return null;
|
|
11
|
+
const names = assets.map((a) => formatOrgName(a.org, a.name)).join(', ');
|
|
12
|
+
const declare = assets.length === 1 ? "doesn't declare" : "don't declare";
|
|
13
|
+
return (_jsxs(Text, { color: 'yellow', children: [dryRun ? 'Would remove' : 'Removed', " ", names, " for ", tool, ": the hook", assets.length === 1 ? '' : 's', " ", declare, " it."] }));
|
|
14
|
+
}
|
|
15
|
+
//# sourceMappingURL=UndeclaredRemovedHint.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UndeclaredRemovedHint.js","sourceRoot":"","sources":["../../src/components/UndeclaredRemovedHint.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAE3B,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAW9C;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,qBAAqB,CAAC,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,EAAE,IAAI,EAA8B;IACxG,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,IAAI,CAAC;IAErC,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzE,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,eAAe,CAAC;IAC1E,OAAO,CACL,MAAC,IAAI,IAAC,KAAK,EAAC,QAAQ,aACjB,MAAM,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,SAAS,OAAG,KAAK,WAAO,IAAI,gBAAY,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,OAAG,OAAO,YACtG,CACR,CAAC;AACJ,CAAC"}
|
|
@@ -40,5 +40,6 @@ export { CheckIcon, FileStatusIcon } from './StatusBadge.js';
|
|
|
40
40
|
export { default as SyncAllInSync } from './SyncAllInSync.js';
|
|
41
41
|
export { default as SyncDriftedList } from './SyncDriftedList.js';
|
|
42
42
|
export { default as SyncNoAssets } from './SyncNoAssets.js';
|
|
43
|
+
export { default as UndeclaredRemovedHint } from './UndeclaredRemovedHint.js';
|
|
43
44
|
export { default as UpdateBanner } from './UpdateBanner.js';
|
|
44
45
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACpE,OAAO,EACL,OAAO,IAAI,oBAAoB,EAC/B,KAAK,UAAU,EACf,mBAAmB,EACnB,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,0BAA0B,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AACvH,OAAO,EAAE,OAAO,IAAI,UAAU,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC3F,OAAO,EAAE,KAAK,eAAe,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACtF,OAAO,EAAE,OAAO,IAAI,QAAQ,EAAE,KAAK,aAAa,EAAE,MAAM,eAAe,CAAC;AACxE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,KAAK,EAAE,MAAM,YAAY,CAAC;AAC9C,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,IAAI,MAAM,EAAE,MAAM,aAAa,CAAC;AACrE,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AACtE,OAAO,EAAE,KAAK,oBAAoB,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,IAAI,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAClH,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,KAAK,eAAe,EAAE,OAAO,IAAI,eAAe,EAAE,KAAK,oBAAoB,EAAE,MAAM,sBAAsB,CAAC;AACnH,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC1D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AACxH,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,qBAAqB,EAAE,oBAAoB,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,kBAAkB,CAAC;AACvG,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAChE,OAAO,EAAE,OAAO,IAAI,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,OAAO,IAAI,OAAO,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAC9D,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAClE,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAC5D,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -40,5 +40,6 @@ export { CheckIcon, FileStatusIcon } from './StatusBadge.js';
|
|
|
40
40
|
export { default as SyncAllInSync } from './SyncAllInSync.js';
|
|
41
41
|
export { default as SyncDriftedList } from './SyncDriftedList.js';
|
|
42
42
|
export { default as SyncNoAssets } from './SyncNoAssets.js';
|
|
43
|
+
export { default as UndeclaredRemovedHint } from './UndeclaredRemovedHint.js';
|
|
43
44
|
export { default as UpdateBanner } from './UpdateBanner.js';
|
|
44
45
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/components/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useListActions.d.ts","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,OAAO,CAAC;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"useListActions.d.ts","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAqB,MAAM,OAAO,CAAC;AAE1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAC9D,OAAO,KAAK,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAsB/D;;;;;GAKG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,SAAS,EAChB,QAAQ,EAAE,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,EACpC,aAAa,EAAE,SAAS,CAAC,MAAM,CAAC,EAChC,eAAe,EAAE,SAAS,CAAC,IAAI,GAAG;IAAE,OAAO,EAAE,OAAO,CAAC;IAAC,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAAC,EACrG,gBAAgB,CAAC,EAAE,SAAS,CAAC,IAAI,GAAG,aAAa,CAAC,GACjD,IAAI,CA+MN"}
|
|
@@ -4,7 +4,7 @@ import { freezeAssetInConfig, isAssetFrozen, loadProjectConfig, thawAssetInConfi
|
|
|
4
4
|
import { errorMessage } from '../lib/errors.js';
|
|
5
5
|
import { LOCKFILE_LOCKED_MESSAGE, LockfileLockedError, pinAssetVersion, readLockfile, unpinAssetVersion, withLockfileLock, writeLockfile, } from '../lib/lockfile.js';
|
|
6
6
|
import { uninstallAsset } from '../lib/uninstaller.js';
|
|
7
|
-
import { declarationAllowsVersion, updateAsset } from '../lib/updater.js';
|
|
7
|
+
import { declarationAllowsVersion, removeUndeclaredAfterUpdate, updateAsset, } from '../lib/updater.js';
|
|
8
8
|
/**
|
|
9
9
|
* Encapsulates the action execution side-effect for the list command.
|
|
10
10
|
*
|
|
@@ -113,7 +113,7 @@ export function useListActions(state, dispatch, projectDirRef, resolvedToolRef,
|
|
|
113
113
|
throw new Error('No tools configured. Run `atk setup` to select your AI coding tool.');
|
|
114
114
|
}
|
|
115
115
|
const adapters = [resolved.adapter, ...(resolved.additionalAdapters ?? [])];
|
|
116
|
-
const results = await withLockfileLock(projectDirRef.current, async () => {
|
|
116
|
+
const { removedFor, removeErrors, toolResults: results, } = await withLockfileLock(projectDirRef.current, async () => {
|
|
117
117
|
const lockfile = await readLockfile(projectDirRef.current);
|
|
118
118
|
const registry = currentState.registry;
|
|
119
119
|
const installed = (lockfile.assets ?? []).find((a) => a.name === asset.name && a.type === asset.type && a.org === asset.org);
|
|
@@ -132,7 +132,7 @@ export function useListActions(state, dispatch, projectDirRef, resolvedToolRef,
|
|
|
132
132
|
if (isExcludedForTool(installed, adapter.tool) || !supportsType(adapter, installed.type))
|
|
133
133
|
continue;
|
|
134
134
|
if (!declarationAllowsVersion(registry, installed, undefined, adapter)) {
|
|
135
|
-
undeclared.push(adapter
|
|
135
|
+
undeclared.push(adapter);
|
|
136
136
|
continue;
|
|
137
137
|
}
|
|
138
138
|
toolResults.push(await updateAsset(asset.name, installed, registry, {
|
|
@@ -146,20 +146,42 @@ export function useListActions(state, dispatch, projectDirRef, resolvedToolRef,
|
|
|
146
146
|
toolLockfile: lockfile,
|
|
147
147
|
}));
|
|
148
148
|
}
|
|
149
|
-
|
|
149
|
+
// Then, as `atk update` does, those tools lose their copy when the version the lockfile
|
|
150
|
+
// now records doesn't declare them either.
|
|
151
|
+
const removedFor = [];
|
|
152
|
+
const removeErrors = [];
|
|
153
|
+
for (const adapter of undeclared) {
|
|
154
|
+
const { failures, removed } = await removeUndeclaredAfterUpdate([installed], registry, {
|
|
155
|
+
adapter,
|
|
156
|
+
projectDir: projectDirRef.current,
|
|
157
|
+
toolLockfile: lockfile,
|
|
158
|
+
});
|
|
159
|
+
if (removed.length > 0)
|
|
160
|
+
removedFor.push(adapter.tool);
|
|
161
|
+
removeErrors.push(...failures.map((f) => f.error));
|
|
162
|
+
}
|
|
163
|
+
if (toolResults.length === 0 && removedFor.length === 0 && removeErrors.length === 0) {
|
|
150
164
|
throw new Error(undeclared.length > 0
|
|
151
|
-
? `The latest version of ${asset.name} does not declare ${undeclared.join(', ')}, so it is not updated there.`
|
|
165
|
+
? `The latest version of ${asset.name} does not declare ${undeclared.map((a) => a.tool).join(', ')}, so it is not updated there.`
|
|
152
166
|
: `No configured tool has ${asset.name} to update.`);
|
|
153
167
|
}
|
|
154
|
-
return toolResults;
|
|
168
|
+
return { removedFor, removeErrors, toolResults };
|
|
155
169
|
});
|
|
156
170
|
if (!cancelled) {
|
|
157
171
|
const newLockfile = await readLockfile(projectDirRef.current);
|
|
158
172
|
const warnings = results.flatMap((r) => r.warnings ?? []).map((w) => `${w.message} Run: ${w.command}`);
|
|
159
|
-
const
|
|
160
|
-
?
|
|
161
|
-
:
|
|
162
|
-
|
|
173
|
+
const updatedNote = results.length === 0
|
|
174
|
+
? ''
|
|
175
|
+
: warnings.length > 0
|
|
176
|
+
? `Updated ${asset.name}; ${warnings.join(' ')}`
|
|
177
|
+
: `Updated ${asset.name} successfully`;
|
|
178
|
+
const removedNote = removedFor.length > 0
|
|
179
|
+
? `Removed ${asset.name} for ${removedFor.join(', ')}: the hook doesn't declare ${removedFor.length === 1 ? 'it' : 'them'}.`
|
|
180
|
+
: '';
|
|
181
|
+
const message = [updatedNote, removedNote, ...removeErrors]
|
|
182
|
+
.filter(Boolean)
|
|
183
|
+
.reduce((text, part) => (text ? `${text.endsWith('.') ? text : `${text}.`} ${part}` : part), '');
|
|
184
|
+
dispatch({ message, success: removeErrors.length === 0, type: 'ACTION_COMPLETE' });
|
|
163
185
|
dispatch({ lockfile: newLockfile, type: 'REFRESH_LOCKFILE' });
|
|
164
186
|
}
|
|
165
187
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useListActions.js","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,SAAS,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAM1D,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC5G,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EACL,uBAAuB,EACvB,mBAAmB,EACnB,eAAe,EACf,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,aAAa,GACd,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,
|
|
1
|
+
{"version":3,"file":"useListActions.js","sourceRoot":"","sources":["../../src/hooks/useListActions.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* - the credential chain (`getCredential`) as the client's `getToken`;
|
|
6
6
|
* - the CLI's version as `X-Atk-Cli-Version`, so the API can refuse an
|
|
7
7
|
* outdated CLI (`426 cli_outdated`);
|
|
8
|
-
* - the Sunset-observing base fetch (deleted in step 5d);
|
|
9
8
|
* - the CLI's words for a failed call: {@link presentProblem} turns an
|
|
10
9
|
* AtkError into the message, hint and command the CLI has always shown, and
|
|
11
10
|
* {@link callApi} throws them as an {@link ApiRequestError}.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"api-client.d.ts","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AAEH,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,QAAQ,EAA+B,KAAK,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAGtH,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,+EAA+E;AAC/E,eAAO,MAAM,eAAe,4CAA4C,CAAC;AAEzE,uEAAuE;AACvE,eAAO,MAAM,eAAe,gBAAgB,CAAC;AAE7C;;;;;;;;GAQG;AACH,qBAAa,eAAgB,SAAQ,YAAY;IACvC,IAAI,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,MAAM,EAAE,SAAS,eAAe,EAAE,CAAC;IACnC,IAAI,SAAqB;IAClC,MAAM,EAAE,MAAM,CAAC;gBAGb,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,aAAa,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,SAAS,eAAe,EAAE,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE;CAMjG;AA6CD;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAAC,CAAC,EAC7B,QAAQ,EAAE,MAAM,EAChB,IAAI,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,OAAO,CAAC,CAAC,CAAC,EACpC,MAAM,CAAC,EAAE,SAAS,GACjB,OAAO,CAAC,CAAC,CAAC,CAOZ;AAED;;;GAGG;AACH,wBAAgB,MAAM,IAAI,OAAO,CAAC,SAAS,CAAC,CAS3C;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,SAAS,CAOxE;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,GAAG,IAAI,eAAe,CAW/F;AAED;;;;GAIG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,QAAQ,EACf,QAAQ,EAAE,MAAM,GACf;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CA2EtD;AAED;;;GAGG;AACH,wBAAgB,cAAc,IAAI,IAAI,CAErC;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,MAAM,CAAC,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,MAAM,CAIlE;AAED,+EAA+E;AAC/E,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,eAAe,CAKpF"}
|
package/build/lib/api-client.js
CHANGED
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* - the credential chain (`getCredential`) as the client's `getToken`;
|
|
6
6
|
* - the CLI's version as `X-Atk-Cli-Version`, so the API can refuse an
|
|
7
7
|
* outdated CLI (`426 cli_outdated`);
|
|
8
|
-
* - the Sunset-observing base fetch (deleted in step 5d);
|
|
9
8
|
* - the CLI's words for a failed call: {@link presentProblem} turns an
|
|
10
9
|
* AtkError into the message, hint and command the CLI has always shown, and
|
|
11
10
|
* {@link callApi} throws them as an {@link ApiRequestError}.
|
|
@@ -16,7 +15,6 @@ import { createAtkClient, isAtkError } from './atk-api/index.js';
|
|
|
16
15
|
import { getCredential } from './auth.js';
|
|
17
16
|
import { loadConfig } from './config.js';
|
|
18
17
|
import { ApiCodeError } from './errors.js';
|
|
19
|
-
import { addNotice } from './notices.js';
|
|
20
18
|
import { CLI_VERSION, UPGRADE_COMMAND } from './version.js';
|
|
21
19
|
/** Production ATK API. Used when neither `ATK_API_URL` nor `apiUrl` is set. */
|
|
22
20
|
export const DEFAULT_API_URL = 'https://func-atk-prod.azurewebsites.net';
|
|
@@ -41,12 +39,10 @@ export class ApiRequestError extends ApiCodeError {
|
|
|
41
39
|
this.status = options.status;
|
|
42
40
|
}
|
|
43
41
|
}
|
|
44
|
-
const AUTH_HINT = 'Sign in with your Emergent account (`atk login`)
|
|
42
|
+
const AUTH_HINT = 'Sign in with your Emergent account (`atk login`).';
|
|
45
43
|
const AUTH_COMMAND = 'atk login';
|
|
46
|
-
const AUTH_MESSAGE = 'Authentication failed. Run `atk login
|
|
44
|
+
const AUTH_MESSAGE = 'Authentication failed. Run `atk login` to sign in again.';
|
|
47
45
|
const GUEST_HINT = 'ATK is available to members of the Emergent Software tenant only.';
|
|
48
|
-
const NOT_MEMBER_MESSAGE = 'Your GitHub account is not an active member of the EmergentSoftware organization (or membership could not be verified).';
|
|
49
|
-
const NOT_MEMBER_HINT = 'Ask an org admin to add you, or re-authorise your token with the read:org scope (`gh auth refresh -s read:org`).';
|
|
50
46
|
const UNAVAILABLE_HINT = 'The registry may be temporarily unavailable. Retry in a moment.';
|
|
51
47
|
const AMBIGUOUS_NAME_HINT = 'Pass `--type <type>` (or `--type bundle`) to choose one.';
|
|
52
48
|
const REGISTRY_CHANGED_HINT = 'The registry changed while the pull request was being prepared. Retry the command.';
|
|
@@ -105,7 +101,6 @@ export function getAtk() {
|
|
|
105
101
|
app: 'cli',
|
|
106
102
|
baseUrl: resolveApiUrl(await loadConfig()),
|
|
107
103
|
cliVersion: CLI_VERSION,
|
|
108
|
-
fetch: observingFetch,
|
|
109
104
|
getToken: async () => (await getCredential()).token,
|
|
110
105
|
}))();
|
|
111
106
|
return atkPromise;
|
|
@@ -119,7 +114,6 @@ export function getAtkForToken(token, baseUrl) {
|
|
|
119
114
|
app: 'cli',
|
|
120
115
|
baseUrl,
|
|
121
116
|
cliVersion: CLI_VERSION,
|
|
122
|
-
fetch: observingFetch,
|
|
123
117
|
getToken: async () => token,
|
|
124
118
|
});
|
|
125
119
|
}
|
|
@@ -168,9 +162,6 @@ export function presentProblem(error, resource) {
|
|
|
168
162
|
}
|
|
169
163
|
return fallback;
|
|
170
164
|
case 'forbidden':
|
|
171
|
-
if (problem.code === 'not_org_member' || problem.code === 'org_membership_unverifiable') {
|
|
172
|
-
return { hint: NOT_MEMBER_HINT, message: NOT_MEMBER_MESSAGE };
|
|
173
|
-
}
|
|
174
165
|
if (problem.code === 'guest_not_allowed' && apiMessage) {
|
|
175
166
|
return { hint: GUEST_HINT, message: apiMessage };
|
|
176
167
|
}
|
|
@@ -245,23 +236,4 @@ export function toApiRequestError(error, resource) {
|
|
|
245
236
|
const issues = error.problem.kind === 'invalid' ? error.problem.issues : [];
|
|
246
237
|
return new ApiRequestError(message, { code, ...guidance, issues, status: error.status });
|
|
247
238
|
}
|
|
248
|
-
/** `Sunset` is an HTTP-date; show it as `YYYY-MM-DD`, or verbatim if unparseable. */
|
|
249
|
-
function formatSunsetDate(headerValue) {
|
|
250
|
-
const parsed = new Date(headerValue);
|
|
251
|
-
return Number.isNaN(parsed.getTime()) ? headerValue : parsed.toISOString().slice(0, 10);
|
|
252
|
-
}
|
|
253
|
-
/**
|
|
254
|
-
* The client's base fetch: `globalThis.fetch` (looked up per request) plus
|
|
255
|
-
* response observation. A `Sunset` header (sent on GitHub-authenticated
|
|
256
|
-
* requests while a GitHub sign-in cutoff is scheduled) records a once-per-run
|
|
257
|
-
* notice for the App shell. It must not retry: the client retries around it.
|
|
258
|
-
*/
|
|
259
|
-
async function observingFetch(input, init) {
|
|
260
|
-
const response = await globalThis.fetch(input, init);
|
|
261
|
-
const sunset = response.headers.get('Sunset');
|
|
262
|
-
if (sunset) {
|
|
263
|
-
addNotice({ date: formatSunsetDate(sunset), kind: 'github-sunset' });
|
|
264
|
-
}
|
|
265
|
-
return response;
|
|
266
|
-
}
|
|
267
239
|
//# sourceMappingURL=api-client.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"api-client.js","sourceRoot":"","sources":["../../src/lib/api-client.ts"],"names":[],"mappings":"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"}
|
package/build/lib/auth.d.ts
CHANGED
|
@@ -4,14 +4,14 @@ import { GuidedError } from './errors.js';
|
|
|
4
4
|
export declare class AuthError extends GuidedError {
|
|
5
5
|
name: string;
|
|
6
6
|
}
|
|
7
|
-
/** Environment variable holding a raw
|
|
7
|
+
/** Environment variable holding a raw Entra access token for the ATK API, for CI and agents. */
|
|
8
8
|
export declare const ATK_TOKEN_ENV_VAR = "ATK_TOKEN";
|
|
9
9
|
export interface Credential {
|
|
10
10
|
source: CredentialSource;
|
|
11
11
|
token: string;
|
|
12
12
|
}
|
|
13
13
|
/** Where a credential came from, in chain order. */
|
|
14
|
-
export type CredentialSource = 'ATK_TOKEN' | '
|
|
14
|
+
export type CredentialSource = 'ATK_TOKEN' | 'entra';
|
|
15
15
|
/**
|
|
16
16
|
* Clear the cached credential. Useful for testing, and for
|
|
17
17
|
* `atk login` / `atk logout`, which change what the chain would return.
|
|
@@ -21,15 +21,11 @@ export declare function clearTokenCache(): void;
|
|
|
21
21
|
* Resolve the bearer token to send to the ATK API, and where it came from.
|
|
22
22
|
*
|
|
23
23
|
* Resolution order (the first hit wins and is cached for the process):
|
|
24
|
-
* 1. `ATK_TOKEN` environment variable (
|
|
24
|
+
* 1. `ATK_TOKEN` environment variable (an Entra access token, for CI and agents)
|
|
25
25
|
* 2. The cached Entra session, refreshed silently (`atk login`)
|
|
26
|
-
* 3. `githubToken` in `~/.atkrc.json`
|
|
27
|
-
* 4. `GITHUB_TOKEN` environment variable
|
|
28
|
-
* 5. `gh auth token`
|
|
29
26
|
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
* found the {@link AuthError} names `atk login` as the fix. Commands never
|
|
27
|
+
* When neither yields a token the {@link AuthError} names `atk login` as the
|
|
28
|
+
* fix, and says so differently when the session has expired. Commands never
|
|
33
29
|
* start the device-code flow themselves.
|
|
34
30
|
*/
|
|
35
31
|
export declare function getCredential(): Promise<Credential>;
|
|
@@ -40,8 +36,7 @@ export declare function getCredential(): Promise<Credential>;
|
|
|
40
36
|
export declare function getLastEntraSession(): EntraSession | undefined;
|
|
41
37
|
/**
|
|
42
38
|
* Validate that a token is accepted by the ATK API by calling `GET /me` with
|
|
43
|
-
* exactly that token — never the process-cached one.
|
|
44
|
-
* Entra tokens alike; the API picks the scheme.
|
|
39
|
+
* exactly that token — never the process-cached one.
|
|
45
40
|
*
|
|
46
41
|
* A 401/403 is an expected outcome and returns `{ valid: false }` quietly;
|
|
47
42
|
* only a network failure logs a warning. `principal` is the `/me` payload on
|
package/build/lib/auth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AACA,OAAO,EAAc,KAAK,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAEhE,OAAO,EAAE,KAAK,YAAY,EAAmB,MAAM,YAAY,CAAC;AAChE,OAAO,EAAgB,WAAW,EAAE,MAAM,aAAa,CAAC;AAExD,qBAAa,SAAU,SAAQ,WAAW;IAC/B,IAAI,SAAe;CAC7B;AAED,gGAAgG;AAChG,eAAO,MAAM,iBAAiB,cAAc,CAAC;AAE7C,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,gBAAgB,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,oDAAoD;AACpD,MAAM,MAAM,gBAAgB,GAAG,WAAW,GAAG,OAAO,CAAC;AAUrD;;;GAGG;AACH,wBAAgB,eAAe,IAAI,IAAI,CAGtC;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAAC,UAAU,CAAC,CAMnD;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,YAAY,GAAG,SAAS,CAE9D;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,KAAK,EAAE,MAAM,GACZ,OAAO,CAAC;IAAE,SAAS,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAYvE"}
|
package/build/lib/auth.js
CHANGED
|
@@ -1,18 +1,15 @@
|
|
|
1
|
-
import { execFile } from 'node:child_process';
|
|
2
1
|
import { getAtkForToken, resolveApiUrl } from './api-client.js';
|
|
3
2
|
import { isAtkError } from './atk-api/index.js';
|
|
4
3
|
import { loadConfig } from './config.js';
|
|
5
4
|
import { getEntraSession } from './entra.js';
|
|
6
5
|
import { errorMessage, GuidedError } from './errors.js';
|
|
7
|
-
import { addNotice } from './notices.js';
|
|
8
6
|
export class AuthError extends GuidedError {
|
|
9
7
|
name = 'AuthError';
|
|
10
8
|
}
|
|
11
|
-
/** Environment variable holding a raw
|
|
9
|
+
/** Environment variable holding a raw Entra access token for the ATK API, for CI and agents. */
|
|
12
10
|
export const ATK_TOKEN_ENV_VAR = 'ATK_TOKEN';
|
|
13
|
-
const NOT_SIGNED_IN_MESSAGE = 'Not signed in. Run `atk login` to sign in with your Emergent account
|
|
14
|
-
const SESSION_EXPIRED_MESSAGE = 'Your Emergent sign-in has expired. Run `atk login` to renew it
|
|
15
|
-
const GITHUB_HINT = 'Run `gh auth login`, or set the GITHUB_TOKEN environment variable.';
|
|
11
|
+
const NOT_SIGNED_IN_MESSAGE = 'Not signed in. Run `atk login` to sign in with your Emergent account.';
|
|
12
|
+
const SESSION_EXPIRED_MESSAGE = 'Your Emergent sign-in has expired. Run `atk login` to renew it.';
|
|
16
13
|
/** Cached results so a process resolves each chain at most once. */
|
|
17
14
|
let cachedCredential;
|
|
18
15
|
/** The Entra outcome the last {@link getCredential} run observed, for `atk doctor`. */
|
|
@@ -29,15 +26,11 @@ export function clearTokenCache() {
|
|
|
29
26
|
* Resolve the bearer token to send to the ATK API, and where it came from.
|
|
30
27
|
*
|
|
31
28
|
* Resolution order (the first hit wins and is cached for the process):
|
|
32
|
-
* 1. `ATK_TOKEN` environment variable (
|
|
29
|
+
* 1. `ATK_TOKEN` environment variable (an Entra access token, for CI and agents)
|
|
33
30
|
* 2. The cached Entra session, refreshed silently (`atk login`)
|
|
34
|
-
* 3. `githubToken` in `~/.atkrc.json`
|
|
35
|
-
* 4. `GITHUB_TOKEN` environment variable
|
|
36
|
-
* 5. `gh auth token`
|
|
37
31
|
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
40
|
-
* found the {@link AuthError} names `atk login` as the fix. Commands never
|
|
32
|
+
* When neither yields a token the {@link AuthError} names `atk login` as the
|
|
33
|
+
* fix, and says so differently when the session has expired. Commands never
|
|
41
34
|
* start the device-code flow themselves.
|
|
42
35
|
*/
|
|
43
36
|
export function getCredential() {
|
|
@@ -56,8 +49,7 @@ export function getLastEntraSession() {
|
|
|
56
49
|
}
|
|
57
50
|
/**
|
|
58
51
|
* Validate that a token is accepted by the ATK API by calling `GET /me` with
|
|
59
|
-
* exactly that token — never the process-cached one.
|
|
60
|
-
* Entra tokens alike; the API picks the scheme.
|
|
52
|
+
* exactly that token — never the process-cached one.
|
|
61
53
|
*
|
|
62
54
|
* A 401/403 is an expected outcome and returns `{ valid: false }` quietly;
|
|
63
55
|
* only a network failure logs a warning. `principal` is the `/me` payload on
|
|
@@ -77,33 +69,8 @@ export async function validateToken(token) {
|
|
|
77
69
|
return { valid: false };
|
|
78
70
|
}
|
|
79
71
|
}
|
|
80
|
-
/**
|
|
81
|
-
* Get a token from the GitHub CLI (`gh auth token`).
|
|
82
|
-
*/
|
|
83
|
-
function getTokenFromGhCli() {
|
|
84
|
-
return new Promise((resolve, reject) => {
|
|
85
|
-
execFile('gh', ['auth', 'token'], { timeout: 10_000 }, (error, stdout, stderr) => {
|
|
86
|
-
if (error) {
|
|
87
|
-
const msg = stderr.includes('not logged in')
|
|
88
|
-
? 'GitHub CLI is not authenticated. Run `gh auth login` first.'
|
|
89
|
-
: `Failed to get token from GitHub CLI: ${stderr || error.message}`;
|
|
90
|
-
reject(new AuthError(msg, { command: 'gh auth login', hint: GITHUB_HINT }));
|
|
91
|
-
return;
|
|
92
|
-
}
|
|
93
|
-
const token = stdout.trim();
|
|
94
|
-
if (!token) {
|
|
95
|
-
reject(new AuthError('GitHub CLI returned an empty token. Run `gh auth login` first.', {
|
|
96
|
-
command: 'gh auth login',
|
|
97
|
-
hint: GITHUB_HINT,
|
|
98
|
-
}));
|
|
99
|
-
return;
|
|
100
|
-
}
|
|
101
|
-
resolve(token);
|
|
102
|
-
});
|
|
103
|
-
});
|
|
104
|
-
}
|
|
105
72
|
async function resolveCredential() {
|
|
106
|
-
// 1. ATK_TOKEN: a raw bearer
|
|
73
|
+
// 1. ATK_TOKEN: a raw bearer for CI and agents
|
|
107
74
|
const atkToken = process.env[ATK_TOKEN_ENV_VAR]?.trim();
|
|
108
75
|
if (atkToken) {
|
|
109
76
|
return { source: 'ATK_TOKEN', token: atkToken };
|
|
@@ -114,32 +81,8 @@ async function resolveCredential() {
|
|
|
114
81
|
if (entra.ok) {
|
|
115
82
|
return { source: 'entra', token: entra.token };
|
|
116
83
|
}
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
github = await resolveGitHubToken();
|
|
121
|
-
}
|
|
122
|
-
catch (err) {
|
|
123
|
-
const ghDetail = errorMessage(err);
|
|
124
|
-
throw new AuthError(entra.reason === 'expired' ? SESSION_EXPIRED_MESSAGE : NOT_SIGNED_IN_MESSAGE, {
|
|
125
|
-
command: 'atk login',
|
|
126
|
-
hint: `No GitHub token was found either (${ghDetail})`,
|
|
127
|
-
});
|
|
128
|
-
}
|
|
129
|
-
if (entra.reason === 'expired') {
|
|
130
|
-
addNotice({ kind: 'entra-expired' });
|
|
131
|
-
}
|
|
132
|
-
return github;
|
|
133
|
-
}
|
|
134
|
-
async function resolveGitHubToken() {
|
|
135
|
-
const config = await loadConfig();
|
|
136
|
-
if (config.githubToken) {
|
|
137
|
-
return { source: 'config', token: config.githubToken };
|
|
138
|
-
}
|
|
139
|
-
const envToken = process.env['GITHUB_TOKEN'];
|
|
140
|
-
if (envToken) {
|
|
141
|
-
return { source: 'GITHUB_TOKEN', token: envToken };
|
|
142
|
-
}
|
|
143
|
-
return { source: 'gh', token: await getTokenFromGhCli() };
|
|
84
|
+
throw new AuthError(entra.reason === 'expired' ? SESSION_EXPIRED_MESSAGE : NOT_SIGNED_IN_MESSAGE, {
|
|
85
|
+
command: 'atk login',
|
|
86
|
+
});
|
|
144
87
|
}
|
|
145
88
|
//# sourceMappingURL=auth.js.map
|
package/build/lib/auth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EACL,KAAK,MAAM,EAGX,KAAK,aAAa,EAGnB,MAAM,qBAAqB,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAIpD,OAAO,EACL,KAAK,MAAM,EAGX,KAAK,aAAa,EAGnB,MAAM,qBAAqB,CAAC;AAY7B;;;GAGG;AACH,wBAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,SAAS,EACf,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CA0Bf;AAED;;GAEG;AACH,wBAAgB,WAAW,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAEnD;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAEtC;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAKnE;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE/D;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAE1D;AAED;;;GAGG;AACH,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,SAAS,EAChB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,OAAO,CAAC,CAGlB;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,IAAI,GAAG,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,EAAE,MAAM,GAAG,OAAO,CASpH;AAED;;GAEG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,CAAC;IAAE,SAAS,EAAE,OAAO,CAAC;IAAC,GAAG,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAAC,CAQ5G;AAED;;;;GAIG;AACH,wBAAsB,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,CAUlD;AAED;;;;;GAKG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,aAAa,CAAC,CAczF;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAgBpE;AAED;;GAEG;AACH,wBAAsB,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9D;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,MAAM,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAchG;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,MAAM,CA2BjF;AAED;;;GAGG;AACH,wBAAsB,iBAAiB,CACrC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,SAAS,EAChB,GAAG,CAAC,EAAE,MAAM,GACX,OAAO,CAAC,IAAI,CAAC,CAqBf"}
|
package/build/lib/config.js
CHANGED
|
@@ -10,7 +10,9 @@ import { writeJsonFile } from './write-file.js';
|
|
|
10
10
|
const ATKRC_FILENAME = '.atkrc.json';
|
|
11
11
|
// ~/.atkrc.json is both the user config and the config of a project set up in the home
|
|
12
12
|
// directory, so each save rewrites only the keys it owns and keeps the rest.
|
|
13
|
-
|
|
13
|
+
// Retired user keys stay owned, so the next save removes them: `githubToken` held a GitHub token.
|
|
14
|
+
const RETIRED_USER_CONFIG_KEYS = ['githubToken'];
|
|
15
|
+
const USER_CONFIG_KEYS = [...Object.keys(ConfigSchema.shape), ...RETIRED_USER_CONFIG_KEYS];
|
|
14
16
|
const PROJECT_CONFIG_KEYS = [...Object.keys(ProjectConfigBase.shape), 'tool'];
|
|
15
17
|
/**
|
|
16
18
|
* Freeze an asset by adding it to the project config's `frozenAssets` array.
|