Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions examples/11-release-readiness-org.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"contact": "platform@example.com"
},
"marketplaces": {
"official-plugins": {
"sandboxed-code-official": {
"source": "github",
"owner": "CCimen",
"repo": "sandboxed-code-plugins",
Expand Down Expand Up @@ -45,13 +45,13 @@
},
"defaults": {
"enabled_plugins": [
"scc-safety-net@official-plugins"
"scc-safety-net@sandboxed-code-official"
],
"disabled_plugins": [
"legacy-tools@official-plugins"
"legacy-tools@sandboxed-code-official"
],
"allowed_plugins": [
"*@official-plugins"
"*@sandboxed-code-official"
],
"allowed_mcp_servers": [
"https://mcp.context7.com/*",
Expand All @@ -65,7 +65,7 @@
"/usr/local/bin/*"
],
"extra_marketplaces": [
"official-plugins"
"sandboxed-code-official"
],
"cache_ttl_hours": 24,
"network_policy": "corp-proxy-only",
Expand All @@ -91,8 +91,8 @@
"platform": {
"description": "Platform engineering tools and core MCP access",
"additional_plugins": [
"platform-tooling@official-plugins",
"infra-helper@official-plugins"
"platform-tooling@sandboxed-code-official",
"infra-helper@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand All @@ -112,8 +112,8 @@
"frontend": {
"description": "Frontend team with design and UI MCP servers",
"additional_plugins": [
"frontend-toolkit@official-plugins",
"ui-kit@official-plugins"
"frontend-toolkit@sandboxed-code-official",
"ui-kit@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand All @@ -135,7 +135,7 @@
"backend": {
"description": "Backend services team with internal API MCP",
"additional_plugins": [
"backend-tooling@official-plugins"
"backend-tooling@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand All @@ -159,8 +159,8 @@
"data": {
"description": "Data team with catalog MCP and longer sessions",
"additional_plugins": [
"data-tooling@official-plugins",
"notebook-helper@official-plugins"
"data-tooling@sandboxed-code-official",
"notebook-helper@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand All @@ -181,7 +181,7 @@
"browser-automation": {
"description": "Browser automation team using Playwright MCP",
"additional_plugins": [
"browser-tools@official-plugins"
"browser-tools@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand All @@ -204,7 +204,7 @@
"security": {
"description": "Security team with scanning tools and isolated network policy",
"additional_plugins": [
"security-audit@official-plugins"
"security-audit@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand Down
14 changes: 7 additions & 7 deletions examples/99-complete-reference.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"contact": "docs@example.com"
},
"marketplaces": {
"official-plugins": {
"sandboxed-code-official": {
"source": "github",
"owner": "CCimen",
"repo": "sandboxed-code-plugins",
Expand Down Expand Up @@ -64,22 +64,22 @@
},
"defaults": {
"enabled_plugins": [
"scc-safety-net@official-plugins"
"scc-safety-net@sandboxed-code-official"
],
"disabled_plugins": [
"legacy-tool@official-plugins"
"legacy-tool@sandboxed-code-official"
],
"allowed_plugins": [
"core-*",
"org-approved-*",
"*@official-plugins"
"*@sandboxed-code-official"
],
"allowed_mcp_servers": [
"https://mcp.example.com/*",
"https://*.company.com/*"
],
"extra_marketplaces": [
"official-plugins"
"sandboxed-code-official"
],
"cache_ttl_hours": 24,
"network_policy": "unrestricted",
Expand Down Expand Up @@ -110,8 +110,8 @@
"team-a": {
"description": "Example team A with HTTP MCP servers (authenticated and public)",
"additional_plugins": [
"team-plugin-1@official-plugins",
"team-plugin-2@official-plugins"
"team-plugin-1@sandboxed-code-official",
"team-plugin-2@sandboxed-code-official"
],
"additional_mcp_servers": [
{
Expand Down
10 changes: 8 additions & 2 deletions examples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -228,15 +228,21 @@ PY

</details>

If your SCC version supports it, you can validate a team by name after the org config is installed:
If your SCC version supports it, you can validate a team config file directly:

```
scc team validate --file team-config.json
```

If the org config is installed, you can also validate by team name:

```
scc team validate <TEAM_NAME>
```

If you are unsure which commands your version supports, see:

- [docs/CLI-REFERENCE.md](../docs/CLI-REFERENCE.md)
- [CLI Reference](https://scc-cli.dev/reference/cli/overview/)

---

Expand Down
29 changes: 29 additions & 0 deletions src/scc_cli/application/compute_effective_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,14 @@ def compute_effective_config(
)
if default_session.get("auto_resume") is not None:
result.session_config.auto_resume = default_session["auto_resume"]
result.decisions.append(
ConfigDecision(
field="session.auto_resume",
value=default_session["auto_resume"],
reason="Organization default session auto-resume",
source="org.defaults",
)
)

profiles = org_config.get("profiles", {})
team_config = profiles.get(team_name, {})
Expand Down Expand Up @@ -602,6 +610,16 @@ def compute_effective_config(
source=f"team.{team_name}",
)
)
if team_session.get("auto_resume") is not None:
result.session_config.auto_resume = team_session["auto_resume"]
result.decisions.append(
ConfigDecision(
field="session.auto_resume",
value=team_session["auto_resume"],
reason=f"Overridden by team profile '{team_name}'",
source=f"team.{team_name}",
)
)

if project_config:
project_delegated, delegation_reason = is_project_delegated(org_config, team_name)
Expand Down Expand Up @@ -742,5 +760,16 @@ def compute_effective_config(
source="project",
)
)
if project_session.get("auto_resume") is not None:
if project_delegated:
result.session_config.auto_resume = project_session["auto_resume"]
result.decisions.append(
ConfigDecision(
field="session.auto_resume",
value=project_session["auto_resume"],
reason="Overridden by project config",
source="project",
)
)

return result
2 changes: 0 additions & 2 deletions src/scc_cli/cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ def main_callback(
session_name=None,
resume=False,
select=False,
continue_session=False,
worktree_name=None,
fresh=False,
install_deps=False,
Expand Down Expand Up @@ -174,7 +173,6 @@ def main_callback(
session_name=None,
resume=False,
select=False,
continue_session=False,
worktree_name=None,
fresh=False,
install_deps=False,
Expand Down
Loading
Loading