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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' [codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' [codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); [codex] Add Qwen runtime source options to desktop release by DragonnZhang · Pull Request #8 · modelstudioai/openwork · GitHub
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
67 changes: 65 additions & 2 deletions .github/workflows/desktop-release.yml
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,8 +13,22 @@ on:
description: "Release title. Defaults to the tag."
required: false
type: string
qwen_code_source:
description: "Qwen Code runtime source to vendor into the desktop app."
required: true
default: pinned_package_version
type: choice
options:
- npm_latest
- source_branch
- pinned_package_version
qwen_code_ref:
description: "QwenLM/qwen-code branch, tag, or commit when qwen_code_source is source_branch."
required: false
default: main
type: string
qwen_code_version:
description: "Optional @qwen-code/qwen-code version to vendor into the desktop app."
description: "Optional exact @qwen-code/qwen-code npm version for pinned_package_version. Defaults to package.json qwenCodeRuntime.version."
required: false
type: string
dry_run:
Expand DownExpand Up@@ -48,7 +62,6 @@ concurrency:
env:
BUN_VERSION: 1.3.9
CRAFT_BRAND: openwork
QWEN_CODE_VERSION: ${{ inputs.qwen_code_version }}

jobs:
release_metadata:
Expand DownExpand Up@@ -166,6 +179,14 @@ jobs:
with:
ref: ${{ needs.release_metadata.outputs.release_ref }}

- name: Check out Qwen Code source
if: ${{ inputs.qwen_code_source == 'source_branch' }}
uses: actions/checkout@v4
with:
repository: QwenLM/qwen-code
ref: ${{ inputs.qwen_code_ref }}
path: qwen-code-source

- name: Set up Bun
uses: oven-sh/setup-bun@v2
with:
Expand All@@ -180,12 +201,54 @@ jobs:
- name: Install dependencies
run: bun install --frozen-lockfile

- name: Install Qwen Code source dependencies
if: ${{ inputs.qwen_code_source == 'source_branch' }}
working-directory: qwen-code-source
run: npm ci

- name: Bump desktop version
run: bun run bump-desktop-version "${{ needs.release_metadata.outputs.version }}"

- name: Confirm release version
run: bun run check-release-version --version "${{ needs.release_metadata.outputs.version }}"

- name: Configure Qwen Code runtime source
shell: bash
env:
QWEN_CODE_REF_INPUT: ${{ inputs.qwen_code_ref }}
QWEN_CODE_SOURCE_INPUT: ${{ inputs.qwen_code_source }}
QWEN_CODE_SOURCE_ROOT: ${{ github.workspace }}/qwen-code-source
QWEN_CODE_VERSION_INPUT: ${{ inputs.qwen_code_version }}
run: |
set -euo pipefail

case "$QWEN_CODE_SOURCE_INPUT" in
npm_latest)
echo "QWEN_CODE_VERSION=latest" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from npm dist-tag: latest"
;;
source_branch)
if [ -z "$QWEN_CODE_REF_INPUT" ]; then
echo "::error::qwen_code_ref is required when qwen_code_source is source_branch."
exit 1
fi
echo "QWEN_CODE_ROOT=$QWEN_CODE_SOURCE_ROOT" >> "$GITHUB_ENV"
echo "Using Qwen Code runtime from QwenLM/qwen-code ref: $QWEN_CODE_REF_INPUT"
;;
pinned_package_version)
if [ -n "$QWEN_CODE_VERSION_INPUT" ]; then
echo "QWEN_CODE_VERSION=$QWEN_CODE_VERSION_INPUT" >> "$GITHUB_ENV"
echo "Using exact Qwen Code npm version: $QWEN_CODE_VERSION_INPUT"
else
echo "Using Qwen Code runtime from package.json qwenCodeRuntime.version"
fi
;;
*)
echo "::error::Unknown qwen_code_source: $QWEN_CODE_SOURCE_INPUT"
exit 1
;;
esac

