Skip to content

Commit 52fba8a

Browse files
committed
Merge branch 'main' into os-88-forwardtcp-relay/pml
2 parents 6c2cafa + d414e69 commit 52fba8a

51 files changed

Lines changed: 6003 additions & 1017 deletions

Some content is hidden

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

‎.agents/skills/debug-openshell-cluster/SKILL.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ Component images (server, sandbox) can reach kubelet via two paths:
184184

185185
**Local/external pull mode** (default local via `mise run cluster`): Local images are tagged to the configured local registry base (default `127.0.0.1:5000/openshell/*`), pushed to that registry, and pulled by k3s via `registries.yaml` mirror endpoint (typically `host.docker.internal:5000`). The `cluster` task rebuilds the local gateway image before tagging and pushing it, so a fresh bootstrap should not reuse stale `openshell/gateway:dev` bits from a previous source revision.
186186

187-
Gateway image builds now stage a partial Rust workspace from `deploy/docker/Dockerfile.images`. If cargo fails with a missing manifest under `/build/crates/...`, or an imported symbol exists locally but is missing in the image build, verify that every current gateway dependency crate (including `openshell-driver-kubernetes` and `openshell-ocsf`) is copied into the staged workspace there.
187+
Gateway image builds now stage a partial Rust workspace from `deploy/docker/Dockerfile.images`. If cargo fails with a missing manifest under `/build/crates/...`, or an imported symbol exists locally but is missing in the image build, verify that every current gateway dependency crate (including `openshell-driver-docker`, `openshell-driver-kubernetes`, and `openshell-ocsf`) is copied into the staged workspace there.
188188

