Skip to content

Commit 8c58f03

Browse files
authored
Merge pull request #34 from codervisor/develop
Develop
2 parents 9a1cf90 + 820aff1 commit 8c58f03

File tree

93 files changed

+2745
-3824
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+2745
-3824
lines changed

.github/copilot-instructions.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@
2121
- **Temp files**: Use `tmp/` folder for experiments (gitignored)
2222
- **Build packages**: Use `pnpm build` (builds all packages)
2323
- **Containers**: `docker compose -f docker-compose.dev.yml up web-dev -d --wait`
24+
- **Validating**: Use `pnpm validate`
2425
- **Testing**: Use `pnpm test`
2526

2627
### Task Tracking
2728
- **Always start by checking**: Search related devlogs before starting ANY new work
2829
- **Must create devlogs**: For features, refactoring, or multistep work (>30min)
2930
- **Required progress updates**: Add notes after successful builds, major changes, or blockers
3031
- **Always complete**: Document learnings and close devlogs when work is finished
32+
- **Required details**: Include necessary information in devlogs for comprehensive context
3133

3234
## 🎯 Essential Patterns
3335

.github/instructions/all.instructions.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -355,9 +355,6 @@ export class ProjectService {
355355
if (!this.database.isInitialized) {
356356
await this.database.initialize();
357357
}
358-
359-
// Create default project if it doesn't exist
360-
await this.createDefaultProject();
361358
}
362359

363360
async list(): Promise<ProjectMetadata[]> {

.github/scripts/publish-dev-packages.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ echo "📦 Publishing packages to NPM with dev tag..."
66

77
# Define all publishable packages (as regular arrays for better compatibility)
88
PACKAGES=(
9+
"core:packages/core"
910
"mcp:packages/mcp"
10-
"core:packages/core"
1111
"ai:packages/ai"
1212
"cli:packages/cli"
1313
)

.github/scripts/setup-node.sh

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,6 @@
22
# Setup Node.js, pnpm, and dependencies with caching
33
set -euo pipefail
44

5-
NODE_VERSION=${1:-"20"}
6-
PNPM_VERSION=${2:-"10.13.1"}
7-
8-
echo "🔧 Setting up Node.js $NODE_VERSION and pnpm $PNPM_VERSION..."
9-
105
# pnpm store path is already set by pnpm/action-setup
116
echo "📦 Installing dependencies..."
127
pnpm install --frozen-lockfile

.github/scripts/verify-build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ else
3838
FAILED=1
3939
fi
4040

41-
# Check web package (uses .next-build for standalone builds)
42-
if [ -d "packages/web/.next-build" ]; then
41+
# Check web package
42+
if [ -d "packages/web/.next" ]; then
4343
echo "✅ Web package build artifacts verified"
4444
else
4545
echo "❌ Web package build artifacts missing"

.github/workflows/main.yml

Lines changed: 11 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ on:
2121
env:
2222
REGISTRY: ghcr.io
2323
IMAGE_NAME: ${{ github.repository }}
24+
NODE_VERSION: 22
25+
PNPM_VERSION: 10.13.1
2426

2527
jobs:
2628
# Phase 1: Build and Test
@@ -29,26 +31,22 @@ jobs:
2931
runs-on: ubuntu-latest
3032
outputs:
3133
cache-key: ${{ steps.cache-key.outputs.key }}
32-
33-
strategy:
34-
matrix:
35-
node-version: [ 20, 22 ]
36-
34+
3735
steps:
3836
- name: Checkout code
3937
uses: actions/checkout@v4
4038
with:
4139
fetch-depth: 0
4240

43-
- name: Setup Node.js ${{ matrix.node-version }}
41+
- name: Setup Node.js ${{ env.NODE_VERSION }}
4442
uses: actions/setup-node@v4
4543
with:
46-
node-version: ${{ matrix.node-version }}
44+
node-version: ${{ env.NODE_VERSION }}
4745

4846
- name: Setup pnpm
4947
uses: pnpm/action-setup@v4
5048
with:
51-
version: 10.13.1
49+
version: ${{ env.PNPM_VERSION }}
5250
run_install: false
5351

5452
- name: Generate cache key
@@ -68,7 +66,7 @@ jobs:
6866
- name: Install dependencies
6967
run: ./.github/scripts/setup-node.sh
7068

71-
- name: Build packages (dependency order)
69+
- name: Build packages
7270
run: ./.github/scripts/build-packages.sh
7371

7472
- name: Run tests
@@ -145,34 +143,6 @@ jobs:
145143
IMAGE_TAG=$(echo "${{ steps.meta.outputs.tags }}" | head -n1)
146144
./.github/scripts/test-docker.sh "$IMAGE_TAG"
147145
148-
# Phase 3: Security Scan (depends on docker-build)
149-
security-scan:
150-
name: Security Scan
151-
runs-on: ubuntu-latest
152-
needs: docker-build
153-
if: github.event_name != 'pull_request'
154-
permissions:
155-
contents: read
156-
packages: read
157-
security-events: write
158-
159-
steps:
160-
- name: Checkout code
161-
uses: actions/checkout@v4
162-
163-
- name: Run Trivy vulnerability scanner
164-
uses: aquasecurity/trivy-action@master
165-
with:
166-
image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.sha }}
167-
format: 'sarif'
168-
output: 'trivy-results.sarif'
169-
170-
- name: Upload Trivy scan results to GitHub Security tab
171-
uses: github/codeql-action/upload-sarif@v3
172-
if: always()
173-
with:
174-
sarif_file: 'trivy-results.sarif'
175-
176146
# Phase 4a: NPM Publish Stable (main branch)
177147
npm-publish-stable:
178148
name: Publish to NPM (Stable)
@@ -196,13 +166,13 @@ jobs:
196166
- name: Setup Node.js
197167
uses: actions/setup-node@v4
198168
with:
199-
node-version: '20'
169+
node-version: ${{ env.NODE_VERSION }}
200170
registry-url: 'https://registry.npmjs.org'
201171

