@ainova-systems/intelligence 0.11.0-rc.9 → 0.11.0

package/cli/commands/adapter.sh

@@ -9,7 +9,7 @@ name="${2:-}"
 adapter_list() {
     detect_project
     local manifest="" content_dir="" seen=" " file item enabled output configured
-    if [ "$IP_MODE" = "v2" ]; then
+    if [ "$IP_MODE" = "cli" ]; then
         manifest="$IP_ROOT/intelligence.yaml"
         content_dir="$(manifest_intelligence_dir "$manifest")"
     fi
@@ -46,7 +46,7 @@ adapter_list() {
 adapter_create() {
     [ -n "$name" ] && [ $# -eq 0 ] || die "usage: intelligence adapter create <name>"
     assert_valid_target_name "$name"
-    require_v2
+    require_cli_project
     ensure_project_current "$IP_ROOT"
     local manifest="$IP_ROOT/intelligence.yaml" content_dir repo_phys probe old_ifs part probe_phys
     local template adapter_dir adapter_phys dest tmp
@@ -94,7 +94,7 @@ adapter_remove() {
     done
     [ -n "$name" ] || die "usage: intelligence adapter remove <name> [--apply]"
     assert_valid_target_name "$name"
-    require_v2
+    require_cli_project
     ensure_project_current "$IP_ROOT"
     manifest="$IP_ROOT/intelligence.yaml"
     content_dir="$(manifest_intelligence_dir "$manifest")"
@@ -135,12 +135,44 @@ case "$action" in
     enable|disable)
         [ -n "$name" ] && [ $# -eq 2 ] || die "usage: intelligence adapter <enable|disable> <name>"
         assert_valid_target_name "$name"
-        require_v2
+        require_cli_project
         ensure_project_current "$IP_ROOT"
-        bash "$CLI_DIR/internal/target-state.sh" "$action" "$name"
         if [ "$action" = "enable" ]; then
-            exec bash "$CLI_DIR/commands/sync.sh"
+            state_stage="$(mktemp -d -t intelligence-adapter-state-XXXXXX)"
+            cp "$IP_ROOT/intelligence.yaml" "$state_stage/intelligence.yaml"
+            gitignore_existed=0
+            if [ -f "$IP_ROOT/.gitignore" ]; then
+                gitignore_existed=1
+                cp "$IP_ROOT/.gitignore" "$state_stage/gitignore"
+            fi
+            while IFS= read -r policy_file; do
+                [ -f "$IP_ROOT/$policy_file" ] || continue
+                cp "$IP_ROOT/$policy_file" "$state_stage/$policy_file"
+            done < <(publisher_ignore_file_names)
+            enable_rc=0
+            bash "$CLI_DIR/internal/target-state.sh" "$action" "$name" || enable_rc=$?
+            if [ "$enable_rc" -eq 0 ]; then
+                bash "$CLI_DIR/commands/sync.sh" || enable_rc=$?
+            fi
+            if [ "$enable_rc" -ne 0 ]; then
+                cp "$state_stage/intelligence.yaml" "$IP_ROOT/intelligence.yaml"
+                if [ "$gitignore_existed" -eq 1 ]; then
+                    cp "$state_stage/gitignore" "$IP_ROOT/.gitignore"
+                else
+                    rm -f "$IP_ROOT/.gitignore"
+                fi
+                while IFS= read -r policy_file; do
+                    [ -f "$state_stage/$policy_file" ] || continue
+                    cp "$state_stage/$policy_file" "$IP_ROOT/$policy_file"
+                done < <(publisher_ignore_file_names)
+                echo "ERROR: adapter enable failed; manifest and ignore policies were restored." >&2
+            else
+                report_tracked_managed_ignores "$IP_ROOT" "$IP_ROOT/intelligence.yaml"
+            fi
+            rm -rf "$state_stage"
+            exit "$enable_rc"
         fi
+        bash "$CLI_DIR/internal/target-state.sh" "$action" "$name"
         ;;
     remove)
         [ -n "$name" ] || die "usage: intelligence adapter remove <name> [--apply]"
@@ -148,6 +180,14 @@ case "$action" in
         adapter_remove "$@"
         ;;
     *)
+        case "$name" in
+            list)
+                die "adapter action comes first - run: intelligence adapter list"
+                ;;
+            create|enable|disable|remove)
+                die "adapter action comes first - run: intelligence adapter $name $action"
+                ;;
+        esac
         die "usage: intelligence adapter <list|create|enable|disable|remove> [name]"
         ;;
 esac

package/cli/commands/init.sh

@@ -12,6 +12,50 @@ source "$CLI_DIR/lib/cli-common.sh"
 
 targets_arg="" no_sync=0 content_dir="intelligence" bare=0
 targets_set=0 dir_set=0 bare_set=0 preview=0 apply=0 force=0
+
+print_new_project_onboarding() {
+    local heading="Intelligence ready"
+    [ "$no_sync" -eq 0 ] || heading="Next steps"
+
+    echo ""
+    echo "=== $heading ==="
+    if [ -n "${ONBOARDING_BACKUP_REL:-}" ]; then
+        echo "  Existing AI instructions preserved:"
+        echo "    $ONBOARDING_BACKUP_REL ($ONBOARDING_BACKUP_COUNT path(s))"
+        if [ "$bare" -eq 0 ]; then
+            echo "    The learn skill will migrate them before proposing backup removal."
+        else
+            echo "    Review and migrate them before removing this backup."
+        fi
+    fi
+    if [ "$no_sync" -eq 1 ]; then
+        echo "  Run first:"
+        echo "    intelligence sync"
+    fi
+    if [ "$bare" -eq 0 ]; then
+        echo "  Recommended starter package:"
+        echo "    intelligence package add @ainova-systems/core"
+        echo "    Install it before learning so package/project duplicates can be detected."
+        echo "  Finalize repository onboarding:"
+        echo "    Ask your agent to run /intelligence-learn-from-repository"
+        echo "    It recognizes the initial backup, recovers setup if needed, then proposes repository-specific migration after approval."
+    fi
+    echo "  Review adapters:"
+    echo "    intelligence adapter list"
+    echo "    intelligence adapter enable codex"
+    echo "    intelligence adapter disable cursor"
+    echo "  Version control:"
+    echo "    Generated adapter output is gitignored by CLI-owned path."
+    echo "    Commit intelligence.yaml, intelligence.lock, intelligence/, AGENTS.md, and .github/."
+    echo "    Existing .vscodeignore, .npmignore, and .dockerignore files receive packaging exclusions."
+    echo "    Shared tool settings remain trackable; review the exact ownership policy:"
+    echo "    https://github.com/ainova-systems/intelligence/blob/main/packages/sync/references/conventions.md#generated-output-and-version-control"
+    report_tracked_managed_ignores "$root" "$manifest"
+    echo "  Write your own:"
+    echo "    create $content_dir/rules/context.md, then intelligence sync"
+    echo "  Docs: https://github.com/ainova-systems/intelligence#readme"
+}
+
 while [ $# -gt 0 ]; do
     case "$1" in
         --targets) shift; targets_arg="${1:-}"; targets_set=1 ;;
@@ -34,14 +78,14 @@ esac
 
 detect_project
 case "$IP_MODE" in
-    v2)
+    cli)
         [ "$targets_set" -eq 0 ] || die "--targets applies only when creating a new project"
         [ "$dir_set" -eq 0 ] || die "--dir applies only when creating a new project"
         [ "$bare_set" -eq 0 ] || die "--bare applies only when creating a new project"
