@zivis/cli 0.1.0-alpha.3 → 0.1.0-alpha.30
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/dist/commands/app/index.js +2 -2
- package/dist/commands/app/index.js.map +1 -1
- package/dist/commands/auth/bind.d.ts +14 -0
- package/dist/commands/auth/bind.js +108 -0
- package/dist/commands/auth/bind.js.map +1 -0
- package/dist/commands/auth/index.js +27 -1
- package/dist/commands/auth/index.js.map +1 -1
- package/dist/commands/auth/init.d.ts +5 -0
- package/dist/commands/auth/init.js +271 -0
- package/dist/commands/auth/init.js.map +1 -0
- package/dist/commands/auth/login.d.ts +2 -0
- package/dist/commands/auth/login.js +28 -8
- package/dist/commands/auth/login.js.map +1 -1
- package/dist/commands/auth/logout.js +21 -6
- package/dist/commands/auth/logout.js.map +1 -1
- package/dist/commands/auth/sessions.js +7 -3
- package/dist/commands/auth/sessions.js.map +1 -1
- package/dist/commands/auth/status.js +34 -11
- package/dist/commands/auth/status.js.map +1 -1
- package/dist/commands/auth/token.d.ts +17 -0
- package/dist/commands/auth/token.js +91 -0
- package/dist/commands/auth/token.js.map +1 -0
- package/dist/commands/credits/index.js +2 -2
- package/dist/commands/credits/index.js.map +1 -1
- package/dist/commands/mcp/index.js +79 -13
- package/dist/commands/mcp/index.js.map +1 -1
- package/dist/commands/scan/index.js +2 -2
- package/dist/commands/scan/index.js.map +1 -1
- package/dist/commands/tm/index.js +3 -3
- package/dist/commands/tm/index.js.map +1 -1
- package/dist/internal/binding-token-mint.d.ts +60 -0
- package/dist/internal/binding-token-mint.js +185 -0
- package/dist/internal/binding-token-mint.js.map +1 -0
- package/dist/internal/ide-setup.d.ts +38 -7
- package/dist/internal/ide-setup.js +359 -41
- package/dist/internal/ide-setup.js.map +1 -1
- package/dist/internal/project-binding.d.ts +2 -0
- package/dist/internal/project-binding.js +18 -8
- package/dist/internal/project-binding.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ApiClient } from "@zivis/mcp/api-client";
|
|
2
|
-
import {
|
|
2
|
+
import { resolveConfigFromBinding } from "@zivis/mcp/project-binding";
|
|
3
3
|
import { loginApplication, logoutTarget, tokenInfo, getValidTargetToken, } from "../../internal/target-auth/index.js";
|
|
4
4
|
import { getStorageName } from "../../internal/target-auth/keychain.js";
|
|
5
5
|
import { decodeJwtPayload } from "../../internal/target-auth/workos.js";
|
|
@@ -239,7 +239,7 @@ export function registerAppCommands(program) {
|
|
|
239
239
|
});
|
|
240
240
|
}
|
|
241
241
|
function buildClient(opts) {
|
|
242
|
-
const config = opts.session ? { ...
|
|
242
|
+
const config = opts.session ? { ...resolveConfigFromBinding(process.cwd()), session: opts.session } : resolveConfigFromBinding(process.cwd());
|
|
243
243
|
return new ApiClient(config);
|
|
244
244
|
}
|
|
245
245
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/app/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/app/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAElD,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EACL,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,mBAAmB,GACpB,MAAM,qCAAqC,CAAC;AAC7C,OAAO,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAC;AACxE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sCAAsC,CAAC;AACxE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAE3E,MAAM,eAAe,GAAG,SAAS,CAAC;AAElC;;;;;;;GAOG;AACH,MAAM,UAAU,mBAAmB,CAAC,OAAgB;IAClD,MAAM,GAAG,GAAG,OAAO;SAChB,OAAO,CAAC,KAAK,CAAC;SACd,WAAW,CAAC,iEAAiE,CAAC,CAAC;IAElF,GAAG;SACA,OAAO,CAAC,MAAM,CAAC;SACf,WAAW,CAAC,qCAAqC,CAAC;SAClD,MAAM,CAAC,sBAAsB,EAAE,eAAe,CAAC;SAC/C,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;SACjC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACjC,MAAM,IAAI,GAAG,MAAM,MAAM,CAAC,OAAO,CAE/B,KAAK,EAAE,sBAAsB,CAAC,CAAC;QACjC,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAC3D,OAAO;QACT,CAAC;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC;YACjB,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAC;YAC5C,OAAO;QACT,CAAC;QACD,KAAK,MAAM,CAAC,IAAI,IAAI,EAAE,CAAC;YACrB,MAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1C,MAAM,IAAI,GAAG,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC;YACrD,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,EAAE,CAAC,CAAC;YAChD,IAAI,CAAC,CAAC,OAAO;gBAAE,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/C,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,gDAAgD,CAAC;SAC7D,MAAM,CAAC,sBAAsB,EAAE,eAAe,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAI,EAAE,EAAE;QACpC,MAAM,GAAG,GAAG,MAAM,eAAe,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,QAAQ,CAAC;SACjB,WAAW,CAAC,yEAAyE,CAAC;SACtF,cAAc,CAAC,eAAe,EAAE,0BAA0B,CAAC;SAC3D,cAAc,CAAC,kBAAkB,EAAE,8CAA8C,CAAC;SAClF,MAAM,CAAC,eAAe,EAAE,2DAA2D,EAAE,OAAO,CAAC;SAC7F,MAAM,CAAC,sBAAsB,EAAE,sBAAsB,CAAC;SACtD,MAAM,CAAC,kBAAkB,EAAE,sCAAsC,CAAC;SAClE,MAAM,CAAC,qBAAqB,EAAE,6BAA6B,CAAC;SAC5D,MAAM,CAAC,kBAAkB,EAAE,mCAAmC,CAAC;SAC/D,MAAM,CAAC,mBAAmB,EAAE,+BAA+B,CAAC;SAC5D,MAAM,CAAC,iBAAiB,EAAE,yDAAyD,CAAC;SACpF,MAAM,CAAC,gBAAgB,EAAE,yDAAyD,CAAC;SACnF,MAAM,CAAC,sBAAsB,EAAE,eAAe,CAAC;SAC/C,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;SACjC,MAAM,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;QACrB,MAAM,YAAY,GAAG,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC;QAC9C,MAAM,IAAI,GAA4B;YACpC,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,OAAO,EAAE,IAAI,CAAC,OAAO;YACrB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,iBAAiB,EAAE,YAAY;YAC/B,yEAAyE;YACzE,qEAAqE;YACrE,kEAAkE;YAClE,QAAQ,EAAE,YAAY;SACvB,CAAC;QACF,IAAI,IAAI,CAAC,WAAW;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QAC1D,IAAI,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjD,IAAI,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QACvD,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC,OAAO,CAAC;QACvD,IAAI,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjD,IAAI,IAAI,CAAC,MAAM,EAAE,CAAC;YAChB,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACpF,CAAC;QAED,IAAI,CAAC,YAAY,EAAE,CAAC;YAClB,OAAO,CAAC,KAAK,CACX,gGAAgG;gBAC9F,kFAAkF,CACrF,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,MAAM,CAAC,OAAO,CAClC,MAAM,EACN,sBAAsB,EACtB,IAAI,CACL,CAAC;YACF,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBAC9D,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,yBAAyB,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;YACnD,OAAO,CAAC,GAAG,CAAC,KAAK,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;YAC5E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,CAAC,wBAAwB,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC;QACpD,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,6EAA6E,CAAC;SAC1F,MAAM,CAAC,eAAe,EAAE,wBAAwB,CAAC;SACjD,MAAM,CAAC,sBAAsB,EAAE,wBAAwB,CAAC;SACxD,MAAM,CAAC,eAAe,EAAE,2DAA2D,CAAC;SACpF,MAAM,CAAC,iBAAiB,EAAE,yCAAyC,CAAC;SACpE,MAAM,CAAC,wBAAwB,EAAE,oDAAoD,CAAC;SACtF,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CAAC;SAC7C,MAAM,CAAC,kBAAkB,EAAE,wBAAwB,CAAC;SACpD,MAAM,CAAC,qBAAqB,EAAE,oBAAoB,CAAC;SACnD,MAAM,CAAC,sBAAsB,EAAE,eAAe,CAAC;SAC/C,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;SACjC,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAI,EAAE,EAAE;QACpC,MAAM,IAAI,GAA4B,EAAE,CAAC;QACzC,IAAI,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrC,IAAI,IAAI,CAAC,WAAW,KAAK,SAAS;YAAE,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,WAAW,CAAC;QACxE,IAAI,IAAI,CAAC,IAAI;YAAE,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC;QACrC,IAAI,IAAI,CAAC,YAAY;YAAE,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC;QACrD,IAAI,IAAI,CAAC,gBAAgB,KAAK,KAAK;YAAE,IAAI,CAAC,iBAAiB,GAAG,KAAK,CAAC;QACpE,IAAI,IAAI,CAAC,OAAO;YAAE,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC;QAC9C,IAAI,IAAI,CAAC,QAAQ;YAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QACjD,IAAI,IAAI,CAAC,UAAU;YAAE,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,UAAU,CAAC;QAEvD,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACnC,OAAO,CAAC,KAAK,CAAC,8EAA8E,CAAC,CAAC;YAC9F,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;QACjC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,OAAO,CACjC,OAAO,EACP,wBAAwB,kBAAkB,CAAC,KAAK,CAAC,EAAE,EACnD,IAAI,CACL,CAAC;YACF,MAAM,WAAW,GAAG,MAAM,CAAC,WAAW,IAAI,MAAM,CAAC;YACjD,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;gBACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;gBAClE,OAAO;YACT,CAAC;YACD,OAAO,CAAC,GAAG,CAAC,aAAc,WAAmB,CAAC,EAAE,IAAI,KAAK,EAAE,CAAC,CAAC;YAC7D,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAClC,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,IAAI,CAAC,SAAS,CAAE,IAAY,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YAC7D,CAAC;QACH,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,gBAAgB,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,cAAc,CAAC;SACvB,WAAW,CAAC,2EAA2E,CAAC;SACxF,MAAM,CAAC,sBAAsB,EAAE,iCAAiC,EAAE,eAAe,CAAC;SAClF,MAAM,CAAC,sBAAsB,EAAE,eAAe,CAAC;SAC/C,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAI,EAAE,EAAE;QACpC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YACzE,MAAM,MAAM,GAAG,gBAAgB,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;YAC3D,OAAO,CAAC,GAAG,CAAC,2BAA2B,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;YACxD,OAAO,CAAC,GAAG,CAAC,cAAc,cAAc,EAAE,EAAE,CAAC,CAAC;YAC9C,IAAK,MAA2B,CAAC,GAAG;gBAAE,OAAO,CAAC,GAAG,CAAC,cAAe,MAA2B,CAAC,GAAG,EAAE,CAAC,CAAC;YACpG,IAAK,MAA6B,CAAC,KAAK;gBAAE,OAAO,CAAC,GAAG,CAAC,cAAe,MAA6B,CAAC,KAAK,EAAE,CAAC,CAAC;YAC5G,IAAK,MAA8B,CAAC,MAAM;gBAAE,OAAO,CAAC,GAAG,CAAC,cAAe,MAA8B,CAAC,MAAM,EAAE,CAAC,CAAC;YAChH,OAAO,CAAC,GAAG,CAAC,cAAc,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;QACzE,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,eAAe,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACzE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,eAAe,CAAC;SACxB,WAAW,CAAC,2EAA2E,CAAC;SACxF,MAAM,CAAC,sBAAsB,EAAE,SAAS,EAAE,eAAe,CAAC;SAC1D,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAI,EAAE,EAAE;QACpC,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,mBAAmB,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;YAC9D,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,OAAO,CAAC,KAAK,CACX,4BAA4B,KAAK,cAAc,IAAI,CAAC,OAAO,0BAA0B,KAAK,OAAO,IAAI,CAAC,OAAO,EAAE,CAChH,CAAC;gBACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAClB,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,CAAC,KAAK,CAAC,qBAAqB,EAAE,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/E,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;IACH,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,uDAAuD,CAAC;SACpE,MAAM,CAAC,sBAAsB,EAAE,SAAS,EAAE,eAAe,CAAC;SAC1D,MAAM,CAAC,QAAQ,EAAE,eAAe,CAAC;SACjC,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAI,EAAE,EAAE;QACpC,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClD,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,CAAC,KAAK,CAAC,oCAAoC,KAAK,cAAc,IAAI,CAAC,OAAO,IAAI,CAAC,CAAC;YACvF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QACD,MAAM,GAAG,GAAG,EAAE,aAAa,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,IAAI,EAAE,CAAC;QACrE,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC;YACd,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAC1D,OAAO;QACT,CAAC;QACD,OAAO,CAAC,GAAG,CAAC,gBAAgB,KAAK,EAAE,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;QAC5C,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC1C,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;QAC9C,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,gBAAgB,GAAG,CAAC,CAAC;QACtD,OAAO,CAAC,GAAG,CAAC,gBAAgB,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC;IACxE,CAAC,CAAC,CAAC;IAEL,GAAG;SACA,OAAO,CAAC,gBAAgB,CAAC;SACzB,WAAW,CAAC,gDAAgD,CAAC;SAC7D,MAAM,CAAC,sBAAsB,EAAE,SAAS,EAAE,eAAe,CAAC;SAC1D,MAAM,CAAC,KAAK,EAAE,KAAa,EAAE,IAAI,EAAE,EAAE;QACpC,MAAM,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACxC,OAAO,CAAC,GAAG,CAAC,oCAAoC,KAAK,cAAc,IAAI,CAAC,OAAO,GAAG,CAAC,CAAC;IACtF,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,WAAW,CAAC,IAA0B;IAC7C,MAAM,MAAM,GAAG,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,GAAG,wBAAwB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,wBAAwB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9I,OAAO,IAAI,SAAS,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* zivis auth bind
|
|
3
|
+
*
|
|
4
|
+
* **Explicit** mint-only command: OAuth once, POST /api/auth/bind, persist apikey.<session>.
|
|
5
|
+
* After `zivis auth login`, the same mint usually runs automatically when the repo is bound.
|
|
6
|
+
* Use `bind` to repair a missing MCP key without re-running full login prompts, or force a
|
|
7
|
+
* mint when auto-mint failed.
|
|
8
|
+
*
|
|
9
|
+
* OAuth from this command is discarded after minting — MCP uses the minted WorkOS API key.
|
|
10
|
+
*/
|
|
11
|
+
export interface BindCmdOpts {
|
|
12
|
+
yes?: boolean;
|
|
13
|
+
}
|
|
14
|
+
export declare function bindCommand(opts: BindCmdOpts): Promise<void>;
|
|
@@ -0,0 +1,108 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* zivis auth bind
|
|
3
|
+
*
|
|
4
|
+
* **Explicit** mint-only command: OAuth once, POST /api/auth/bind, persist apikey.<session>.
|
|
5
|
+
* After `zivis auth login`, the same mint usually runs automatically when the repo is bound.
|
|
6
|
+
* Use `bind` to repair a missing MCP key without re-running full login prompts, or force a
|
|
7
|
+
* mint when auto-mint failed.
|
|
8
|
+
*
|
|
9
|
+
* OAuth from this command is discarded after minting — MCP uses the minted WorkOS API key.
|
|
10
|
+
*/
|
|
11
|
+
import { login } from "@zivis/mcp/auth";
|
|
12
|
+
import { keychainClearSession } from "@zivis/mcp/auth";
|
|
13
|
+
import { detectProjectBinding, resolveConfigFromBinding } from "@zivis/mcp/project-binding";
|
|
14
|
+
import { DEFAULT_CONFIG, credentialStorageFromConfig } from "@zivis/mcp/types";
|
|
15
|
+
import { extractEmail } from "../../internal/orgs.js";
|
|
16
|
+
import { ensureProjectBinding } from "../../internal/project-binding.js";
|
|
17
|
+
import { mintLocalProjectBindingToken } from "../../internal/binding-token-mint.js";
|
|
18
|
+
import { setupCursorWorkspace, setupVsCodeClaude, setupVsCodeCopilot, setupClaudeCodeCli, } from "../../internal/ide-setup.js";
|
|
19
|
+
export async function bindCommand(opts) {
|
|
20
|
+
const cwd = process.cwd();
|
|
21
|
+
const config = { ...DEFAULT_CONFIG, ...resolveConfigFromBinding(cwd) };
|
|
22
|
+
const detected = detectProjectBinding(cwd);
|
|
23
|
+
if (!detected?.binding.workosOrgId) {
|
|
24
|
+
console.error("");
|
|
25
|
+
console.error("[zivis] ERROR: No project binding found.");
|
|
26
|
+
console.error("[zivis] Run zivis auth login (or auth init) in this repo first,");
|
|
27
|
+
console.error("[zivis] then run zivis auth bind if MCP still needs an API key.");
|
|
28
|
+
console.error("");
|
|
29
|
+
process.exit(1);
|
|
30
|
+
}
|
|
31
|
+
const { workosOrgId, session: bindingSession, orgName } = detected.binding;
|
|
32
|
+
const session = bindingSession;
|
|
33
|
+
console.log("");
|
|
34
|
+
console.log(`Minting MCP API key for ${orgName ?? workosOrgId} (session: "${session}")`);
|
|
35
|
+
console.log("");
|
|
36
|
+
let tokens;
|
|
37
|
+
try {
|
|
38
|
+
tokens = await login(config, `__bind_temp_${session}`, workosOrgId, {
|
|
39
|
+
orgName,
|
|
40
|
+
sessionLabel: session,
|
|
41
|
+
skipConfirm: opts.yes === true,
|
|
42
|
+
});
|
|
43
|
+
}
|
|
44
|
+
catch (err) {
|
|
45
|
+
console.error("[zivis] Authentication failed:", err instanceof Error ? err.message : err);
|
|
46
|
+
process.exit(1);
|
|
47
|
+
}
|
|
48
|
+
const email = extractEmail(tokens.id_token);
|
|
49
|
+
console.log(`✓ Authenticated as ${email}`);
|
|
50
|
+
const credentialStorage = credentialStorageFromConfig(config);
|
|
51
|
+
let mint;
|
|
52
|
+
try {
|
|
53
|
+
mint = await mintLocalProjectBindingToken({
|
|
54
|
+
config,
|
|
55
|
+
session,
|
|
56
|
+
accessToken: tokens.access_token,
|
|
57
|
+
cwd,
|
|
58
|
+
});
|
|
59
|
+
}
|
|
60
|
+
finally {
|
|
61
|
+
await keychainClearSession(`__bind_temp_${session}`, credentialStorage).catch(() => { });
|
|
62
|
+
}
|
|
63
|
+
if (!mint.ok) {
|
|
64
|
+
console.error(`[zivis] Bind failed: ${mint.error}`);
|
|
65
|
+
process.exit(1);
|
|
66
|
+
}
|
|
67
|
+
const maskedKey = `${mint.key.slice(0, 10)}...${mint.key.slice(-4)}`;
|
|
68
|
+
console.log(`✓ Local Project Binding Token stored (${maskedKey})`);
|
|
69
|
+
console.log(` Org: ${mint.orgName} (${mint.workosOrgId})`);
|
|
70
|
+
console.log(` Key name: ${mint.keyName}`);
|
|
71
|
+
try {
|
|
72
|
+
await setupCursorWorkspace();
|
|
73
|
+
}
|
|
74
|
+
catch (err) {
|
|
75
|
+
console.log(` WARNING: Failed to update .cursor/mcp.json: ${err instanceof Error ? err.message : err}`);
|
|
76
|
+
}
|
|
77
|
+
try {
|
|
78
|
+
await setupVsCodeClaude();
|
|
79
|
+
await setupVsCodeCopilot();
|
|
80
|
+
}
|
|
81
|
+
catch (err) {
|
|
82
|
+
console.log(` WARNING: Failed to update .vscode/mcp.json: ${err instanceof Error ? err.message : err}`);
|
|
83
|
+
}
|
|
84
|
+
try {
|
|
85
|
+
await setupClaudeCodeCli();
|
|
86
|
+
}
|
|
87
|
+
catch (err) {
|
|
88
|
+
console.log(` WARNING: Failed to update Claude Code CLI config: ${err instanceof Error ? err.message : err}`);
|
|
89
|
+
}
|
|
90
|
+
await ensureProjectBinding({
|
|
91
|
+
config,
|
|
92
|
+
session,
|
|
93
|
+
accessToken: tokens.access_token,
|
|
94
|
+
organizationId: workosOrgId,
|
|
95
|
+
cwd,
|
|
96
|
+
autoBind: true,
|
|
97
|
+
skipBind: false,
|
|
98
|
+
force: false,
|
|
99
|
+
});
|
|
100
|
+
console.log("");
|
|
101
|
+
console.log("✓ Bind complete. Reload your IDE to activate the MCP server.");
|
|
102
|
+
console.log("");
|
|
103
|
+
console.log(" To verify: zivis auth status");
|
|
104
|
+
console.log(" To revoke: zivis auth logout (or Settings → API Tokens in the UI)");
|
|
105
|
+
console.log("");
|
|
106
|
+
process.exit(0);
|
|
107
|
+
}
|
|
108
|
+
//# sourceMappingURL=bind.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"bind.js","sourceRoot":"","sources":["../../../src/commands/auth/bind.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,36 @@
|
|
|
1
|
+
import { bindCommand } from "./bind.js";
|
|
1
2
|
import { loginCommand } from "./login.js";
|
|
3
|
+
import { initCommand } from "./init.js";
|
|
2
4
|
import { statusCommand } from "./status.js";
|
|
3
5
|
import { logoutCommand } from "./logout.js";
|
|
4
6
|
import { sessionsCommand } from "./sessions.js";
|
|
7
|
+
import { tokenCommand } from "./token.js";
|
|
5
8
|
export function registerAuthCommands(program) {
|
|
6
9
|
const auth = program.command("auth").description("authentication");
|
|
10
|
+
auth
|
|
11
|
+
.command("bind")
|
|
12
|
+
.description("mint MCP API key for this repo (OAuth once + stored key). Normally automatic after login — use bind to repair.")
|
|
13
|
+
.option("-y, --yes", "skip confirmation prompt")
|
|
14
|
+
.action(async (opts) => {
|
|
15
|
+
await bindCommand(opts);
|
|
16
|
+
});
|
|
17
|
+
auth
|
|
18
|
+
.command("init")
|
|
19
|
+
.description("interactive setup: authenticate, pick org, and bind this repo")
|
|
20
|
+
.option("-s, --session <name>", "named session for multi-tenant")
|
|
21
|
+
.option("--skip-mint-key", "skip MCP API key mint after successful OAuth")
|
|
22
|
+
.action(async (opts) => {
|
|
23
|
+
await initCommand(opts);
|
|
24
|
+
});
|
|
7
25
|
auth
|
|
8
26
|
.command("login")
|
|
9
|
-
.description("OAuth PKCE login
|
|
27
|
+
.description("OAuth PKCE login; when this repo has a binding, mints MCP API key automatically")
|
|
10
28
|
.option("-s, --session <name>", "named session for multi-tenant")
|
|
11
29
|
.option("-o, --org <workosOrgId>", "scope JWT to a specific WorkOS org")
|
|
12
30
|
.option("-y, --yes", "skip interactive confirmation")
|
|
13
31
|
.option("--bind", "auto-write .zivis/project.json binding")
|
|
14
32
|
.option("--no-bind", "skip project binding")
|
|
33
|
+
.option("--skip-mint-key", "skip MCP API key mint after successful OAuth")
|
|
15
34
|
.action(async (opts) => {
|
|
16
35
|
await loginCommand(opts);
|
|
17
36
|
});
|
|
@@ -37,5 +56,12 @@ export function registerAuthCommands(program) {
|
|
|
37
56
|
.action(async (opts) => {
|
|
38
57
|
await sessionsCommand(opts);
|
|
39
58
|
});
|
|
59
|
+
auth
|
|
60
|
+
.command("token <apiKey>")
|
|
61
|
+
.description("store a ZIVIS API access token for MCP/CI use (generate at Settings → API Tokens)")
|
|
62
|
+
.option("-s, --session <name>", "named session to bind this token to (defaults to project binding if present)")
|
|
63
|
+
.action(async (apiKey, opts) => {
|
|
64
|
+
await tokenCommand(apiKey, opts);
|
|
65
|
+
});
|
|
40
66
|
}
|
|
41
67
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/commands/auth/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,271 @@
|
|
|
1
|
+
import * as readline from "node:readline/promises";
|
|
2
|
+
import { login, getStorageName, saveSessionEntry } from "@zivis/mcp/auth";
|
|
3
|
+
import { credentialStorageFromConfig, DEFAULT_CONFIG } from "@zivis/mcp/types";
|
|
4
|
+
import { resolveConfigFromBinding } from "@zivis/mcp/project-binding";
|
|
5
|
+
import { fetchUserOrgs, extractEmail } from "../../internal/orgs.js";
|
|
6
|
+
import { ensureProjectBinding } from "../../internal/project-binding.js";
|
|
7
|
+
import { discardOauthAfterLogin, tryAutoMintBindingTokenAfterLogin, } from "../../internal/binding-token-mint.js";
|
|
8
|
+
import { decodeJwtPayload } from "@zivis/mcp/auth/jwt";
|
|
9
|
+
import { detectIdesInRepo, writeGuidance } from "../../internal/ide-setup.js";
|
|
10
|
+
async function prompt(question) {
|
|
11
|
+
const rl = readline.createInterface({ input: process.stdin, output: process.stderr });
|
|
12
|
+
try {
|
|
13
|
+
return (await rl.question(question)).trim();
|
|
14
|
+
}
|
|
15
|
+
finally {
|
|
16
|
+
rl.close();
|
|
17
|
+
}
|
|
18
|
+
}
|
|
19
|
+
/**
|
|
20
|
+
* After project binding succeeds, offer to write IDE guidance files.
|
|
21
|
+
* This is the prime moment to ask — the user is already in setup mode.
|
|
22
|
+
*/
|
|
23
|
+
async function offerGuidanceInstall(cwd) {
|
|
24
|
+
const detectedIdes = detectIdesInRepo(cwd);
|
|
25
|
+
if (detectedIdes.length === 0)
|
|
26
|
+
return;
|
|
27
|
+
const ideLabels = {
|
|
28
|
+
cursor: "Cursor",
|
|
29
|
+
"claude-code-cli": "Claude Code (CLAUDE.md)",
|
|
30
|
+
"vscode-copilot": "VS Code (Copilot)",
|
|
31
|
+
"vscode-claude": "VS Code (Claude)",
|
|
32
|
+
cline: "Cline",
|
|
33
|
+
windsurf: "Windsurf",
|
|
34
|
+
};
|
|
35
|
+
const ideNames = detectedIdes.map((ide) => ideLabels[ide] ?? ide).join(", ");
|
|
36
|
+
console.log(`\nDetected IDE configs in this repo: ${ideNames}`);
|
|
37
|
+
const ans = await prompt("Add ZIVIS guidance so your AI assistant suggests security checks at the right moments?\n" +
|
|
38
|
+
"(Adds a rule/instruction file. You can edit or remove it anytime.) [Y/n] ");
|
|
39
|
+
if (ans.toLowerCase() === "n" || ans.toLowerCase() === "no") {
|
|
40
|
+
console.log(" Skipped. Run 'zivis mcp install --client <ide> --with-guidance' anytime to add later.");
|
|
41
|
+
return;
|
|
42
|
+
}
|
|
43
|
+
const written = [];
|
|
44
|
+
for (const ide of detectedIdes) {
|
|
45
|
+
try {
|
|
46
|
+
const files = writeGuidance({ cwd, client: ide });
|
|
47
|
+
written.push(...files);
|
|
48
|
+
}
|
|
49
|
+
catch (err) {
|
|
50
|
+
console.warn(` Warning: Could not write guidance for ${ide}: ${err instanceof Error ? err.message : err}`);
|
|
51
|
+
}
|
|
52
|
+
}
|
|
53
|
+
if (written.length > 0) {
|
|
54
|
+
console.log(`✓ Wrote guidance files:`);
|
|
55
|
+
for (const f of written)
|
|
56
|
+
console.log(` ${f}`);
|
|
57
|
+
}
|
|
58
|
+
}
|
|
59
|
+
export async function initCommand(opts) {
|
|
60
|
+
// Prefer URL config from the existing project binding (if any) so that
|
|
61
|
+
// re-running `zivis auth init` in a staging repo hits staging automatically.
|
|
62
|
+
const config = {
|
|
63
|
+
...DEFAULT_CONFIG,
|
|
64
|
+
...resolveConfigFromBinding(process.cwd()),
|
|
65
|
+
};
|
|
66
|
+
const session = opts.session || "default";
|
|
67
|
+
const envLabel = config.apiBaseUrl.includes("staging") ? "staging" : "production";
|
|
68
|
+
console.log(`Environment: ${envLabel} (${config.apiBaseUrl})`);
|
|
69
|
+
console.log("");
|
|
70
|
+
// Step 1: Open browser — no org pre-selection. User picks the org in their browser.
|
|
71
|
+
console.log("Opening browser for authentication...");
|
|
72
|
+
console.log("Log into the org you want to bind this project to.\n");
|
|
73
|
+
let tokens;
|
|
74
|
+
try {
|
|
75
|
+
tokens = await login(config, session, undefined, { skipConfirm: true });
|
|
76
|
+
}
|
|
77
|
+
catch (err) {
|
|
78
|
+
console.error("Login failed:", err instanceof Error ? err.message : err);
|
|
79
|
+
process.exit(1);
|
|
80
|
+
}
|
|
81
|
+
const email = extractEmail(tokens.id_token);
|
|
82
|
+
// Step 2: Determine which org the JWT is scoped to
|
|
83
|
+
const claims = decodeJwtPayload(tokens.access_token);
|
|
84
|
+
const jwtOrgId = claims?.org_id;
|
|
85
|
+
if (jwtOrgId) {
|
|
86
|
+
// Look up org name before confirming
|
|
87
|
+
let orgName;
|
|
88
|
+
try {
|
|
89
|
+
const orgs = await fetchUserOrgs(config, tokens.access_token);
|
|
90
|
+
orgName = orgs.find((o) => o.workosOrgId === jwtOrgId)?.name;
|
|
91
|
+
if (!orgName && orgs.length > 0) {
|
|
92
|
+
console.log(`\n ⚠ WorkOS org ${jwtOrgId} is not registered in ZIVIS.`);
|
|
93
|
+
console.log(` Your ZIVIS orgs: ${orgs.map((o) => `${o.name} (${o.workosOrgId})`).join(", ")}`);
|
|
94
|
+
console.log(` Try logging into ${config.apiBaseUrl} in your browser first, then re-run init.\n`);
|
|
95
|
+
}
|
|
96
|
+
}
|
|
97
|
+
catch (e) {
|
|
98
|
+
console.error(` (note: org name lookup failed — ${e instanceof Error ? e.message : e})`);
|
|
99
|
+
}
|
|
100
|
+
const orgLabel = orgName ?? `unknown org (${jwtOrgId})`;
|
|
101
|
+
console.log(`\nAuthenticated as: ${email}`);
|
|
102
|
+
console.log(`Org: ${orgLabel}`);
|
|
103
|
+
console.log(`Environment: ${envLabel} (${config.apiBaseUrl})\n`);
|
|
104
|
+
const confirm = await prompt(`Bind this project to "${orgLabel}"? [Y/n] `);
|
|
105
|
+
if (confirm.toLowerCase() === "n" || confirm.toLowerCase() === "no") {
|
|
106
|
+
console.log("");
|
|
107
|
+
const retry = await prompt("Retry login in a private/incognito window? [Y/n] ");
|
|
108
|
+
if (retry.toLowerCase() !== "n" && retry.toLowerCase() !== "no") {
|
|
109
|
+
console.log("\nOpening a private/incognito window — log into the correct org...\n");
|
|
110
|
+
let retryTokens;
|
|
111
|
+
try {
|
|
112
|
+
retryTokens = await login(config, session, undefined, { skipConfirm: true, incognito: true });
|
|
113
|
+
}
|
|
114
|
+
catch (err) {
|
|
115
|
+
console.error("Login failed:", err instanceof Error ? err.message : err);
|
|
116
|
+
process.exit(1);
|
|
117
|
+
}
|
|
118
|
+
// Recurse by re-entering the confirmation flow with the new tokens
|
|
119
|
+
tokens = retryTokens;
|
|
120
|
+
const retryClaims = decodeJwtPayload(retryTokens.access_token);
|
|
121
|
+
const retryOrgId = retryClaims?.org_id;
|
|
122
|
+
if (!retryOrgId) {
|
|
123
|
+
console.error("JWT returned no org scope. Try `zivis auth logout` then `zivis auth init` again.");
|
|
124
|
+
process.exit(1);
|
|
125
|
+
}
|
|
126
|
+
let retryOrgName;
|
|
127
|
+
try {
|
|
128
|
+
const retryOrgs = await fetchUserOrgs(config, retryTokens.access_token);
|
|
129
|
+
retryOrgName = retryOrgs.find((o) => o.workosOrgId === retryOrgId)?.name;
|
|
130
|
+
}
|
|
131
|
+
catch (e) {
|
|
132
|
+
console.error(` (note: org name lookup failed — ${e instanceof Error ? e.message : e})`);
|
|
133
|
+
}
|
|
134
|
+
const retryLabel = retryOrgName ?? retryOrgId;
|
|
135
|
+
const retryEmail = extractEmail(retryTokens.id_token);
|
|
136
|
+
console.log(`\nAuthenticated as: ${retryEmail}`);
|
|
137
|
+
console.log(`Org: ${retryLabel}\n`);
|
|
138
|
+
const retryConfirm = await prompt(`Bind this project to "${retryLabel}"? [Y/n] `);
|
|
139
|
+
if (retryConfirm.toLowerCase() === "n" || retryConfirm.toLowerCase() === "no") {
|
|
140
|
+
console.log("Aborted.");
|
|
141
|
+
process.exit(0);
|
|
142
|
+
}
|
|
143
|
+
const storageName2 = getStorageName();
|
|
144
|
+
await saveSessionEntry(session, retryEmail, credentialStorageFromConfig(config));
|
|
145
|
+
console.log(`\n✓ Logged in as ${retryEmail} → ${retryLabel}`);
|
|
146
|
+
console.log(`✓ Credentials stored in ${storageName2}`);
|
|
147
|
+
await ensureProjectBinding({
|
|
148
|
+
config, session, accessToken: retryTokens.access_token,
|
|
149
|
+
organizationId: retryOrgId, cwd: process.cwd(), autoBind: true, skipBind: false, force: true,
|
|
150
|
+
});
|
|
151
|
+
await tryAutoMintBindingTokenAfterLogin({
|
|
152
|
+
cwd: process.cwd(),
|
|
153
|
+
sessionName: session,
|
|
154
|
+
accessToken: retryTokens.access_token,
|
|
155
|
+
skip: opts.skipMintKey === true,
|
|
156
|
+
warnOnFailure: true,
|
|
157
|
+
});
|
|
158
|
+
await discardOauthAfterLogin({ session, config });
|
|
159
|
+
await offerGuidanceInstall(process.cwd());
|
|
160
|
+
process.exit(0);
|
|
161
|
+
}
|
|
162
|
+
console.log("\nAborted. Switch orgs in your browser then run `zivis auth logout && zivis auth init`.");
|
|
163
|
+
process.exit(0);
|
|
164
|
+
}
|
|
165
|
+
const storageName = getStorageName();
|
|
166
|
+
await saveSessionEntry(session, email, credentialStorageFromConfig(config));
|
|
167
|
+
console.log(`\n✓ Logged in as ${email} → ${orgLabel}`);
|
|
168
|
+
console.log(`✓ Credentials stored in ${storageName}`);
|
|
169
|
+
await ensureProjectBinding({
|
|
170
|
+
config,
|
|
171
|
+
session,
|
|
172
|
+
accessToken: tokens.access_token,
|
|
173
|
+
organizationId: jwtOrgId,
|
|
174
|
+
cwd: process.cwd(),
|
|
175
|
+
autoBind: true,
|
|
176
|
+
skipBind: false,
|
|
177
|
+
force: true,
|
|
178
|
+
});
|
|
179
|
+
await tryAutoMintBindingTokenAfterLogin({
|
|
180
|
+
cwd: process.cwd(),
|
|
181
|
+
sessionName: session,
|
|
182
|
+
accessToken: tokens.access_token,
|
|
183
|
+
skip: opts.skipMintKey === true,
|
|
184
|
+
warnOnFailure: true,
|
|
185
|
+
});
|
|
186
|
+
await discardOauthAfterLogin({ session, config });
|
|
187
|
+
await offerGuidanceInstall(process.cwd());
|
|
188
|
+
}
|
|
189
|
+
else {
|
|
190
|
+
// No org in JWT — user is authenticated but not scoped to an org yet.
|
|
191
|
+
// Fetch orgs and let them pick, then do a scoped login.
|
|
192
|
+
console.log("\nYour account isn't scoped to a specific org yet.");
|
|
193
|
+
console.log("Fetching your organizations...\n");
|
|
194
|
+
let orgs;
|
|
195
|
+
try {
|
|
196
|
+
orgs = await fetchUserOrgs(config, tokens.access_token);
|
|
197
|
+
}
|
|
198
|
+
catch (err) {
|
|
199
|
+
console.error("Failed to fetch organizations:", err instanceof Error ? err.message : err);
|
|
200
|
+
process.exit(1);
|
|
201
|
+
}
|
|
202
|
+
if (orgs.length === 0) {
|
|
203
|
+
console.error("No organizations found. Contact support.");
|
|
204
|
+
process.exit(1);
|
|
205
|
+
}
|
|
206
|
+
if (orgs.length === 1) {
|
|
207
|
+
console.log(`One org found: ${orgs[0].name}. Re-authenticating scoped to that org...`);
|
|
208
|
+
}
|
|
209
|
+
else {
|
|
210
|
+
console.log("Your organizations:");
|
|
211
|
+
orgs.forEach((org, i) => console.log(` ${i + 1}. ${org.name}`));
|
|
212
|
+
const answer = await prompt(`\nSelect org to bind this project to [1-${orgs.length}]: `);
|
|
213
|
+
const idx = parseInt(answer, 10) - 1;
|
|
214
|
+
if (isNaN(idx) || idx < 0 || idx >= orgs.length) {
|
|
215
|
+
console.error("Invalid selection.");
|
|
216
|
+
process.exit(1);
|
|
217
|
+
}
|
|
218
|
+
const selected = orgs[idx];
|
|
219
|
+
if (!selected.workosOrgId) {
|
|
220
|
+
console.error(`Org "${selected.name}" has no WorkOS org ID.`);
|
|
221
|
+
process.exit(1);
|
|
222
|
+
}
|
|
223
|
+
console.log(`\nRe-opening browser scoped to ${selected.name}...`);
|
|
224
|
+
console.log("(Tip: if your browser logs into the wrong org, use option 2 to get a URL for a private/incognito window)\n");
|
|
225
|
+
try {
|
|
226
|
+
const scopedTokens = await login(config, session, selected.workosOrgId, {
|
|
227
|
+
orgName: selected.name,
|
|
228
|
+
skipConfirm: true,
|
|
229
|
+
});
|
|
230
|
+
const storageName2 = getStorageName();
|
|
231
|
+
await saveSessionEntry(session, email, credentialStorageFromConfig(config));
|
|
232
|
+
console.log(`\n✓ Logged in as ${email} → ${selected.name}`);
|
|
233
|
+
console.log(`✓ Credentials stored in ${storageName2}`);
|
|
234
|
+
await ensureProjectBinding({
|
|
235
|
+
config,
|
|
236
|
+
session,
|
|
237
|
+
accessToken: scopedTokens.access_token,
|
|
238
|
+
organizationId: selected.workosOrgId,
|
|
239
|
+
cwd: process.cwd(),
|
|
240
|
+
autoBind: true,
|
|
241
|
+
skipBind: false,
|
|
242
|
+
force: true,
|
|
243
|
+
});
|
|
244
|
+
await tryAutoMintBindingTokenAfterLogin({
|
|
245
|
+
cwd: process.cwd(),
|
|
246
|
+
sessionName: session,
|
|
247
|
+
accessToken: scopedTokens.access_token,
|
|
248
|
+
skip: opts.skipMintKey === true,
|
|
249
|
+
warnOnFailure: true,
|
|
250
|
+
});
|
|
251
|
+
await discardOauthAfterLogin({ session, config });
|
|
252
|
+
await offerGuidanceInstall(process.cwd());
|
|
253
|
+
}
|
|
254
|
+
catch (err) {
|
|
255
|
+
const msg = err instanceof Error ? err.message : String(err);
|
|
256
|
+
const m = msg.match(/received (org_\w+)/);
|
|
257
|
+
if (m) {
|
|
258
|
+
console.error(`\n⚠ Browser authenticated to a different org than selected.`);
|
|
259
|
+
console.error(` Your browser has an active session for a different org.\n`);
|
|
260
|
+
console.error(` To fix: run \`zivis auth init\` again and paste the URL into a private/incognito window.`);
|
|
261
|
+
}
|
|
262
|
+
else {
|
|
263
|
+
console.error("Login failed:", msg);
|
|
264
|
+
}
|
|
265
|
+
process.exit(1);
|
|
266
|
+
}
|
|
267
|
+
}
|
|
268
|
+
}
|
|
269
|
+
process.exit(0);
|
|
270
|
+
}
|
|
271
|
+
//# sourceMappingURL=init.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"init.js","sourceRoot":"","sources":["../../../src/commands/auth/init.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,13 +1,17 @@
|
|
|
1
1
|
import { login } from "@zivis/mcp/auth";
|
|
2
2
|
import { getStorageName } from "@zivis/mcp/auth";
|
|
3
3
|
import { saveSessionEntry } from "@zivis/mcp/auth";
|
|
4
|
-
import { detectProjectBinding } from "@zivis/mcp/project-binding";
|
|
5
|
-
import { DEFAULT_CONFIG } from "@zivis/mcp/types";
|
|
4
|
+
import { detectProjectBinding, resolveConfigFromBinding } from "@zivis/mcp/project-binding";
|
|
5
|
+
import { credentialStorageFromConfig, DEFAULT_CONFIG } from "@zivis/mcp/types";
|
|
6
6
|
import { extractEmail } from "../../internal/orgs.js";
|
|
7
7
|
import { ensureProjectBinding } from "../../internal/project-binding.js";
|
|
8
|
-
import {
|
|
8
|
+
import { discardOauthAfterLogin, tryAutoMintBindingTokenAfterLogin, } from "../../internal/binding-token-mint.js";
|
|
9
|
+
import { setupCursorWorkspace, setupVsCodeClaude, setupVsCodeCopilot, setupClaudeCodeCli, } from "../../internal/ide-setup.js";
|
|
9
10
|
export async function loginCommand(opts) {
|
|
10
|
-
const config =
|
|
11
|
+
const config = {
|
|
12
|
+
...DEFAULT_CONFIG,
|
|
13
|
+
...resolveConfigFromBinding(process.cwd()),
|
|
14
|
+
};
|
|
11
15
|
const detected = detectProjectBinding(process.cwd());
|
|
12
16
|
const session = opts.session || detected?.binding.session || config.session;
|
|
13
17
|
let organizationId = opts.org;
|
|
@@ -26,7 +30,7 @@ export async function loginCommand(opts) {
|
|
|
26
30
|
const storageName = getStorageName();
|
|
27
31
|
const email = extractEmail(tokens.id_token);
|
|
28
32
|
const sessionName = session || "default";
|
|
29
|
-
await saveSessionEntry(sessionName, email);
|
|
33
|
+
await saveSessionEntry(sessionName, email, credentialStorageFromConfig(config));
|
|
30
34
|
const sessionLabel = session ? ` (session: ${session})` : "";
|
|
31
35
|
console.log(`✓ Logged in as ${email}${sessionLabel}`);
|
|
32
36
|
console.log(`✓ Credentials stored in ${storageName}`);
|
|
@@ -34,14 +38,20 @@ export async function loginCommand(opts) {
|
|
|
34
38
|
console.log(`✓ JWT scoped to organization: ${organizationId}`);
|
|
35
39
|
}
|
|
36
40
|
try {
|
|
37
|
-
await
|
|
38
|
-
|
|
41
|
+
await setupCursorWorkspace();
|
|
42
|
+
}
|
|
43
|
+
catch (err) {
|
|
44
|
+
console.log(` WARNING: Failed to update .cursor/mcp.json: ${err instanceof Error ? err.message : err}`);
|
|
45
|
+
}
|
|
46
|
+
try {
|
|
47
|
+
await setupVsCodeClaude();
|
|
48
|
+
await setupVsCodeCopilot();
|
|
39
49
|
}
|
|
40
50
|
catch (err) {
|
|
41
51
|
console.log(` WARNING: Failed to update .vscode/mcp.json: ${err instanceof Error ? err.message : err}`);
|
|
42
52
|
}
|
|
43
53
|
try {
|
|
44
|
-
await setupClaudeCodeCli(
|
|
54
|
+
await setupClaudeCodeCli();
|
|
45
55
|
}
|
|
46
56
|
catch (err) {
|
|
47
57
|
console.log(` WARNING: Failed to update Claude Code CLI config: ${err instanceof Error ? err.message : err}`);
|
|
@@ -55,6 +65,16 @@ export async function loginCommand(opts) {
|
|
|
55
65
|
autoBind: opts.bind === true,
|
|
56
66
|
skipBind: opts.noBind === true,
|
|
57
67
|
});
|
|
68
|
+
await tryAutoMintBindingTokenAfterLogin({
|
|
69
|
+
cwd: process.cwd(),
|
|
70
|
+
sessionName,
|
|
71
|
+
accessToken: tokens.access_token,
|
|
72
|
+
skip: opts.skipMintKey === true,
|
|
73
|
+
warnOnFailure: true,
|
|
74
|
+
});
|
|
75
|
+
// OAuth has done its job (mint, org verify). MCP only reads apikey.<session>,
|
|
76
|
+
// so any OAuth tokens left in the keychain are dead weight + drift risk.
|
|
77
|
+
await discardOauthAfterLogin({ session, config });
|
|
58
78
|
process.exit(0);
|
|
59
79
|
}
|
|
60
80
|
catch (err) {
|