202172
- name: Setup pnpm
203173
uses: pnpm/action-setup@v4
204174
with:
205-
version: 10.13.1
175+
version: ${{ env.PNPM_VERSION }}
206176
run_install: false
207177

208178
- name: Restore pnpm cache
@@ -280,13 +250,13 @@ jobs:
280250
- name: Setup Node.js
281251
uses: actions/setup-node@v4
282252
with:
283-
node-version: '20'
253+
node-version: ${{ env.NODE_VERSION }}
284254
registry-url: 'https://registry.npmjs.org'
285255

286256
- name: Setup pnpm
287257
uses: pnpm/action-setup@v4
288258
with:
289-
version: 10.13.1
259+
version: ${{ env.PNPM_VERSION }}
290260
run_install: false
291261

292262
- name: Restore pnpm cache

.github/workflows/vscode-automation.yml

Lines changed: 1 addition & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -156,39 +156,4 @@ jobs:
156156
platforms: linux/amd64,linux/arm64
157157
build-args: |
158158
BUILD_DATE=${{ fromJSON(steps.meta.outputs.json).labels['org.opencontainers.image.created'] }}
159-
VCS_REF=${{ github.sha }}
160-
161-
# Phase 3: Security Scan
162-
security-scan:
163-
name: Security Scan VSCode Automation
164-
runs-on: ubuntu-latest
165-
needs: build-vscode-automation
166-
if: github.event_name != 'pull_request'
167-
permissions:
168-
contents: read
169-
packages: read
170-
security-events: write
171-
172-
steps:
173-
- name: Checkout code
174-
uses: actions/checkout@v4
175-
176-
- name: Log in to Container Registry
177-
uses: docker/login-action@v3
178-
with:
179-
registry: ${{ env.REGISTRY }}
180-
username: ${{ github.actor }}
181-
password: ${{ secrets.GITHUB_TOKEN }}
182-
183-
- name: Run Trivy vulnerability scanner
184-
uses: aquasecurity/trivy-action@master
185-
with:
186-
image-ref: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
187-
format: 'sarif'
188-
output: 'trivy-results-vscode-automation.sarif'
189-
190-
- name: Upload Trivy scan results to GitHub Security tab
191-
uses: github/codeql-action/upload-sarif@v3
192-
if: always()
193-
with:
194-
sarif_file: 'trivy-results-vscode-automation.sarif'
159+
VCS_REF=${{ github.sha }}

.vscode/mcp.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
"command": "npx",
1414
"args": [
1515
"@codervisor/devlog-mcp@dev"
16-
]
16+
],
17+
"env": {
18+
// "DEVLOG_BASE_URL": "http://localhost:3200"
19+
}
1720
},
1821
"sequential-thinking": {
1922
"command": "npx",

.vscode/settings.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,12 @@
88
"chat.agent.maxRequests": 100,
99
"github.copilot.chat.languageContext.typescript.enabled": true,
1010
"github.copilot.chat.codesearch.enabled": true,
11-
"github.copilot.chat.scopeSelection": true
11+
"github.copilot.chat.scopeSelection": true,
12+
"chat.mcp.serverSampling": {
13+
"devlog/.vscode/mcp.json: devlog": {
14+
"allowedModels": [
15+
"copilot/claude-sonnet-4"
16+
]
17+
}
18+
}
1219
}

Dockerfile.dev

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ RUN apk add --no-cache libc6-compat python3 make g++ curl
77
# Enable pnpm
88
ENV PNPM_HOME="/pnpm"
99
ENV PATH="$PNPM_HOME:$PATH"
10+
RUN npm install -g pnpm
1011

1112
# Set working directory
1213
WORKDIR /app

0 commit comments

Comments
 (0)