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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
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" + '
fix(clawde): revive an agent whose tab is the last one in its workspace by Castrozan · Pull Request #22 · Castrozan/clawde · 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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
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('^' + ".*" + ' fix(clawde): revive an agent whose tab is the last one in its workspace by Castrozan · Pull Request #22 · Castrozan/clawde · 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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
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('^' + ".*" + ' fix(clawde): revive an agent whose tab is the last one in its workspace by Castrozan · Pull Request #22 · Castrozan/clawde · 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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
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" + ' fix(clawde): revive an agent whose tab is the last one in its workspace by Castrozan · Pull Request #22 · Castrozan/clawde · 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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
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('^' + ".*" + ' fix(clawde): revive an agent whose tab is the last one in its workspace by Castrozan · Pull Request #22 · Castrozan/clawde · 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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
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); } })(); })(); fix(clawde): revive an agent whose tab is the last one in its workspace by Castrozan · Pull Request #22 · Castrozan/clawde · 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
28 changes: 18 additions & 10 deletions module/scripts/clawde-service/supervisor_backend_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,21 +118,29 @@ def create_agent_window(
return False
return self.run_wrapper_in_pane(pane_id, wrapper_command)

def discard_superseded_tab(
self, session_name: str, agent_name: str, tab_id: str
) -> None:
close_result = self.run_herdr_command("tab", "close", tab_id)
if close_result.returncode == 0:
return
print(
f"Error: failed to close the superseded herdr tab {tab_id!r} of "
f"{agent_name!r} in workspace {session_name!r}: "
f"{close_result.stderr.strip()}",
file=sys.stderr,
)

def relaunch_wrapper_in_window(
self, session_name: str, agent_name: str, wrapper_command: str
) -> bool:
tab = self.find_agent_tab(session_name, agent_name)
if tab is None:
superseded_tab = self.find_agent_tab(session_name, agent_name)
if superseded_tab is None:
return self.create_agent_window(session_name, agent_name, wrapper_command)
close_result = self.run_herdr_command("tab", "close", tab["tab_id"])
if close_result.returncode != 0:
print(
f"Error: failed to replace herdr tab {agent_name!r} in workspace "
f"{session_name!r}: {close_result.stderr.strip()}",
file=sys.stderr,
)
if not self.create_agent_window(session_name, agent_name, wrapper_command):
return False
return self.create_agent_window(session_name, agent_name, wrapper_command)
self.discard_superseded_tab(session_name, agent_name, superseded_tab["tab_id"])
return True

def ensure_host_ready(self, session_name: str) -> bool:
if not self.ensure_server_running():
Expand Down
45 changes: 41 additions & 4 deletions module/scripts/tests/unit/test_clawde_service_herdr.py
Original file line numberDiff line numberDiff line change
Expand Up@@ -4,6 +4,7 @@
sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent))

from herdr_backend_test_support import (
CompletedProcessStub,
TAB_CREATE_JSON,
TAB_LIST_WP,
TAB_LIST_WP_ONLY_BOOTSTRAP,
Expand DownExpand Up@@ -130,7 +131,7 @@ def test_create_agent_window_creates_the_workspace_when_missing():
) in issued


def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
def test_relaunch_starts_the_replacement_tab_before_discarding_the_stale_one():
issued = []
backend = backend_with_responses(
issued,
Expand All@@ -143,16 +144,16 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert ("tab", "close", "wP:t7") in issued
assert (
creation = (
"tab",
"create",
"--workspace",
"wP",
"--label",
"bronze",
"--no-focus",
) in issued
)
assert issued.index(creation) < issued.index(("tab", "close", "wP:t7"))
assert (
"pane",
"run",
Expand All@@ -162,6 +163,42 @@ def test_relaunch_replaces_the_existing_tab_before_starting_the_wrapper():
assert not any(command[:3] == ("pane", "run", "wP:p7") for command in issued)


def test_relaunch_revives_an_agent_whose_tab_is_the_last_one_in_its_workspace():
issued = []
backend = backend_with_responses(
issued,
[
(("workspace", "list"), WORKSPACE_LIST_WITH_CLAWDE),
(("tab", "list", "--workspace"), TAB_LIST_WP),
(("tab", "create"), TAB_CREATE_JSON),
],
)
creating_run = backend.run_herdr_command

def run_refusing_to_close_the_last_tab(*arguments):
if arguments[:2] == ("tab", "close"):
issued.append(arguments)
refusal = CompletedProcessStub(1, "")
refusal.stderr = (
'{"error":{"code":"tab_close_failed",'
'"message":"cannot close the last tab in a workspace"}}'
)
return refusal
return creating_run(*arguments)

backend.run_herdr_command = run_refusing_to_close_the_last_tab

assert backend.relaunch_wrapper_in_window(
"clawde", "bronze", "exec /nix/store/x-agent"
)
assert (
"pane",
"run",
"wZ:p9",
"CLAWDE_MULTIPLEXER=herdr exec /nix/store/x-agent",
) in issued


def test_remove_agent_window_closes_the_agent_tab():
issued = []
backend = backend_with_responses(
Expand Down