189189
```bash
190190
# Verify image refs currently used by openshell deployment

‎.agents/skills/triage-issue/SKILL.md‎

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -85,19 +85,7 @@ Check whether the issue body contains a substantive agent diagnostic section. Lo
8585
```bash
8686
gh issue edit <id> --add-label "state:triage-needed"
8787
```
88-
2. Post a comment with the triage marker:
89-
```
90-
> **📋 triage-agent**
91-
>
92-
> This issue was opened without an agent investigation.
93-
>
94-
> OpenShell is an agent-first project - before we triage this, please point your coding agent at the repo and have it investigate. Your agent can load skills like `debug-openshell-cluster` (for cluster issues), `debug-inference` (for inference setup issues), `openshell-cli` (for usage questions), or `generate-sandbox-policy` (for policy help).
95-
>
96-
> See [CONTRIBUTING.md](https://github.com/NVIDIA/OpenShell/blob/main/CONTRIBUTING.md#before-you-open-an-issue) for the full workflow.
97-
>
98-
> **Classification:** needs-more-info (agent diagnostic required)
99-
```
100-
3. Stop. Do not proceed with diagnosis until the reporter provides diagnostics.
88+
2. Do not post a standalone redirect comment. Report the missing diagnostic to the operator and stop unless a human explicitly asks you to continue triage anyway.
10189

10290
**If the diagnostic section is substantive**, proceed to Step 4.
10391

‎.github/workflows/branch-checks.yml‎

Lines changed: 34 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,37 @@ permissions:
1313
packages: read
1414

1515
jobs:
16+
mise-lockfile:
17+
name: mise Lockfile
18+
runs-on: build-amd64
19+
container:
20+
image: ghcr.io/nvidia/openshell/ci:latest
21+
credentials:
22+
username: ${{ github.actor }}
23+
password: ${{ secrets.GITHUB_TOKEN }}
24+
steps:
25+
- uses: actions/checkout@v4
26+
27+
- name: Mark workspace as safe for git
28+
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
29+
30+
- name: Detect mise config changes
31+
id: changed
32+
uses: tj-actions/changed-files@aa08304bd477b800d468db44fe10f6c61f7f7b11 # v42.1.0
33+
with:
34+
files: |
35+
mise.toml
36+
mise.lock
37+
38+
- name: Verify mise.lock is in sync with mise.toml
39+
if: steps.changed.outputs.any_changed == 'true'
40+
run: |
41+
mise lock
42+
if ! git diff --exit-code mise.lock; then
43+
echo "::error::mise.lock is out of sync with mise.toml. Run 'mise lock' locally and commit the result." >&2
44+
exit 1
45+
fi
46+
1647
license-headers:
1748
name: License Headers
1849
runs-on: build-amd64
@@ -25,7 +56,7 @@ jobs:
2556
- uses: actions/checkout@v4
2657

2758
- name: Install tools
28-
run: mise install
59+
run: mise install --locked
2960

3061
- name: Check license headers
3162
run: mise run license:check
@@ -46,7 +77,7 @@ jobs:
4677
- uses: actions/checkout@v4
4778

4879
- name: Install tools
49-
run: mise install
80+
run: mise install --locked
5081

5182
- name: Configure sccache remote cache
5283
if: vars.SCCACHE_MEMCACHED_ENDPOINT != ''
@@ -90,7 +121,7 @@ jobs:
90121
- uses: actions/checkout@v4
91122

92123
- name: Install tools
93-
run: mise install
124+
run: mise install --locked
94125

95126
- name: Install dependencies
96127
run: uv sync --frozen

‎.github/workflows/ci-image.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ on:
66
paths:
77
- 'deploy/docker/Dockerfile.ci'
88
- 'mise.toml'
9+
- 'mise.lock'
910
- 'tasks/**'
1011
- '.github/workflows/ci-image.yml'
1112
workflow_dispatch:

‎.github/workflows/e2e-label-help.yml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ jobs:
2323
runs-on: ubuntu-latest
2424
permissions:
2525
pull-requests: write
26+
actions: read
27+
contents: read
2628
steps:
2729
- name: Post comment
2830
env:
@@ -54,11 +56,12 @@ jobs:
5456
run_id=$(gh api "repos/$GH_REPO/actions/workflows/$workflow_file/runs?head_sha=$PR_HEAD_SHA&event=push" \
5557
--jq '.workflow_runs | sort_by(.created_at) | reverse | .[0].id // empty')
5658
if [ -n "$run_id" ]; then
57-
run_link="[the existing run](https://github.com/$GH_REPO/actions/runs/$run_id)"
59+
instructions="Open [the existing run](https://github.com/$GH_REPO/actions/runs/$run_id) and click **Re-run all jobs** to execute with the label set."
5860
else
59-
run_link="[$workflow_name](https://github.com/$GH_REPO/actions/workflows/$workflow_file)"
61+
workflow_link="[$workflow_name](https://github.com/$GH_REPO/actions/workflows/$workflow_file)"
62+
instructions="Open $workflow_link, find the run for commit \`$short_pr\`, and click **Re-run all jobs** to execute with the label set."
6063
fi
61-
body="Label \`$LABEL_NAME\` applied for \`$short_pr\`. Open $run_link and click **Re-run all jobs** to execute with the label set. The \`E2E Gate\` check on this PR will flip green automatically once the run finishes."
64+
body="Label \`$LABEL_NAME\` applied for \`$short_pr\`. $instructions The \`E2E Gate\` check on this PR will flip green automatically once the run finishes."
6265
fi
6366
6467
gh pr comment "$PR_NUMBER" --body "$body"

‎.github/workflows/issue-triage.yml‎

Lines changed: 7 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@ jobs:
2020
const body = context.payload.issue.body || '';
2121
2222
// Check if the Agent Diagnostic section has substantive content.
23-
// The template placeholder starts with "Example:" — if that's still
24-
// there or the section is empty, the reporter didn't fill it in.
23+
// GitHub issue forms render textarea labels as h3 headings, but
24+
// issues created through gh or API clients often use h2 headings.
2525
const diagnosticMatch = body.match(
26-
/### Agent Diagnostic\s*\n([\s\S]*?)(?=\n### |\n$)/
26+
/^#{2,4}\s+Agent Diagnostic[s]?\s*\n([\s\S]*?)(?=\n#{2,4}\s+|$)/im
2727
);
2828
29-
const hasSubstantiveDiagnostic = diagnosticMatch
30-
&& diagnosticMatch[1].trim().length > 0
31-
&& !diagnosticMatch[1].trim().startsWith('Example:');
29+
const diagnosticText = diagnosticMatch?.[1].trim() || '';
30+
const hasSubstantiveDiagnostic = diagnosticText.length > 0
31+
&& !diagnosticText.toLowerCase().startsWith('example:')
32+
&& !['n/a', 'none', 'no', 'not applicable'].includes(diagnosticText.toLowerCase());
3233
3334
if (hasSubstantiveDiagnostic) {
3435
console.log('Agent diagnostic section found with content. Passing.');
@@ -44,17 +45,3 @@ jobs:
4445
issue_number: context.issue.number,
4546
labels: ['state:triage-needed']
4647
});
47-
48-
// Post redirect comment
49-
await github.rest.issues.createComment({
50-
owner: context.repo.owner,
51-
repo: context.repo.repo,
52-
issue_number: context.issue.number,
53-
body: [
54-
'This issue appears to have been opened without an agent investigation.',
55-
'',
56-
'OpenShell is an agent-first project - please point your coding agent at the repo and have it diagnose this before we triage. Your agent can load skills like `debug-openshell-cluster`, `debug-inference`, `openshell-cli`, and `generate-sandbox-policy`.',
57-
'',
58-
'See [CONTRIBUTING.md](https://github.com/NVIDIA/OpenShell/blob/main/CONTRIBUTING.md#before-you-open-an-issue) for the full workflow.',
59-
].join('\n')
60-
});

‎.github/workflows/release-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ jobs:
246246
run: git fetch --tags --force
247247

248248
- name: Install tools
249-
run: mise install
249+
run: mise install --locked
250250

251251
- name: Cache Rust target and registry
252252
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -418,7 +418,7 @@ jobs:
418418
run: git fetch --tags --force
419419

420420
- name: Install tools
421-
run: mise install
421+
run: mise install --locked
422422

423423
- name: Cache Rust target and registry
424424
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -569,7 +569,7 @@ jobs:
569569
run: git fetch --tags --force
570570

571571
- name: Install tools
572-
run: mise install
572+
run: mise install --locked
573573

574574
- name: Cache Rust target and registry
575575
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2

‎.github/workflows/release-tag.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ jobs:
269269
run: git fetch --tags --force
270270

271271
- name: Install tools
272-
run: mise install
272+
run: mise install --locked
273273

274274
- name: Cache Rust target and registry
275275
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -443,7 +443,7 @@ jobs:
443443
run: git fetch --tags --force
444444

445445
- name: Install tools
446-
run: mise install
446+
run: mise install --locked
447447

448448
- name: Cache Rust target and registry
449449
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -528,7 +528,7 @@ jobs:
528528
run: git fetch --tags --force
529529

530530
- name: Install tools
531-
run: mise install
531+
run: mise install --locked
532532

533533
- name: Cache Rust target and registry
534534
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2

‎.github/workflows/release-vm-dev.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ jobs:
153153
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${{ github.actor }}" --password-stdin
154154

155155
- name: Install tools
156-
run: mise install
156+
run: mise install --locked
157157

158158
- name: Install zstd
159159
run: apt-get update && apt-get install -y --no-install-recommends zstd && rm -rf /var/lib/apt/lists/*
@@ -222,7 +222,7 @@ jobs:
222222
run: git fetch --tags --force
223223

224224
- name: Install tools
225-
run: mise install
225+
run: mise install --locked
226226

227227
- name: Cache Rust target and registry
228228
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2
@@ -459,7 +459,7 @@ jobs:
459459
run: git fetch --tags --force
460460

461461
- name: Install tools
462-
run: mise install
462+
run: mise install --locked
463463

464464
- name: Cache Rust target and registry
465465
uses: Swatinem/rust-cache@779680da715d629ac1d338a641029a2f4372abb5 # v2

0 commit comments

Comments
 (0)