thingsboard-cli 4.3.1.3__tar.gz → 4.3.1.3.post1__tar.gz

{thingsboard_cli-4.3.1.3 → thingsboard_cli-4.3.1.3.post1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: thingsboard-cli
-Version: 4.3.1.3
+Version: 4.3.1.3.post1
 Summary: CLI tool for managing ThingsBoard resources
 Project-URL: Homepage, https://github.com/thingsboard/thingsboard-cli
 Project-URL: Source, https://github.com/thingsboard/thingsboard-cli
@@ -12,6 +12,7 @@ Requires-Dist: httpx<1.0,>=0.28
 Requires-Dist: packaging>=24.0
 Requires-Dist: pydantic-settings<3.0,>=2.13
 Requires-Dist: pydantic<3.0,>=2.12
+Requires-Dist: questionary<3.0,>=2.0
 Requires-Dist: rich<15.0,>=14.0
 Requires-Dist: tb-pe-client==4.3.1.3
 Requires-Dist: textual<2.0,>=0.83

{thingsboard_cli-4.3.1.3 → thingsboard_cli-4.3.1.3.post1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "thingsboard-cli"
-version = "4.3.1.3"
+version = "4.3.1.3.post1"
 description = "CLI tool for managing ThingsBoard resources"
 readme = "README.md"
 requires-python = ">=3.11,<3.15"
@@ -11,6 +11,7 @@ dependencies = [
     "pydantic-settings>=2.13,<3.0",
     "rich>=14.0,<15.0",
     "textual>=0.83,<2.0",
+    "questionary>=2.0,<3.0",
     "httpx>=0.28,<1.0",
     "tb-pe-client==4.3.1.3",
     "packaging>=24.0",

thingsboard_cli-4.3.1.3/scaffold/.claude/CLAUDE.md → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit/INSTRUCTIONS.md

@@ -14,6 +14,38 @@ Before working with entities — especially fetching/pulling them from an instan
 - **Never `cd` into solution directories** — always use `--solution <name>` to target a solution. Do not use `cd` to change into solution directories.
 - **Never push** — never run `tb push`. The user decides when to deploy. Running `tb validate` is safe (dry-run) and should be run after creating entities.
 - **Never modify profiles** — never run `tb config set`, `tb config add`, `tb config use`, or `tb config remove`. Authentication is the user's responsibility.
+- **`tb feedback` is allowed** — running `tb feedback` (to record user feedback, see below) is safe and expected; it is not a config or push command.
+
+## Feedback
+
+Two separate things — do both.
+
+### 1. Always end a completed generation with a feedback invitation
+
+Whenever you finish generating anything — a single entity, a standalone artifact (`standalone-*`), or a full solution (`create-solution` / `update-solution`) — the **last line of your final message MUST be**, verbatim:
+
+> Help us make the CLI better — share quick feedback anytime with `tb feedback`.
+
+This is a passive one-liner (not a question); print it in the same turn the generation finishes, after any deploy/`tb push` notice. Do not skip it, and do not print it when you did not generate anything.
+
+### 2. Follow the feedback hook
+
+A feedback hook (Claude Code `UserPromptSubmit` / Antigravity `PreInvocation`) runs `tb feedback --hook` automatically on **every** message. When a feedback ask is due (the user generated something, or skipped a real-terminal push prompt — and it's been ≥4h since the last ask), the hook injects a reminder telling you to ask. **You never track timing yourself; just obey the reminder when it appears.**
+
+When you see that reminder, **before** handling the request, ask **one** `AskUserQuestion` (`header: "Feedback"`, options **Yes** · **Partly** · **No** · **Skip**):
+
+> "Did you achieve the result you expected? Tell us what to improve in your own words — your feedback shapes what we build next."
+
+The user clicks an option, or picks the auto-provided **"Other"** field to write a comment (the only free-text path — capture whatever they write). Then **record it yourself** (never make the user run the command):
+
+- **Yes / Partly / No** → `tb feedback --outcome <yes|partly|no> [--message "<their comment>"] [--feature "<a feature idea>"] --source push-followup`
+- **Skip** (or no answer) → `tb feedback --dismiss`
+
+Then continue with the request. Ask at most once per reminder; do not ask when no reminder is present. Feedback is anonymous and honors the analytics opt-out (the hook stays silent when analytics is off).
+
+<!-- The question wording and the `tb feedback --outcome … --source push-followup` / `--dismiss`
+     command spec above mirror `_HOOK_REMINDER` in src/thingsboard_cli/core/feedback.py.
+     Keep the two in sync when either changes. -->
 
 ## Routing: solution skill vs. direct entity generation
 

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/agents/entities-planner.md

@@ -317,7 +317,7 @@ The 8 slices are exact JSON arrays — each is the `<workerType>` field the call
 | Slice | Shape | Source |
 |---|---|---|
 | `customers` | `{id, title[, parentCustomerId]}` | one per customer **instance** (one per `customerNameToId` entry). `title` is the unique instance name. Include `parentCustomerId: {"entityType": "CUSTOMER", "id": "<parent-uuid>"}` for sub-customers — resolve the parent UUID via `customerNameToId[parentCustomerByInstance[instanceName]]`; omit for top-level customers. **The slice is topologically ordered by customer hierarchy depth** (all top-level customers first, then depth-2 sub-customers, etc.) — `customers-generator` saves entries in slice order so each parent exists by the time its sub-customer is saved. |
-| `roles` | `{id, name, type, permissions}` | one per IAM role (`type: "GENERIC"`, permissions mapped to TB's resource→operations map shape `{"<resource>": ["<op>", ...]}`: `CRUD`→`{"ALL":["ALL"]}`, `RU`→`{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY","WRITE","WRITE_CREDENTIALS","WRITE_ATTRIBUTES","WRITE_TELEMETRY"]}`, `R`→`{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY"]}`) plus one read-only role (`type: "GROUP"`, `permissions: {"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY"]}`, `name: <readOnlyRoleName>`) |
+| `roles` | `{id, name, type, permissions}` | one per IAM role (`type: "GENERIC"`, permissions as a resource→operations **map** `{"<resource>": ["<op>", ...]}`: `CRUD`→`{"ALL":["ALL"]}`, `RU`→`{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY","WRITE","WRITE_CREDENTIALS","WRITE_ATTRIBUTES","WRITE_TELEMETRY"]}`, `R`→`{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY"]}`) plus one read-only role (`type: "GROUP"`, `permissions: ["READ","RPC_CALL","READ_ATTRIBUTES","READ_TELEMETRY"]`, `name: <readOnlyRoleName>`). The permissions **shape depends on `type`**: GENERIC roles take the object map above; GROUP roles take a flat **array** of operation names (group roles apply to the bound entity group, so credential ops like `READ_CREDENTIALS` are dropped). |
 | `entity_groups` | `{id, name, type[, ownerId]}` | one per USER + one per DASHBOARD (`Dashboards for <role>`) + one per `profileGroupIdByPair` entry + one per `customerProfileToGroupId` entry. `ownerId` only on customer-owned DEVICE/ASSET groups, shape `{"entityType": "CUSTOMER", "id": "<customerId>"}` |
 | `device_profiles` | `{id, name, type: "DEFAULT", transportType: "DEFAULT", profileData}` | one per `entity-profiles.json.deviceProfiles`. `profileData` always `{configuration: {type: "DEFAULT"}, transportConfiguration: {type: "DEFAULT"}, provisionConfiguration: {type: "DISABLED", provisionDeviceSecret: null}}` (omitting it causes NPE on `tb push`) |
 | `asset_profiles` | `{id, name, profileData}` | one per `entity-profiles.json.assetProfiles`. `profileData: {}` unless design specifies more |

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/agents/roles-generator.md

@@ -18,11 +18,13 @@ Goal: save exactly one `tb role save` per entry in the `roles` array supplied in
 ## Brief inputs
 
 - `solution` — solution slug.
-- `roles` — JSON array of `{id, name, type, permissions}` objects. `id` is a ROLE UUID; `name` is the role's display name; `type` is `GENERIC` or `GROUP`; `permissions` is TB's resource→operations map shape `{"<resourceType>": ["<op>", ...]}`. The skill has already mapped from IAM's high-level codes:
-  - `CRUD` → `{"ALL":["ALL"]}`
-  - `RU` → `{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY","WRITE","WRITE_CREDENTIALS","WRITE_ATTRIBUTES","WRITE_TELEMETRY"]}`
-  - `R` → `{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY"]}`
-  - read-only role → same as `R`.
+- `roles` — JSON array of `{id, name, type, permissions}` objects. `id` is a ROLE UUID; `name` is the role's display name; `type` is `GENERIC` or `GROUP`; `permissions` is already fully resolved by the skill — pass it through verbatim as given. Its JSON shape depends on `type`:
+  - **GENERIC** roles carry a resource→operations map `{"<resourceType>": ["<op>", ...]}`. The skill maps IAM's high-level codes:
+    - `CRUD` → `{"ALL":["ALL"]}`
+    - `RU` → `{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY","WRITE","WRITE_CREDENTIALS","WRITE_ATTRIBUTES","WRITE_TELEMETRY"]}`
+    - `R` → `{"ALL":["READ","RPC_CALL","READ_CREDENTIALS","READ_ATTRIBUTES","READ_TELEMETRY"]}`
+  - **GROUP** roles carry a flat array of operation names `["<op>", ...]` (the operations apply to the bound entity group, so credential ops are dropped). The solution-wide read-only role is a GROUP role → `["READ","RPC_CALL","READ_ATTRIBUTES","READ_TELEMETRY"]`.
+  - Never reshape `permissions` yourself — an object stays an object, an array stays an array.
 
 ## Step 1 — Discover schema
 

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/settings.json

@@ -9,5 +9,14 @@
       "Edit(solutions/**)",
       "Write(solutions/**)"
     ]
+  },
+  "hooks": {
+    "UserPromptSubmit": [
+      {
+        "hooks": [
+          { "type": "command", "command": "tb feedback --hook" }
+        ]
+      }
+    ]
   }
 }

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/skills/create-solution/SKILL.md

@@ -102,6 +102,8 @@ Applies to Steps 3 and 5. After generation completes, `tb validate <slug>` passe
 
 ````
 Generated <what>. To deploy, run `tb push <slug>`. Add `--run-tasks` to also generate demo telemetry and backfill calculated fields.
+
+Help us make the CLI better — share quick feedback anytime with `tb feedback`.
 ````
 
 If `tb validate <slug>` reported errors, do **not** print the notice — surface the errors and stop.

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/skills/standalone-alarm-rules/SKILL.md

@@ -62,7 +62,7 @@ The §1 batch covers the whole set; render and save each rule on top of that sha
 
 1. `tb validate <slug>` — surface any failure verbatim.
 2. `Skill commit-step` with `solution=<slug>`, `step="Standalone: <created|updated> <N> alarm rule(s) on <parent(s)>"`.
-3. Report every rule created/changed and where it lives. Alarm rules evaluate live events — there is no reprocessing task and no `--run-tasks` requirement for these changes alone.
+3. Report every rule created/changed and where it lives. Alarm rules evaluate live events — there is no reprocessing task and no `--run-tasks` requirement for these changes alone. Close with: "Help us make the CLI better — share quick feedback anytime with `tb feedback`."
 
 ## Common mistakes
 

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/skills/standalone-calculated-fields/SKILL.md

@@ -76,7 +76,7 @@ Independent CFs keep the default `--order 100`.
 
 1. `tb validate <slug>` — surface any failure verbatim.
 2. `Skill commit-step` with `solution=<slug>`, `step="Standalone: <created|updated> <N> calculated field(s) on <parent(s)>"`.
-3. Report: every CF created/changed, where each lives, the dependency order when chained, and — when reprocess tasks exist — that deployment needs `tb push <slug> --run-tasks`.
+3. Report: every CF created/changed, where each lives, the dependency order when chained, and — when reprocess tasks exist — that deployment needs `tb push <slug> --run-tasks`. Close with: "Help us make the CLI better — share quick feedback anytime with `tb feedback`."
 
 ## Common mistakes
 

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/skills/standalone-dashboard/SKILL.md

@@ -68,7 +68,7 @@ The agent edits the existing JSON in place — untouched widgets, aliases, and s
 
 1. `tb validate <slug>` — surface any failure verbatim.
 2. `Skill commit-step` with `solution=<slug>`, `step="Standalone: <created|updated> dashboard <title>"`.
-3. Report the dashboard, where it lives, and which entities it binds to.
+3. Report the dashboard, where it lives, and which entities it binds to. Close with: "Help us make the CLI better — share quick feedback anytime with `tb feedback`."
 
 ## Common mistakes
 

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/skills/standalone-entities/SKILL.md

@@ -55,7 +55,7 @@ Per entity being edited:
 
 1. `tb validate <slug>` — surface any failure verbatim.
 2. `Skill commit-step` with `solution=<slug>`, `step="Standalone: <created|updated> <N> <type>(s) <names>"`.
-3. Report every entity with its ID, where they live, and — when emulator tasks were added — that deployment needs `tb push <slug> --run-tasks`.
+3. Report every entity with its ID, where they live, and — when emulator tasks were added — that deployment needs `tb push <slug> --run-tasks`. Close with: "Help us make the CLI better — share quick feedback anytime with `tb feedback`."
 
 ## Common mistakes
 

{thingsboard_cli-4.3.1.3/scaffold/.claude → thingsboard_cli-4.3.1.3.post1/scaffold/agent-kit}/skills/update-solution/SKILL.md

@@ -349,6 +349,8 @@ Then print one line telling the user how to deploy. Include the `--run-tasks` se
 
 ````
 Updated <what>. To deploy, run `tb push <slug>`.
+
+Help us make the CLI better — share quick feedback anytime with `tb feedback`.
 ````
 
 (When task files were written in 3.5, append: `Add --run-tasks to also generate demo telemetry and backfill calculated fields.`)

thingsboard_cli-4.3.1.3.post1/scaffold/manifest.json

@@ -0,0 +1,4 @@
+{
+  "version": 92,
+  "content_hash": "sha256:ba9496f4e93e224d08169aff886c92f337a83c1169c9771c6a475f146b61afcb"
+}

thingsboard_cli-4.3.1.3.post1/src/thingsboard_cli/commands/feedback.py

@@ -0,0 +1,96 @@
+"""`tb feedback` — share feedback about the ThingsBoard CLI.
+
+Interactive by default (the same friction-ladder flow shown after a push).
+Passing ``--outcome`` submits non-interactively (scriptable, used by tests).
+"""
+
+from __future__ import annotations
+
+from typing import Annotated
+
+import typer
+
+from thingsboard_cli.core import feedback as fb
+from thingsboard_cli.core.output import console, error
+
+
+def feedback_command(
+    outcome: Annotated[
+        str | None,
+        typer.Option("--outcome", "-o", help="yes | partly | no (skip for interactive mode)"),
+    ] = None,
+    message: Annotated[
+        str | None,
+        typer.Option("--message", "-m", help="Free-text feedback (non-interactive submit)"),
+    ] = None,
+    feature: Annotated[
+        str | None,
+        typer.Option("--feature", help="A feature worth adding (non-interactive submit)"),
+    ] = None,
+    source: Annotated[
+        str,
+        typer.Option(
+            "--source", help="Where the feedback came from: push | push-followup | experience | command", hidden=True
+        ),
+    ] = "command",
+    due: Annotated[
+        bool,
+        typer.Option("--due", help="Print 'followup' | 'due' | 'not-due' for the Claude-driven ask", hidden=True),
+    ] = False,
+    push_due: Annotated[
+        bool,
+        typer.Option("--push-due", help="Print 'open'/'closed' for the push track (Claude-observed push)", hidden=True),
+    ] = False,
+    dismiss: Annotated[
+        bool,
+        typer.Option("--dismiss", help="Record that a Claude-driven ask was declined", hidden=True),
+    ] = False,
+    hook: Annotated[
+        bool,
+        typer.Option("--hook", help="Agent hook: emit an ask-for-feedback reminder when one is due", hidden=True),
+    ] = False,
+    hook_format: Annotated[
+        fb.HookFormat,
+        typer.Option(
+            "--hook-format",
+            help="Hook stdout envelope: claude (raw text) | antigravity (injectSteps JSON)",
+            hidden=True,
+        ),
+    ] = fb.HookFormat.claude,
+) -> None:
+    """Share feedback about the ThingsBoard CLI. Anonymous; honors the analytics opt-out."""
+    # Claude-driven helpers (checked before the enabled gate so they always answer).
+    if hook:
+        reminder = fb.hook_reminder()
+        if reminder:
+            fb.mark_shown()  # fire once per cooldown, even if the agent forgets to record
+        # antigravity emits JSON on every call (even the empty no-op), so give it a trailing
+        # newline; claude's raw-text envelope stays newline-free so a no-op prints nothing.
+        typer.echo(fb.format_hook_output(reminder, hook_format), nl=hook_format == fb.HookFormat.antigravity)
+        return
+    if due:
+        console.print(fb.due_state())
+        return
+    if push_due:
+        console.print("open" if fb.push_track_open() else "closed")
+        return
+    if dismiss:
+        fb.record_dismiss()
+        return
+
+    if not fb.is_enabled():
+        console.print(
+            "Feedback is off because analytics is disabled. "
+            "Enable it with [cyan]tb config analytics true[/cyan] to share feedback."
+        )
+        return
+
+    if outcome is not None:
+        normalized = outcome.strip().lower()
+        if normalized not in fb.OUTCOMES:
+            error(f"Invalid --outcome '{outcome}'. Choose one of: {', '.join(fb.OUTCOMES)}.")
+        fb.submit(normalized, source=source, message=message, feature=feature)
+        console.print("Thanks for the feedback! 🙏")
+        return
+
+    fb.prompt_and_submit(source="command")

{thingsboard_cli-4.3.1.3 → thingsboard_cli-4.3.1.3.post1}/src/thingsboard_cli/commands/project.py

@@ -5,6 +5,7 @@ from __future__ import annotations
 import json
 import shutil
 import subprocess
+import sys
 import time
 from collections.abc import Iterable
 from pathlib import Path
@@ -17,6 +18,8 @@ from rich.markup import escape
 from thingsboard_cli.commands._pagination import coerce_page_kwargs
 from thingsboard_cli.common.options import ProfileOption
 from thingsboard_cli.config.resolver import resolve_profile
+from thingsboard_cli.core import feedback as fb
+from thingsboard_cli.core.agent_format import AgentFormat
 from thingsboard_cli.core.client import build_client
 from thingsboard_cli.core.output import console, error, pluralize, success, warning
 
@@ -35,6 +38,8 @@ solution.json
 
 # Editor / tooling
 .claude/
+.agents/
+AGENTS.md
 """
 
 
@@ -179,68 +184,126 @@ def find_project_root() -> Path | None:
         current = parent
 
 
-def _copy_scaffold(project_root: Path) -> list[str]:
-    """Copy all scaffold contents to the project, with conflict handling.
+_Q_AGENT_FORMAT = "Unpack skills and agents for which format?"
 
-    Returns a list of status labels for display.
 
-    The bundled scaffold ``.gitignore`` is intentionally skipped — the
-    ``init_command`` writes a richer default in its place (see
-    ``DEFAULT_GITIGNORE``).
+def _prompt_agent_format(detected: set[AgentFormat]) -> AgentFormat:
+    """Report what was detected, then ask for the scaffold format.
+
+    Prints the detection result, then offers an arrow-key menu (`questionary`) of
+    claude / antigravity / both — installed CLI(s) marked "(detected)", the
+    recommended option pre-highlighted. Off-TTY (pipes, CI, an agent's shell) it
+    falls back to a typed choice, mirroring the `tb feedback` prompt so both
+    commands feel the same.
     """
-    from thingsboard_cli.core.scaffold import _copy_with_substitutions
+    from thingsboard_cli.core.agent_format import AGENT_FORMATS, ANTIGRAVITY, CLAUDE
+    from thingsboard_cli.core.interactive import FALLBACK, questionary_ask
+
+    if detected == {CLAUDE}:
+        console.print("Detected Claude Code.")
+        default = CLAUDE
+    elif detected == {ANTIGRAVITY}:
+        console.print("Detected Antigravity CLI (agy).")
+        default = ANTIGRAVITY
+    elif detected == {CLAUDE, ANTIGRAVITY}:
+        console.print("Detected both Claude Code and Antigravity CLI (agy).")
+        default = CLAUDE
+    else:
+        console.print("No agent CLI detected — defaulting to Claude Code.")
+        default = CLAUDE
+
+    options = list(AGENT_FORMATS)
+    labels = {opt: f"{opt}{'  (detected)' if opt in detected else ''}" for opt in options}
+
+    # Arrow-key menu on a real terminal; the recommended format is pre-highlighted.
+    choice = questionary_ask(
+        lambda q: q.select(
+            _Q_AGENT_FORMAT,
+            choices=[q.Choice(title=labels[opt], value=str(opt)) for opt in options],
+            default=str(default),
+            instruction="(use ↑/↓ arrows, Enter to select)",
+        ).ask()
+    )
+    if choice is not FALLBACK:
+        # None → the user cancelled (Ctrl-C / Esc); take the recommended default.
+        return AgentFormat(choice) if choice else default
 
-    statuses: list[str] = []
-    ignore = shutil.ignore_patterns(".gitkeep")
+    # Typed fallback off-TTY: list the options with their markers, then a validated choice.
+    for opt in options:
+        console.print(f"  - {labels[opt]}")
+    typed = typer.prompt(_Q_AGENT_FORMAT, type=click.Choice(options), default=default)
+    return AgentFormat(typed)
+
+
+def _resolve_agent_format(flag: AgentFormat | None) -> AgentFormat:
+    """Resolve the scaffold format for ``tb init``.
+
+    Two paths: an explicit ``--agent-format`` flag is used verbatim (CI /
+    scripting); otherwise detect installed CLIs and prompt. With no flag and no
+    interactive terminal, fall back to a single detected CLI, else claude — so
+    init never blocks on a prompt it cannot show.
+    """
+    from thingsboard_cli.core.agent_detect import detect_agent_clis
+    from thingsboard_cli.core.agent_format import ANTIGRAVITY, CLAUDE
+
+    if flag is not None:
+        return flag
 
-    def _copy_file(src: str, dst: str) -> str:
-        src_path = Path(src)
-        dst_path = Path(dst)
-        rel = src_path.relative_to(SCAFFOLD_DIR).as_posix()
-        _copy_with_substitutions(src_path, dst_path, rel)
-        return dst
+    detected = detect_agent_clis()
+    if not sys.stdin.isatty():
+        return ANTIGRAVITY if detected == {ANTIGRAVITY} else CLAUDE
+    return _prompt_agent_format(detected)
 
-    def _copy_top_level(src: Path, dst: Path) -> None:
-        rel = src.relative_to(SCAFFOLD_DIR).as_posix()
-        _copy_with_substitutions(src, dst, rel)
 
-    for item in sorted(SCAFFOLD_DIR.iterdir()):
-        if item.name in {"manifest.json", ".gitignore"}:
+def _copy_scaffold(project_root: Path, agent_format: AgentFormat) -> list[str]:
+    """Emit scaffold contents for ``agent_format`` into the project.
+
+    Builds the destination plan (including one-time seed files like
+    settings.json) and writes it. Prompts overwrite/skip per pre-existing
+    top-level target (e.g. an existing ``.claude/`` in a not-yet-initialized
+    directory). Returns status labels for display. The bundled scaffold
+    ``.gitignore`` is intentionally skipped — ``init_command`` writes a richer
+    default in its place (see ``DEFAULT_GITIGNORE``).
+    """
+    from thingsboard_cli.core.scaffold import _build_emit_plan
+
+    plan = _build_emit_plan(SCAFFOLD_DIR, agent_format, include_init_only=True)
+
+    # First-seen order of top-level targets (e.g. ".claude", ".agents", "AGENTS.md").
+    tops: list[str] = []
+    for dest_rel in plan:
+        top = dest_rel.split("/", 1)[0]
+        if top not in tops:
+            tops.append(top)
+
+    statuses: list[str] = []
+    skip_tops: set[str] = set()
+    for top in tops:
+        dst = project_root / top
+        is_dir = any(d.startswith(f"{top}/") for d in plan)
+        label = f"{top}/" if is_dir else top
+        if not dst.exists():
+            statuses.append(label)
             continue
-        dst = project_root / item.name
-        if item.is_dir():
-            if not dst.exists():
-                shutil.copytree(item, dst, ignore=ignore, copy_function=_copy_file)
-                statuses.append(f"{item.name}/")
-            else:
-                action = typer.prompt(
-                    f"{item.name}/ already exists — overwrite or skip?",
-                    type=click.Choice(["overwrite", "skip"]),
-                    default="skip",
-                )
-                if action == "overwrite":
-                    shutil.rmtree(dst)
-                    shutil.copytree(item, dst, ignore=ignore, copy_function=_copy_file)
-                    statuses.append(f"{item.name}/ (overwritten)")
-                else:
-                    statuses.append(f"{item.name}/ (skipped)")
-        else:
-            if item.name == ".gitkeep":
-                continue
-            if not dst.exists():
-                _copy_top_level(item, dst)
-                statuses.append(item.name)
-            else:
-                action = typer.prompt(
-                    f"{item.name} already exists — overwrite or skip?",
-                    type=click.Choice(["overwrite", "skip"]),
-                    default="skip",
-                )
-                if action == "overwrite":
-                    _copy_top_level(item, dst)
-                    statuses.append(f"{item.name} (overwritten)")
-                else:
-                    statuses.append(f"{item.name} (skipped)")
+        action = typer.prompt(
+            f"{label} already exists — overwrite or skip?",
+            type=click.Choice(["overwrite", "skip"]),
+            default="skip",
+        )
+        if action == "skip":
+            skip_tops.add(top)
+            statuses.append(f"{label} (skipped)")
+            continue
+        if dst.is_dir():
+            shutil.rmtree(dst)
+        statuses.append(f"{label} (overwritten)")
+
+    for dest_rel, data in plan.items():
+        if dest_rel.split("/", 1)[0] in skip_tops:
+            continue
+        dst_path = project_root / dest_rel
+        dst_path.parent.mkdir(parents=True, exist_ok=True)
+        dst_path.write_bytes(data)
 
     return statuses
 
@@ -274,7 +337,15 @@ def _write_default_gitignore(project_root: Path) -> str:
     return ".gitignore"
 
 
-def init_command() -> None:
+def init_command(
+    agent_format: Annotated[
+        AgentFormat | None,
+        typer.Option(
+            "--agent-format",
+            help="Scaffold format: claude, antigravity, or both. Omit to detect installed CLIs and prompt.",
+        ),
+    ] = None,
+) -> None:
     """Initialize a ThingsBoard project directory."""
     # Lazy import to avoid circular dependency (local.py imports find_project_root)
     from thingsboard_cli.core.local import ENTITY_DIR_MAP
@@ -288,12 +359,14 @@ def init_command() -> None:
         console.print(f"Already initialized (found {MARKER_FILE})")
         return
 
+    resolved_format = _resolve_agent_format(agent_format)
+
     for dirname in entity_dirs:
         (project_root / dirname).mkdir(exist_ok=True)
 
     (project_root / "tasks").mkdir(exist_ok=True)
 
-    scaffold_statuses = _copy_scaffold(project_root)
+    scaffold_statuses = _copy_scaffold(project_root, resolved_format)
     gitignore_status = _write_default_gitignore(project_root)
 
     from thingsboard_cli.core.scaffold import (
@@ -303,12 +376,13 @@ def init_command() -> None:
 
     manifest = get_scaffold_manifest(SCAFFOLD_DIR)
     scaffold_version = manifest.get("version", 1) if manifest else 1
-    scaffold_hash = compute_local_scaffold_hash(project_root, SCAFFOLD_DIR)
+    scaffold_hash = compute_local_scaffold_hash(project_root, SCAFFOLD_DIR, resolved_format)
 
     marker_data = {
         "version": 2,
         "mode": "local",
         "scaffold_version": scaffold_version,
+        "agent_format": resolved_format,
         "scaffold_content_hash": scaffold_hash,
     }
     marker_path.write_text(json.dumps(marker_data, indent=2) + "\n", encoding="utf-8")
@@ -950,6 +1024,8 @@ def push_command(
             abort=True,
         )
 
+    pushed_any = False
+
     for label, solution_dir in dirs_to_push:
         entity_files, solution_data = _load_solution_entities(solution_dir)
         if not entity_files:
@@ -969,6 +1045,7 @@ def push_command(
             error("Validation failed. Fix the issues above or use --skip-validate to push anyway.")
 
         result = _rest_post(client, "/api/solution/import", solution_data)
+        pushed_any = True
 
         if len(dirs_to_push) == 1:
             console.print(f"Pushed solution ({pluralize(total, 'entity', 'entities')})")
@@ -980,6 +1057,11 @@ def push_command(
             _run_emulators(client, solution_dir, result, force=force_emulators)
             _run_reprocessing(client, solution_dir, result)
 
+    # A successful push is the natural moment to ask how it went. The hook is
+    # rate-limited and fully non-critical — it never affects the push outcome.
+    if pushed_any:
+        fb.maybe_prompt_after_push()
+
 
 def validate_command(
     ctx: typer.Context,
@@ -1001,6 +1083,7 @@ def validate_command(
     dirs_to_validate = _resolve_solution_dirs(project_root, targets)
 
     all_valid = True
+    validated_any = False
     for label, solution_dir in dirs_to_validate:
         entity_files, solution_data = _load_solution_entities(solution_dir)
         if not entity_files:
@@ -1008,11 +1091,17 @@ def validate_command(
                 console.print("No entities to validate.")
             continue
 
+        validated_any = True
         if len(dirs_to_validate) > 1:
             console.print(f"\n[bold]{escape(label)}[/bold]")
 
         if not _validate_and_display(client, solution_data):
             all_valid = False
 
+    # A validate over real entities marks the end of a generation/edit — flag a
+    # feedback ask for the user's next message (the UserPromptSubmit hook surfaces it).
+    if validated_any:
+        fb.mark_pending()
+
     if not all_valid:
         raise typer.Exit(1)

thingsboard_cli-4.3.1.3.post1/src/thingsboard_cli/core/agent_detect.py

@@ -0,0 +1,31 @@
+"""Detect which agent CLIs (Claude Code / Antigravity) are installed.
+
+Used by ``tb init`` to recommend a scaffold format. Detection is a best-effort
+PATH probe — the presence of the launcher binary is taken as "the user uses
+this tool". It never raises; an undetectable environment simply returns an
+empty set and the caller falls back to a default.
+"""
+
+from __future__ import annotations
+
+import shutil
+
+# The format vocabulary lives in ``agent_format`` (the packing layer owns the
+# identifiers); detection is a consumer. Imported here only for this module's
+# own use — ``_BINARIES`` keys and the return annotation. Callers should import
+# the identifiers from ``agent_format``, the single public source.
+from thingsboard_cli.core.agent_format import ANTIGRAVITY, CLAUDE, AgentFormat
+
+# Launcher binary on PATH per CLI.
+_BINARIES = {
+    CLAUDE: "claude",
+    ANTIGRAVITY: "agy",
+}
+
+
+def detect_agent_clis() -> set[AgentFormat]:
+    """Return the set of agent CLIs found on PATH.
+
+    A subset of ``{claude, antigravity}``. Empty when neither is installed.
+    """
+    return {fmt for fmt, binary in _BINARIES.items() if shutil.which(binary) is not None}