-        [ "$force" -eq 0 ] || die "--force applies only when converting an archived v1 project"
+        [ "$force" -eq 0 ] || die "--force applies only when converting a legacy Intelligence Sync project"
         if [ "$preview" -eq 1 ]; then
             check_version_compat "$IP_ROOT/intelligence.yaml"
-            echo "project: v2 at $IP_ROOT"
+            echo "project: Intelligence CLI at $IP_ROOT"
             if project_needs_upgrade "$IP_ROOT"; then
                 echo "  would align project lifecycle with engine $(bundled_engine_version)"
             else
@@ -68,35 +112,53 @@ case "$IP_MODE" in
             ensure_project_current "$IP_ROOT"
         fi
         restore_project_store_if_missing "$IP_ROOT"
+        ensure_manifest_gitignore "$IP_ROOT" "$IP_ROOT/intelligence.yaml"
+        ensure_manifest_publisher_ignores "$IP_ROOT" "$IP_ROOT/intelligence.yaml"
         [ "$no_sync" -eq 1 ] && exit 0
         cd "$IP_ROOT"
-        exec bash "$CLI_DIR/commands/sync.sh"
+        sync_rc=0
+        bash "$CLI_DIR/commands/sync.sh" || sync_rc=$?
+        if [ "$sync_rc" -ne 0 ]; then
+            content_dir="$(manifest_intelligence_dir "$IP_ROOT/intelligence.yaml")"
+            recovery_backup=""
+            if [ -f "$IP_ROOT/$content_dir/_backup/manifest.tsv" ]; then
+                recovery_backup="; initial backup: $content_dir/_backup/manifest.tsv"
+            fi
+            echo "" >&2
+            echo "=== Intelligence setup needs recovery ===" >&2
+            echo "  No partial adapter update was kept; sync restored its pre-run outputs." >&2
+            echo "  Ask your agent to read:" >&2
+            echo "    $SYNC_PKG_STORE/skills/intelligence-learn-from-repository/SKILL.md" >&2
+            echo "  and finalize this Intelligence setup$recovery_backup." >&2
+        fi
+        [ "$sync_rc" -ne 0 ] || report_tracked_managed_ignores "$IP_ROOT" "$IP_ROOT/intelligence.yaml"
+        exit "$sync_rc"
         ;;
     legacy)
         [ "$targets_set" -eq 0 ] || die "--targets applies only when creating a new project"
         [ "$dir_set" -eq 0 ] || die "--dir applies only when creating a new project"
         [ "$bare_set" -eq 0 ] || die "--bare applies only when creating a new project"
         [ "$no_sync" -eq 0 ] || die "--no-sync cannot skip transactional conversion verification"
