autotouch-cli 0.2.30__tar.gz → 0.2.31__tar.gz

{autotouch_cli-0.2.30 → autotouch_cli-0.2.31}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autotouch-cli
-Version: 0.2.30
+Version: 0.2.31
 Summary: Autotouch Smart Table CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
@@ -71,6 +71,7 @@ Developer keys and scopes are identical to raw API usage (`stk_...`, same scope
 autotouch auth set-key --api-key stk_... --base-url https://app.autotouch.ai
 autotouch auth check
 autotouch auth show
+autotouch auth whoami
 ```
 
 For user/admin endpoints like onboarding, org context, and personal context, sign in with a user session too:
@@ -107,8 +108,9 @@ autotouch auth bootstrap --data-file bootstrap.json --save-key
 
 Notes:
 - New orgs created through signup/bootstrap start with `50` credits.
-- `--save-key` stores the returned `apiKey` in local CLI config automatically.
+- `--save-key` stores the returned `apiKey` and also signs in the same user so the saved config has both the developer key and the user session.
 - Identity linking is email-based: later human sign-in with the same normalized email maps to the same user/org.
+- `auth whoami` shows which user/org the saved session belongs to.
 
 ## Onboarding and context
 

{autotouch_cli-0.2.30 → autotouch_cli-0.2.31}/autotouch_cli/cli.py

@@ -801,20 +801,73 @@ def _api_url(value: Optional[str] = None) -> str:
     return DEFAULT_API_URL.rstrip("/")
 
 
+def _looks_like_api_key(value: Optional[str]) -> bool:
+    token = str(value or "").strip()
+    return token.startswith("stk_") and "." in token
+
+
+def _looks_like_jwt(value: Optional[str]) -> bool:
+    token = str(value or "").strip()
+    return bool(token) and not _looks_like_api_key(token) and token.count(".") == 2
+
+
+def _env_user_token() -> Optional[str]:
+    for key in ("SMARTTABLE_TOKEN", "AUTOTOUCH_TOKEN"):
+        value = str(os.environ.get(key) or "").strip()
+        if value and not _looks_like_api_key(value):
+            return value
+    return None
+
+
+def _env_api_key() -> Optional[str]:
+    direct = str(os.environ.get("AUTOTOUCH_API_KEY") or "").strip()
+    if direct:
+        return direct
+    for key in ("SMARTTABLE_TOKEN", "AUTOTOUCH_TOKEN"):
+        value = str(os.environ.get(key) or "").strip()
+        if _looks_like_api_key(value):
+            return value
+    return None
+
+
 def _resolve_token(explicit_token: Optional[str], required: bool = True) -> Optional[str]:
-    tok = (
-        explicit_token
-        or os.environ.get("SMARTTABLE_TOKEN")
-        or os.environ.get("AUTOTOUCH_API_KEY")
-        or os.environ.get("AUTOTOUCH_TOKEN")
-    )
+    tok = str(explicit_token or "").strip()
+    if not tok:
+        cfg = _load_config()
+        tok = (
+            str(cfg.get("auth_token") or "").strip()
+            or str(cfg.get("api_key") or "").strip()
+            or str(_env_user_token() or "").strip()
+            or str(_env_api_key() or "").strip()
+        )
+    if not tok:
+        if required:
+            print(
+                "ERROR: missing token. Pass --token, run `autotouch auth login`, or run `autotouch auth set-key`.",
+                file=sys.stderr,
+            )
+            sys.exit(2)
+        return None
+    return tok
+
+
+def _resolve_user_session_token(explicit_token: Optional[str], required: bool = True) -> Optional[str]:
+    tok = str(explicit_token or "").strip()
+    if tok and _looks_like_api_key(tok):
+        print(
+            "ERROR: this command requires a user session token, not a developer API key. Run `autotouch auth login`.",
+            file=sys.stderr,
+        )
+        sys.exit(2)
+
     if not tok:
         cfg = _load_config()
-        tok = cfg.get("auth_token") or cfg.get("api_key")
+        tok = str(cfg.get("auth_token") or "").strip() or str(_env_user_token() or "").strip()
+
     if not tok:
         if required:
             print(
-                "ERROR: missing token. Pass --token, set SMARTTABLE_TOKEN/AUTOTOUCH_API_KEY, or run `autotouch auth login` / `autotouch auth set-key`.",
+                "ERROR: this command requires a saved user session. Run `autotouch auth login` or pass a JWT with --token.",
                 file=sys.stderr,
             )
             sys.exit(2)
@@ -3109,16 +3162,53 @@ def cmd_auth_bootstrap(args: argparse.Namespace) -> None:
     output: Any = data
     if getattr(args, "save_key", False) and isinstance(data, dict):
         api_key = str(data.get("apiKey") or data.get("api_key") or "").strip()
+        email = str(payload.get("email") or "").strip().lower()
+        password = str(payload.get("password") or "").strip()
+        session_data: Optional[Dict[str, Any]] = None
+        session_error: Optional[str] = None
+
+        if email and password:
+            try:
+                session_data = _request_api(
+                    "POST",
+                    "/api/auth/login",
+                    base_url=args.base_url,
+                    token=None,
+                    use_x_api_key=False,
+                    payload={"email": email, "password": password},
+                    timeout=args.timeout,
+                    verbose=args.verbose,
+                )
+            except SystemExit as exc:
+                session_error = f"login failed with exit code {exc.code}"
+            except Exception as exc:
+                session_error = str(exc)
+
         if api_key:
             cfg = _load_config()
             cfg["api_key"] = api_key
+            access_token = _normalize_string_value((session_data or {}).get("access_token"))
+            refresh_token = _normalize_string_value((session_data or {}).get("refresh_token"))
+            if access_token:
+                cfg["auth_token"] = access_token
+                cfg["auth_email"] = email
+                if refresh_token:
+                    cfg["refresh_token"] = refresh_token
             cfg["base_url"] = str(args.base_url or _api_url()).rstrip("/")
             cfg["updated_at_epoch"] = int(time.time())
             config_path = _save_config(cfg)
             output = dict(data)
             output["saved"] = True
+            output["saved_api_key"] = True
+            output["saved_session"] = bool(access_token)
             output["config_path"] = str(config_path)
             output["api_key_masked"] = _mask_api_key(api_key)
+            if access_token:
+                output["access_token_masked"] = _mask_secret(access_token)
+            if refresh_token:
+                output["refresh_token_masked"] = _mask_secret(refresh_token)
+            if session_error:
+                output["session_warning"] = session_error
         else:
             output = dict(data)
             output["saved"] = False
@@ -3202,6 +3292,9 @@ def cmd_auth_show(args: argparse.Namespace) -> None:
     refresh_token = str(cfg.get("refresh_token") or "").strip()
     base_url = str(cfg.get("base_url") or _api_url()).rstrip("/")
     path = _config_path()
+    default_general_auth = "auth_token" if auth_token else ("api_key" if api_key else None)
+    default_user_session_auth = "auth_token" if auth_token else ("env_token" if _env_user_token() else None)
+    default_developer_auth = "api_key" if api_key else ("env_api_key" if _env_api_key() else None)
     output = {
         "config_path": str(path),
         "config_exists": path.exists(),
@@ -3214,10 +3307,27 @@ def cmd_auth_show(args: argparse.Namespace) -> None:
         "auth_email": cfg.get("auth_email"),
         "base_url": base_url,
         "updated_at_epoch": cfg.get("updated_at_epoch"),
+        "default_general_auth": default_general_auth,
+        "default_user_session_auth": default_user_session_auth,
+        "default_developer_auth": default_developer_auth,
     }
     _print_json(output, compact=args.compact)
 
 
+def cmd_auth_whoami(args: argparse.Namespace) -> None:
+    token = _resolve_user_session_token(args.token, required=True)
+    data = _request_api(
+        "GET",
+        "/api/auth/me",
+        base_url=args.base_url,
+        token=token,
+        use_x_api_key=False,
+        timeout=args.timeout,
+        verbose=args.verbose,
+    )
+    _print_json(data, compact=args.compact)
+
+
 def cmd_auth_clear(args: argparse.Namespace) -> None:
     cfg = _load_config()
     changed = False
@@ -3355,7 +3465,7 @@ def _build_personal_context_payload(args: argparse.Namespace) -> Dict[str, Any]:
 
 
 def cmd_onboarding_submit_domain(args: argparse.Namespace) -> None:
-    token = _resolve_token(args.token, required=True)
+    token = _resolve_user_session_token(args.token, required=True)
     payload = _load_json_input(
         inline_json=getattr(args, "data_json", None),
         file_path=getattr(args, "data_file", None),
@@ -3377,7 +3487,7 @@ def cmd_onboarding_submit_domain(args: argparse.Namespace) -> None:
         "/api/onboarding/submit-domain",
         base_url=args.base_url,
         token=token,
-        use_x_api_key=args.use_x_api_key,
+        use_x_api_key=False,
         form_payload={
             "website": str(payload.get("website") or payload.get("domain") or "").strip(),
             "domain": str(payload.get("domain") or "").strip(),
@@ -3389,13 +3499,13 @@ def cmd_onboarding_submit_domain(args: argparse.Namespace) -> None:
 
 
 def cmd_org_context_get(args: argparse.Namespace) -> None:
-    token = _resolve_token(args.token, required=True)
+    token = _resolve_user_session_token(args.token, required=True)
     data = _request_api(
         "GET",
         "/api/org/context",
         base_url=args.base_url,
         token=token,
-        use_x_api_key=args.use_x_api_key,
+        use_x_api_key=False,
         timeout=args.timeout,
         verbose=args.verbose,
     )
@@ -3403,14 +3513,14 @@ def cmd_org_context_get(args: argparse.Namespace) -> None:
 
 
 def cmd_org_context_set(args: argparse.Namespace) -> None:
-    token = _resolve_token(args.token, required=True)
+    token = _resolve_user_session_token(args.token, required=True)
     payload = _build_org_context_payload(args)
     data = _request_api(
         "POST",
         "/api/org/context",
         base_url=args.base_url,
         token=token,
-        use_x_api_key=args.use_x_api_key,
+        use_x_api_key=False,
         form_payload=_org_context_form_payload(payload),
         timeout=args.timeout,
         verbose=args.verbose,
@@ -3419,13 +3529,13 @@ def cmd_org_context_set(args: argparse.Namespace) -> None:
 
 
 def cmd_personal_context_get(args: argparse.Namespace) -> None:
-    token = _resolve_token(args.token, required=True)
+    token = _resolve_user_session_token(args.token, required=True)
     data = _request_api(
         "GET",
         "/api/onboarding/personal-context",
         base_url=args.base_url,
         token=token,
-        use_x_api_key=args.use_x_api_key,
+        use_x_api_key=False,
         timeout=args.timeout,
         verbose=args.verbose,
     )
@@ -3433,14 +3543,14 @@ def cmd_personal_context_get(args: argparse.Namespace) -> None:
 
 
 def cmd_personal_context_set(args: argparse.Namespace) -> None:
-    token = _resolve_token(args.token, required=True)
+    token = _resolve_user_session_token(args.token, required=True)
     payload = _build_personal_context_payload(args)
     data = _request_api(
         "POST",
         "/api/onboarding/personal-context",
         base_url=args.base_url,
         token=token,
-        use_x_api_key=args.use_x_api_key,
+        use_x_api_key=False,
         payload=payload,
         timeout=args.timeout,
         verbose=args.verbose,
@@ -3449,13 +3559,13 @@ def cmd_personal_context_set(args: argparse.Namespace) -> None:
 
 
 def cmd_context_resolved(args: argparse.Namespace) -> None:
-    token = _resolve_token(args.token, required=True)
+    token = _resolve_user_session_token(args.token, required=True)
     data = _request_api(
         "GET",
         "/api/llm/company-context",
         base_url=args.base_url,
         token=token,
-        use_x_api_key=args.use_x_api_key,
+        use_x_api_key=False,
         timeout=args.timeout,
         verbose=args.verbose,
     )
@@ -6290,7 +6400,7 @@ def build_parser() -> argparse.ArgumentParser:
     pab.add_argument("--scopes-file", help="Optional JSON file with scopes array")
     pab.add_argument("--data-json", help="Explicit agent bootstrap payload JSON")
     pab.add_argument("--data-file", help="Path to agent bootstrap payload JSON file")
-    pab.add_argument("--save-key", action="store_true", help="Persist the returned apiKey into local CLI config")
+    pab.add_argument("--save-key", action="store_true", help="Persist the returned apiKey and bootstrap a saved JWT session")
     pab.add_argument("--base-url", default=_api_url(), help=f"API base URL (default: {DEFAULT_API_URL})")
     pab.add_argument("--timeout", type=int, default=DEFAULT_TIMEOUT_SECONDS, help="HTTP timeout in seconds")
     pab.add_argument("--output", choices=["json", "human"], default="json", help="Output mode")
@@ -6325,6 +6435,15 @@ def build_parser() -> argparse.ArgumentParser:
     pashow.add_argument("--compact", action="store_true", help="Print compact JSON")
     pashow.set_defaults(func=cmd_auth_show)
 
+    pawho = auth_sub.add_parser("whoami", help="Show the current saved user session identity")
+    pawho.add_argument("--token", help="Explicit JWT session token")
+    pawho.add_argument("--base-url", default=_api_url(), help=f"API base URL (default: {DEFAULT_API_URL})")
+    pawho.add_argument("--timeout", type=int, default=DEFAULT_TIMEOUT_SECONDS, help="HTTP timeout in seconds")
+    pawho.add_argument("--output", choices=["json", "human"], default="json", help="Output mode")
+    pawho.add_argument("--compact", action="store_true", help="Print compact JSON")
+    pawho.add_argument("--verbose", action="store_true", help="Print request metadata to stderr")
+    pawho.set_defaults(func=cmd_auth_whoami)
+
     paclear = auth_sub.add_parser("clear", help="Clear stored auth config")
     paclear.add_argument("--all", action="store_true", help="Clear all config keys")
     paclear.add_argument("--clear-base-url", action="store_true", help="Also clear stored base_url")

{autotouch_cli-0.2.30 → autotouch_cli-0.2.31}/autotouch_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: autotouch-cli
-Version: 0.2.30
+Version: 0.2.31
 Summary: Autotouch Smart Table CLI
 Requires-Python: >=3.9
 Description-Content-Type: text/markdown
@@ -71,6 +71,7 @@ Developer keys and scopes are identical to raw API usage (`stk_...`, same scope
 autotouch auth set-key --api-key stk_... --base-url https://app.autotouch.ai
 autotouch auth check
 autotouch auth show
+autotouch auth whoami
 ```
 
 For user/admin endpoints like onboarding, org context, and personal context, sign in with a user session too:
@@ -107,8 +108,9 @@ autotouch auth bootstrap --data-file bootstrap.json --save-key
 
 Notes:
 - New orgs created through signup/bootstrap start with `50` credits.
-- `--save-key` stores the returned `apiKey` in local CLI config automatically.
+- `--save-key` stores the returned `apiKey` and also signs in the same user so the saved config has both the developer key and the user session.
 - Identity linking is email-based: later human sign-in with the same normalized email maps to the same user/org.
+- `auth whoami` shows which user/org the saved session belongs to.
 
 ## Onboarding and context
 

{autotouch_cli-0.2.30 → autotouch_cli-0.2.31}/docs/research-table/reference/autotouch-cli.md

@@ -62,6 +62,7 @@ Developer keys and scopes are identical to raw API usage (`stk_...`, same scope
 autotouch auth set-key --api-key stk_... --base-url https://app.autotouch.ai
 autotouch auth check
 autotouch auth show
+autotouch auth whoami
 ```
 
 For user/admin endpoints like onboarding, org context, and personal context, sign in with a user session too:
@@ -98,8 +99,9 @@ autotouch auth bootstrap --data-file bootstrap.json --save-key
 
 Notes:
 - New orgs created through signup/bootstrap start with `50` credits.
-- `--save-key` stores the returned `apiKey` in local CLI config automatically.
+- `--save-key` stores the returned `apiKey` and also signs in the same user so the saved config has both the developer key and the user session.
 - Identity linking is email-based: later human sign-in with the same normalized email maps to the same user/org.
+- `auth whoami` shows which user/org the saved session belongs to.
 
 ## Onboarding and context
 

{autotouch_cli-0.2.30 → autotouch_cli-0.2.31}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "autotouch-cli"
-version = "0.2.30"
+version = "0.2.31"
 description = "Autotouch Smart Table CLI"
 readme = "docs/research-table/reference/autotouch-cli.md"
 requires-python = ">=3.9"