Skip to content

refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344

Open
la14-1 wants to merge 1 commit into
mainfrom
refactor/extract-do-oauth-helpers
Open

refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom
refactor/extract-do-oauth-helpers

Conversation

@la14-1

@la14-1la14-1 commented Apr 23, 2026

Copy link
Copy Markdown
Collaborator

Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.

Changes

Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:

  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.

tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.

Verification

  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail

-- spawn-refactor/complexity-hunter

@la14-1
la14-1 marked this pull request as ready for review April 23, 2026 03:13
@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from 24e7f5e to e7c01f1CompareApril 25, 2026 08:21
@la14-1

la14-1 commented Apr 25, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Rebased onto main to resolve merge conflicts (package.json version bump).

-- refactor/pr-maintainer

@la14-1

la14-1 commented Apr 25, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.

-- refactor/pr-maintainer

@la14-1

la14-1 commented Apr 26, 2026

Copy link
Copy Markdown
CollaboratorAuthor

This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.

Requesting human review when convenient.

-- refactor/pr-maintainer

@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from bcceb9b to 91e0747CompareApril 29, 2026 06:48
@la14-1

la14-1 commented Apr 29, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.

-- refactor/pr-maintainer

@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from 91e0747 to 7bf77b9CompareApril 30, 2026 05:08
@la14-1

la14-1 commented May 3, 2026

Copy link
Copy Markdown
CollaboratorAuthor

This PR is ready for review. All CI checks pass and there are no merge conflicts.

-- refactor/pr-maintainer

@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from 7bf77b9 to ec044e6CompareMay 3, 2026 14:19
@la14-1

la14-1 commented May 3, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.

-- refactor/pr-maintainer

@la14-1

la14-1 commented May 4, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.

-- refactor/pr-maintainer

@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from 1a06445 to 3b263f9CompareMay 9, 2026 16:16
@la14-1

la14-1 commented May 10, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.

-- refactor/pr-maintainer

@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch 2 times, most recently from 0fb9ba4 to ea3deb1CompareMay 12, 2026 08:57
@la14-1

la14-1 commented May 12, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.

-- refactor/pr-maintainer

@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from ea3deb1 to 55e639aCompareMay 14, 2026 14:51
@la14-1

la14-1 commented May 18, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.

-- refactor/pr-maintainer

@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed the refactor/extract-do-oauth-helpers branch from 55e639a to aa6fcc9CompareMay 21, 2026 22:30
@la14-1

la14-1 commented May 21, 2026

Copy link
Copy Markdown
CollaboratorAuthor

Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.

-- refactor/pr-maintainer

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv
, '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" + '
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv

, '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('^' + ".*" + '
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv

, '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('^' + ".*" + '
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv

, '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" + '
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv

, '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('^' + ".*" + '
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv

, '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('^' + ".*" + '
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv

, '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); }
})();
})();
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth by la14-1 · Pull Request #3344 · OpenRouterLabs/spawn · GitHub
Skip to content
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth - #3344
Open
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Open
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth#3344
la14-1 wants to merge 1 commit into
mainfrom 
refactor/extract-do-oauth-helpers
Conversation
@la14-1
@la14-1la14-1
commented
Apr 23, 2026

Copy link


Copy Markdown

Collaborator
Why:tryDoOAuth() was 260 lines with 4 distinct responsibilities (connectivity check, HTTP callback server, terminal I/O wait loop, token exchange) — extracting reduces cognitive load and makes each piece independently testable.
Changes
Split tryDoOAuth() in packages/cli/src/digitalocean/digitalocean.ts into 3 focused helpers:
  • startOAuthCallbackServer(csrfState) — Starts Bun.serve on localhost, scanning ports 5190-5199. Returns the server, actual port, and a shared OAuthCallbackState object that the callback handler mutates.
  • waitForOAuthCallback(cbState, server) — Handles the initial 120s polling timeout, non-interactive timeout, and extended interactive wait with raw-mode Escape-key detection. Returns a discriminated outcome: "code" | "denied" | "manual" | "timeout".
  • exchangeOAuthCode(code, redirectUri) — POSTs to the DigitalOcean token endpoint and persists the access/refresh tokens.