-        migrate_args=()
-        [ "$force" -eq 1 ] && migrate_args+=(--force)
+        conversion_args=()
+        [ "$force" -eq 1 ] && conversion_args+=(--force)
         if [ "$preview" -eq 1 ]; then
-            exec bash "$CLI_DIR/internal/migrate-v1.sh" --dry-run ${migrate_args[@]+"${migrate_args[@]}"}
+            exec bash "$CLI_DIR/internal/convert-legacy.sh" --dry-run ${conversion_args[@]+"${conversion_args[@]}"}
         fi
         if [ "$apply" -eq 1 ]; then
-            exec bash "$CLI_DIR/internal/migrate-v1.sh" ${migrate_args[@]+"${migrate_args[@]}"}
+            exec bash "$CLI_DIR/internal/convert-legacy.sh" ${conversion_args[@]+"${conversion_args[@]}"}
         fi
-        bash "$CLI_DIR/internal/migrate-v1.sh" --dry-run ${migrate_args[@]+"${migrate_args[@]}"}
-        [ -t 0 ] || die "v1 migration requires confirmation — rerun 'intelligence init --apply'"
-        printf 'Apply this migration? [Y/n] '
+        bash "$CLI_DIR/internal/convert-legacy.sh" --dry-run ${conversion_args[@]+"${conversion_args[@]}"}
+        [ -t 0 ] || die "legacy project conversion requires confirmation — rerun 'intelligence init --apply'"
+        printf 'Apply this conversion? [Y/n] '
         read -r answer
         case "$answer" in
