@experiture/xyra-cli 0.6.1 → 0.6.4
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/README.md +24 -1
- package/dist/auth/oauthClient.js +89 -30
- package/dist/auth/oauthClient.js.map +1 -1
- package/dist/auth/session.js +11 -7
- package/dist/auth/session.js.map +1 -1
- package/dist/auth/tokenStore.js.map +1 -1
- package/dist/chat/runtimeChatClient.js +22503 -1287
- package/dist/chat/runtimeChatClient.js.map +4 -4
- package/dist/commands/chat.js +159 -37
- package/dist/commands/chat.js.map +1 -1
- package/dist/commands/login.js +7 -7
- package/dist/commands/login.js.map +1 -1
- package/dist/commands/mcpContext.js +29 -3
- package/dist/commands/mcpContext.js.map +1 -1
- package/dist/commands/session.js +32 -24
- package/dist/commands/session.js.map +1 -1
- package/dist/commands/tools.js +72 -7
- package/dist/commands/tools.js.map +1 -1
- package/dist/commands/workflowProposal.js +19 -0
- package/dist/commands/workflowProposal.js.map +1 -0
- package/dist/config/configStore.js +130 -104
- package/dist/config/configStore.js.map +3 -3
- package/dist/index.js +26 -10
- package/dist/index.js.map +1 -1
- package/dist/mcp/confirmation.js +17 -3
- package/dist/mcp/confirmation.js.map +1 -1
- package/dist/mcp/mcpClient.js +83 -32
- package/dist/mcp/mcpClient.js.map +4 -4
- package/dist/output/formatters.js +4 -0
- package/dist/output/formatters.js.map +1 -1
- package/package.json +3 -3
package/README.md
CHANGED
|
@@ -43,13 +43,19 @@ otherwise the CLI falls back per the security model below):
|
|
|
43
43
|
|
|
44
44
|
```bash
|
|
45
45
|
npm pack --workspace=apps/xyra-cli --pack-destination /tmp
|
|
46
|
-
npm install -g /tmp/experiture-xyra-cli-0.6.
|
|
46
|
+
npm install -g /tmp/experiture-xyra-cli-0.6.3.tgz
|
|
47
47
|
xyra --version
|
|
48
48
|
```
|
|
49
49
|
|
|
50
50
|
For development, `npm link` from `apps/xyra-cli` keeps the global `xyra`
|
|
51
51
|
pointing at your working tree.
|
|
52
52
|
|
|
53
|
+
The CLI bundles its shared chat client at build time. After changing runtime
|
|
54
|
+
contracts locally, rebuild and reinstall the packed CLI before testing: an older
|
|
55
|
+
global installation still validates the older event shapes even when the local
|
|
56
|
+
services and browser have updated. Keep the strict shared validation; do not
|
|
57
|
+
ignore unfamiliar progress fields to make a stale installation appear healthy.
|
|
58
|
+
|
|
53
59
|
## Security model
|
|
54
60
|
|
|
55
61
|
- **Public client, no secret.** `experiture-xyra-mcp-delegated` uses PKCE
|
|
@@ -83,6 +89,13 @@ xyra logout [--session <name>] # remove only the selected login
|
|
|
83
89
|
xyra chat start [--title <text>] [--json] # create a conversation
|
|
84
90
|
xyra chat send --conversation <id> "<message>" # continue one conversation
|
|
85
91
|
xyra chat send --new "<message>" # create, then send one turn
|
|
92
|
+
xyra chat send --new --wait-background "<message>" # show the saved reply, then follow its background work
|
|
93
|
+
xyra chat resume --conversation <id> --request <id> --wait-background # reattach without submitting again
|
|
94
|
+
xyra chat resume --conversation <id> --request <id> --guidance "Keep the heading" # continue one correction batch
|
|
95
|
+
xyra chat resume --conversation <id> --request <id> --execution <id> --revision <n> # select one of several corrections
|
|
96
|
+
xyra chat stop --conversation <id> --request <id> # stop while keeping saved content and history
|
|
97
|
+
xyra chat stop --conversation <id> --request <id> --execution <id> --revision <n> # stop only the selected correction
|
|
98
|
+
xyra chat proposal --conversation <id> --request <id> --execution <id> --revision <n> --step <key> # read an unsaved proposal
|
|
86
99
|
xyra mcp metadata [--json] # public OAuth resource metadata (no login)
|
|
87
100
|
xyra mcp initialize [--json] # MCP handshake / capabilities
|
|
88
101
|
xyra tools list [--domain <id>] [--task <k>] [--limit <n>] [--json]
|
|
@@ -95,6 +108,16 @@ xyra --timings tools list --limit 1
|
|
|
95
108
|
xyra --timings-json tools call <toolKey> --arg k=v
|
|
96
109
|
```
|
|
97
110
|
|
|
111
|
+
`chat send --wait-background` shows the completed reply before waiting on the background jobs attached to that reply. It uses the current login and ordinary token renewal, follows the existing jobs without submitting the work again, and stops for approval or a required reconnect. In JSON mode, the early reply goes to stderr and the final JSON includes the background observation; a background read problem preserves the successful primary result. Without this option, the command returns after the primary reply and does not promise continued attendance after it exits.
|
|
112
|
+
|
|
113
|
+
If the process ends after a request was accepted, use `chat resume` with the original conversation and request IDs from the output. This renews observation of that same request and retrieves its saved answer; it takes no message argument and does not repeat template creation or another business action. `--wait-background` also follows any job references in the recovered reply, and `no_jobs_reported` means the reply supplied no observable jobs, not that background work was completed.
|
|
114
|
+
|
|
115
|
+
A correction pause preserves the candidate and reports the remaining issues and previous attempts. An explicit `chat resume` continues one batch; `--guidance` advises that correction without changing the accepted target or scope. `chat stop` cancels the retained work and keeps saved results and history; it does not permit a later resume to undo cancellation. `chat proposal` reads only an authorized, explicitly declared unsaved proposal and does not apply it; saving still uses the normal product operation and version checks.
|
|
116
|
+
|
|
117
|
+
For direct MCP `tools/call`, ordinary `_meta["com.experiture.xyra/workflowResume"]` with `executionId` and `expectedRevision` recovers existing work only. Explicitly add `continueCorrection:true` to approve one further correction batch, with optional `guidance`; guidance alone is not consent. Chat-owned work uses the existing `xyra/chat` control instead of borrowing direct-tool ownership.
|
|
118
|
+
|
|
119
|
+
The CLI prints the conversation and request IDs as soon as the runtime accepts the request. Ctrl+C asks the runtime to stop the current work and preserves already saved results; a dropped connection alone leaves accepted work available for recovery. When a background job needs input, approval or renewed access, observation of its dependent jobs also returns, while independent jobs can finish.
|
|
120
|
+
|
|
98
121
|
Named logins store independent credentials under the existing secure token store;
|
|
99
122
|
refreshing or removing one does not replace the other.
|
|
100
123
|
Names use up to 64 lowercase letters, numbers, hyphens or underscores and begin
|
package/dist/auth/oauthClient.js
CHANGED
|
@@ -1,40 +1,36 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ACCESS_TOKEN_OPERATION_SAFETY_SECONDS = void 0;
|
|
4
3
|
exports.buildAuthorizeUrl = buildAuthorizeUrl;
|
|
5
4
|
exports.exchangeCode = exchangeCode;
|
|
6
5
|
exports.refreshToken = refreshToken;
|
|
7
6
|
exports.decodeJwtClaims = decodeJwtClaims;
|
|
7
|
+
exports.conservativeStoredTokenExpiry = conservativeStoredTokenExpiry;
|
|
8
8
|
exports.toStoredToken = toStoredToken;
|
|
9
|
+
exports.discoverLoginScopes = discoverLoginScopes;
|
|
10
|
+
exports.revokeStoredToken = revokeStoredToken;
|
|
9
11
|
const CliError_1 = require("../errors/CliError");
|
|
10
|
-
/**
|
|
11
|
-
* Keep enough access-token lifetime for one long-running Xyra operation.
|
|
12
|
-
*
|
|
13
|
-
* Authentication is checked before a command starts, while a streamed turn can
|
|
14
|
-
* legitimately continue for more than one minute. Refreshing two minutes
|
|
15
|
-
* before the issuer's expiry prevents a token that was valid at dispatch from
|
|
16
|
-
* expiring during owner-API calls later in the same turn.
|
|
17
|
-
*/
|
|
18
|
-
exports.ACCESS_TOKEN_OPERATION_SAFETY_SECONDS = 120;
|
|
19
12
|
/** Build the browser authorization URL (authorization_code + PKCE, public client). */
|
|
20
13
|
function buildAuthorizeUrl(env, params) {
|
|
21
14
|
const url = new URL(env.authorizationEndpoint);
|
|
22
|
-
url.searchParams.set(
|
|
23
|
-
url.searchParams.set(
|
|
24
|
-
url.searchParams.set(
|
|
25
|
-
url.searchParams.set(
|
|
26
|
-
url.searchParams.set(
|
|
27
|
-
url.searchParams.set(
|
|
28
|
-
url.searchParams.set(
|
|
29
|
-
url.searchParams.set(
|
|
15
|
+
url.searchParams.set("response_type", "code");
|
|
16
|
+
url.searchParams.set("client_id", env.clientId);
|
|
17
|
+
url.searchParams.set("redirect_uri", params.redirectUri);
|
|
18
|
+
url.searchParams.set("resource", env.oauthResource);
|
|
19
|
+
url.searchParams.set("scope", params.scopes.join(" "));
|
|
20
|
+
url.searchParams.set("state", params.state);
|
|
21
|
+
url.searchParams.set("code_challenge", params.codeChallenge);
|
|
22
|
+
url.searchParams.set("code_challenge_method", "S256");
|
|
30
23
|
return url.toString();
|
|
31
24
|
}
|
|
32
25
|
async function postToken(env, body) {
|
|
33
26
|
let response;
|
|
34
27
|
try {
|
|
35
28
|
response = await fetch(env.tokenEndpoint, {
|
|
36
|
-
method:
|
|
37
|
-
headers: {
|
|
29
|
+
method: "POST",
|
|
30
|
+
headers: {
|
|
31
|
+
"content-type": "application/x-www-form-urlencoded",
|
|
32
|
+
accept: "application/json",
|
|
33
|
+
},
|
|
38
34
|
body: body.toString(),
|
|
39
35
|
});
|
|
40
36
|
}
|
|
@@ -48,19 +44,21 @@ async function postToken(env, body) {
|
|
|
48
44
|
try {
|
|
49
45
|
const parsed = JSON.parse(text);
|
|
50
46
|
if (parsed.error)
|
|
51
|
-
errCode = parsed.error_description
|
|
47
|
+
errCode = parsed.error_description
|
|
48
|
+
? `${parsed.error}: ${parsed.error_description}`
|
|
49
|
+
: parsed.error;
|
|
52
50
|
}
|
|
53
51
|
catch {
|
|
54
52
|
/* non-JSON body; keep HTTP status only */
|
|
55
53
|
}
|
|
56
|
-
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, `Token exchange failed (${errCode})
|
|
54
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, `Token exchange failed (${errCode}).`, undefined, response.status);
|
|
57
55
|
}
|
|
58
56
|
return JSON.parse(text);
|
|
59
57
|
}
|
|
60
58
|
/** Exchange an authorization code for tokens (public client: no client_secret). */
|
|
61
59
|
function exchangeCode(env, input) {
|
|
62
60
|
const body = new URLSearchParams({
|
|
63
|
-
grant_type:
|
|
61
|
+
grant_type: "authorization_code",
|
|
64
62
|
client_id: env.clientId,
|
|
65
63
|
code: input.code,
|
|
66
64
|
code_verifier: input.codeVerifier,
|
|
@@ -72,7 +70,7 @@ function exchangeCode(env, input) {
|
|
|
72
70
|
/** Refresh the access token using a refresh token (gate G2). */
|
|
73
71
|
function refreshToken(env, refresh) {
|
|
74
72
|
const body = new URLSearchParams({
|
|
75
|
-
grant_type:
|
|
73
|
+
grant_type: "refresh_token",
|
|
76
74
|
client_id: env.clientId,
|
|
77
75
|
refresh_token: refresh,
|
|
78
76
|
resource: env.oauthResource,
|
|
@@ -81,28 +79,89 @@ function refreshToken(env, refresh) {
|
|
|
81
79
|
}
|
|
82
80
|
/** Decode untrusted claims for display/anti-confusion only; the resource server owns verification and authority. */
|
|
83
81
|
function decodeJwtClaims(accessToken) {
|
|
84
|
-
const parts = accessToken.split(
|
|
82
|
+
const parts = accessToken.split(".");
|
|
85
83
|
if (parts.length !== 3)
|
|
86
84
|
return {};
|
|
87
85
|
try {
|
|
88
|
-
const json = Buffer.from(parts[1].replace(/-/g,
|
|
86
|
+
const json = Buffer.from(parts[1].replace(/-/g, "+").replace(/_/g, "/"), "base64").toString("utf8");
|
|
89
87
|
return JSON.parse(json);
|
|
90
88
|
}
|
|
91
89
|
catch {
|
|
92
90
|
return {};
|
|
93
91
|
}
|
|
94
92
|
}
|
|
93
|
+
/** Unverified expiry may shorten a local refresh schedule; it never grants authority or extends a token. */
|
|
94
|
+
function conservativeStoredTokenExpiry(token) {
|
|
95
|
+
const issuerSeconds = decodeJwtClaims(token.accessToken)?.exp;
|
|
96
|
+
const issuerExpiry = typeof issuerSeconds === 'number' && Number.isFinite(issuerSeconds)
|
|
97
|
+
&& Number.isFinite(issuerSeconds * 1000) ? issuerSeconds * 1000 : undefined;
|
|
98
|
+
const storedExpiry = Number.isFinite(token.expiresAt) ? token.expiresAt : 0;
|
|
99
|
+
const deadlines = [storedExpiry, token.accessTokenExpiresAt, issuerExpiry]
|
|
100
|
+
.filter((value) => typeof value === 'number' && Number.isFinite(value));
|
|
101
|
+
return deadlines.length ? Math.min(...deadlines) : 0;
|
|
102
|
+
}
|
|
95
103
|
function toStoredToken(response) {
|
|
96
104
|
const claims = decodeJwtClaims(response.access_token);
|
|
97
|
-
const subjectType = claims
|
|
105
|
+
const subjectType = claims?.sub_type === "client" ? "client" : "user";
|
|
106
|
+
const receivedExpiry = Date.now() + Math.max(0, response.expires_in) * 1000;
|
|
107
|
+
const expiry = conservativeStoredTokenExpiry({ accessToken: response.access_token, expiresAt: receivedExpiry });
|
|
98
108
|
return {
|
|
99
109
|
accessToken: response.access_token,
|
|
100
110
|
refreshToken: response.refresh_token,
|
|
101
|
-
tokenType: response.token_type ||
|
|
111
|
+
tokenType: response.token_type || "Bearer",
|
|
102
112
|
scope: response.scope,
|
|
103
|
-
expiresAt:
|
|
104
|
-
|
|
113
|
+
expiresAt: expiry,
|
|
114
|
+
accessTokenExpiresAt: expiry,
|
|
105
115
|
subjectType,
|
|
106
116
|
};
|
|
107
117
|
}
|
|
118
|
+
/** Uses only the configured issuer; advertised scopes remain subject to Auth's user and installation checks. */
|
|
119
|
+
async function discoverLoginScopes(env, requestedScopes) {
|
|
120
|
+
const url = new URL(env.tokenEndpoint);
|
|
121
|
+
url.pathname = url.pathname.replace(/\/token$/, `/clients/${encodeURIComponent(env.clientId)}/authorization-metadata`);
|
|
122
|
+
const response = await fetch(url, { redirect: "error" });
|
|
123
|
+
if (!response.ok)
|
|
124
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, "The sign-in service could not provide this app’s current permissions.");
|
|
125
|
+
const value = (await response.json());
|
|
126
|
+
if (value.clientId !== env.clientId ||
|
|
127
|
+
!Array.isArray(value.resources) ||
|
|
128
|
+
!value.resources.includes(env.oauthResource) ||
|
|
129
|
+
!Array.isArray(value.requestableScopes) ||
|
|
130
|
+
value.requestableScopes.some((s) => typeof s !== "string" ||
|
|
131
|
+
!/^[A-Za-z0-9_.:-]+$/.test(s) ||
|
|
132
|
+
s.includes("*")) ||
|
|
133
|
+
value.requestableScopes.join(" ").length > 8192)
|
|
134
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, "The sign-in service returned permissions that do not match this app.");
|
|
135
|
+
const scopes = value.requestableScopes;
|
|
136
|
+
if (!env.scopes.every((scope) => scopes.includes(scope)))
|
|
137
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, "The sign-in service omitted this app’s required protocol scopes.");
|
|
138
|
+
if (requestedScopes === undefined)
|
|
139
|
+
return [...new Set(scopes)];
|
|
140
|
+
const selected = [...new Set([...env.scopes, ...requestedScopes])];
|
|
141
|
+
if (!requestedScopes.length || selected.some(scope => !scopes.includes(scope)))
|
|
142
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.ConfigInvalid, 'Requested permissions are not available for this app.');
|
|
143
|
+
return selected;
|
|
144
|
+
}
|
|
145
|
+
async function revokeStoredToken(env, token) {
|
|
146
|
+
const url = new URL(env.tokenEndpoint);
|
|
147
|
+
url.pathname = url.pathname.replace(/\/token$/, "/revoke");
|
|
148
|
+
let response;
|
|
149
|
+
try {
|
|
150
|
+
response = await fetch(url, {
|
|
151
|
+
method: "POST",
|
|
152
|
+
redirect: "error",
|
|
153
|
+
headers: { "content-type": "application/x-www-form-urlencoded" },
|
|
154
|
+
body: new URLSearchParams({
|
|
155
|
+
client_id: env.clientId,
|
|
156
|
+
token: token.refreshToken ?? token.accessToken,
|
|
157
|
+
token_type_hint: token.refreshToken ? "refresh_token" : "access_token",
|
|
158
|
+
}),
|
|
159
|
+
});
|
|
160
|
+
}
|
|
161
|
+
catch {
|
|
162
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, "Sign-out could not reach Auth. Your stored connection was kept so you can retry.");
|
|
163
|
+
}
|
|
164
|
+
if (!response.ok)
|
|
165
|
+
throw new CliError_1.CliError(CliError_1.CliErrorCodes.TokenExchangeFailed, "Auth could not end this connection. Retry sign-out; the stored connection has been kept.");
|
|
166
|
+
}
|
|
108
167
|
//# sourceMappingURL=oauthClient.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauthClient.js","sourceRoot":"","sources":["../../src/auth/oauthClient.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"oauthClient.js","sourceRoot":"","sources":["../../src/auth/oauthClient.ts"],"names":[],"mappings":"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"}
|
package/dist/auth/session.js
CHANGED
|
@@ -118,18 +118,20 @@ async function deleteSessionToken(env, store, sessionName) {
|
|
|
118
118
|
}
|
|
119
119
|
/**
|
|
120
120
|
* Return a non-expired access token for the environment, silently refreshing
|
|
121
|
-
* with the refresh token when the
|
|
121
|
+
* with the refresh token when the issuer-bound access lifetime has lapsed (gate G2).
|
|
122
122
|
* Throws NotAuthenticated when there is no usable session.
|
|
123
123
|
*/
|
|
124
124
|
async function getValidToken(env, store, sessionName) {
|
|
125
125
|
const key = accountKey(env, sessionName);
|
|
126
126
|
const sessionLabel = sessionName === undefined ? `'${env.name}'` : `'${env.name}' session '${sessionName}'`;
|
|
127
127
|
const loginHint = sessionName === undefined ? "Run 'xyra login'." : `Run 'xyra login --session ${sessionName}'.`;
|
|
128
|
-
const
|
|
129
|
-
if (!
|
|
128
|
+
const storedRecord = await store.get(key);
|
|
129
|
+
if (!storedRecord) {
|
|
130
130
|
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to ${sessionLabel}.`, loginHint);
|
|
131
131
|
}
|
|
132
|
-
(0, administrationSession_1.assertTokenPurpose)(env,
|
|
132
|
+
(0, administrationSession_1.assertTokenPurpose)(env, storedRecord);
|
|
133
|
+
const storedExpiry = (0, oauthClient_1.conservativeStoredTokenExpiry)(storedRecord);
|
|
134
|
+
const stored = { ...storedRecord, expiresAt: storedExpiry, accessTokenExpiresAt: storedExpiry };
|
|
133
135
|
if (Date.now() < stored.expiresAt) {
|
|
134
136
|
return stored;
|
|
135
137
|
}
|
|
@@ -137,11 +139,13 @@ async function getValidToken(env, store, sessionName) {
|
|
|
137
139
|
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Login for ${sessionLabel} expired and no refresh token is available.`, loginHint);
|
|
138
140
|
}
|
|
139
141
|
return withSessionLock(key, async () => {
|
|
140
|
-
const
|
|
141
|
-
if (!
|
|
142
|
+
const latestRecord = await store.get(key);
|
|
143
|
+
if (!latestRecord) {
|
|
142
144
|
throw new CliError_1.CliError(CliError_1.CliErrorCodes.NotAuthenticated, `Not signed in to ${sessionLabel}.`, loginHint);
|
|
143
145
|
}
|
|
144
|
-
(0, administrationSession_1.assertTokenPurpose)(env,
|
|
146
|
+
(0, administrationSession_1.assertTokenPurpose)(env, latestRecord);
|
|
147
|
+
const latestExpiry = (0, oauthClient_1.conservativeStoredTokenExpiry)(latestRecord);
|
|
148
|
+
const latest = { ...latestRecord, expiresAt: latestExpiry, accessTokenExpiresAt: latestExpiry };
|
|
145
149
|
if (Date.now() < latest.expiresAt) {
|
|
146
150
|
return latest;
|
|
147
151
|
}
|
package/dist/auth/session.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":";;AAYA,gCAsBC;AA8ED,4CAMC;AAGD,gDAKC;AAOD,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/auth/session.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tokenStore.js","sourceRoot":"","sources":["../../src/auth/tokenStore.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"tokenStore.js","sourceRoot":"","sources":["../../src/auth/tokenStore.ts"],"names":[],"mappings":"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"}
|