@detergent-software/atk 8.5.0-dev.7 → 8.5.0-dev.8
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 +6 -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/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/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/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/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/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [8.5.0-dev.8](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.5.0-dev.7&targetVersion=GTv8.5.0-dev.8) (2026-10-12)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* **cli:** sign in with Emergent only, drop GitHub token sources (ATK-35) ([352871f](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/commit/352871f925ea9630b462593011d49342fb4c3a35))
|
|
6
|
+
|
|
1
7
|
## [8.5.0-dev.7](https://emergentcode.visualstudio.com/Emergent%20Software/_git/Emergent.AgenticToolkit/branchCompare?baseVersion=GTv8.5.0-dev.6&targetVersion=GTv8.5.0-dev.7) (2026-10-12)
|
|
2
8
|
|
|
3
9
|
### Refactoring
|
package/README.md
CHANGED
|
@@ -18,7 +18,7 @@ AI coding assistants become far more capable with the right configuration — cu
|
|
|
18
18
|
|
|
19
19
|
- **Node.js** >= 24.0.0
|
|
20
20
|
- **pnpm** 10.5.2+
|
|
21
|
-
- An **Emergent Software account** (sign in with `atk login`)
|
|
21
|
+
- An **Emergent Software account** (sign in with `atk login`). ATK talks to the ATK API, which accepts an Emergent (Microsoft Entra) sign-in from members of the tenant. See [Authentication](#authentication). No command needs `git` or the GitHub CLI (`gh`).
|
|
22
22
|
|
|
23
23
|
### Installation
|
|
24
24
|
|
|
@@ -78,7 +78,7 @@ atk update
|
|
|
78
78
|
| `atk install <asset>` | Install an asset with dependency resolution |
|
|
79
79
|
| `atk list` | List all installed assets |
|
|
80
80
|
| `atk login` | Sign in with your Emergent (Microsoft Entra) account |
|
|
81
|
-
| `atk logout` | Sign out of your Emergent account
|
|
81
|
+
| `atk logout` | Sign out of your Emergent account |
|
|
82
82
|
| `atk outdated` | Show assets with available updates |
|
|
83
83
|
| `atk pin <asset>` | Pin an asset to its current version |
|
|
84
84
|
| `atk promote <name>` | Promote an org-scoped asset or bundle to global via PR |
|
|
@@ -97,22 +97,18 @@ atk update
|
|
|
97
97
|
|
|
98
98
|
## Authentication
|
|
99
99
|
|
|
100
|
-
Every registry read, `atk checkout`, `atk publish`, `atk unpublish`, `atk promote`, `atk deprecate` and `atk release-notes` go through the ATK API with a bearer token
|
|
100
|
+
Every registry read, `atk checkout`, `atk publish`, `atk unpublish`, `atk promote`, `atk deprecate` and `atk release-notes` go through the ATK API with a bearer token for your Emergent Software (Microsoft Entra) account.
|
|
101
101
|
|
|
102
|
-
|
|
103
|
-
- **GitHub token.** A token for an account that is an active member of the `EmergentSoftware` organization, from `githubToken` in config, the `GITHUB_TOKEN` environment variable, or `gh auth token`.
|
|
102
|
+
Run `atk login`: it prints a URL and a one-time code, you sign in with your Emergent account in a browser, and the CLI keeps a session in `~/.atk/auth/msal-cache.json`. The file holds a refresh token, so it is created readable by you only and is not touched by `atk cache clear`. The session renews itself silently; when it can no longer be renewed, run `atk login` again. `atk logout` removes the session and the file. Guest accounts in the tenant are refused.
|
|
104
103
|
|
|
105
104
|
ATK resolves the credential in this order and uses the first hit for the whole run:
|
|
106
105
|
|
|
107
|
-
1. `ATK_TOKEN` environment variable — a raw
|
|
106
|
+
1. `ATK_TOKEN` environment variable — a raw Entra access token for the ATK API, for CI and agents (for example `az account get-access-token --scope api://8da5aa72-0565-4ae8-bf5a-db89d8bd3186/access_as_user --query accessToken -o tsv`).
|
|
108
107
|
2. The `atk login` session.
|
|
109
|
-
3. `githubToken` in `~/.atkrc.json`.
|
|
110
|
-
4. `GITHUB_TOKEN`.
|
|
111
|
-
5. `gh auth token`.
|
|
112
108
|
|
|
113
|
-
`atk whoami` shows who you are signed in as, which scheme the API applied, and which source supplied the credential; `atk doctor` reports the same in its **Authentication** check.
|
|
109
|
+
When neither is there, commands fail with "Not signed in" (or "Your Emergent sign-in has expired") and name `atk login`. `atk whoami` shows who you are signed in as, which scheme the API applied, and which source supplied the credential; `atk doctor` reports the same in its **Authentication** check.
|
|
114
110
|
|
|
115
|
-
GitHub sign-in to ATK
|
|
111
|
+
GitHub sign-in to ATK has ended. GitHub tokens are no longer read from `gh`, `GITHUB_TOKEN` or config; one passed in `ATK_TOKEN` is refused by the API with a message naming `atk login`.
|
|
116
112
|
|
|
117
113
|
## Asset Types
|
|
118
114
|
|
|
@@ -127,7 +123,7 @@ GitHub sign-in to ATK will be retired on a date announced by the API. Until then
|
|
|
127
123
|
|
|
128
124
|
## How It Works
|
|
129
125
|
|
|
130
|
-
1. **Registry** — Assets live in the `assets/` directory of the registry repository, each with a `manifest.json` declaring metadata, dependencies, trust level, and security review info. CI validates asset and bundle changes on pull requests, rebuilds `registry.json` and `schemas/` on pushes to `develop` and `main`, and promotes asset-only changes to `main` through a dedicated promotion branch. The CLI never reads the repository directly: it talks to the **ATK API** (`https://func-atk-prod.azurewebsites.net` by default), which serves `registry.json` with ETag caching, asset manifests and files, `atk checkout` working copies and CLI release notes, and opens publish, unpublish and promote pull requests on your behalf
|
|
126
|
+
1. **Registry** — Assets live in the `assets/` directory of the registry repository, each with a `manifest.json` declaring metadata, dependencies, trust level, and security review info. CI validates asset and bundle changes on pull requests, rebuilds `registry.json` and `schemas/` on pushes to `develop` and `main`, and promotes asset-only changes to `main` through a dedicated promotion branch. The CLI never reads the repository directly: it talks to the **ATK API** (`https://func-atk-prod.azurewebsites.net` by default), which serves `registry.json` with ETag caching, asset manifests and files, `atk checkout` working copies and CLI release notes, and opens publish, unpublish and promote pull requests on your behalf with the API's publish identity (the commit authored as you, and the PR body naming you).
|
|
131
127
|
|
|
132
128
|
2. **Tool Adapters** — JSON adapter files in `tool-adapters/` define how assets are placed for each AI tool. The Claude Code adapter puts skills in `.claude/skills/`, agents in `.claude/agents/`, MCP servers in `.mcp.json`, and so on. Supported tools today are **Claude Code** (`claude-code`), **GitHub Copilot CLI** (`copilot-cli`), and **OpenAI Codex CLI** (`codex-cli`); pick one or more with `atk setup`. New tools are added by dropping in an adapter file — no CLI code changes needed. Config registration targets can be JSON or TOML (`configFormat`).
|
|
133
129
|
|
|
@@ -287,7 +283,6 @@ atk config org --reset
|
|
|
287
283
|
| `cacheDir` | `~/.atk/cache/` | Override cache directory |
|
|
288
284
|
| `cacheTtlMinutes` | `5` | Cache TTL in minutes for registry data |
|
|
289
285
|
| `checkUpdates` | `true` | Show a banner when a newer ATK version is available (in `--json` output, an `update-available` entry in `notices`) |
|
|
290
|
-
| `githubToken` | _(not set)_ | GitHub token override (defaults to `GITHUB_TOKEN`, then `gh auth token`); an `atk login` session wins over all three |
|
|
291
286
|
| `org` | _(not set)_ | Default organization scope for asset resolution |
|
|
292
287
|
|
|
293
288
|
### Environment Variables
|
|
@@ -296,8 +291,7 @@ atk config org --reset
|
|
|
296
291
|
| -------------- | ------------------------------------------------------------------------------------------------------------ |
|
|
297
292
|
| `ATK_API_URL` | Overrides `apiUrl` (e.g. `https://func-atk-dev.azurewebsites.net` to target the dev API). |
|
|
298
293
|
| `ATK_WEB_URL` | Overrides the ATK web app base URL used for the `Web:` links in `info`, `browse`, `list` and `search`. |
|
|
299
|
-
| `ATK_TOKEN` | A raw
|
|
300
|
-
| `GITHUB_TOKEN` | GitHub token, used after the `atk login` session and `githubToken` config, before `gh auth token`. |
|
|
294
|
+
| `ATK_TOKEN` | A raw Entra access token for the ATK API, for CI and agents. Wins over the `atk login` session. |
|
|
301
295
|
|
|
302
296
|
## Development
|
|
303
297
|
|
|
@@ -408,7 +402,7 @@ Pull requests targeting `main` or `develop` that touch `apps/cli/` run the `atk-
|
|
|
408
402
|
**Runtime:** Node.js >= 24, TypeScript 5.7+, ES2024
|
|
409
403
|
**CLI:** Pastel (file-based routing) + Ink (React for terminals) + React 19
|
|
410
404
|
**Validation:** Zod 4 (runtime schemas + JSON Schema export)
|
|
411
|
-
**Auth:** Microsoft Entra device-code sign-in via `@azure/msal-node` (`atk login`, session in `~/.atk/auth/`) or
|
|
405
|
+
**Auth:** Microsoft Entra device-code sign-in via `@azure/msal-node` (`atk login`, session in `~/.atk/auth/`), or an Entra access token in `ATK_TOKEN`, sent as a bearer to the ATK API, which verifies tenant membership
|
|
412
406
|
**Registry access:** ATK API (`@hey-api/openapi-ts` generated client, vendored contract in `openapi/`)
|
|
413
407
|
**Distribution:** npm (`@detergent-software` scope)
|
|
414
408
|
**CI/CD:** GitHub Actions + semantic-release
|
package/build/commands/_app.js
CHANGED
|
@@ -56,8 +56,8 @@ export default function App({ commandProps, Component }) {
|
|
|
56
56
|
const jsonFromOptions = Boolean(commandProps.options?.json);
|
|
57
57
|
const { isRawModeSupported } = useStdin();
|
|
58
58
|
const effectiveJson = jsonFromOptions || !isRawModeSupported;
|
|
59
|
-
// Once-per-run notices
|
|
60
|
-
//
|
|
59
|
+
// Once-per-run notices arrive while the command runs; subscribing
|
|
60
|
+
// re-renders the shell in place.
|
|
61
61
|
const notices = React.useSyncExternalStore(subscribeNotices, getNotices, getNotices);
|
|
62
62
|
const [updateInfo, setUpdateInfo] = React.useState(null);
|
|
63
63
|
React.useEffect(() => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_app.js","sourceRoot":"","sources":["../../src/commands/_app.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"_app.js","sourceRoot":"","sources":["../../src/commands/_app.tsx"],"names":[],"mappings":"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"}
|
package/build/commands/index.js
CHANGED
|
@@ -17,7 +17,7 @@ const commands = [
|
|
|
17
17
|
['install', 'Install an asset or bundle (no args syncs from lockfile)'],
|
|
18
18
|
['list', 'List installed assets'],
|
|
19
19
|
['login', 'Sign in with your Emergent (Microsoft Entra) account'],
|
|
20
|
-
['logout', 'Sign out of your Emergent account
|
|
20
|
+
['logout', 'Sign out of your Emergent account'],
|
|
21
21
|
['outdated', 'Show available updates for installed assets'],
|
|
22
22
|
['pin', 'Pin an installed asset at its installed version'],
|
|
23
23
|
['promote', 'Promote an org-scoped asset or bundle to the global namespace'],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,MAAM,CAAC,MAAM,WAAW,GAAG,sDAAsD,CAAC;AAElF,MAAM,QAAQ,GAAG;IACf,CAAC,OAAO,EAAE,gDAAgD,CAAC;IAC3D,CAAC,QAAQ,EAAE,yCAAyC,CAAC;IACrD,CAAC,OAAO,EAAE,2BAA2B,CAAC;IACtC,CAAC,UAAU,EAAE,mDAAmD,CAAC;IACjE,CAAC,QAAQ,EAAE,+CAA+C,CAAC;IAC3D,CAAC,WAAW,EAAE,gFAAgF,CAAC;IAC/F,CAAC,MAAM,EAAE,mDAAmD,CAAC;IAC7D,CAAC,QAAQ,EAAE,8CAA8C,CAAC;IAC1D,CAAC,OAAO,EAAE,sEAAsE,CAAC;IACjF,CAAC,QAAQ,EAAE,0EAA0E,CAAC;IACtF,CAAC,MAAM,EAAE,uCAAuC,CAAC;IACjD,CAAC,MAAM,EAAE,gCAAgC,CAAC;IAC1C,CAAC,SAAS,EAAE,0DAA0D,CAAC;IACvE,CAAC,MAAM,EAAE,uBAAuB,CAAC;IACjC,CAAC,OAAO,EAAE,sDAAsD,CAAC;IACjE,CAAC,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/commands/index.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAEhC,MAAM,CAAC,MAAM,WAAW,GAAG,sDAAsD,CAAC;AAElF,MAAM,QAAQ,GAAG;IACf,CAAC,OAAO,EAAE,gDAAgD,CAAC;IAC3D,CAAC,QAAQ,EAAE,yCAAyC,CAAC;IACrD,CAAC,OAAO,EAAE,2BAA2B,CAAC;IACtC,CAAC,UAAU,EAAE,mDAAmD,CAAC;IACjE,CAAC,QAAQ,EAAE,+CAA+C,CAAC;IAC3D,CAAC,WAAW,EAAE,gFAAgF,CAAC;IAC/F,CAAC,MAAM,EAAE,mDAAmD,CAAC;IAC7D,CAAC,QAAQ,EAAE,8CAA8C,CAAC;IAC1D,CAAC,OAAO,EAAE,sEAAsE,CAAC;IACjF,CAAC,QAAQ,EAAE,0EAA0E,CAAC;IACtF,CAAC,MAAM,EAAE,uCAAuC,CAAC;IACjD,CAAC,MAAM,EAAE,gCAAgC,CAAC;IAC1C,CAAC,SAAS,EAAE,0DAA0D,CAAC;IACvE,CAAC,MAAM,EAAE,uBAAuB,CAAC;IACjC,CAAC,OAAO,EAAE,sDAAsD,CAAC;IACjE,CAAC,QAAQ,EAAE,mCAAmC,CAAC;IAC/C,CAAC,UAAU,EAAE,6CAA6C,CAAC;IAC3D,CAAC,KAAK,EAAE,iDAAiD,CAAC;IAC1D,CAAC,SAAS,EAAE,+DAA+D,CAAC;IAC5E,CAAC,OAAO,EAAE,8BAA8B,CAAC;IACzC,CAAC,SAAS,EAAE,4CAA4C,CAAC;IACzD,CAAC,UAAU,EAAE,uDAAuD,CAAC;IACrE,CAAC,eAAe,EAAE,+DAA+D,CAAC;IAClF,CAAC,UAAU,EAAE,+EAA+E,CAAC;IAC7F,CAAC,QAAQ,EAAE,mFAAmF,CAAC;IAC/F,CAAC,QAAQ,EAAE,+CAA+C,CAAC;IAC3D,CAAC,OAAO,EAAE,oEAAoE,CAAC;IAC/E,CAAC,MAAM,EAAE,6FAA6F,CAAC;IACvG,CAAC,MAAM,EAAE,oEAAoE,CAAC;IAC9E,CAAC,WAAW,EAAE,8BAA8B,CAAC;IAC7C,CAAC,OAAO,EAAE,8CAA8C,CAAC;IACzD,CAAC,WAAW,EAAE,uDAAuD,CAAC;IACtE,CAAC,QAAQ,EAAE,yBAAyB,CAAC;IACrC,CAAC,QAAQ,EAAE,kEAAkE,CAAC;IAC9E,CAAC,KAAK,EAAE,mCAAmC,CAAC;CACpC,CAAC;AAEX,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;AAEtE,MAAM,CAAC,OAAO,UAAU,KAAK;IAC3B,OAAO,CACL,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,EAAC,GAAG,EAAE,CAAC,aAChC,MAAC,IAAI,0DACoC,KAAC,IAAI,IAAC,IAAI,iCAAkB,mCAC9D,EACP,MAAC,GAAG,IAAC,aAAa,EAAC,QAAQ,aACzB,KAAC,IAAI,IAAC,QAAQ,gCAAiB,EAC9B,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAC9B,MAAC,IAAI,eACF,IAAI,EACL,KAAC,IAAI,IAAC,IAAI,kBAAE,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,GAAQ,OAAE,IAAI,KAFxC,IAAI,CAGR,CACR,CAAC,IACE,IACF,CACP,CAAC;AACJ,CAAC"}
|
package/build/commands/login.js
CHANGED
|
@@ -30,7 +30,7 @@ export const options = z.object({
|
|
|
30
30
|
/** "Jason Paff (jasonp@emergentsoftware.net) via Entra", degrading gracefully. */
|
|
31
31
|
export function describePrincipal(principal) {
|
|
32
32
|
const who = principal.name ? `${principal.name} (${principal.email ?? principal.login})` : principal.login;
|
|
33
|
-
const via = principal.scheme === 'entra' ? 'Entra' : principal.scheme
|
|
33
|
+
const via = principal.scheme === 'entra' ? 'Entra' : principal.scheme;
|
|
34
34
|
return `${who} via ${via}`;
|
|
35
35
|
}
|
|
36
36
|
export default function Login({ options: { force, json } }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACpD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAGL,iBAAiB,EACjB,eAAe,EACf,mBAAmB,EACnB,WAAW,EACX,kBAAkB,GACnB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAEjE,MAAM,CAAC,MAAM,WAAW,GAAG,sDAAsD,CAAC;AAElF,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,KAAK,EAAE,CAAC;SACL,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,+CAA+C;KAC7D,CAAC,CACH;IACH,IAAI,EAAE,CAAC;SACJ,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,wCAAwC;KACtD,CAAC,CACH;CACJ,CAAC,CAAC;AAqBH,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,SAAoB;IACpD,MAAM,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,IAAI,KAAK,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC;IAC3G,MAAM,GAAG,GAAG,SAAS,CAAC,MAAM,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"login.js","sourceRoot":"","sources":["../../src/commands/login.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { z } from 'zod';
|
|
2
|
-
export declare const description = "Sign out of your Emergent account
|
|
2
|
+
export declare const description = "Sign out of your Emergent account";
|
|
3
3
|
export declare const options: z.ZodObject<{
|
|
4
4
|
json: z.ZodDefault<z.ZodBoolean>;
|
|
5
5
|
}, z.core.$strip>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/commands/logout.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,eAAO,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"logout.d.ts","sourceRoot":"","sources":["../../src/commands/logout.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAQxB,eAAO,MAAM,WAAW,sCAAsC,CAAC;AAE/D,eAAO,MAAM,OAAO;;iBAUlB,CAAC;AAEH,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;AAEF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,2CAyC1D"}
|
package/build/commands/logout.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
|
-
import {
|
|
2
|
+
import { Text } from 'ink';
|
|
3
3
|
import { option } from 'pastel';
|
|
4
4
|
import { z } from 'zod';
|
|
5
5
|
import { ErrorView, Spinner } from '../components/index.js';
|
|
@@ -7,7 +7,7 @@ import { useCommand } from '../hooks/useCommand.js';
|
|
|
7
7
|
import { clearTokenCache } from '../lib/auth.js';
|
|
8
8
|
import { getEntraCachePath, logoutEntra } from '../lib/entra.js';
|
|
9
9
|
import { renderJson, useNonInteractive } from '../lib/output.js';
|
|
10
|
-
export const description = 'Sign out of your Emergent account
|
|
10
|
+
export const description = 'Sign out of your Emergent account';
|
|
11
11
|
export const options = z.object({
|
|
12
12
|
json: z
|
|
13
13
|
.boolean()
|
|
@@ -17,7 +17,6 @@ export const options = z.object({
|
|
|
17
17
|
description: 'Output raw JSON (for scripting and CI)',
|
|
18
18
|
})),
|
|
19
19
|
});
|
|
20
|
-
const GITHUB_NOTE = 'GitHub tokens (gh, GITHUB_TOKEN, githubToken in config) are untouched.';
|
|
21
20
|
export default function Logout({ options: { json } }) {
|
|
22
21
|
const { json: effectiveJson } = useNonInteractive(json);
|
|
23
22
|
const state = useCommand(async () => {
|
|
@@ -44,6 +43,6 @@ export default function Logout({ options: { json } }) {
|
|
|
44
43
|
if (effectiveJson) {
|
|
45
44
|
return renderJson({ cleared, outcome: 'ok' });
|
|
46
45
|
}
|
|
47
|
-
return
|
|
46
|
+
return cleared ? (_jsxs(Text, { color: 'green', children: ["\u2713 Signed out of your Emergent account. Removed ", getEntraCachePath(), "."] })) : (_jsx(Text, { dimColor: true, children: "No Emergent session to clear." }));
|
|
48
47
|
}
|
|
49
48
|
//# sourceMappingURL=logout.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"logout.js","sourceRoot":"","sources":["../../src/commands/logout.tsx"],"names":[],"mappings":"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"}
|
|
@@ -12,9 +12,9 @@ export declare const args: z.ZodTuple<[z.ZodEnum<{
|
|
|
12
12
|
"mcp-config": "mcp-config";
|
|
13
13
|
bundle: "bundle";
|
|
14
14
|
registry: "registry";
|
|
15
|
-
config: "config";
|
|
16
15
|
lockfile: "lockfile";
|
|
17
16
|
adapter: "adapter";
|
|
17
|
+
config: "config";
|
|
18
18
|
}>], null>;
|
|
19
19
|
type Props = {
|
|
20
20
|
args: z.infer<typeof args>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,WAAW,qEAAqE,CAAC;AAE9F,eAAO,MAAM,OAAO;;iBAUlB,CAAC;AAEH,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;
|
|
1
|
+
{"version":3,"file":"whoami.d.ts","sourceRoot":"","sources":["../../src/commands/whoami.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAWxB,eAAO,MAAM,WAAW,qEAAqE,CAAC;AAE9F,eAAO,MAAM,OAAO;;iBAUlB,CAAC;AAEH,KAAK,KAAK,GAAG;IACX,OAAO,EAAE,CAAC,CAAC,KAAK,CAAC,OAAO,OAAO,CAAC,CAAC;CAClC,CAAC;AAYF,MAAM,CAAC,OAAO,UAAU,MAAM,CAAC,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,2CA6D1D"}
|
package/build/commands/whoami.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { jsx as _jsx, jsxs as _jsxs
|
|
1
|
+
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
2
2
|
import { Box, Text } from 'ink';
|
|
3
3
|
import { option } from 'pastel';
|
|
4
4
|
import { z } from 'zod';
|
|
@@ -20,10 +20,7 @@ export const options = z.object({
|
|
|
20
20
|
});
|
|
21
21
|
const SOURCE_LABELS = {
|
|
22
22
|
ATK_TOKEN: 'ATK_TOKEN environment variable',
|
|
23
|
-
config: 'githubToken in ~/.atkrc.json',
|
|
24
23
|
entra: 'atk login session',
|
|
25
|
-
gh: 'gh auth token',
|
|
26
|
-
GITHUB_TOKEN: 'GITHUB_TOKEN environment variable',
|
|
27
24
|
};
|
|
28
25
|
export default function Whoami({ options: { json } }) {
|
|
29
26
|
const { json: effectiveJson } = useNonInteractive(json);
|
|
@@ -63,6 +60,6 @@ export default function Whoami({ options: { json } }) {
|
|
|
63
60
|
source,
|
|
64
61
|
});
|
|
65
62
|
}
|
|
66
|
-
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { children: ["Signed in as ", _jsx(Text, { bold: true, children: describePrincipal(principal) })] }), _jsx(Text, { children: " " }), _jsx(Field, { label: 'Scheme', value: principal.scheme }), _jsx(Field, { label: 'Login', value: principal.login }), principal.name ? _jsx(Field, { label: 'Name', value: principal.name }) : null, principal.email ? _jsx(Field, { label: 'Email', value: principal.email }) : null, _jsx(Field, { label: 'Source', value: SOURCE_LABELS[source] })
|
|
63
|
+
return (_jsxs(Box, { flexDirection: 'column', children: [_jsxs(Text, { children: ["Signed in as ", _jsx(Text, { bold: true, children: describePrincipal(principal) })] }), _jsx(Text, { children: " " }), _jsx(Field, { label: 'Scheme', value: principal.scheme }), _jsx(Field, { label: 'Login', value: principal.login }), principal.name ? _jsx(Field, { label: 'Name', value: principal.name }) : null, principal.email ? _jsx(Field, { label: 'Email', value: principal.email }) : null, _jsx(Field, { label: 'Source', value: SOURCE_LABELS[source] })] }));
|
|
67
64
|
}
|
|
68
65
|
//# sourceMappingURL=whoami.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC;AAChC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAIxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,wBAAwB,CAAC;AACnE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACpD,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAC/C,OAAO,EAAyB,aAAa,EAAE,MAAM,gBAAgB,CAAC;AACtE,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,YAAY,CAAC;AAE/C,MAAM,CAAC,MAAM,WAAW,GAAG,kEAAkE,CAAC;AAE9F,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,CAAC,MAAM,CAAC;IAC9B,IAAI,EAAE,CAAC;SACJ,OAAO,EAAE;SACT,OAAO,CAAC,KAAK,CAAC;SACd,QAAQ,CACP,MAAM,CAAC;QACL,KAAK,EAAE,GAAG;QACV,WAAW,EAAE,wCAAwC;KACtD,CAAC,CACH;CACJ,CAAC,CAAC;AAWH,MAAM,aAAa,GAAqC;IACtD,SAAS,EAAE,gCAAgC;IAC3C,
|
|
1
|
+
{"version":3,"file":"whoami.js","sourceRoot":"","sources":["../../src/commands/whoami.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NoticeBanner.d.ts","sourceRoot":"","sources":["../../src/components/NoticeBanner.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"NoticeBanner.d.ts","sourceRoot":"","sources":["../../src/components/NoticeBanner.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAEhD,UAAU,iBAAiB;IACzB,OAAO,EAAE,SAAS,MAAM,EAAE,CAAC;CAC5B;AAED;;;GAGG;AACH,MAAM,CAAC,OAAO,UAAU,YAAY,CAAC,EAAE,OAAO,EAAE,EAAE,iBAAiB,kDAclE"}
|
|
@@ -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"}
|
|
@@ -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"}
|