-            ""|y|Y|yes|YES) exec bash "$CLI_DIR/internal/migrate-v1.sh" ${migrate_args[@]+"${migrate_args[@]}"} ;;
-            *) echo "migration cancelled"; exit 0 ;;
+            ""|y|Y|yes|YES) exec bash "$CLI_DIR/internal/convert-legacy.sh" ${conversion_args[@]+"${conversion_args[@]}"} ;;
+            *) echo "conversion cancelled"; exit 0 ;;
         esac
         ;;
 esac
 
-[ "$force" -eq 0 ] || die "--force applies only when converting an archived v1 project"
+[ "$force" -eq 0 ] || die "--force applies only when converting a legacy Intelligence Sync project"
 root="$(git rev-parse --show-toplevel 2>/dev/null || pwd)"
 root="$(cd "$root" && pwd)"
 assert_safe_content_dir "$root" "$content_dir"
@@ -117,17 +179,30 @@ if [ -n "$targets_arg" ]; then
     done
 else
     if [ -d "$root/.claude" ] || [ -f "$root/CLAUDE.md" ]; then targets="$targets claude"; fi
-    [ -d "$root/.cursor" ] && targets="$targets cursor"
-    [ -d "$root/.codex" ] && targets="$targets codex"
+    if [ -d "$root/.cursor" ] || [ -f "$root/.cursorrules" ]; then targets="$targets cursor"; fi
+    if [ -d "$root/.codex" ] || [ -d "$root/.agents" ]; then targets="$targets codex"; fi
     [ -d "$root/.pi" ] && targets="$targets pi"
     [ -d "$root/.opencode" ] && targets="$targets opencode"
-    [ -d "$root/.github" ] && [ -d "$root/.github/instructions" ] && targets="$targets copilot"
+    if [ -f "$root/.github/copilot-instructions.md" ] \
+        || [ -d "$root/.github/instructions" ] \
+        || [ -d "$root/.github/agents" ] \
+        || [ -d "$root/.github/skills" ]; then
+        targets="$targets copilot"
+    fi
     if [ "$targets" = "agents" ]; then
         echo "  NOTE: no tool markers found (.claude/, CLAUDE.md, .cursor/, …) — only AGENTS.md is enabled." >&2
         echo "        Name your tools explicitly: intelligence init --targets claude,cursor  (or edit targets: later)" >&2
     fi
 fi
 
+onboarding_count="$(onboarding_source_count "$root" "$content_dir" "$targets")"
+onboarding_has_agents=0
+[ -f "$root/AGENTS.md" ] && onboarding_has_agents=1
+if [ "$preview" -eq 0 ] && [ "$onboarding_count" -gt 0 ] \
+    && [ -e "$root/$content_dir/_backup" ]; then
+    die "onboarding backup already exists at $content_dir/_backup - review or move it before rerunning init"
+fi
+
 if [ "$preview" -eq 1 ]; then
     echo "project: no Intelligence setup found"
     echo "  would create intelligence.yaml and intelligence.lock"
@@ -141,6 +216,9 @@ if [ "$preview" -eq 1 ]; then
     else
         echo "  would enable adapters:$targets, then sync"
     fi
+    if [ "$onboarding_count" -gt 0 ]; then
+        echo "  would preserve $onboarding_count existing AI instruction path(s) in $content_dir/_backup before sync"
+    fi
     exit 0
 fi
 
@@ -175,7 +253,21 @@ manifest="$root/intelligence.yaml"
     echo "# Generated output, one entry per tool. Add or drop tools freely."
     echo "targets:"
     for t in $targets; do
-        echo "  $t: { enabled: true, output: \"$(default_target_output "$t")\" }"
+        if [ "$t" = "agents" ] && [ "$onboarding_has_agents" -eq 1 ]; then
+            echo "  agents:"
+            echo "    enabled: true"
+            echo "    output: \"AGENTS.md\""
+            echo "    header: |"
+            echo "      > Intelligence onboarding is pending. Before repository work, read"
+            echo "      > \`$content_dir/_backup/AGENTS.md\`, which preserves the original project instructions."
+            if [ "$bare" -eq 0 ]; then
+                echo "      > Run /intelligence-learn-from-repository to migrate and verify them before removing the backup."
+            else
+                echo "      > Review and migrate that backup before removing it."
+            fi
+        else
+            echo "  $t: { enabled: true, output: \"$(default_target_output "$t")\" }"
+        fi
     done
     echo ""
     echo "# Packages are managed with 'intelligence package add|search|list':"
