diff --git a/cfg/global.yaml b/cfg/global.yaml
index 975d016..8f76dd8 100644
--- a/cfg/global.yaml
+++ b/cfg/global.yaml
@@ -35,8 +35,6 @@ filesystem:
         - /sys
         - '{XDG_CONFIG_HOME}/anvillm'
         - '{HOME}/env'
-        - '{HOME}/prj'
-        - '{HOME}/src'
     rox:
         - /usr
         - /lib
@@ -52,6 +50,8 @@ filesystem:
         - /dev/random
     rwx:
         - /home/lkn/src/mcp/agent-q/
+        - '{HOME}/prj'
+        - '{HOME}/src'
 
 network:
     enabled: false
diff --git a/cfg/roles/default.yaml b/cfg/roles/default.yaml
index bf6d24a..b1c896d 100644
--- a/cfg/roles/default.yaml
+++ b/cfg/roles/default.yaml
@@ -1,5 +1,5 @@
-# Default role: permissive settings for ad-hoc usage
-# Equivalent to current global sandbox.yaml behavior
+# Default role: combined most-permissive settings from all tasks/roles
+# TODO: revisit role-based permissions later
 filesystem:
   ro:
     - "{HOME}/.gitconfig"
@@ -12,25 +12,86 @@ filesystem:
     - "/etc/gitattributes"
     - "/etc/ssh/ssh_config"
     - "/etc/ssh/ssh_known_hosts"
-    - "{HOME}/doc"
+    - "/etc/magic"
+    - "/var/log"
+    - "/run/systemd"
+    - "/var/log/journal"
+    - "/etc/systemd"
+    - "{HOME}/.jenkins"
+    - "{HOME}/.psqlrc"
+    - "{HOME}/.pgpass"
+    - "{HOME}/.aws"
+    - "{HOME}/.ansible"
+    - "{HOME}/.ansible.cfg"
+    - "{HOME}/.jira.d"
+    - "{HOME}/.my.cnf"
+    - "{HOME}/.mylogin.cnf"
+    - "{XDG_CONFIG_HOME}/gh"
+    - "{XDG_DATA_HOME}/gh/extensions"
   rw:
     - "{HOME}/.ssh/known_hosts"
     - "{HOME}/.git-credentials"
     - "{XDG_CONFIG_HOME}/git/credentials"
     - "{XDG_RUNTIME_DIR}/git/"
     - "{HOME}/.mcpt"
-    - "{HOME}/doc/agent-skills"
+    - "{HOME}/doc"
+    - "{HOME}/.gnupg"
+    - "{XDG_DOCUMENTS_DIR}"
+    - "{XDG_CONFIG_HOME}/.jira"
+    - "{HOME}/.m2"
+    - "{HOME}/.gradle"
+    - "/var/run/docker.sock"
+    - "{HOME}/.docker"
+    - "{HOME}/.npm"
+    - "{HOME}/.yarn"
+    - "{HOME}/.pnpm-store"
+    - "{XDG_CONFIG_HOME}/yarn"
+    - "{HOME}/.yarnrc.yml"
+    - "{HOME}/.npmrc"
+    - "{HOME}/.ansible/tmp"
+    - "{XDG_RUNTIME_DIR}/podman"
+    - "{XDG_DATA_HOME}/containers"
+    - "{XDG_CONFIG_HOME}/containers"
+    - "{XDG_CONFIG_HOME}/pip"
+    - "{HOME}/.pip"
+    - "{HOME}/.cargo"
+    - "{HOME}/.rustup"
+    - "{XDG_CONFIG_HOME}/nvim"
+    - "{XDG_CONFIG_HOME}/vim"
+    - "{XDG_DATA_HOME}/nvim"
+    - "{XDG_STATE_HOME}/nvim"
+    - "{HOME}/.vimrc"
+    - "{HOME}/.vim"
+    - "{HOME}/.emacs.d"
+    - "{HOME}/.config/emacs"
+    - "/etc"
+    - "/usr/local/etc"
+  rox:
+    - "{HOME}/go/bin"
+    - "{HOME}/env"
   rwx:
     - "{CWD}"
