From a41a07363fd606a0d9bd58ac24f4b4632e861c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ph=E1=BA=A1m=20Ph=C3=BA=20Ng=E1=BB=8Dc=20Trai?=
 <phamphungoctraivl1@gmail.com>
Date: Wed, 1 Apr 2026 04:06:11 +0700
Subject: [PATCH] fix: correct SOURCE_KIRO path in Kiro installer (#1025)

The script lives inside .kiro/, so SCRIPT_DIR already resolves to the .kiro directory. Appending /.kiro again produced an invalid path (.kiro/.kiro) causing the installer to find no source files to copy.
---
 .kiro/install.sh | 282 ++++++++++++++++++++++++-----------------------
 1 file changed, 143 insertions(+), 139 deletions(-)

diff --git a/.kiro/install.sh b/.kiro/install.sh
index 1cb25e95..e1e6b520 100755
--- a/.kiro/install.sh
+++ b/.kiro/install.sh
@@ -1,139 +1,143 @@
-#!/bin/bash
-#
-# ECC Kiro Installer
-# Installs Everything Claude Code workflows into a Kiro project.
-#
-# Usage:
-#   ./install.sh              # Install to current directory
-#   ./install.sh /path/to/dir # Install to specific directory
-#   ./install.sh ~            # Install globally to ~/.kiro/
-#
-
-set -euo pipefail
-
-# When globs match nothing, expand to empty list instead of the literal pattern
-shopt -s nullglob
-
-# Resolve the directory where this script lives (the repo root)
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-SOURCE_KIRO="$SCRIPT_DIR/.kiro"
-
-# Target directory: argument or current working directory
-TARGET="${1:-.}"
-
-# Expand ~ to $HOME
-if [ "$TARGET" = "~" ] || [[ "$TARGET" == "~/"* ]]; then
-  TARGET="${TARGET/#\~/$HOME}"
-fi
-
-# Resolve to absolute path
-TARGET="$(cd "$TARGET" 2>/dev/null && pwd || echo "$TARGET")"
-
-echo "ECC Kiro Installer"
-echo "=================="
-echo ""
-echo "Source:  $SOURCE_KIRO"
-echo "Target:  $TARGET/.kiro/"
-echo ""
-
-# Subdirectories to create and populate
-SUBDIRS="agents skills steering hooks scripts settings"
-
-# Create all required .kiro/ subdirectories
-for dir in $SUBDIRS; do
-  mkdir -p "$TARGET/.kiro/$dir"
-done
-
-# Counters for summary
-agents=0; skills=0; steering=0; hooks=0; scripts=0; settings=0
-
-# Copy agents (JSON for CLI, Markdown for IDE)
-if [ -d "$SOURCE_KIRO/agents" ]; then
-  for f in "$SOURCE_KIRO/agents"/*.json "$SOURCE_KIRO/agents"/*.md; do
-    [ -f "$f" ] || continue
-    local_name=$(basename "$f")
-    if [ ! -f "$TARGET/.kiro/agents/$local_name" ]; then
-      cp "$f" "$TARGET/.kiro/agents/" 2>/dev/null || true
-      agents=$((agents + 1))
-    fi
-  done
-fi
-
-# Copy skills (directories with SKILL.md)
-if [ -d "$SOURCE_KIRO/skills" ]; then
-  for d in "$SOURCE_KIRO/skills"/*/; do
-    [ -d "$d" ] || continue
-    skill_name="$(basename "$d")"
-    if [ ! -d "$TARGET/.kiro/skills/$skill_name" ]; then
-      mkdir -p "$TARGET/.kiro/skills/$skill_name"
-      cp "$d"* "$TARGET/.kiro/skills/$skill_name/" 2>/dev/null || true
-      skills=$((skills + 1))
-    fi
-  done
-fi
-
-# Copy steering files (markdown)
-if [ -d "$SOURCE_KIRO/steering" ]; then
-  for f in "$SOURCE_KIRO/steering"/*.md; do
-    local_name=$(basename "$f")
-    if [ ! -f "$TARGET/.kiro/steering/$local_name" ]; then
-      cp "$f" "$TARGET/.kiro/steering/" 2>/dev/null || true
-      steering=$((steering + 1))
-    fi
-  done
-fi
-
-# Copy hooks (.kiro.hook files and README)
-if [ -d "$SOURCE_KIRO/hooks" ]; then
-  for f in "$SOURCE_KIRO/hooks"/*.kiro.hook "$SOURCE_KIRO/hooks"/*.md; do
-    [ -f "$f" ] || continue
-    local_name=$(basename "$f")
-    if [ ! -f "$TARGET/.kiro/hooks/$local_name" ]; then
-      cp "$f" "$TARGET/.kiro/hooks/" 2>/dev/null || true
-      hooks=$((hooks + 1))
-    fi
-  done
-fi
-
-# Copy scripts (shell scripts) and make executable
-if [ -d "$SOURCE_KIRO/scripts" ]; then
-  for f in "$SOURCE_KIRO/scripts"/*.sh; do
-    local_name=$(basename "$f")
-    if [ ! -f "$TARGET/.kiro/scripts/$local_name" ]; then
-      cp "$f" "$TARGET/.kiro/scripts/" 2>/dev/null || true
-      chmod +x "$TARGET/.kiro/scripts/$local_name" 2>/dev/null || true
-      scripts=$((scripts + 1))
-    fi
-  done
-fi
-
-# Copy settings (example files)
-if [ -d "$SOURCE_KIRO/settings" ]; then
-  for f in "$SOURCE_KIRO/settings"/*; do
-    [ -f "$f" ] || continue
-    local_name=$(basename "$f")
-    if [ ! -f "$TARGET/.kiro/settings/$local_name" ]; then
-      cp "$f" "$TARGET/.kiro/settings/" 2>/dev/null || true
-      settings=$((settings + 1))
-    fi
-  done
-fi
-
-# Installation summary
-echo "Installation complete!"
-echo ""
-echo "Components installed:"
-echo "  Agents:    $agents"
-echo "  Skills:    $skills"
-echo "  Steering:  $steering"
-echo "  Hooks:     $hooks"
-echo "  Scripts:   $scripts"
-echo "  Settings:  $settings"
-echo ""
-echo "Next steps:"
-echo "  1. Open your project in Kiro"
-echo "  2. Agents: Automatic in IDE, /agent swap in CLI"
-echo "  3. Skills: Available via / menu in chat"
-echo "  4. Steering files with 'auto' inclusion load automatically"
-echo "  5. Toggle hooks in the Agent Hooks panel"
-echo "  6. Copy desired MCP servers from .kiro/settings/mcp.json.example to .kiro/settings/mcp.json"
+#!/bin/bash
+#
+# ECC Kiro Installer
+# Installs Everything Claude Code workflows into a Kiro project.
+#
+# Usage:
+#   ./install.sh              # Install to current directory
+#   ./install.sh /path/to/dir # Install to specific directory
+#   ./install.sh ~            # Install globally to ~/.kiro/
+#
+
+set -euo pipefail
+
+# When globs match nothing, expand to empty list instead of the literal pattern
+shopt -s nullglob
+
+# Resolve the directory where this script lives
+SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
+
+# The script lives inside .kiro/, so SCRIPT_DIR *is* the source.
+# If invoked from the repo root (e.g., .kiro/install.sh), SCRIPT_DIR already
+# points to the .kiro directory — no need to append /.kiro again.
+SOURCE_KIRO="$SCRIPT_DIR"
+
+# Target directory: argument or current working directory
+TARGET="${1:-.}"
+
+# Expand ~ to $HOME
+if [ "$TARGET" = "~" ] || [[ "$TARGET" == "~/"* ]]; then
+  TARGET="${TARGET/#\~/$HOME}"
+fi
+
+# Resolve to absolute path
+TARGET="$(cd "$TARGET" 2>/dev/null && pwd || echo "$TARGET")"
+
+echo "ECC Kiro Installer"
+echo "=================="
+echo ""
+echo "Source:  $SOURCE_KIRO"
+echo "Target:  $TARGET/.kiro/"
+echo ""
+
+# Subdirectories to create and populate
+SUBDIRS="agents skills steering hooks scripts settings"
+
+# Create all required .kiro/ subdirectories
+for dir in $SUBDIRS; do
+  mkdir -p "$TARGET/.kiro/$dir"
+done
+
+# Counters for summary
+agents=0; skills=0; steering=0; hooks=0; scripts=0; settings=0
+
+# Copy agents (JSON for CLI, Markdown for IDE)
+if [ -d "$SOURCE_KIRO/agents" ]; then
+  for f in "$SOURCE_KIRO/agents"/*.json "$SOURCE_KIRO/agents"/*.md; do
+    [ -f "$f" ] || continue
+    local_name=$(basename "$f")
+    if [ ! -f "$TARGET/.kiro/agents/$local_name" ]; then
+      cp "$f" "$TARGET/.kiro/agents/" 2>/dev/null || true
+      agents=$((agents + 1))
+    fi
+  done
+fi
+
+# Copy skills (directories with SKILL.md)
+if [ -d "$SOURCE_KIRO/skills" ]; then
+  for d in "$SOURCE_KIRO/skills"/*/; do
+    [ -d "$d" ] || continue
+    skill_name="$(basename "$d")"
+    if [ ! -d "$TARGET/.kiro/skills/$skill_name" ]; then
+      mkdir -p "$TARGET/.kiro/skills/$skill_name"
+      cp "$d"* "$TARGET/.kiro/skills/$skill_name/" 2>/dev/null || true
+      skills=$((skills + 1))
+    fi
+  done
+fi
+
+# Copy steering files (markdown)
+if [ -d "$SOURCE_KIRO/steering" ]; then
+  for f in "$SOURCE_KIRO/steering"/*.md; do
+    local_name=$(basename "$f")
+    if [ ! -f "$TARGET/.kiro/steering/$local_name" ]; then
+      cp "$f" "$TARGET/.kiro/steering/" 2>/dev/null || true
+      steering=$((steering + 1))
+    fi
+  done
+fi
+
+# Copy hooks (.kiro.hook files and README)
+if [ -d "$SOURCE_KIRO/hooks" ]; then
+  for f in "$SOURCE_KIRO/hooks"/*.kiro.hook "$SOURCE_KIRO/hooks"/*.md; do
+    [ -f "$f" ] || continue
+    local_name=$(basename "$f")
+    if [ ! -f "$TARGET/.kiro/hooks/$local_name" ]; then
+      cp "$f" "$TARGET/.kiro/hooks/" 2>/dev/null || true
+      hooks=$((hooks + 1))
+    fi
+  done
+fi
+
+# Copy scripts (shell scripts) and make executable
+if [ -d "$SOURCE_KIRO/scripts" ]; then
+  for f in "$SOURCE_KIRO/scripts"/*.sh; do
+    local_name=$(basename "$f")
+    if [ ! -f "$TARGET/.kiro/scripts/$local_name" ]; then
+      cp "$f" "$TARGET/.kiro/scripts/" 2>/dev/null || true
+      chmod +x "$TARGET/.kiro/scripts/$local_name" 2>/dev/null || true
+      scripts=$((scripts + 1))
+    fi
+  done
+fi
+
+# Copy settings (example files)
+if [ -d "$SOURCE_KIRO/settings" ]; then
+  for f in "$SOURCE_KIRO/settings"/*; do
+    [ -f "$f" ] || continue
+    local_name=$(basename "$f")
+    if [ ! -f "$TARGET/.kiro/settings/$local_name" ]; then
+      cp "$f" "$TARGET/.kiro/settings/" 2>/dev/null || true
+      settings=$((settings + 1))
+    fi
+  done
+fi
+
+# Installation summary
+echo "Installation complete!"
+echo ""
+echo "Components installed:"
+echo "  Agents:    $agents"
+echo "  Skills:    $skills"
+echo "  Steering:  $steering"
+echo "  Hooks:     $hooks"
+echo "  Scripts:   $scripts"
+echo "  Settings:  $settings"
+echo ""
+echo "Next steps:"
+echo "  1. Open your project in Kiro"
+echo "  2. Agents: Automatic in IDE, /agent swap in CLI"
+echo "  3. Skills: Available via / menu in chat"
+echo "  4. Steering files with 'auto' inclusion load automatically"
+echo "  5. Toggle hooks in the Agent Hooks panel"
+echo "  6. Copy desired MCP servers from .kiro/settings/mcp.json.example to .kiro/settings/mcp.json"