Skip to content

Commit ad0e267

Browse files
author
Douwe Osinga
committed
Merge branch 'remove-apps-for-now' into release/1.22.0
2 parents 7b5729a + 12d1d86 commit ad0e267

File tree

3 files changed

+6
-33
lines changed

3 files changed

+6
-33
lines changed

crates/goose/src/agents/apps_extension.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![allow(dead_code)]
2+
13
use crate::agents::extension::PlatformExtensionContext;
24
use crate::agents::mcp_client::{Error, McpClientTrait};
35
use crate::config::paths::Paths;
@@ -632,6 +634,7 @@ impl McpClientTrait for AppsManagerClient {
632634
}
633635
}
634636

637+
#[allow(dead_code)]
635638
fn schema<T: JsonSchema>() -> JsonObject {
636639
let mut obj = serde_json::to_value(schema_for!(T))
637640
.map(|v| v.as_object().unwrap().clone())
@@ -642,13 +645,15 @@ fn schema<T: JsonSchema>() -> JsonObject {
642645
obj
643646
}
644647

648+
#[allow(dead_code)]
645649
fn extract_string(args: &JsonObject, key: &str) -> Result<String, String> {
646650
args.get(key)
647651
.and_then(|v| v.as_str())
648652
.map(|s| s.to_string())
649653
.ok_or_else(|| format!("Missing or invalid '{}'", key))
650654
}
651655

656+
#[allow(dead_code)]
652657
fn extract_tool_response<T: serde::de::DeserializeOwned>(
653658
response: &Message,
654659
tool_name: &str,

crates/goose/src/agents/extension.rs

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use crate::agents::apps_extension;
21
use crate::agents::chatrecall_extension;
32
use crate::agents::code_execution_extension;
43
use crate::agents::extension_manager_extension;
@@ -55,17 +54,6 @@ pub static PLATFORM_EXTENSIONS: Lazy<HashMap<&'static str, PlatformExtensionDef>
5554
},
5655
);
5756

58-
map.insert(
59-
apps_extension::EXTENSION_NAME,
60-
PlatformExtensionDef {
61-
name: apps_extension::EXTENSION_NAME,
62-
description:
63-
"Create and manage custom Goose apps through chat. Apps are HTML/CSS/JavaScript and run in sandboxed windows.",
64-
default_enabled: true,
65-
client_factory: |ctx| Box::new(apps_extension::AppsManagerClient::new(ctx).unwrap()),
66-
},
67-
);
68-
6957
map.insert(
7058
chatrecall_extension::EXTENSION_NAME,
7159
PlatformExtensionDef {

ui/desktop/src/components/GooseSidebar/AppSidebar.tsx

Lines changed: 1 addition & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { AppEvents } from '../../constants/events';
22
import React, { useEffect, useState } from 'react';
33
import {
4-
AppWindow,
54
ChefHat,
65
ChevronRight,
76
Clock,
@@ -31,7 +30,6 @@ import { useNavigation } from '../../hooks/useNavigation';
3130
import { SessionIndicators } from '../SessionIndicators';
3231
import { useSidebarSessionStatus } from '../../hooks/useSidebarSessionStatus';
3332
import { getInitialWorkingDir } from '../../utils/workingDir';
34-
import { useConfig } from '../ConfigContext';
3533

3634
interface SidebarProps {
3735
onSelectSession: (sessionId: string) => void;
@@ -63,13 +61,6 @@ const menuItems: NavigationEntry[] = [
6361
icon: FileText,
6462
tooltip: 'Browse your saved recipes',
6563
},
66-
{
67-
type: 'item',
68-
path: '/apps',
69-
label: 'Apps',
70-
icon: AppWindow,
71-
tooltip: 'MCP and custom apps',
72-
},
7364
{
7465
type: 'item',
7566
path: '/schedules',
@@ -198,11 +189,8 @@ SessionList.displayName = 'SessionList';
198189
const AppSidebar: React.FC<SidebarProps> = ({ currentPath }) => {
199190
const navigate = useNavigate();
200191
const chatContext = useChatContext();
201-
const configContext = useConfig();
202192
const setView = useNavigation();
203193

204-
const appsExtensionEnabled = !!configContext.extensionsList?.find((ext) => ext.name === 'apps')
205-
?.enabled;
206194
const [searchParams] = useSearchParams();
207195
const [recentSessions, setRecentSessions] = useState<Session[]>([]);
208196
const [isChatExpanded, setIsChatExpanded] = useState(true);
@@ -468,14 +456,6 @@ const AppSidebar: React.FC<SidebarProps> = ({ currentPath }) => {
468456
);
469457
};
470458

471-
const visibleMenuItems = menuItems.filter((entry) => {
472-
// Filter out Apps if extension is not enabled
473-
if (entry.type === 'item' && entry.path === '/apps') {
474-
return appsExtensionEnabled;
475-
}
476-
return true;
477-
});
478-
479459
return (
480460
<>
481461
<SidebarContent className="pt-12">
@@ -561,7 +541,7 @@ const AppSidebar: React.FC<SidebarProps> = ({ currentPath }) => {
561541

562542
<SidebarSeparator />
563543

564-
{visibleMenuItems.map((entry, index) => renderMenuItem(entry, index))}
544+
{menuItems.map((entry, index) => renderMenuItem(entry, index))}
565545
</SidebarMenu>
566546
</SidebarContent>
567547
</>

0 commit comments

Comments
 (0)