-    - "{PLAN9}/bin"
-  rox:
+    - "{PLAN9}"
     - "{HOME}/bin"
     - "{HOME}/.local/bin"
+    - "{HOME}/go"
+    - "{HOME}/opt"
+    - "{HOME}/src"
+    - "{HOME}/prj"
+    - "{HOME}/.nvm"
 env:
-    - AGENT_SKILLS_PATH
-    - NAMESPACE
-    - HOME
-    - TMPDIR
-    - AGENT_ID
+  - AGENT_SKILLS_PATH
+  - NAMESPACE
+  - HOME
+  - TMPDIR
+  - AGENT_ID
+  - PLAN9
+  - JENKINS_USER_ID
+  - JENKINS_API_TOKEN
+  - JENKINS_MCP_AUTH
+  - JIRA_API_TOKEN
+  - BITBUCKET_ACCESS_TOKEN
+  - BITBUCKET_TOKEN
+  - BITBUCKET_USERNAME
 network:
   unrestricted: true
diff --git a/kiro-cli/agent/anvillm-agent.json b/kiro-cli/agent/anvillm-agent.json
index 549b4aa..5fc6f3c 100644
--- a/kiro-cli/agent/anvillm-agent.json
+++ b/kiro-cli/agent/anvillm-agent.json
@@ -7,17 +7,17 @@
   "hooks": {
     "agentSpawn": [
       {
-        "command": "agent-hook agentSpawn"
+        "command": "anvillm-hook agentSpawn"
       }
     ],
     "userPromptSubmit": [
       {
-        "command": "agent-hook userPromptSubmit"
+        "command": "anvillm-hook userPromptSubmit"
       }
     ],
     "stop": [
       {
-        "command": "agent-hook stop"
+        "command": "anvillm-hook stop"
       }
     ]
   }
diff --git a/mkfile b/mkfile
index 56b68c9..f5ec0e6 100644
--- a/mkfile
+++ b/mkfile
@@ -12,8 +12,8 @@ build:V:
 	chmod 0755 $INSTALL_PATH/Alog
 	cp scripts/anvillm-skills $INSTALL_PATH/anvillm-skills
 	chmod 0755 $INSTALL_PATH/anvillm-skills
-	cp scripts/agent-hook $INSTALL_PATH/agent-hook
-	chmod 0755 $INSTALL_PATH/agent-hook
+	cp scripts/anvillm-hook $INSTALL_PATH/anvillm-hook
+	chmod 0755 $INSTALL_PATH/anvillm-hook
 	cp scripts/9p-read-inbox $INSTALL_PATH/9p-read-inbox
 	chmod 0755 $INSTALL_PATH/9p-read-inbox
 	mkdir -p $INSTALL_PATH/Workflows
diff --git a/scripts/agent-hook b/scripts/anvillm-hook
similarity index 78%
rename from scripts/agent-hook
rename to scripts/anvillm-hook
index 152bca4..0aff5ea 100755
--- a/scripts/agent-hook
+++ b/scripts/anvillm-hook
@@ -30,7 +30,13 @@ anvillm_set_state() {
 
 case "$event" in
     agentSpawn)
-        cat ~/.kiro/SKILLS_PROMPT.md
+        cd "$cwd" 2>/dev/null || :
+        if command -v agent-prompt &>/dev/null; then
+            agent-prompt --harness=kiro
+        else
+            skills_cmd=$(command -v agent-skills 2>/dev/null || echo anvillm-skills)
+            sed "s/anvillm-skills/$skills_cmd/g" ~/.kiro/SKILLS_PROMPT.md
+        fi
         ;;
     userPromptSubmit)
         anvillm_set_state running