@@ -202,13 +294,10 @@ manifest="$root/intelligence.yaml"
 } > "$manifest"
 
 # The package store is restorable state, never committed — the npm model.
-if [ ! -f "$root/.gitignore" ] || ! grep -q '^\.intelligence/' "$root/.gitignore"; then
-    {
-        [ -f "$root/.gitignore" ] && [ -n "$(tail -c 1 "$root/.gitignore" 2>/dev/null)" ] && echo ""
-        echo "# intelligence CLI package store (restored automatically by 'intelligence sync')"
-        echo ".intelligence/"
-    } >> "$root/.gitignore"
-fi
+ensure_base_gitignore "$root"
+for target in $targets; do
+    ensure_target_gitignore "$root" "$manifest" "$target"
+done
 
 # The engine's own content (meta-skills, authoring rule, engine agents) is an
 # ordinary package: auto-selected, opted out with --bare, removable later with
@@ -218,16 +307,32 @@ if [ "$bare" -eq 0 ]; then
     sync_pkg_install "$root"
 fi
 
+preserve_onboarding_sources "$root" "$content_dir" "$targets"
+ensure_manifest_publisher_ignores "$root" "$manifest"
+
 echo "initialized: intelligence.yaml (targets:$(printf ' %s' $targets))"
 [ "$bare" -eq 1 ] && echo "  bare setup: no packages — engine meta-skills not installed"
-echo "  add packages:  intelligence package add @ainova-systems/core   (browse: intelligence package search)"
-echo "  write your own: create $content_dir/rules/context.md, then intelligence sync"
-if [ "$bare" -eq 0 ]; then
-    echo "  tailor this repository: ask your agent to run /intelligence-learn-from-repository after sync"
-fi
-echo "  docs: https://github.com/ainova-systems/intelligence#readme"
-
 if [ "$no_sync" -eq 0 ]; then
     cd "$root"
-    exec bash "$CLI_DIR/commands/sync.sh"
+    sync_rc=0
+    echo ""
+    echo "=== Sync started ==="
+    echo "  Rendering enabled adapters in compact mode..."
+    bash "$CLI_DIR/commands/sync.sh" --compact || sync_rc=$?
+    if [ "$sync_rc" -ne 0 ]; then
+        echo "" >&2
+        echo "=== Intelligence setup needs recovery ===" >&2
+        echo "  No partial adapter update was kept; sync restored its pre-run outputs." >&2
+        if [ "$bare" -eq 0 ]; then
+            echo "  Ask your agent to read:" >&2
+            echo "    $SYNC_PKG_STORE/skills/intelligence-learn-from-repository/SKILL.md" >&2
+            echo "  and finalize the initial Intelligence setup. The snapshot is $content_dir/_backup/manifest.tsv." >&2
+        else
+            echo "  Fix the reported error, then rerun: intelligence init" >&2
+        fi
+        exit "$sync_rc"
+    fi
+    echo "=== Sync completed ==="
 fi
+
+print_new_project_onboarding

package/cli/commands/package.sh

@@ -9,12 +9,12 @@ shift
 
 case "$action" in
     add)
-        require_v2
+        require_cli_project
         ensure_project_current "$IP_ROOT"
         exec bash "$CLI_DIR/internal/package-add.sh" "$@"
         ;;
     remove)
-        require_v2
+        require_cli_project
         ensure_project_current "$IP_ROOT"
         exec bash "$CLI_DIR/internal/package-remove.sh" "$@"
         ;;

package/cli/commands/registry.sh

@@ -12,7 +12,7 @@ sub="${1:-list}"
 case "$sub" in
     list)
         detect_project
