fix: consolidate icp.yaml at repo root for shared network state

- Move icp.yaml back to root combining canisters + examples canisters
  (paths updated to reference canisters/ and examples/ subdirs)
- Remove canisters/icp.yaml and examples/icp.yaml
- Remove icp_canisters/icp_examples helpers; all scripts use bare icp
- Centralize REPO_ROOT in constants.sh, sourced by all scripts
- Simplify .gitignore: ignore all .icp dirs, untrack mainnet.ids.json

The icp CLI stores a global port descriptor at
~/Library/Caches/org.dfinity.icp-cli/port-descriptors/<port>.json
mapping ports to project directories. Split icp.yaml files cannot
share a network across projects without symlinks. A single root
icp.yaml is the correct solution.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: Web3NL

.gitignore

@@ -55,12 +55,7 @@ build/
 
 # dfx / icp-cli files
 .dfx
-.icp/*
-!.icp/data/
-.icp/data/*
-!.icp/data/mappings/
-.icp/data/mappings/*
-!.icp/data/mappings/*.ids.json
+.icp
 
 # Claude
 .claude

.icp/data/mappings/mainnet.ids.json

@@ -5,15 +5,31 @@ canisters:
     recipe:
       type: "@dfinity/asset-canister@v2.1.0"
       configuration:
-        dir: my-canister-app/build
+        dir: canisters/my-canister-app/build
 
   - name: wasm-registry
     recipe:
       type: "@dfinity/rust@v3.0.0"
       configuration:
         package: wasm-registry
         shrink: true
-        candid: wasm-registry/wasm-registry.did
+        candid: canisters/wasm-registry/wasm-registry.did
+
+  - name: my-hello-world
+    recipe:
+      type: "@dfinity/rust@v3.0.0"
+      configuration:
+        package: my-hello-world
+        shrink: true
+        candid: examples/my-hello-world/src/backend/my-hello-world.did
+
+  - name: my-notepad
+    recipe:
+      type: "@dfinity/rust@v3.0.0"
+      configuration:
+        package: my-notepad
+        shrink: true
+        candid: examples/my-notepad/src/backend/my-notepad.did
 
 networks:
   - name: local
@@ -26,7 +42,7 @@ networks:
 environments:
   - name: local
     network: local
-    canisters: [my-canister-app, wasm-registry]
+    canisters: [my-canister-app, wasm-registry, my-hello-world, my-notepad]
 
   - name: mainnet
     network: ic

examples/icp.yaml

@@ -1,6 +1,10 @@
 #!/bin/bash
 # Shared constants for build/test scripts
 
+# Repository root (constants.sh lives in scripts/)
+export REPO_ROOT
+REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
+
 # Cycle amounts
 export CANISTER_INITIAL_CYCLES="1000000000000"
 
@@ -12,8 +16,8 @@ export WASM_REGISTRY_CANISTER="wasm-registry"
 export DAPP_ORIGIN_VITE="http://localhost:5173"
 
 # Resolve DAPP_ORIGIN_CANISTER from test.env if it exists (set during setup)
-if [ -f "tests/test.env" ]; then
-  HELLO_WORLD_ID=$(grep VITE_MY_HELLO_WORLD_CANISTER_ID tests/test.env | cut -d '=' -f2 || true)
+if [ -f "$REPO_ROOT/tests/test.env" ]; then
+  HELLO_WORLD_ID=$(grep VITE_MY_HELLO_WORLD_CANISTER_ID "$REPO_ROOT/tests/test.env" | cut -d '=' -f2 || true)
   if [ -n "$HELLO_WORLD_ID" ]; then
     export DAPP_ORIGIN_CANISTER="http://${HELLO_WORLD_ID}.localhost:8080"
   fi

canisters/icp.yaml icp.yamlcanisters/icp.yaml renamed to icp.yaml

@@ -28,7 +28,7 @@ fi
 
 # Deploy the app (ICP_NETWORK=ic triggers production build)
 echo "🚢 Deploying to IC..."
-(cd canisters && ICP_NETWORK=ic icp deploy my-canister-app -e mainnet --identity web3nl)
+ICP_NETWORK=ic icp deploy my-canister-app -e mainnet --identity web3nl
 
 # Get current commit hash after successful deploy
 COMMIT_HASH=$(git rev-parse HEAD)

scripts/constants.sh

@@ -15,8 +15,7 @@ DASHBOARD_VITE_SERVER=true npx playwright test \
 # Swap II principal to canister-served origin for the second batch
 PRINCIPAL_CANISTER=$(cat test-output/derived-ii-principal-canister.txt)
 echo "Switching II principal to canister-served origin for second test batch..."
-REPO_ROOT="$(dirname "$0")/.."
-(cd "$REPO_ROOT/examples" && icp canister call "$HELLO_WORLD_CANISTER" manage_ii_principal "(variant { Set = principal \"$PRINCIPAL_CANISTER\" })" -e local --identity ident-1)
+icp canister call "$HELLO_WORLD_CANISTER" manage_ii_principal "(variant { Set = principal \"$PRINCIPAL_CANISTER\" })" -e local --identity ident-1
 
 # Batch 2: Canister-served dashboard + hello-world frontend
 npx playwright test \

scripts/deploy-app.sh

@@ -5,12 +5,7 @@ set -euo pipefail
 source "$(dirname "$0")/constants.sh"
 
 # Ensure we're in the project root directory
-ROOT="$(dirname "$0")/.."
-cd "$ROOT"
-
-# Helper functions to run icp commands in the correct project context
-icp_examples() { (cd examples && icp "$@"); }
-icp_canisters() { (cd canisters && icp "$@"); }
+cd "$REPO_ROOT"
 
 echo "Setting up dashboard development environment..."
 
@@ -19,11 +14,11 @@ echo "Deploying $HELLO_WORLD_CANISTER canister..."
 # Build hello-world frontend with test env vars (identity provider URL)
 # before the Rust canister embeds it via include_dir!
 npm run build --workspace=my-hello-world-frontend
-icp_examples deploy "$HELLO_WORLD_CANISTER" -e local --identity ident-1 --cycles "$CANISTER_INITIAL_CYCLES"
+icp deploy "$HELLO_WORLD_CANISTER" -e local --identity ident-1 --cycles "$CANISTER_INITIAL_CYCLES"
 ./scripts/copy-example-wasm.sh
 
 # Update test.env with the hello-world canister ID
-HELLO_WORLD_ID=$(icp_examples canister status my-hello-world -e local --id-only)
+HELLO_WORLD_ID=$(icp canister status my-hello-world -e local --id-only)
 if ! grep -q "VITE_MY_HELLO_WORLD_CANISTER_ID" tests/test.env 2>/dev/null; then
   echo "VITE_MY_HELLO_WORLD_CANISTER_ID=${HELLO_WORLD_ID}" >> tests/test.env
 fi
@@ -42,17 +37,17 @@ echo "Reading principals from both files..."
 PRINCIPAL_VITE=$(cat test-output/derived-ii-principal-vite.txt)
 PRINCIPAL_CANISTER=$(cat test-output/derived-ii-principal-canister.txt)
 
-IDENT1=$(icp_canisters identity principal --identity ident-1)
+IDENT1=$(icp identity principal --identity ident-1)
 
 echo "Setting controllers for $HELLO_WORLD_CANISTER canister..."
-icp_examples canister settings update "$HELLO_WORLD_CANISTER" -e local --identity ident-1 \
+icp canister settings update "$HELLO_WORLD_CANISTER" -e local --identity ident-1 \
   --set-controller "$CANISTER_ID" \
   --set-controller "$PRINCIPAL_VITE" \
   --set-controller "$PRINCIPAL_CANISTER" \
   --set-controller "$IDENT1" \
   -f
 
 echo "Setting authorized Internet Identity principal (Vite origin for first e2e batch)..."
-icp_examples canister call "$HELLO_WORLD_CANISTER" manage_ii_principal "(variant { Set = principal \"$PRINCIPAL_VITE\" })" -e local --identity ident-1
+icp canister call "$HELLO_WORLD_CANISTER" manage_ii_principal "(variant { Set = principal \"$PRINCIPAL_VITE\" })" -e local --identity ident-1
 
 echo "✓ Dashboard development environment setup complete"

scripts/run-test-e2e.sh

@@ -33,14 +33,13 @@ echo "Uploading $NAME v$VERSION ($FILE_SIZE bytes) to wasm-registry..."
 # Encode argument as Candid binary hex written to a temp file
 # (hex string is ~1.6MB which exceeds ARG_MAX for command-line args)
 SCRIPT_DIR="$(dirname "$0")"
+
 TMPFILE=$(mktemp)
 echo "Encoding Candid argument to $TMPFILE..."
 node "$SCRIPT_DIR/encode-upload-arg.mjs" "$NAME" "$DESCRIPTION" "$VERSION" "$WASM_GZ_PATH" > "$TMPFILE"
 
 echo "Calling wasm-registry upload_wasm..."
-# Run from canisters/ where the wasm-registry icp.yaml lives
-REPO_ROOT="$(dirname "$0")/.."
-(cd "$REPO_ROOT/canisters" && icp canister call wasm-registry upload_wasm "$TMPFILE" "${EXTRA_ARGS[@]}")
+icp canister call wasm-registry upload_wasm "$TMPFILE" "${EXTRA_ARGS[@]}"
 rm -f "$TMPFILE"
 
 echo "Upload complete!"

scripts/setup-dashboard-dev-env.sh

@@ -5,12 +5,14 @@ set -euo pipefail
 # The NNS II (rdmx6-jaaaa-aaaaa-aaadq-cai) is provisioned automatically by
 # the local network (nns: true, ii: true in icp.yaml).
 
-# Ensure we're in the project root directory
-cd "$(dirname "$0")/.."
+# Source shared constants
+source "$(dirname "$0")/constants.sh"
+
+cd "$REPO_ROOT"
 
 II_CANISTER_ID="rdmx6-jaaaa-aaaaa-aaadq-cai"
-HELLO_WORLD_ID=$((cd examples && icp canister status my-hello-world -e local --id-only) 2>/dev/null || echo "")
-APP_CANISTER_ID=$((cd canisters && icp canister status my-canister-app -e local --id-only) 2>/dev/null || echo "")
+HELLO_WORLD_ID=$(icp canister status my-hello-world -e local --id-only 2>/dev/null || echo "")
+APP_CANISTER_ID=$(icp canister status my-canister-app -e local --id-only 2>/dev/null || echo "")
 
 # Write test.env with discovered canister IDs
 cat > tests/test.env <<EOF
@@ -29,7 +31,7 @@ if [ -n "$APP_CANISTER_ID" ]; then
 fi
 
 # Add wasm-registry canister ID if it exists
-WASM_REGISTRY_ID=$((cd canisters && icp canister status wasm-registry -e local --id-only) 2>/dev/null || echo "")
+WASM_REGISTRY_ID=$(icp canister status wasm-registry -e local --id-only 2>/dev/null || echo "")
 if [ -n "$WASM_REGISTRY_ID" ]; then
   echo "VITE_WASM_REGISTRY_CANISTER_ID=${WASM_REGISTRY_ID}" >> tests/test.env
 fi