tryDoOAuth() is now a ~45-line orchestrator that checks connectivity, delegates to each helper, and maps outcomes to return values.
Verification
  • bunx @biomejs/biome check src/ — 0 errors (193 files)
  • bun test — 2106 pass, 2 fail (same 2 pre-existing failures on main)
  • DigitalOcean-specific tests (digitalocean*.test.ts) — 9 pass, 0 fail
-- spawn-refactor/complexity-hunter
@la14-1
la14-1
marked this pull request as ready for review
April 23, 2026 03:13
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
24e7f5e to
e7c01f1CompareApril 25, 2026 08:21
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main to resolve merge conflicts (package.json version bump).
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 25, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Fixed CI: removed duplicate "version" key in packages/cli/package.json that was introduced during the rebase. bun install was failing with Duplicate key "version" in object literal. CI should pass now.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
Apr 26, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR has been open for 3+ days with all CI checks passing (ShellCheck, Mock Tests, Biome Lint, Unit Tests, macOS Compatibility — all SUCCESS). It is mergeable with no conflicts.
Requesting human review when convenient.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
bcceb9b to
91e0747CompareApril 29, 2026 06:48
@la14-1
la14-1
commented
Apr 29, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (dropped the now-redundant duplicate-version-key fix commit). Branch is clean with 1 commit. Awaiting human review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
91e0747 to
7bf77b9CompareApril 30, 2026 05:08
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
This PR is ready for review. All CI checks pass and there are no merge conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
7bf77b9 to
ec044e6CompareMay 3, 2026 14:19
@la14-1
la14-1
commented
May 3, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 4 commits behind). Clean rebase, no conflicts.
-- refactor/pr-maintainer
@la14-1
la14-1
commented
May 4, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified in worktree: tests pass (2236/2238, same 2 pre-existing failures as main), lint clean (biome 0 errors). PR is mergeable and ready for review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
1a06445 to
3b263f9CompareMay 9, 2026 16:16
@la14-1
la14-1
commented
May 10, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Branch is current with main (already rebased). CI checks: all passing. Tests: 2247 pass (2 pre-existing failures on main). Awaiting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
2 times, most recently
from
0fb9ba4 to
ea3deb1CompareMay 12, 2026 08:57
@la14-1
la14-1
commented
May 12, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 1 commit behind). This PR has been open for 19 days (created 2026-04-23) with all CI passing. Requesting review.
-- refactor/pr-maintainer
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
ea3deb1 to
55e639aCompareMay 14, 2026 14:51
@la14-1
la14-1
commented
May 18, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Verified on current main (2026-05-18): lint clean (0 errors), 2202 pass / 2 fail (pre-existing: hetzner-cov, digitalocean-token — addressed by #3406). Branch is mergeable with no conflicts. Ready for review.
-- refactor/pr-maintainer
@louisgv@claude
refactor(digitalocean): extract 3 helpers from 260-line tryDoOAuth
aa6fcc9
Split tryDoOAuth() into focused helpers:
- startOAuthCallbackServer(): HTTP server setup + port scanning
- waitForOAuthCallback(): 120s timeout + extended wait + escape-key
- exchangeOAuthCode(): authorization code → access token exchange
tryDoOAuth() is now a 45-line orchestrator that delegates to each.
Agent: complexity-hunter
Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
@la14-1
la14-1force-pushed
the
refactor/extract-do-oauth-helpers
branch
from
55e639a to
aa6fcc9CompareMay 21, 2026 22:30
@la14-1
la14-1
commented
May 21, 2026

Copy link


Copy Markdown

CollaboratorAuthor
Rebased onto main (was 2 commits behind). Clean rebase, no conflicts. Awaiting human review.
-- refactor/pr-maintainer
Sign up for freeto join this conversation on GitHub.
Already have an account?
Sign in to comment

Reviewers


No reviews


Assignees


No one assigned


Labels


None yet


Projects


None yet


Milestone


No milestone


Development

Successfully merging this pull request may close these issues.

2 participants

@la14-1@louisgv