- name: Configure optional signing secrets
shell: bash
env:
Expand Down
68 changes: 62 additions & 6 deletions scripts/vendor-qwen-code.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -14,13 +14,27 @@ const desktopRoot = join(import.meta.dir, '..');
const defaultRepoRoot = join(desktopRoot, '..', '..');
const electronDir = join(desktopRoot, 'apps', 'electron');
const vendorDir = join(electronDir, 'vendor', 'qwen-code');
const qwenCodePackageName = '@qwen-code/qwen-code';
const qwenCodeMetadataUrl = `https://registry.npmjs.org/${encodeURIComponent(qwenCodePackageName)}`;

interface DesktopPackageJson {
qwenCodeRuntime?: {
version?: string;
};
}

interface NpmPackageMetadata {
'dist-tags'?: Record<string, string>;
versions?: Record<
string,
{
dist?: {
tarball?: string;
};
}
>;
}

function npmCommand(): string {
return process.platform === 'win32' ? 'npm.cmd' : 'npm';
}
Expand DownExpand Up@@ -106,17 +120,59 @@ async function vendorLocalCheckout(repoRoot: string): Promise<void> {
console.log(`Vendored local Qwen Code CLI into ${vendorDir}`);
}

async function vendorNpmVersion(version: string): Promise<void> {
console.log(`Downloading Qwen Code ${version} from npm...`);
async function readNpmPackageMetadata(): Promise<NpmPackageMetadata> {
const response = await fetch(qwenCodeMetadataUrl);
if (!response.ok) {
throw new Error(
`Failed to read ${qwenCodePackageName} metadata from npm: HTTP ${response.status}`,
);
}
return (await response.json()) as NpmPackageMetadata;
}

async function resolveNpmVersionOrTag(
versionOrTag: string,
): Promise<{ tarballUrl: string; version: string }> {
const requested = versionOrTag.trim();
if (!requested) {
throw new Error('Qwen Code npm version or dist-tag is required.');
}

const metadata = await readNpmPackageMetadata();
const version = metadata.versions?.[requested]
? requested
: metadata['dist-tags']?.[requested];
if (!version) {
throw new Error(
`Could not resolve ${qwenCodePackageName}@${requested} from npm.`,
);
}

const tarballUrl = metadata.versions?.[version]?.dist?.tarball;
if (!tarballUrl) {
throw new Error(
`Could not find npm tarball for ${qwenCodePackageName}@${version}.`,
);
}

return { tarballUrl, version };
}

async function vendorNpmVersion(versionOrTag: string): Promise<void> {
const { tarballUrl, version } = await resolveNpmVersionOrTag(versionOrTag);
const sourceLabel =
versionOrTag === version ? version : `${versionOrTag} (${version})`;
console.log(`Downloading Qwen Code ${sourceLabel} from npm...`);

const tempDir = mkdtempSync(join(tmpdir(), 'qwen-code-vendor-'));
const tarballPath = join(tempDir, `qwen-code-${version}.tgz`);
const url = `https://registry.npmjs.org/@qwen-code/qwen-code/-/qwen-code-${version}.tgz`;

try {
const response = await fetch(url);
const response = await fetch(tarballUrl);
if (!response.ok) {
throw new Error(`Failed to download ${url}: HTTP ${response.status}`);
throw new Error(
`Failed to download ${tarballUrl}: HTTP ${response.status}`,
);
}
await Bun.write(tarballPath, await response.arrayBuffer());

Expand All@@ -130,7 +186,7 @@ async function vendorNpmVersion(version: string): Promise<void> {
);

verifyVendoredCli();
console.log(`Vendored @qwen-code/qwen-code@${version} into ${vendorDir}`);
console.log(`Vendored ${qwenCodePackageName}@${version} into ${vendorDir}`);
} finally {
rmSync(tempDir, { recursive: true, force: true });
}
Expand Down