@hasna/economy 0.5.6 → 0.5.7

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- Support first-phone QR setup through private owner-Terminal login or explicitly confirmed signup. Accept signup HTTP 201 and attempt cleanup on catchable Terminal shutdown while preserving supplied sessions.
+
 ## 0.5.6
 
 ### Patch Changes

package/dist/chunks/{index-zqsx461z.js → index-6yr4hb72.js}

@@ -4,7 +4,7 @@ import {
 } from "./index-w3bvv0ns.js";
 import {
   getStore
-} from "./index-zs5dba3t.js";
+} from "./index-z2n5y111.js";
 import {
   formatReportedUsd,
   formatSummaryCoverage,

package/dist/chunks/{index-m12xttw1.js → index-b6c649mq.js}

@@ -20,7 +20,7 @@ import {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.6",
+  version: "0.5.7",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/chunks/{index-qvcafabj.js → index-wq7c4wqs.js}

@@ -1,7 +1,7 @@
 // @bun
 import {
   LOCAL_STORAGE_OPT_IN_KEYS
-} from "./index-m12xttw1.js";
+} from "./index-b6c649mq.js";
 import {
   assessCostFromDb,
   getIngestState,

package/dist/chunks/{index-zs5dba3t.js → index-z2n5y111.js}

@@ -14,7 +14,7 @@ import {
   querySavingsSummary,
   requireCurrentBillingDiffSummary,
   requireCurrentSavingsReport
-} from "./index-m12xttw1.js";
+} from "./index-b6c649mq.js";
 import {
   deleteBudget,
   deleteGoal,

package/dist/chunks/{serve-ept6cfbe.js → serve-ms8dvf7e.js}

@@ -5,7 +5,7 @@ import {
 } from "./index-w3bvv0ns.js";
 import {
   syncAll
-} from "./index-qvcafabj.js";
+} from "./index-wq7c4wqs.js";
 import {
   buildBrief,
   packageMetadata,
@@ -16,7 +16,7 @@ import {
   queryProjectDetail,
   queryRangeStats,
   querySavingsSummary
-} from "./index-m12xttw1.js";
+} from "./index-b6c649mq.js";
 import {
   AGENTS,
   INGEST_SCHEMA_SQL,

package/dist/chunks/{tui-4bh067a3.js → tui-9t7340wd.js}

@@ -6,10 +6,10 @@ import {
   printStatusLine,
   printWaybarJson,
   runTui
-} from "./index-zqsx461z.js";
+} from "./index-6yr4hb72.js";
 import"./index-w3bvv0ns.js";
-import"./index-zs5dba3t.js";
-import"./index-m12xttw1.js";
+import"./index-z2n5y111.js";
+import"./index-b6c649mq.js";
 import"./index-f5jv6q5q.js";
 import"./index-p35cyhc4.js";
 export {

package/dist/chunks/{watch-227kxmra.js → watch-t6ssnx30.js}

@@ -2,12 +2,12 @@
 import {
   agentPaths,
   syncAll
-} from "./index-qvcafabj.js";
+} from "./index-wq7c4wqs.js";
 import {
   getStore,
   isCloudStore
-} from "./index-zs5dba3t.js";
-import"./index-m12xttw1.js";
+} from "./index-z2n5y111.js";
+import"./index-b6c649mq.js";
 import {
   formatSummaryValue
 } from "./index-f5jv6q5q.js";

package/dist/cli/index.js