-        if [ "$IP_MODE" = "v2" ] && [ -f "$IP_ROOT/intelligence.yaml" ]; then
+        if [ "$IP_MODE" = "cli" ] && [ -f "$IP_ROOT/intelligence.yaml" ]; then
             echo "Project registries (intelligence.yaml, trust order):"
             found=0
             while IFS= read -r url; do
@@ -39,7 +39,7 @@ case "$sub" in
             @*) die "registries are added by URL — names carry their own scope. To install a package: intelligence package add $url/<name>" ;;
         esac
         assert_safe_source_url "${url#git+}"
-        require_v2
+        require_cli_project
         ensure_project_current "$IP_ROOT"
         # Fail closed: a URL that cannot produce an index is not a registry,
         # and recording it would turn a typo here into a confusing failure at
@@ -70,7 +70,7 @@ case "$sub" in
     remove)
         url="${2:-}"
         [ -n "$url" ] || die "usage: intelligence registry remove <url>"
-        require_v2
+        require_cli_project
         ensure_project_current "$IP_ROOT"
         registries_remove "$IP_ROOT/intelligence.yaml" "$url"
         # The retired flat-map form also stored scope keys — drop one if the

package/cli/commands/status.sh

@@ -11,8 +11,8 @@ esac
 
 detect_project
 case "$IP_MODE" in
-    v2)
-        echo "Project:  $IP_ROOT (CLI setup)"
+    cli)
+        echo "Project:  $IP_ROOT (Intelligence project)"
         echo "Manifest: intelligence.yaml (schema_version $(read_schema_version "$IP_ROOT/intelligence.yaml"))"
         if [ -f "$IP_ROOT/intelligence.lock" ]; then
             echo "Lockfile: intelligence.lock"
@@ -30,12 +30,12 @@ case "$IP_MODE" in
         echo "Engine:   $(bundled_engine_version) (bundled with the CLI)"
         ;;
     legacy)
-        echo "Project:  $IP_ROOT (vendored v1 setup)"
+        echo "Project:  $IP_ROOT (legacy Intelligence Sync)"
         echo "Umbrella: $IP_UMBRELLA"
         echo "Engine:   $(tr -d ' \t\r\n' < "$IP_MODULE_DIR/scripts/VERSION") (vendored at $IP_MODULE_DIR)"
         echo "Stamp:    $(top_scalar "$IP_UMBRELLA/config.yaml" "sync_version")"
         echo ""
-        echo "Convert to the CLI setup: intelligence init"
+        echo "Convert to Intelligence: intelligence init"
         ;;
     *)
         echo "No intelligence project here. Start one: intelligence init"

package/cli/commands/sync.sh

@@ -1,27 +1,80 @@
 #!/bin/bash
-# intelligence sync [target] — render intelligence to every enabled tool.
+# intelligence sync [target] [--compact] - render intelligence to enabled tools.
 set -euo pipefail
 source "$CLI_DIR/lib/cli-common.sh"
 
