@athsra/cli 1.0.4 → 1.1.1

package/src/commands/rollback.ts

@@ -1,22 +1,25 @@
 import { loadAuthContext } from '../lib/auth-context.ts';
+import { CONFIG_USAGE_HINT, configTag, resolveProject } from '../lib/auto-project.ts';
 import { promptConfirm } from '../lib/prompt.ts';
 
-const USAGE = 'usage: athsra rollback <project> <version_id>';
+const USAGE = ['usage: athsra rollback <project>[:<env>] <version_id>', CONFIG_USAGE_HINT].join(
+  '\n',
+);
 
 /**
- * athsra rollback <project> <version_id>
- *   - 특정 version 을 current 로 복원
+ * athsra rollback <project>[:<env>] <version_id>
+ *   - 특정 version 을 current 로 복원 (해당 환경(config) 한정)
  *   - tombstone 있으면 자동 제거 (rollback 은 항상 active 상태로)
  *   - confirm 필요 (--yes 로 우회 가능)
  */
 export async function rollbackCmd(args: string[]): Promise<number> {
-  const project = args[0];
-  const versionId = args[1];
+  const { project, config, rest } = resolveProject(args, { requirePositional: true });
+  const versionId = rest[0];
   if (!project || !versionId) {
     console.error(USAGE);
     return 2;
   }
-  const yes = args.includes('--yes') || args.includes('-y');
+  const yes = rest.includes('--yes') || rest.includes('-y');
 
   const ctx = await loadAuthContext();
   if (!ctx) return 1;
@@ -24,12 +27,12 @@ export async function rollbackCmd(args: string[]): Promise<number> {
 
   if (!yes && process.env.ATHSRA_ROLLBACK_CONFIRMED !== '1') {
     const ok = await promptConfirm(
-      `Rollback ${project} to ${versionId}? Current version becomes inactive (still in history).`,
+      `Rollback ${project}${configTag(config)} to ${versionId}? Current version becomes inactive (still in history).`,
     );
     if (!ok) return 0;
   }
 
-  const result = await client.rollbackProject(project, versionId);
-  console.log(`✓ ${project}: rolled back to ${result.current_version}`);
+  const result = await client.rollbackProject(project, versionId, config);
+  console.log(`✓ ${project}${configTag(config)}: rolled back to ${result.current_version}`);
   return 0;
 }

package/src/commands/rotate-master.ts

@@ -1,14 +1,8 @@
-import {
-  deriveKey,
-  ENTERPRISE_KDF,
-  fromBase64,
-  isValidPhrase,
-  normalizePhrase,
-  toBase64,
-  wordCount,
-} from '@athsra/crypto';
+import { ENTERPRISE_KDF, isValidPhrase, normalizePhrase, wordCount } from '@athsra/crypto';
 import { loadAuthContext, type UserAuthContext } from '../lib/auth-context.ts';
+import { deriveMasterProof } from '../lib/auth-proof.ts';
 import { AthsraClient } from '../lib/client.ts';
+import { saveConfig } from '../lib/config.ts';
 import { readPlain, writePlain } from '../lib/envelope.ts';
 import { rewrapForRotation } from '../lib/identity-key.ts';
 import { setMasterPw, setToken } from '../lib/keyring.ts';
@@ -115,19 +109,25 @@ export async function rotateMasterCmd(_args: string[]): Promise<number> {
   // POST /auth/rotate-master
   console.log('\n• Rotating server-side proof + invalidating all tokens...');
   const info = await client.info();
-  const globalSalt = fromBase64(info.global_salt);
-  const oldProof = toBase64(deriveKey(oldPw, globalSalt));
-  const newProof = toBase64(deriveKey(newPw, globalSalt));
+  const me = await client.whoami();
+  if (me.userId === undefined) {
+    console.error('whoami 에 user_id 없음 — 재로그인 필요 (`athsra login`).');
+    return 1;
+  }
+  const oldProof = deriveMasterProof(oldPw, me.userId, info.global_salt);
+  const newProof = deriveMasterProof(newPw, me.userId, info.global_salt);
   const rot = await client.rotateMaster(oldProof, newProof, keyRewrap ?? undefined);
   console.log(`  ✓ new token issued (machineId=${rot.machineId})`);
 
   // 3. keyring 갱신 + 새 client
   setMasterPw(config.machineId, newPw);
   setToken(config.machineId, rot.token);
+  const nextConfig = { ...config, userId: me.userId };
+  saveConfig(nextConfig);
   const newClient = new AthsraClient(config.workerUrl, rot.token);
   const newCtx: UserAuthContext = {
     kind: 'user',
-    config,
+    config: nextConfig,
     masterPw: newPw,
     token: rot.token,
     client: newClient,

package/src/commands/run.ts

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { loadAuthContext } from '../lib/auth-context.ts';
-import { resolveProject } from '../lib/auto-project.ts';
-import { partitionEnv } from '../lib/env-format.ts';
+import { CONFIG_USAGE_HINT, configTag, resolveProject } from '../lib/auto-project.ts';
+import { buildChildEnv } from '../lib/env-format.ts';
 import { readPlain } from '../lib/envelope.ts';
 
 const USAGE = [
@@ -9,6 +9,7 @@ const USAGE = [
   '',
   '<project> 자동 감지 (cwd 기반): basename(cwd) > .athsra > package.json athsra.project',
   '23 sibling repo 안에서: cd ~/code/<repo> && athsra run -- bun run dev',
+  CONFIG_USAGE_HINT,
 ].join('\n');
 
 export async function runCmd(args: string[]): Promise<number> {
@@ -19,7 +20,7 @@ export async function runCmd(args: string[]): Promise<number> {
   }
   // -- 앞 영역에서 project 추출 (auto-detect 가능). -- 뒤는 cmd.
   const beforeSep = args.slice(0, sepIdx);
-  const { project } = resolveProject(beforeSep);
+  const { project, config } = resolveProject(beforeSep);
   if (!project) {
     console.error(USAGE);
     return 2;
@@ -34,9 +35,9 @@ export async function runCmd(args: string[]): Promise<number> {
   const ctx = await loadAuthContext(project);
   if (!ctx) return 1;
 
-  const plain = await readPlain(ctx, project);
+  const plain = await readPlain(ctx, project, config);
   if (!plain) {
-    console.error(`project not found: ${project}`);
+    console.error(`project not found: ${project}${configTag(config)}`);
     return 1;
   }
 
@@ -64,22 +65,3 @@ export async function runCmd(args: string[]): Promise<number> {
     });
   });
 }
-
-/**
- * 자식 프로세스 env 를 만든다. 빈 값 secret 키는 inject 대상에서 제외해
- * 부모 환경 변수를 보존한다.
- *
- * 키 이름만 등록되고 값이 빈 secret (migration scaffolding 산출물) 을
- * `{ ...process.env, ...plain }` 로 합치면 부모 env 의 유효한 값 (예:
- * ~/.zshrc 의 CLOUDFLARE_API_TOKEN) 이 빈 문자열로 덮어써져 배포 인증이
- * 깨진다. 빈 값 키를 제외하면 부모 env 값이 그대로 살아남는다.
- *
- * @returns env — 자식 프로세스 env, skipped — 제외된 빈 값 키 (정렬됨)
- */
-export function buildChildEnv(
-  parentEnv: Record<string, string | undefined>,
-  plain: Record<string, string>,
-): { env: Record<string, string | undefined>; skipped: string[] } {
-  const { filled, emptyKeys } = partitionEnv(plain);
-  return { env: { ...parentEnv, ...filled }, skipped: emptyKeys };
-}

package/src/commands/service-token.ts

@@ -1,7 +1,10 @@
-import { addServiceRecipient, migrateV1ToV2, type SecretEnvelopeV2 } from '@athsra/crypto';
 import { loadAuthContext } from '../lib/auth-context.ts';
 import { resolveProject } from '../lib/auto-project.ts';
 import { red, yellow } from '../lib/colors.ts';
+import {
+  type CreatedServiceToken,
+  createServiceTokenWithRecipient,
+} from '../lib/service-tokens.ts';
 
 /** worker expiry-notify (apps/worker/src/queue/expiry-notify.ts) 의 최임박 threshold 와 동기. */
 const EXPIRING_SOON_DAYS = 14;
@@ -58,40 +61,21 @@ async function createCmd(args: string[]): Promise<number> {
     console.error('athsra service-token create 은 user token (master pw) 가 필요합니다.');
     return 1;
   }
-  const { masterPw, client } = ctx;
 
-  // envelope 확인 — 없으면 service token 발급 무의미
-  const envelope = await client.getEnvelope(project);
-  if (!envelope) {
-    console.error(
-      `project ${project} envelope 없음 — 먼저 \`athsra set ${project} KEY=value\` 실행.`,
-    );
+  // 발급 + recipient 추가 (lib/service-tokens.ts — MCP athsra_service_token_create 와 공용 경로)
+  let created: CreatedServiceToken;
+  try {
+    created = await createServiceTokenWithRecipient(ctx, {
+      project,
+      label,
+      perms,
+      expiresInDays: expiresDays,
+    });
+  } catch (err) {
+    console.error((err as Error).message);
     return 1;
   }
 
-  // worker 에 service token 발급
-  const created = await client.createServiceToken({
-    project,
-    label,
-    perms,
-    expiresInDays: expiresDays,
-  });
-
-  // envelope 에 recipient 추가 — v1 이면 v2 로 자동 migrate
-  let v2Envelope: SecretEnvelopeV2;
-  if (envelope.version === 1) {
-    v2Envelope = await migrateV1ToV2(envelope, masterPw);
-  } else {
-    v2Envelope = envelope;
-  }
-  const updated = await addServiceRecipient(
-    v2Envelope,
-    masterPw,
-    created.token,
-    created.recipient_id,
-  );
-  await client.putEnvelope(project, updated);
-
   console.log('\n✓ service token 발급 완료\n');
   console.log(`  token:        ${created.token}`);
   console.log(`  project:      ${created.project}`);

package/src/commands/set.ts

@@ -1,6 +1,6 @@
 import { readFileSync } from 'node:fs';
 import { loadAuthContext } from '../lib/auth-context.ts';
-import { resolveProject } from '../lib/auto-project.ts';
+import { CONFIG_USAGE_HINT, configTag, resolveProject } from '../lib/auto-project.ts';
 import { parseEnv, partitionEnv } from '../lib/env-format.ts';
 import { readPlain, writePlain } from '../lib/envelope.ts';
 
@@ -12,6 +12,7 @@ const USAGE = [
   '<project> 자동 감지 (cwd 기반):',
   '  --project=<x> > positional > .athsra file > package.json athsra.project > basename(cwd)',
   '23 sibling repo 안에서는 cd 한 후 project 인자 생략 가능 (basename 자동 사용).',
+  CONFIG_USAGE_HINT,
 ].join('\n');
 
 async function readStdin(): Promise<string> {
@@ -36,14 +37,14 @@ function parsePairsArg(pairs: string[]): Record<string, string> | null {
 }
 
 export async function setCmd(args: string[]): Promise<number> {
-  const { project, rest, source } = resolveProject(args);
+  const { project, config, rest, source } = resolveProject(args);
   if (!project) {
     console.error(USAGE);
     return 2;
   }
   // mutating 명령 — auto-detect 시점 source 안내 (실수 방지). positional/flag 면 silent.
   if (source !== 'positional' && source !== 'flag') {
-    console.log(`(project=${project} auto-detected from ${source})`);
+    console.log(`(project=${project}${configTag(config)} auto-detected from ${source})`);
   }
 
   let updates: Record<string, string>;
@@ -93,14 +94,14 @@ export async function setCmd(args: string[]): Promise<number> {
   }
 
   // read-modify-write — v1/v2 dispatcher 가 read 처리, write 는 항상 v2.
-  const plain: Record<string, string> = (await readPlain(ctx, project)) ?? {};
+  const plain: Record<string, string> = (await readPlain(ctx, project, config)) ?? {};
   for (const [k, v] of Object.entries(updates)) {
     plain[k] = v;
   }
-  await writePlain(ctx, project, plain);
+  await writePlain(ctx, project, plain, { config });
 
   console.log(
-    `✓ ${project}: ${updateCount} key${updateCount > 1 ? 's' : ''} set (${Object.keys(plain).length} total)`,
+    `✓ ${project}${configTag(config)}: ${updateCount} key${updateCount > 1 ? 's' : ''} set (${Object.keys(plain).length} total)`,
   );
   return 0;
 }

package/src/commands/unset.ts

@@ -1,16 +1,19 @@
 import { loadAuthContext } from '../lib/auth-context.ts';
+import { CONFIG_USAGE_HINT, configTag, resolveProject } from '../lib/auto-project.ts';
 import { readPlain, writePlain } from '../lib/envelope.ts';
 
-const USAGE =
-  'usage: athsra unset <project> KEY1 [KEY2 ...]   # 해당 keys 만 제거 (envelope 그대로, 다른 keys 유지)';
+const USAGE = [
+  'usage: athsra unset <project>[:<env>] KEY1 [KEY2 ...]   # 해당 keys 만 제거 (envelope 그대로, 다른 keys 유지)',
+  CONFIG_USAGE_HINT,
+].join('\n');
 
 export async function unsetCmd(args: string[]): Promise<number> {
-  const project = args[0];
+  const { project, config, rest } = resolveProject(args, { requirePositional: true });
   if (!project) {
     console.error(USAGE);
     return 2;
   }
-  const keys = args.slice(1);
+  const keys = rest;
   if (keys.length === 0) {
     console.error('No keys to unset');
     return 2;
@@ -23,9 +26,9 @@ export async function unsetCmd(args: string[]): Promise<number> {
     return 1;
   }
 
-  const plain = await readPlain(ctx, project);
+  const plain = await readPlain(ctx, project, config);
   if (!plain) {
-    console.error(`project not found: ${project}`);
+    console.error(`project not found: ${project}${configTag(config)}`);
     return 1;
   }
 
@@ -45,9 +48,9 @@ export async function unsetCmd(args: string[]): Promise<number> {
     return 1;
   }
 
-  await writePlain(ctx, project, plain);
+  await writePlain(ctx, project, plain, { config });
   console.log(
-    `✓ ${project}: ${removed.length} key${removed.length > 1 ? 's' : ''} removed (${Object.keys(plain).length} remaining)`,
+    `✓ ${project}${configTag(config)}: ${removed.length} key${removed.length > 1 ? 's' : ''} removed (${Object.keys(plain).length} remaining)`,
   );
   return 0;
 }

package/src/commands/versions.ts

@@ -1,10 +1,11 @@
 import { loadAuthContext } from '../lib/auth-context.ts';
-import { resolveProject } from '../lib/auto-project.ts';
+import { CONFIG_USAGE_HINT, configTag, resolveProject } from '../lib/auto-project.ts';
 
 const USAGE = [
   'usage: athsra versions [<project>]',
   '',
   '<project> 자동 감지 (cwd 기반): basename(cwd) > .athsra > package.json athsra.project',
+  CONFIG_USAGE_HINT,
 ].join('\n');
 
 /**
@@ -15,7 +16,7 @@ const USAGE = [
  *   - <project> 생략 시 cwd 기반 자동 감지
  */
 export async function versionsCmd(args: string[]): Promise<number> {
-  const { project } = resolveProject(args);
+  const { project, config } = resolveProject(args);
   if (!project) {
     console.error(USAGE);
     return 2;
@@ -24,20 +25,21 @@ export async function versionsCmd(args: string[]): Promise<number> {
   if (!ctx) return 1;
   const { client } = ctx;
 
-  const data = await client.listVersions(project);
+  const data = await client.listVersions(project, config);
+  const tag = configTag(config);
   if (data.tombstone) {
     console.log(
       `(deleted ${data.tombstone.deleted_at} by ${data.tombstone.deleted_by} — ${data.versions.length} version(s) recoverable)`,
     );
   }
   if (data.count === 0) {
-    console.log('(no versions — project never existed or hard-deleted)');
+    console.log(`(no versions${tag} — project never existed or hard-deleted)`);
     return 0;
   }
   for (const v of data.versions) {
     const marker = v.version_id === data.current_version ? '*' : ' ';
     console.log(`${marker} ${v.version_id}  ${v.updated_at}  (${v.size}B)`);
   }
-  console.log(`(${data.count} version${data.count > 1 ? 's' : ''})`);
+  console.log(`(${data.count} version${data.count > 1 ? 's' : ''}${tag})`);
   return 0;
 }

package/src/index.ts

@@ -28,7 +28,7 @@ import { setCmd } from './commands/set.ts';
 import { unsetCmd } from './commands/unset.ts';
 import { versionsCmd } from './commands/versions.ts';
 
-const VERSION = '1.0.0';
+const VERSION = '1.1.1';
 
 const commands: Record<string, (args: string[]) => Promise<number>> = {
   login: loginCmd,
@@ -70,14 +70,15 @@ if (!cmd || cmd === '--help' || cmd === '-h' || cmd === 'help') {
   console.log(`athsra v${VERSION} — E2EE secret manager on Cloudflare edge
 
 Usage:
-  athsra login                              master pw 입력 + 머신 등록 (Bearer token 발급)
+  athsra login                              브라우저 identity 로그인 (master pw 이 기기 미보관)
+  athsra login --password                   founding master pw 등록/재로그인 (OS keyring 저장)
   athsra logout [--full]                    keyring clear (worker token 유지). --full 시 config 도 삭제
   athsra init <project>                     신규 project 안내
   athsra adopt [<project>] [opts]           sibling repo envelope ↔ CF Worker + Workers Builds 1줄 onboarding
-  athsra set <project> KEY=value            secret 추가/수정 (다건 가능)
-  athsra unset <project> KEY [...]          특정 key 제거 (envelope 유지)
-  athsra get <project> [KEY]                값 출력 (single 또는 dump)
-  athsra ls [project] [--all]               project 또는 key 목록 (--all=deleted 포함)
+  athsra set <project>[:<env>] KEY=value    secret 추가/수정 (다건 가능)
+  athsra unset <project>[:<env>] KEY [...]  특정 key 제거 (envelope 유지)
+  athsra get <project>[:<env>] [KEY]        값 출력 (single 또는 dump)
+  athsra ls [project][:<env>] [--all|--configs]  project / key / 환경 목록
   athsra manifest {init|show|validate|add|remove}  sibling worker 의 secrets opt-in manifest (Option γ)
   athsra mcp                                Model Context Protocol stdio server (AI agent 통합)
   athsra run <project> -- <cmd>             env inject 후 명령 실행 (Doppler-style)
@@ -98,6 +99,9 @@ Usage:
   athsra restore <project>                  tombstone 제거 + 최신 version 활성화
   athsra purge <project>                    hard-delete (delete --hard 별칭, double-confirm)
 
+  환경(config): <project>:<env> 또는 --config=<env> 로 dev/staging/prod 분리 (기본 default).
+               모든 secret 명령 공통. 'athsra ls <project> --configs' 로 환경 목록 조회.
+
   athsra dr {restore-r2|restore-d1}         DR 복원 (backup→STORE / 암호화 D1 dump). dry-run 기본, --execute --confirm
 
   athsra rotate-master                      master pw 변경 (모든 projects re-encrypt)
@@ -108,7 +112,7 @@ Usage:
 
 Files / Storage:
   ~/.athsra/config.json                     worker URL + machine_id
-  OS keyring (libsecret/Keychain/Cred Manager)  master pw + Bearer token
+  OS keyring (libsecret/Keychain/Cred Manager)  identity key 또는 master pw + Bearer token
 
 Env vars (CI):
   ATHSRA_MASTER_PW             non-interactive login
@@ -120,7 +124,7 @@ Env vars (CI):
 Headless (service token — master pw 없이 scoped 복호):
   ATHSRA_TOKEN=ats_...  ATHSRA_WORKER_URL=https://...  athsra run <project> -- <cmd>
 
-Phase 1.x.8 = envelope v2 (DEK + multi-recipient) + service tokens for headless hosts.
+Phase 5 = identity device-login + MCP 3-tier tools + envelope member/self recipients.
 docs: github.com/modfolio/athsra
 `);
   process.exit(0);

package/src/lib/auth-context.ts

@@ -1,9 +1,10 @@
-import { deriveKey, fromBase64, toBase64 } from '@athsra/crypto';
+import { fromBase64 } from '@athsra/crypto';
+import { deriveLegacyMasterProofs, deriveMasterProof } from './auth-proof.ts';
 import { AthsraClient } from './client.ts';
-import { type Config, loadConfig } from './config.ts';
-import { getDeviceToken, getMasterPw, getToken, setToken } from './keyring.ts';
+import { type Config, loadConfig, saveConfig } from './config.ts';
+import { getDeviceToken, getIdentityKey, getMasterPw, getToken, setToken } from './keyring.ts';
 
-/** User token mode — keyring 의 master pw + Bearer token 보유, full access. */
+/** User token mode — keyring 의 master pw + Bearer token 보유. */
 export interface UserAuthContext {
   kind: 'user';
   config: Config;
@@ -27,7 +28,22 @@ export interface ServiceAuthContext {
   workerUrl: string;
 }
 
-export type AuthContext = UserAuthContext | ServiceAuthContext;
+/**
+ * Identity 디바이스 모드 (Phase 5) — keyring 의 identity X25519 private key + token. master pw 가
+ * 이 머신에 없어도 멤버 경로(member:me recipient)로 envelope 복호·재포장. token 은 atk_*(90일
+ * expiry, idle 면제) — 401 시 idle-refresh 불가(master pw 없음)이므로 `athsra login` 재온보딩.
+ */
+export interface IdentityAuthContext {
+  kind: 'identity';
+  config: Config;
+  /** keyring identity-priv → fromBase64. 멤버 복호/재포장에 사용 (worker 미노출). */
+  identityPrivateKey: Uint8Array;
+  userId: number;
+  token: string;
+  client: AthsraClient;
+}
+
+export type AuthContext = UserAuthContext | ServiceAuthContext | IdentityAuthContext;
 
 /**
  * 모든 인증 요구 commands 의 공통 진입점. 두 모드 자동 dispatch:
@@ -49,9 +65,12 @@ export async function loadAuthContext(project?: string): Promise<AuthContext | n
     return loadServiceContext(envToken);
   }
   // 2. user context (master pw + token, full access) — 보유 시 우선
-  const userCtx = loadUserContext();
+  const userCtx = await loadUserContext();
   if (userCtx) return userCtx;
-  // 3. project-scoped device token (device-login agent) — master pw 없는 머신
+  // 3. identity 디바이스 모드 (Phase 5) — master pw 없는 머신, identity privkey + atk_* 보유.
+  const identityCtx = loadIdentityContext();
+  if (identityCtx) return identityCtx;
+  // 4. project-scoped device token (device-login agent) — master pw 없는 머신
   //    Phase 3 P3: `athsra login --device --project <p>` 가 keyring 에 저장한 ats_*.
   if (project) {
     const deviceToken = getDeviceToken(project);
@@ -76,21 +95,40 @@ export async function loadAuthContext(project?: string): Promise<AuthContext | n
 }
 
 /** master pw + token 보유 시 user context. 미보유 시 조용히 null (호출자가 device/안내 처리). */
-function loadUserContext(): UserAuthContext | null {
-  const config = loadConfig();
+async function loadUserContext(): Promise<UserAuthContext | null> {
+  let config = loadConfig();
   if (!config) return null;
   const masterPw = getMasterPw(config.machineId);
   const token = getToken(config.machineId);
   if (!masterPw || !token) return null;
   const client = new AthsraClient(config.workerUrl, token);
-  // Phase 3 — idle timeout 자동 재인증. 401 session_idle_timeout 시 keyring master pw
-  // 로 silent re-register (proof = Argon2id(pw + GLOBAL_SALT)) → 새 token keyring 저장.
+
+  // Legacy config migration: older CLI versions did not persist userId. When the current token is
+  // still valid, backfill it from whoami so later proof operations use the authenticated user.
+  if (config.userId === undefined) {
+    try {
+      const me = await client.whoami();
+      if (me.userId !== undefined) {
+        config = { ...config, userId: me.userId };
+        saveConfig(config);
+      }
+    } catch {
+      // Token may already be idle-revoked. Keep fail-closed idle refresh below instead of guessing.
+    }
+  }
+
+  // Phase 3 — idle timeout 자동 재인증. founding password-login token 만 keyring master pw
+  // 로 silent re-register 가능. SSO/non-founding user 는 /auth/register 대상이 아니라 재로그인 필요.
   // 기기 잠금 (OS keyring 차단) 이 방어선이므로 작업 중엔 끊김 없이, 잠금 시엔 idle 유효.
   client.setIdleRefresh(async () => {
     try {
+      if (config.userId !== 1) return null;
       const info = await client.info();
-      const proof = toBase64(deriveKey(masterPw, fromBase64(info.global_salt)));
-      const reg = await client.register(proof, config.machineId);
+      const proof = deriveMasterProof(masterPw, config.userId, info.global_salt);
+      // 버전 업그레이드 무중단: 저장 proof 가 옛 스킴이면 worker 가 자동 G-1 마이그레이션.
+      const legacyProofs = deriveLegacyMasterProofs(masterPw, info.global_salt);
+      const reg = await client.register(proof, config.machineId, legacyProofs);
+      if (reg.userId !== undefined && reg.userId !== config.userId) return null;
       let token = reg.token;
       // Phase 4 Slice 6a — re-register 는 자기 personal org 로 token 발급. switch 상태였으면
       // (config.orgId) 다시 그 org 로 전환 — 안 하면 idle 후 사용자 모르게 personal 컨텍스트로 reset.
@@ -117,6 +155,32 @@ function loadUserContext(): UserAuthContext | null {
   };
 }
 
+/**
+ * identity privkey + token 보유 시 identity context (master pw 없는 머신). config.userId 필수
+ * (member recipient 매칭). 미보유/손상 시 조용히 null (호출자가 device/안내 처리).
+ */
+function loadIdentityContext(): IdentityAuthContext | null {
+  const config = loadConfig();
+  if (!config || config.userId === undefined) return null;
+  const privB64 = getIdentityKey(config.machineId);
+  const token = getToken(config.machineId);
+  if (!privB64 || !token) return null;
+  let identityPrivateKey: Uint8Array;
+  try {
+    identityPrivateKey = fromBase64(privB64);
+  } catch {
+    return null;
+  }
+  return {
+    kind: 'identity',
+    config,
+    identityPrivateKey,
+    userId: config.userId,
+    token,
+    client: new AthsraClient(config.workerUrl, token),
+  };
+}
+
 async function loadServiceContext(
   token: string,
   opts?: { silent?: boolean },

package/src/lib/auth-proof.ts

@@ -0,0 +1,26 @@
+import { deriveKey, deriveProof, fromBase64, toBase64 } from '@athsra/crypto';
+
+/** G-1 auth proof — per-user salt + GLOBAL_SALT pepper, base64 wire format. */
+export function deriveMasterProof(
+  masterPw: string,
+  userId: number,
+  globalSaltBase64: string,
+): string {
+  return toBase64(deriveProof(masterPw, userId, fromBase64(globalSaltBase64)));
+}
+
+/**
+ * 레거시 proof (pre-G-1, ≤1.0.2): `deriveKey(masterPw, GLOBAL_SALT)` — userId/도메인 prefix 없음.
+ *
+ * **버전 업그레이드 무중단 마이그레이션 전용.** 현 스킴(G-1) proof 가 mismatch 일 때 CLI 가 이 레거시
+ * proof 를 함께 보내고, worker 가 그것으로 검증 성공 시 저장 proof 를 G-1 으로 자동 재작성한다 →
+ * CLI 버전이 바뀌어도(옛 스킴 stored ↔ 새 스킴 client) 로그인이 깨지지 않는다. 정공법: 스킴 전환을
+ * 게이트가 아니라 자동 마이그레이션으로 흡수. 신규 스킴 추가 시 이 배열에 한 줄만 더하면 된다.
+ */
+export function deriveLegacyMasterProofs(masterPw: string, globalSaltBase64: string): string[] {
+  const salt = fromBase64(globalSaltBase64);
+  return [
+    // gen-0 (≤1.0.2): Argon2id(masterPw, GLOBAL_SALT) — per-user salt 도입 전.
+    toBase64(deriveKey(masterPw, salt)),
+  ];
+}