Skip to content

Commit fb7881e

Browse files
committed
Merge remote-tracking branch 'origin/main' into staging
# Conflicts: # .github/workflows/ci.yml # .gitignore # CLAUDE.md # README.md # cli/bun.lock # cli/package.json # cli/src/commands/session/list.ts # cli/src/index.ts # cli/src/output/session-list.ts # cli/src/output/task-text.ts # cli/tests/session-list.test.ts # cli/tests/task-search.test.ts # container/.codeforge/config/ccstatusline-settings.json # container/.codeforge/config/orchestrator-system-prompt.md # container/.devcontainer/CHANGELOG.md # container/.devcontainer/CLAUDE.md # container/.devcontainer/features/claude-session-dashboard/README.md # container/.devcontainer/features/claude-session-dashboard/devcontainer-feature.json # container/.devcontainer/features/claude-session-dashboard/install.sh # container/.devcontainer/plugins/devs-marketplace/plugins/session-context/scripts/commit-reminder.py # container/.devcontainer/plugins/devs-marketplace/plugins/spec-workflow/scripts/spec-reminder.py # container/.devcontainer/plugins/devs-marketplace/plugins/workspace-scope-guard/scripts/guard-workspace-scope.py # container/.devcontainer/plugins/devs-marketplace/plugins/workspace-scope-guard/scripts/inject-workspace-cwd.py # container/.devcontainer/scripts/preflight.sh # container/README.md # container/package.json # container/tests/plugins/test_guard_workspace_scope.py # docs/src/content/docs/reference/changelog.md # docs/src/content/docs/reference/commands.md
2 parents e75b20f + 178ad2a commit fb7881e

File tree

12 files changed

+0
-2116
lines changed

12 files changed

+0
-2116
lines changed

container/.devcontainer/features/claude-session-dashboard/README.md

Lines changed: 0 additions & 46 deletions
This file was deleted.

container/.devcontainer/features/claude-session-dashboard/devcontainer-feature.json

Lines changed: 0 additions & 36 deletions
This file was deleted.

container/.devcontainer/features/claude-session-dashboard/install.sh

Lines changed: 0 additions & 164 deletions
This file was deleted.

tests/__init__.py

Whitespace-only changes.

tests/conftest.py

Lines changed: 0 additions & 53 deletions
This file was deleted.

tests/plugins/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)