-detect_project
-case "$IP_MODE" in
-    v2)
-        # `sync` is the normal fresh-clone command. A newer globally installed
-        # CLI upgrades the current v2 project first (except in CI, where a
-        # tracked migration must be reviewed and committed locally), and a
-        # missing ignored store is restored strictly from the committed lock.
-        ensure_project_current "$IP_ROOT"
-        restore_project_store_if_missing "$IP_ROOT"
-        export_engine_env "$IP_ROOT"
-        exec bash "$IS_ENGINE_DIR/sync.sh" "$@"
-        ;;
-    legacy)
-        # A vendored project syncs with ITS engine — its pin is the contract,
-        # and a newer bundled engine must not generate against an older schema.
-        echo "NOTE: vendored (v1) setup — delegating to $IP_MODULE_DIR/scripts/sync.sh. 'intelligence init' converts it to the CLI setup." >&2
-        exec bash "$IP_MODULE_DIR/scripts/sync.sh" "$@"
-        ;;
-    *)
-        die "no intelligence project found here — run 'intelligence init'"
-        ;;
-esac
+compact=0
+target=""
+while [ $# -gt 0 ]; do
+    case "$1" in
+        --compact) compact=1 ;;
+        -*) die "unknown option '$1'" ;;
+        *)
+            [ -z "$target" ] || die "usage: intelligence sync [adapter] [--compact]"
+            target="$1"
+            ;;
+    esac
+    shift
+done
+
+run_sync() {
+    detect_project || return $?
+    case "$IP_MODE" in
+        cli)
+            # `sync` is the normal fresh-clone command. A newer globally installed
+            # CLI aligns the current Intelligence project first (except in CI, where a
+            # tracked migration must be reviewed and committed locally), and a
+            # missing ignored store is restored strictly from the committed lock.
+            ensure_project_current "$IP_ROOT" || return $?
+            restore_project_store_if_missing "$IP_ROOT" || return $?
+            export_engine_env "$IP_ROOT" || return $?
+            if [ -n "$target" ]; then
+                bash "$IS_ENGINE_DIR/sync.sh" "$target" || return $?
+            else
+                bash "$IS_ENGINE_DIR/sync.sh" || return $?
+            fi
+            ;;
+        legacy)
+            [ "$compact" -eq 0 ] || die "--compact is unavailable for a legacy Intelligence Sync project - run 'intelligence init' to convert it first"
+            # A vendored project syncs with its own engine: its pin is the
+            # contract, and a newer bundled engine must not generate against an
+            # older schema.
+            echo "NOTE: legacy Intelligence Sync project - delegating to $IP_MODULE_DIR/scripts/sync.sh. 'intelligence init' converts it into an Intelligence project." >&2
+            if [ -n "$target" ]; then
+                bash "$IP_MODULE_DIR/scripts/sync.sh" "$target" || return $?
+            else
+                bash "$IP_MODULE_DIR/scripts/sync.sh" || return $?
+            fi
+            ;;
+        *)
+            die "no intelligence project found here - run 'intelligence init'"
+            ;;
+    esac
+}
+
+if [ "$compact" -eq 0 ]; then
+    run_sync
+    exit $?
+fi
+
+# Compact mode is intentionally quiet only on success. Buffering the complete
+# combined stream means a failure still returns every diagnostic emitted by
+# lifecycle preflight, locked restore or the engine, together with its real rc.
+compact_output="$(mktemp -t intelligence-sync-XXXXXX)"
+trap 'rm -f "$compact_output"' EXIT
+rc=0
+(run_sync) > "$compact_output" 2>&1 || rc=$?
+if [ "$rc" -ne 0 ]; then
+    cat "$compact_output" >&2
+    exit "$rc"
+fi
+
+status_line="$(grep '^IS_STATUS=ok\($\| \)' "$compact_output" | tail -1 || true)"
+done_line="$(grep '^=== Done:' "$compact_output" | tail -1 || true)"
+if [ -z "$status_line" ] || [ -z "$done_line" ]; then
+    cat "$compact_output" >&2
+    echo "ERROR: sync succeeded without its final status contract" >&2
+    exit 1
+fi
+echo "$status_line"
+echo "$done_line"

package/cli/commands/update.sh