@@ -8,22 +8,22 @@ import {
 import {
   buildStatusLine,
   gatherStatusData
-} from "../chunks/index-zqsx461z.js";
+} from "../chunks/index-6yr4hb72.js";
 import"../chunks/index-w3bvv0ns.js";
 import {
   agentPaths,
   syncAll
-} from "../chunks/index-qvcafabj.js";
+} from "../chunks/index-wq7c4wqs.js";
 import {
   getStore,
   isCloudStore
-} from "../chunks/index-zs5dba3t.js";
+} from "../chunks/index-z2n5y111.js";
 import {
   billingDriftCheck,
   economyCloudStorage,
   economyTransportReport,
   packageMetadata
-} from "../chunks/index-m12xttw1.js";
+} from "../chunks/index-b6c649mq.js";
 import {
   AGENTS,
   MAX_INGEST_BYTES,
@@ -1357,23 +1357,23 @@ function registerExtendedCommands(program) {
     console.log();
   });
   program.command("tui").description("Terminal status dashboard (Linux/SSH friendly)").option("--watch", "Live refresh").option("--interval <seconds>", "Refresh interval", "30").action(async (opts) => {
-    const { runTui } = await import("../chunks/tui-4bh067a3.js");
+    const { runTui } = await import("../chunks/tui-9t7340wd.js");
     await runTui({
       watch: Boolean(opts.watch),
       interval: Number(opts.interval ?? 30)
     });
   });
   program.command("waybar").description("Print waybar-compatible JSON status line").action(async () => {
-    const { printWaybarJson } = await import("../chunks/tui-4bh067a3.js");
+    const { printWaybarJson } = await import("../chunks/tui-9t7340wd.js");
     await printWaybarJson();
   });
   const barCmd = program.command("bar").description("Status bar helpers (Linux)");
   barCmd.command("tui").description("Alias for economy tui").option("--watch", "Live refresh").action(async (opts) => {
-    const { runTui } = await import("../chunks/tui-4bh067a3.js");
+    const { runTui } = await import("../chunks/tui-9t7340wd.js");
     await runTui({ watch: Boolean(opts.watch) });
   });
   barCmd.command("waybar").description("Alias for economy waybar").action(async () => {
-    const { printWaybarJson } = await import("../chunks/tui-4bh067a3.js");
+    const { printWaybarJson } = await import("../chunks/tui-9t7340wd.js");
     await printWaybarJson();
   });
   program.command("estimate").description("Estimate cost for token counts").requiredOption("--model <model>", "Model name").option("--input <n>", "Input tokens", "0").option("--output <n>", "Output tokens", "0").action(async (opts) => {
@@ -3198,7 +3198,7 @@ program.command("accounts [period]").description("List account usage by email ad
   console.log();
 });
 program.command("watch").description("Live stream of incoming costs").option("--interval <seconds>", "Poll interval in seconds", "10").option("--daemon", "Watch agent data directories and sync on change").option("--agent <agent>", `Filter by agent (${AGENTS.join("|")})`).option("--notify <amount>", "Fire macOS notification when cumulative cost crosses this USD threshold").action(async (opts) => {
-  const { watchCosts } = await import("../chunks/watch-227kxmra.js");
+  const { watchCosts } = await import("../chunks/watch-t6ssnx30.js");
   await watchCosts({
     interval: parsePositiveCliInteger(opts.interval ?? "10", "--interval"),
     daemon: Boolean(opts.daemon),
@@ -3434,7 +3434,7 @@ pricingCmd.command("remove <model>").description("Remove pricing for a model").a
 });
 program.command("serve").description("Start the REST API server").option("-p, --port <port>", "Port", "3456").action(async (opts) => {
   const port = parseCliPort(opts.port ?? "3456", "--port");
-  const { startServer } = await import("../chunks/serve-ept6cfbe.js");
+  const { startServer } = await import("../chunks/serve-ms8dvf7e.js");
   startServer(port);
 });
 program.command("mcp").description("Show MCP server install commands").option("--claude", "Install into Claude Code").option("--codex", "Install into Codex").option("--gemini", "Install into Gemini CLI").option("--all", "Install into all agents").action(async (opts) => {

package/dist/index.js

@@ -62,7 +62,7 @@ import { randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.6",
+  version: "0.5.7",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/mcp/index.js

@@ -85,7 +85,7 @@ import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js"
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.6",
+  version: "0.5.7",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/otel/index.js

@@ -3480,7 +3480,7 @@ async function pushIngestRows(cloud, scratch) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.6",
+  version: "0.5.7",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/server/index.js

@@ -5578,7 +5578,7 @@ function isAuthorizedRequest(req, path) {
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.6",
+  version: "0.5.7",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/dist/server/service-worker.js

@@ -7426,7 +7426,7 @@ import { randomUUID } from "crypto";
 // package.json
 var package_default = {
   name: "@hasna/economy",
-  version: "0.5.6",
+  version: "0.5.7",
   description: "AI coding cost tracker \u2014 CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   repository: {
     type: "git",

package/native/README.md

@@ -30,8 +30,28 @@ Never run real codes in a captured agent terminal. The helper obtains a
 single-use code, hands only that temporary code to the CoreImage renderer and
 clears the display within five minutes. `--self-test` decodes a synthetic QR;
 `test_pair_qr.py` proves transcript/agent-key refusal and credential confinement.
-The existing Identities human login flow remains the bootstrap when no human
-session exists; pairing does not create or assume an account.
+Without a saved human session, use
+`python3 native/Tools/pair-qr.py --tenant <workspace-id> --login-email <human-email>`.
+The helper opens the owner's Terminal, asks for confirmation before requesting
+one sign-in email, and reads the verification code there with echo disabled.
+It verifies a human principal and the selected workspace before displaying the
+one-use QR. The new setup session stays in memory. On renderer exit or catchable
+Terminal shutdown (HUP, TERM or Ctrl-C), setup makes one timeout-limited logout
+attempt and reports an unconfirmed result as a failure. Force-kill, a reboot,
+network failure or an interrupted verification response can prevent confirmation;
+check the account's sessions before retrying in those cases. An existing session
+supplied with `--session-ref` is retained.
+Only the temporary QR code reaches the renderer, and no response or verification
+code is returned to the agent terminal.
+
+For a first account, `--create-account` offers signup through the existing
+Identities flow instead of login. It requires direct confirmation in the owner
+Terminal before account creation or email delivery. It does not create an
+organization, grant an owner role, alter memberships or configure Economy's
+store binding. An existing-account refusal is not retried as login, and failed
+delivery/verification is not retried automatically. Never type the owner's code
+for them or copy it into an agent session. A source/fixture test does not prove
+real email delivery, account authority or a successful phone connection.
 
 The adapter verifies Economy's `/auth/session` subject, tenant, effective scopes
 and integer expiry. Viewer sign-in never requests write access. Refresh and period

package/native/Tools/pair-qr.py

@@ -6,14 +6,17 @@ Pass an existing authorized human Identities session's Secrets reference using
 verifies the session and selected tenant; no station agent key works.
 """
 import argparse
+import getpass
 import json
 import os
 from pathlib import Path
 import re
 import shlex
+import signal
 import subprocess
 import sys
 import urllib.request
+import warnings
 
 
 class NoRedirect(urllib.request.HTTPRedirectHandler):
@@ -55,14 +58,20 @@ def owner_terminal():
     return False
 
 
-def launch_owner_terminal(reference, tenant):
-    if not re.fullmatch(r'[A-Za-z0-9][A-Za-z0-9_./-]{0,254}', reference):
+def launch_owner_terminal(reference, tenant, email=None, create_account=False):
+    if reference is not None and not re.fullmatch(r'[A-Za-z0-9][A-Za-z0-9_./-]{0,254}', reference):
         print('Invalid Secrets reference.', file=sys.stderr)
         return 2
     # AppleScript receives references and paths only. Its returned text never
     # contains Terminal output. No QR or credential is returned to this process.
-    command = shlex.join(['secrets', 'exec', reference, '--as', 'ECONOMY_HUMAN_SESSION', '--',
-                          '/usr/bin/python3', str(Path(__file__).resolve()), '--owner-terminal', '--tenant', tenant])
+    arguments = ['/usr/bin/python3', str(Path(__file__).resolve()), '--owner-terminal', '--tenant', tenant]
+    if email is not None:
+        arguments += ['--login-email', email]
+        if create_account:
+            arguments.append('--create-account')
+    else:
+        arguments = ['secrets', 'exec', reference, '--as', 'ECONOMY_HUMAN_SESSION', '--', *arguments]
+    command = shlex.join(arguments)
     script = 'tell application "Terminal"\nactivate\ndo script ' + json.dumps(command) + '\nend tell\n'
     try:
         result = subprocess.run(['/usr/bin/osascript', '-'], input=script, text=True, capture_output=True, timeout=30)
@@ -72,15 +81,68 @@ def launch_owner_terminal(reference, tenant):
     if result.returncode:
         print('Could not open the owner Terminal window. No code was displayed by this process.', file=sys.stderr)
         return 1
-    print('Opened the Economy pairing window on this Mac. Scan it with Economy on your iPhone.')
+    print('Opened Economy setup in Terminal on this Mac. Complete the steps there, then scan its QR code.')
     return 0
 
 
+def identity_request(action, body, bearer=None):
+    if action not in ['signup', 'login', 'verify', 'logout', 'economy-pairing/issue']:
+        raise ValueError('Unsupported identity operation')
+    headers = {'Content-Type': 'application/json', 'Accept': 'application/json',
+               'User-Agent': 'Hasna-Economy-Pairing/1.0'}
+    if bearer is not None:
+        headers['Authorization'] = 'Bearer ' + bearer
+    request = urllib.request.Request('https://api.hasna.com/identities/v1/auth/' + action,
+        data=json.dumps(body).encode(), headers=headers, method='POST')
+    with urllib.request.build_opener(NoRedirect).open(request, timeout=15) as response:
+        raw = response.read(16385)
+        if response.status != (201 if action == 'signup' else 200) or len(raw) > 16384:
+            raise ValueError('Invalid identity response')
+    value = json.loads(raw)
+    if not isinstance(value, dict):
+        raise ValueError('Invalid identity response')
+    return value
+
+
+def login_in_owner_terminal(email, create_account):
+    action = 'Create your Hasna sign-in and send one verification email to' if create_account else 'Send one sign-in email to'
+    if input(action + ' ' + email + '? Type yes to continue: ').strip().lower() != 'yes':
+        print('Cancelled. No email was requested.')
+        return None
+    challenge = identity_request('signup' if create_account else 'login', {'email': email})
+    if challenge.get('challenge') is not True or challenge.get('email_sent') is False:
+        raise ValueError('Email challenge unavailable')
+    with warnings.catch_warnings():
+        warnings.simplefilter('error', getpass.GetPassWarning)
+        code = getpass.getpass('Verification code (hidden; enter only in this Terminal): ')
+    if not re.fullmatch(r'[0-9]{6}', code):
+        raise ValueError('Invalid verification code')
+    try:
+        return identity_request('verify', {'email': email, 'code': code})
+    finally:
+        code = None
+
+
+def render_pairing_code(human, tenant, renderer):
+    value = identity_request('economy-pairing/issue', {'tenant_id': tenant, 'device_name': 'Your iPhone'}, human)
+    if not re.fullmatch(r'hec_[A-Za-z0-9_-]{43}', value.get('code', '')) or not 1 <= value.get('expires_in', 0) <= 300:
+        raise ValueError('Invalid pairing response')
+    environment = {k: v for k, v in os.environ.items() if k in
+                   ['PATH', 'HOME', 'TMPDIR', 'LANG', 'TERM', 'DEVELOPER_DIR', 'CLANG_MODULE_CACHE_PATH']}
+    environment['ECONOMY_PAIR_CODE'] = value['code']
+    environment['ECONOMY_PAIR_SERVER'] = 'https://api.hasna.com/economy'
+    environment['ECONOMY_PAIR_TTL'] = str(value['expires_in'])
+    return subprocess.run(['/usr/bin/swift', str(renderer)], env=environment).returncode
+
+
 def main():
     parser = argparse.ArgumentParser(description=__doc__)
     parser.add_argument('--tenant', help='Exact workspace ID, resolved through Identities')
     parser.add_argument('--self-test', action='store_true')
-    parser.add_argument('--session-ref', help='Authorized human-session reference in Secrets; never a value')
+    source = parser.add_mutually_exclusive_group()
+    source.add_argument('--session-ref', help='Authorized human-session reference in Secrets; never a value')
+    source.add_argument('--login-email', help='Sign in privately in the owner Terminal before displaying the QR code')
+    parser.add_argument('--create-account', action='store_true', help='Offer first-account signup in the owner Terminal; requires --login-email and direct confirmation')
     parser.add_argument('--owner-terminal', action='store_true', help=argparse.SUPPRESS)
     args = parser.parse_args()
     human = os.environ.pop('ECONOMY_HUMAN_SESSION', None)
@@ -90,41 +152,70 @@ def main():
     if not args.tenant or not re.fullmatch(r'[A-Za-z0-9_-]{1,255}', args.tenant):
         print('Provide the exact authorized workspace with --tenant.', file=sys.stderr)
         return 2
+    if args.create_account and not args.login_email:
+        print('--create-account requires --login-email.', file=sys.stderr)
+        return 2
+    if args.login_email is not None and (len(args.login_email) > 320 or not re.fullmatch(r'[A-Za-z0-9._%+-]+@[A-Za-z0-9.-]+', args.login_email)):
+        print('Provide a valid sign-in email address.', file=sys.stderr)
+        return 2
     if not args.owner_terminal:
-        if not args.session_ref:
-            print('Use --session-ref to open the owner Terminal. Credential values are not accepted here.', file=sys.stderr)
+        if not args.session_ref and not args.login_email:
+            print('Use --session-ref or --login-email to open the owner Terminal. Credential values are not accepted here.', file=sys.stderr)
             return 3
-        return launch_owner_terminal(args.session_ref, args.tenant)
+        return launch_owner_terminal(args.session_ref, args.tenant, args.login_email, args.create_account)
     if args.session_ref or not owner_terminal():
         print('Refusing to show a connection code outside the direct owner Terminal path.', file=sys.stderr)
         return 3
-    if not human or not re.fullmatch(r'hst_[A-Za-z0-9_-]{43}', human):
+    if args.login_email and human:
+        print('Choose either a saved session or interactive sign-in.', file=sys.stderr)
+        return 2
+    if not args.login_email and (not human or not re.fullmatch(r'hst_[A-Za-z0-9_-]{43}', human)):
         print('An existing human Identities session is required via ECONOMY_HUMAN_SESSION. Station keys are refused.', file=sys.stderr)
         return 2
-    request = urllib.request.Request('https://api.hasna.com/identities/v1/auth/economy-pairing/issue',
-        data=json.dumps({'tenant_id': args.tenant, 'device_name': 'Your iPhone'}).encode(),
-        headers={'Authorization': 'Bearer ' + human, 'Content-Type': 'application/json',
-                 'Accept': 'application/json', 'User-Agent': 'Hasna-Economy-Pairing/1.0'}, method='POST')
+    created_session = None
+    result = 1
+    previous_handlers = {}
+    cleaning_up = False
+    def shutdown(signum, frame):
+        if not cleaning_up:
+            raise KeyboardInterrupt
     try:
-        with urllib.request.build_opener(NoRedirect).open(request, timeout=15) as response:
-            raw = response.read(8193)
-            if response.status != 200 or len(raw) > 8192:
-                raise ValueError('response')
-        value = json.loads(raw)
-        if not re.fullmatch(r'hec_[A-Za-z0-9_-]{43}', value.get('code', '')) or not 1 <= value.get('expires_in', 0) <= 300:
-            raise ValueError('response')
-    except Exception:
-        print('Unable to issue the connection code. Check the human session, workspace and hosted pairing service.', file=sys.stderr)
-        return 1
-    human = None
-    # Only the temporary code goes to the renderer. The human session was
-    # removed from the environment before any child was started.
-    environment = {k: v for k, v in os.environ.items() if k in
-                   ['PATH', 'HOME', 'TMPDIR', 'LANG', 'TERM', 'DEVELOPER_DIR', 'CLANG_MODULE_CACHE_PATH']}
-    environment['ECONOMY_PAIR_CODE'] = value['code']
-    environment['ECONOMY_PAIR_SERVER'] = 'https://api.hasna.com/economy'
-    environment['ECONOMY_PAIR_TTL'] = str(value['expires_in'])
-    return subprocess.run(['/usr/bin/swift', str(renderer)], env=environment).returncode
+        for sig in [signal.SIGHUP, signal.SIGTERM, signal.SIGINT]:
+            previous_handlers[sig] = signal.signal(sig, shutdown)
+        if args.login_email:
+            identity = login_in_owner_terminal(args.login_email, args.create_account)
+            if identity is None:
+                return 0
+            human = identity.get('session')
+            if not isinstance(human, str) or not re.fullmatch(r'hst_[A-Za-z0-9_-]{43}', human):
+                raise ValueError('Invalid human session')
+            created_session = human
+            if identity.get('principal', {}).get('kind') != 'human' or not any(
+                    isinstance(row, dict) and row.get('tenant_id') == args.tenant for row in identity.get('tenants', [])):
+                raise ValueError('Human or workspace mismatch')
+            identity = None
+            print('Scan this code before closing its window. Setup will then try to sign out its temporary session.')
+        result = render_pairing_code(human, args.tenant, renderer)
+    except (Exception, KeyboardInterrupt):
+        print('Unable to complete setup. No automatic email or sign-in retry was made. Check your account and workspace before trying again.', file=sys.stderr)
+    finally:
+        # Catchable Terminal shutdown unwinds into cleanup. Further catchable
+        # signals cannot interrupt the single timeout-limited logout attempt.
+        cleaning_up = True
+        try:
+            if created_session:
+                try:
+                    if identity_request('logout', {}, created_session).get('signed_out') is not True:
+                        raise ValueError('Sign-out unconfirmed')
+                except Exception:
+                    print('Setup session sign-out could not be confirmed. Check your account sessions before retrying.', file=sys.stderr)
+                    result = 1
+        finally:
+            human = None
+            created_session = None
+            for sig, handler in previous_handlers.items():
+                signal.signal(sig, handler)
+    return result
 
 
 if __name__ == '__main__':

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/economy",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "description": "AI coding cost tracker — CLI + MCP server + REST API for Claude Code, Codex, OpenCode, Cursor, Pi, and Hermes, with legacy Gemini CLI session and Gemini API billing ingestion",
   "repository": {
     "type": "git",