@@ -19,7 +19,7 @@ while [ $# -gt 0 ]; do
 done
 [ "$preview_seen" -eq 0 ] || [ "$apply_seen" -eq 0 ] || die "choose either --preview or --apply"
 
-require_v2
+require_cli_project
 manifest="$IP_ROOT/intelligence.yaml"
 check_version_compat "$manifest"
 eng="$(bundled_engine_version)"

package/cli/intelligence

@@ -43,10 +43,11 @@ intelligence — build, version and distribute AI agent intelligence
 
 Usage: intelligence <command> [args]
 
-  init [--preview|--apply]  Initialize, migrate, restore or align this project
+  init [--preview|--apply]  Initialize, convert, restore or align this project
     --targets a,b --dir name --bare --no-sync   New-project options
-    --force               Accept a dirty worktree during v1 conversion
-  sync [adapter]          Restore locked content if needed, then render enabled adapters
+    --force               Accept a dirty worktree during legacy project conversion
+  sync [adapter] [--compact]  Restore locked content, then render enabled adapters
+    --compact            On success show only final status; on failure show diagnostics
   update [@scope/name]    Show an update plan; ask before applying it
     --preview             Show the plan without asking or writing
     --apply               Apply the plan without asking
@@ -76,6 +77,20 @@ case "$cmd" in
 esac
 cmd_file="$CLI_DIR/commands/$cmd.sh"
 if [ ! -f "$cmd_file" ]; then
+    case "$cmd" in
+        adapters)
+            echo "ERROR: unknown command 'adapters'. Use the singular command: intelligence adapter list" >&2
+            exit 1
+            ;;
+        packages)
+            echo "ERROR: unknown command 'packages'. Use the singular command: intelligence package list" >&2
+            exit 1
+            ;;
+        registries)
+            echo "ERROR: unknown command 'registries'. Use the singular command: intelligence registry list" >&2
+            exit 1
+            ;;
+    esac
     echo "ERROR: unknown command '$cmd'. Run 'intelligence help'." >&2
     exit 1
 fi

package/cli/internal/{upgrade-v2.sh → align-project.sh}

@@ -1,6 +1,6 @@
 #!/bin/bash
-# Internal: bring the project to this CLI's engine: apply v2
-# schema migrations, align the engine-content package to the bundled version,
+# Internal: bring an Intelligence project to this CLI's engine: apply schema
+# migrations, align the engine-content package to the bundled version,
 # restamp schema_version, sync.
 set -euo pipefail
 source "$CLI_DIR/lib/cli-common.sh"
@@ -14,7 +14,7 @@ while [ $# -gt 0 ]; do
     shift
 done
 
-require_v2
+require_cli_project
 manifest="$IP_ROOT/intelligence.yaml"
 
 stamp="$(read_schema_version "$manifest")"
@@ -31,14 +31,15 @@ if [ -n "$legacy_stamp" ] && _ver_gt "$legacy_stamp" "$eng"; then
     die "manifest schema $legacy_stamp is newer than this CLI's engine $eng — update the global CLI first"
 fi
 
-# --- v2 schema migrations -------------------------------------------------
+# --- project schema migrations --------------------------------------------
 # The engine's own chain owns vendored layouts; this one owns the manifest.
 # Same discipline: ascending, append-only, each migration self-detects and
 # no-ops when already applied.
 
-# v2 migration 0: the original RC manifest called the permanent schema key
+# migration 0: the original RC manifest called the permanent schema key
 # `sync_version`. Rename it without changing its value; the final stamp below
-# then aligns it with this engine. The archived v1 reader remains separate.
+# then aligns it with this engine. The legacy Intelligence Sync reader remains
+# separate.
 if [ -n "$legacy_stamp" ]; then
     if [ -n "$stamp" ]; then
         [ "$stamp" = "$legacy_stamp" ] || die "manifest has conflicting schema_version '$stamp' and sync_version '$legacy_stamp'"
@@ -49,7 +50,7 @@ if [ -n "$legacy_stamp" ]; then
     echo "  migrating: sync_version -> schema_version"
 fi
 
-# v2 migration 1: package entries contain requested intent only. Early RCs
+# migration 1: package entries contain requested intent only. Early RCs
 # also copied resolved url/path into the manifest. Preserve the existing lock
 # as the trusted source and remove that duplicate representation. A direct
 # unversioned package becomes an explicit HEAD pin so its manifest entry stays
@@ -74,7 +75,7 @@ if [ "$source_fields_migrated" -eq 1 ]; then
     echo "  migrating: package url/path -> intelligence.lock"
 fi
 
-# v2 migration 2: staged engine content -> the @ainova-systems/sync package.
+# migration 2: staged engine content -> the @ainova-systems/sync package.
 # Pre-package manifests listed `.intelligence/engine/{rules,agents,skills}`
 # as sources fed by a CLI-staged copy; that copy is now an ordinary package
 # entry seeded from the bundle. Post-condition: no `.intelligence/engine`