From 9583e92170e12e3c5d53429971b23cf66dc2d471 Mon Sep 17 00:00:00 2001
From: Ehsan Akhgari <ehsan@mozilla.com>
Date: Wed, 2 May 2012 16:20:02 -0400
Subject: [PATCH] Backout the merge from fx-team because of Ts regressions (no
 bug)

This is the backed out range:
http://hg.mozilla.org/mozilla-central/pushloghtml?changeset=a974c45914eb
---
 .../mochitest/tree/test_dochierarchy.html     |    2 +-
 browser/app/profile/firefox.js                |   18 +-
 browser/base/content/browser-appmenu.inc      |   15 +-
 browser/base/content/browser-fullZoom.js      |    2 +-
 browser/base/content/browser-menubar.inc      |   16 +-
 browser/base/content/browser-sets.inc         |    9 -
 browser/base/content/browser.js               |   32 +-
 browser/base/content/browser.xul              |   54 -
 browser/devtools/debugger/DebuggerUI.jsm      |  206 +-
 .../devtools/debugger/debugger-controller.js  |  163 +-
 browser/devtools/debugger/debugger-view.js    |  233 +-
 browser/devtools/debugger/debugger.xul        |    2 -
 browser/devtools/debugger/test/Makefile.in    |    4 -
 ...rowser_dbg_bug723069_editor-breakpoints.js |   35 +-
 ...rowser_dbg_bug731394_editor-contextmenu.js |   34 +-
 .../debugger/test/browser_dbg_createRemote.js |   86 -
 .../test/browser_dbg_propertyview-01.js       |    6 +-
 .../test/browser_dbg_propertyview-07.js       |   35 +-
 .../test/browser_dbg_propertyview-08.js       |   44 +-
 .../test/browser_dbg_script-switching.js      |   40 +-
 .../test/browser_dbg_scripts-searching-01.js  |  188 -
 .../test/browser_dbg_scripts-searching-02.js  |  146 -
 .../test/browser_dbg_scripts-sorting.js       |  124 -
 .../test/browser_dbg_update-editor-mode.js    |   30 +-
 browser/devtools/debugger/test/head.js        |   15 +-
 browser/devtools/highlighter/inspector.jsm    |    4 +-
 browser/devtools/jar.mn                       |    2 -
 browser/devtools/shared/DeveloperToolbar.jsm  |  476 --
 browser/devtools/shared/Templater.jsm         |   96 +-
 browser/devtools/shared/test/Makefile.in      |   10 -
 .../shared/test/browser_gcli_break.js         |   82 -
 .../shared/test/browser_gcli_commands.js      |   55 -
 .../shared/test/browser_gcli_inspect.js       |   68 -
 .../shared/test/browser_gcli_integrate.js     |   40 -
 .../shared/test/browser_templater_basic.js    |   50 +-
 .../shared/test/browser_toolbar_basic.html    |   35 -
 .../shared/test/browser_toolbar_basic.js      |   36 -
 browser/devtools/shared/test/head.js          |  267 +-
 browser/devtools/webconsole/GcliCommands.jsm  |   14 +-
 browser/devtools/webconsole/HUDService.jsm    |  163 +-
 browser/devtools/webconsole/gcli.css          |   74 -
 browser/devtools/webconsole/gcli.jsm          | 7304 ++++++-----------
 browser/devtools/webconsole/gcliblank.xhtml   |   59 -
 browser/devtools/webconsole/test/Makefile.in  |    9 +
 .../test/browser_gcli_break.html              |   10 +-
 .../webconsole/test/browser_gcli_break.js     |  105 +
 .../webconsole/test/browser_gcli_commands.js  |   80 +
 .../webconsole/test/browser_gcli_helpers.js   |  124 +
 .../test/browser_gcli_inspect.html            |    0
 .../webconsole/test/browser_gcli_inspect.js   |   95 +
 .../webconsole/test/browser_gcli_integrate.js |  106 +
 .../test/browser_gcli_require.js              |   23 +-
 .../test/browser_gcli_web.js                  | 3750 ++++-----
 ...owser_webconsole_bug_579412_input_focus.js |    5 +
 ...ole_bug_580001_closing_after_completion.js |    5 +
 .../browser_webconsole_bug_580400_groups.js   |    5 +
 ..._webconsole_bug_582201_duplicate_errors.js |    5 +
 ...bug_583816_No_input_and_Tab_key_pressed.js |    5 +
 ...webconsole_bug_585991_autocomplete_keys.js |    5 +
 ...ebconsole_bug_585991_autocomplete_popup.js |    5 +
 ...rowser_webconsole_bug_586388_select_all.js |    5 +
 ...owser_webconsole_bug_587617_output_copy.js |    5 +
 ...er_webconsole_bug_588342_document_focus.js |    5 +
 ...r_webconsole_bug_588967_input_expansion.js |    5 +
 ..._webconsole_bug_592442_closing_brackets.js |    5 +
 ..._webconsole_bug_594477_clickable_output.js |    5 +
 ...ebconsole_bug_594497_history_arrow_keys.js |    5 +
 ...ebconsole_bug_595934_message_categories.js |    2 +
 ...ser_webconsole_bug_598357_jsterm_output.js |    5 +
 .../browser_webconsole_bug_601352_scroll.js   |    5 +
 .../test/browser_webconsole_bug_611795.js     |    5 +
 ...owser_webconsole_bug_613280_jsterm_copy.js |    5 +
 ...ser_webconsole_bug_614793_jsterm_scroll.js |    5 +
 ...wser_webconsole_bug_618311_close_panels.js |    5 +
 ..._webconsole_bug_618311_private_browsing.js |    5 +
 ...ser_webconsole_bug_621644_jsterm_dollar.js |    5 +
 ...webconsole_bug_626484_output_copy_order.js |    5 +
 ...nsole_bug_632275_getters_document_width.js |    5 +
 ...console_bug_632347_iterators_generators.js |    5 +
 ...wser_webconsole_bug_642615_autocomplete.js |    5 +
 ...rowser_webconsole_bug_644419_log_limits.js |    5 +
 ...e_bug_651501_document_body_autocomplete.js |    5 +
 ...e_bug_653531_highlighter_console_helper.js |    5 +
 ...wser_webconsole_bug_658368_time_methods.js |    5 +
 ...owser_webconsole_bug_660806_history_nav.js |    5 +
 ...ser_webconsole_bug_664131_console_group.js |    5 +
 .../test/browser_webconsole_bug_704295.js     |    5 +
 .../test/browser_webconsole_chrome.js         |    5 +
 .../test/browser_webconsole_completion.js     |    5 +
 .../browser_webconsole_console_logging_api.js |    5 +
 .../test/browser_webconsole_consoleonpage.js  |    5 +
 ...le_messages_inserts_newlines_in_between.js |    5 +
 .../browser_webconsole_execution_scope.js     |    5 +
 .../test/browser_webconsole_for_of.js         |    5 +
 .../test/browser_webconsole_history.js        |    5 +
 .../test/browser_webconsole_hud_getters.js    |    5 +
 ..._webconsole_js_input_and_output_styling.js |    5 +
 .../browser_webconsole_js_input_expansion.js  |    5 +
 .../test/browser_webconsole_jsterm.js         |    5 +
 ...er_webconsole_null_and_undefined_output.js |    5 +
 .../test/browser_webconsole_output_order.js   |    5 +
 .../test/browser_webconsole_property_panel.js |    5 +
 .../browser_webconsole_property_provider.js   |    5 +
 .../locales/en-US/chrome/browser/browser.dtd  |    9 -
 .../chrome/browser/devtools/debugger.dtd      |    8 -
 .../browser/devtools/debugger.properties      |    6 +-
 .../chrome/browser/devtools/gcli.properties   |  119 +-
 .../browser/devtools/gclicommands.properties  |    5 -
 browser/themes/gnomestripe/browser.css        |   69 +-
 browser/themes/gnomestripe/devtools/gcli.css  |  316 +-
 browser/themes/pinstripe/browser.css          |   66 +-
 browser/themes/pinstripe/devtools/gcli.css    |  332 +-
 browser/themes/winstripe/browser.css          |   69 +-
 browser/themes/winstripe/devtools/gcli.css    |  318 +-
 .../debugger/server/dbg-script-actors.js      |  132 +-
 .../tests/unit/test_framebindings-01.js       |   63 -
 .../devtools/debugger/tests/unit/xpcshell.ini |    1 -
 117 files changed, 6173 insertions(+), 10263 deletions(-)
 delete mode 100644 browser/devtools/debugger/test/browser_dbg_createRemote.js
 delete mode 100644 browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
 delete mode 100644 browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
 delete mode 100644 browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
 delete mode 100644 browser/devtools/shared/DeveloperToolbar.jsm
 delete mode 100644 browser/devtools/shared/test/browser_gcli_break.js
 delete mode 100644 browser/devtools/shared/test/browser_gcli_commands.js
 delete mode 100644 browser/devtools/shared/test/browser_gcli_inspect.js
 delete mode 100644 browser/devtools/shared/test/browser_gcli_integrate.js
 delete mode 100644 browser/devtools/shared/test/browser_toolbar_basic.html
 delete mode 100644 browser/devtools/shared/test/browser_toolbar_basic.js
 delete mode 100644 browser/devtools/webconsole/gcli.css
 delete mode 100644 browser/devtools/webconsole/gcliblank.xhtml
 rename browser/devtools/{shared => webconsole}/test/browser_gcli_break.html (81%)
 create mode 100644 browser/devtools/webconsole/test/browser_gcli_break.js
 create mode 100644 browser/devtools/webconsole/test/browser_gcli_commands.js
 create mode 100644 browser/devtools/webconsole/test/browser_gcli_helpers.js
 rename browser/devtools/{shared => webconsole}/test/browser_gcli_inspect.html (100%)
 create mode 100644 browser/devtools/webconsole/test/browser_gcli_inspect.js
 create mode 100644 browser/devtools/webconsole/test/browser_gcli_integrate.js
 rename browser/devtools/{shared => webconsole}/test/browser_gcli_require.js (87%)
 rename browser/devtools/{shared => webconsole}/test/browser_gcli_web.js (59%)
 delete mode 100644 toolkit/devtools/debugger/tests/unit/test_framebindings-01.js

diff --git a/accessible/tests/mochitest/tree/test_dochierarchy.html b/accessible/tests/mochitest/tree/test_dochierarchy.html
index d2c07934227f..0bc9686aabea 100644
--- a/accessible/tests/mochitest/tree/test_dochierarchy.html
+++ b/accessible/tests/mochitest/tree/test_dochierarchy.html
@@ -31,7 +31,7 @@
 
     is(root.parentDocument, null,
        "Wrong parent document of root accessible");
-    is(root.childDocumentCount, SEAMONKEY ? 1 : 3,
+    is(root.childDocumentCount, 1,
        "Wrong child document count of root accessible");
     is(root.getChildDocumentAt(0), tabDoc,
        "Wrong child document at index 0 of root accessible");
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
index 0f48094b3ae1..4d296f176f79 100644
--- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js
@@ -1045,9 +1045,6 @@ pref("services.sync.prefs.sync.xpinstall.whitelist.required", true);
 // Disable the error console
 pref("devtools.errorconsole.enabled", false);
 
-// Enable the developer toolbar
-pref("devtools.toolbar.enabled", false);
-
 // Enable the Inspector
 pref("devtools.inspector.enabled", true);
 pref("devtools.inspector.htmlHeight", 112);
@@ -1061,14 +1058,9 @@ pref("devtools.layoutview.open", false);
 
 // Enable the Debugger
 pref("devtools.debugger.enabled", false);
-pref("devtools.debugger.remote-enabled", false);
-pref("devtools.debugger.remote-host", "localhost");
-pref("devtools.debugger.remote-port", 6000);
 
 // The default Debugger UI height
 pref("devtools.debugger.ui.height", 250);
-pref("devtools.debugger.ui.remote-win.width", 900);
-pref("devtools.debugger.ui.remote-win.height", 400);
 
 // Enable the style inspector
 pref("devtools.styleinspector.enabled", true);
@@ -1091,14 +1083,8 @@ pref("devtools.styleeditor.transitions", true);
 // Enable tools for Chrome development.
 pref("devtools.chrome.enabled", false);
 
-// Display the introductory text
-pref("devtools.gcli.hideIntro", false);
-
-// How eager are we to show help: never=1, sometimes=2, always=3
-pref("devtools.gcli.eagerHelper", 2);
-
-// Do we allow the 'pref set' command
-pref("devtools.gcli.allowSet", false);
+// Disable the GCLI enhanced command line.
+pref("devtools.gcli.enable", false);
 
 // The last Web Console height. This is initially 0 which means that the Web
 // Console will use the default height next time it shows.
diff --git a/browser/base/content/browser-appmenu.inc b/browser/base/content/browser-appmenu.inc
index f9fe447e7302..6d64185c3c39 100644
--- a/browser/base/content/browser-appmenu.inc
+++ b/browser/base/content/browser-appmenu.inc
@@ -176,14 +176,8 @@
       <menuseparator class="appmenu-menuseparator"/>
       <menu id="appmenu_webDeveloper"
             label="&appMenuWebDeveloper.label;">
-        <menupopup id="appmenu_webDeveloper_popup">
-          <menuitem id="appmenu_devToolbar"
-                    type="checkbox"
-                    autocheck="false"
-                    hidden="true"
-                    label="&devToolbarMenu.label;"
-                    command="Tools:DevToolbar"
-                    key="key_devToolbar"/>
+        <menupopup id="appmenu_webDeveloper_popup"
+                   onpopupshowing="onWebDeveloperMenuShowing();">
           <menuitem id="appmenu_webConsole"
                     label="&webConsoleCmd.label;"
                     type="checkbox"
@@ -197,14 +191,9 @@
                     key="key_inspect"/>
           <menuitem id="appmenu_debugger"
                     hidden="true"
-                    type="checkbox"
                     label="&debuggerMenu.label;"
                     key="key_debugger"
                     command="Tools:Debugger"/>
-          <menuitem id="appmenu_remoteDebugger"
-                    hidden="true"
-                    label="&remoteDebuggerMenu.label;"
-                    command="Tools:RemoteDebugger"/>
           <menuitem id="appmenu_scratchpad"
                     hidden="true"
                     label="&scratchpad.label;"
diff --git a/browser/base/content/browser-fullZoom.js b/browser/base/content/browser-fullZoom.js
index 369b7b296028..e6f54163d85d 100644
--- a/browser/base/content/browser-fullZoom.js
+++ b/browser/base/content/browser-fullZoom.js
@@ -225,7 +225,7 @@ var FullZoom = {
       return;
 
     // Avoid the cps roundtrip and apply the default/global pref.
-    if (aURI.spec == "about:blank") {
+    if (isBlankPageURL(aURI.spec)) {
       this._applyPrefToSetting(undefined, aBrowser);
       return;
     }
diff --git a/browser/base/content/browser-menubar.inc b/browser/base/content/browser-menubar.inc
index 0c3782632b4c..895c7f946a88 100644
--- a/browser/base/content/browser-menubar.inc
+++ b/browser/base/content/browser-menubar.inc
@@ -531,15 +531,8 @@
               <menu id="webDeveloperMenu"
                     label="&webDeveloperMenu.label;"
                     accesskey="&webDeveloperMenu.accesskey;">
-                <menupopup id="menuWebDeveloperPopup">
-                  <menuitem id="menu_devToolbar"
-                            type="checkbox"
-                            autocheck="false"
-                            hidden="true"
-                            label="&devToolbarMenu.label;"
-                            accesskey="&devToolbarMenu.accesskey;"
-                            key="key_devToolbar"
-                            command="Tools:DevToolbar"/>
+                <menupopup id="menuWebDeveloperPopup"
+                           onpopupshowing="onWebDeveloperMenuShowing();">
                   <menuitem id="webConsole"
                             type="checkbox"
                             label="&webConsoleCmd.label;"
@@ -555,14 +548,9 @@
                             command="Tools:Inspect"/>
                   <menuitem id="menu_debugger"
                             hidden="true"
-                            type="checkbox"
                             label="&debuggerMenu.label;"
                             key="key_debugger"
                             command="Tools:Debugger"/>
-                  <menuitem id="menu_remoteDebugger"
-                            hidden="true"
-                            label="&remoteDebuggerMenu.label;"
-                            command="Tools:RemoteDebugger"/>
                   <menuitem id="menu_scratchpad"
                             hidden="true"
                             label="&scratchpad.label;"
diff --git a/browser/base/content/browser-sets.inc b/browser/base/content/browser-sets.inc
index 6947172ffcfc..c8e4235251e4 100644
--- a/browser/base/content/browser-sets.inc
+++ b/browser/base/content/browser-sets.inc
@@ -126,11 +126,9 @@
 
     <command id="Tools:Search" oncommand="BrowserSearch.webSearch();"/>
     <command id="Tools:Downloads" oncommand="BrowserDownloadsUI();"/>
-    <command id="Tools:DevToolbar" oncommand="DeveloperToolbar.toggle();" disabled="true"/>
     <command id="Tools:WebConsole" oncommand="HUDConsoleUI.toggleHUD();"/>
     <command id="Tools:Inspect" oncommand="InspectorUI.toggleInspectorUI();" disabled="true"/>
     <command id="Tools:Debugger" oncommand="DebuggerUI.toggleDebugger();" disabled="true"/>
-    <command id="Tools:RemoteDebugger" oncommand="DebuggerUI.toggleRemoteDebugger();" disabled="true"/>
     <command id="Tools:Scratchpad" oncommand="Scratchpad.openScratchpad();" disabled="true"/>
     <command id="Tools:StyleEditor" oncommand="StyleEditor.openChrome();" disabled="true"/>
     <command id="Tools:Addons" oncommand="BrowserOpenAddonsMgr();"/>
@@ -257,13 +255,6 @@
 #endif
     <key id="key_openAddons" key="&addons.commandkey;" command="Tools:Addons" modifiers="accel,shift"/>
     <key id="key_errorConsole" key="&errorConsoleCmd.commandkey;" oncommand="toJavaScriptConsole();" modifiers="accel,shift" disabled="true"/>
-    <key id="key_devToolbar" key="&devToolbar.commandkey;" command="Tools:DevToolbar"
-#ifdef XP_MACOSX
-         modifiers="accel,alt"
-#else
-         modifiers="accel,shift"
-#endif
-    />
     <key id="key_webConsole" key="&webConsoleCmd.commandkey;" oncommand="HUDConsoleUI.toggleHUD();"
 #ifdef XP_MACOSX
         modifiers="accel,alt"
diff --git a/browser/base/content/browser.js b/browser/base/content/browser.js
index 323a316cebef..111a698f0587 100644
--- a/browser/base/content/browser.js
+++ b/browser/base/content/browser.js
@@ -179,12 +179,6 @@ XPCOMUtils.defineLazyGetter(this, "PopupNotifications", function () {
   }
 });
 
-XPCOMUtils.defineLazyGetter(this, "DeveloperToolbar", function() {
-  let tmp = {};
-  Cu.import("resource:///modules/devtools/DeveloperToolbar.jsm", tmp);
-  return new tmp.DeveloperToolbar(window, document.getElementById("developer-toolbar"));
-});
-
 XPCOMUtils.defineLazyGetter(this, "InspectorUI", function() {
   let tmp = {};
   Cu.import("resource:///modules/inspector.jsm", tmp);
@@ -1702,16 +1696,6 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
       setUrlAndSearchBarWidthForConditionalForwardButton();
   });
 
-  // Enable developer toolbar?
-  let devToolbarEnabled = gPrefService.getBoolPref("devtools.toolbar.enabled");
-  if (devToolbarEnabled) {
-    document.getElementById("menu_devToolbar").hidden = false;
-    document.getElementById("Tools:DevToolbar").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-    document.getElementById("appmenu_devToolbar").hidden = false;
-#endif
-  }
-
   // Enable Inspector?
   let enabled = gPrefService.getBoolPref("devtools.inspector.enabled");
   if (enabled) {
@@ -1720,7 +1704,6 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
 #ifdef MENUBAR_CAN_AUTOHIDE
     document.getElementById("appmenu_pageInspect").hidden = false;
 #endif
-    document.getElementById("developer-toolbar-inspector").hidden = false;
   }
 
   // Enable Debugger?
@@ -1730,17 +1713,6 @@ function delayedStartup(isLoadingBlank, mustLoadSidebar) {
     document.getElementById("Tools:Debugger").removeAttribute("disabled");
 #ifdef MENUBAR_CAN_AUTOHIDE
     document.getElementById("appmenu_debugger").hidden = false;
-#endif
-    document.getElementById("developer-toolbar-debugger").hidden = false;
-  }
-
-  // Enable Remote Debugger?
-  let enabled = gPrefService.getBoolPref("devtools.debugger.remote-enabled");
-  if (enabled) {
-    document.getElementById("menu_remoteDebugger").hidden = false;
-    document.getElementById("Tools:RemoteDebugger").removeAttribute("disabled");
-#ifdef MENUBAR_CAN_AUTOHIDE
-    document.getElementById("appmenu_remoteDebugger").hidden = false;
 #endif
   }
 
@@ -9309,6 +9281,10 @@ var StyleEditor = {
   }
 };
 
+function onWebDeveloperMenuShowing() {
+  document.getElementById("Tools:WebConsole").setAttribute("checked", HUDConsoleUI.getOpenHUD() != null);
+}
+
 
 XPCOMUtils.defineLazyGetter(window, "gShowPageResizers", function () {
 #ifdef XP_WIN
diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul
index b2961b3612cb..a1a0b9e876dc 100644
--- a/browser/base/content/browser.xul
+++ b/browser/base/content/browser.xul
@@ -1039,60 +1039,6 @@
                      tooltiptext="&inspectCloseButton.tooltiptext;"/>
 #endif
     </toolbar>
-
-    <panel id="gcli-tooltip"
-           type="arrow"
-           noautofocus="true"
-           noautohide="true"
-           class="gcli-panel">
-      <iframe id="gcli-tooltip-frame"
-              src="chrome://browser/content/devtools/gcliblank.xhtml"
-              flex="1"/>
-    </panel>
-    <panel id="gcli-output"
-           type="arrow"
-           noautofocus="true"
-           noautohide="true"
-           class="gcli-panel">
-      <iframe id="gcli-output-frame"
-              src="chrome://browser/content/devtools/gcliblank.xhtml"
-              flex="1"/>
-    </panel>
-
-    <toolbar id="developer-toolbar"
-             class="devtools-toolbar"
-             hidden="true">
-#ifdef XP_MACOSX
-          <toolbarbutton id="developer-toolbar-closebutton"
-                         oncommand="DeveloperToolbar.hide();"
-                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
-#endif
-          <stack class="gclitoolbar-stack-node" flex="1">
-            <description class="gclitoolbar-prompt">&#187;</description>
-            <description class="gclitoolbar-complete-node"/>
-            <textbox class="gclitoolbar-input-node" rows="1"/>
-          </stack>
-          <toolbarbutton id="developer-toolbar-webconsole"
-                         label="&webConsoleButton.label;"
-                         class="devtools-toolbarbutton"
-                         command="Tools:WebConsole"/>
-          <toolbarbutton id="developer-toolbar-inspector"
-                         label="&inspectorButton.label;"
-                         class="devtools-toolbarbutton"
-                         hidden="true"
-                         command="Tools:Inspect"/>
-          <toolbarbutton id="developer-toolbar-debugger"
-                         label="&scriptsButton.label;"
-                         class="devtools-toolbarbutton"
-                         hidden="true"
-                         command="Tools:Debugger"/>
-#ifndef XP_MACOSX
-          <toolbarbutton id="developer-toolbar-closebutton"
-                         oncommand="DeveloperToolbar.hide();"
-                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
-#endif
-   </toolbar>
-
     <toolbar id="addon-bar"
              toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;"
              collapsed="true"
diff --git a/browser/devtools/debugger/DebuggerUI.jsm b/browser/devtools/debugger/DebuggerUI.jsm
index 92cc153cd044..cf4bc164f30d 100644
--- a/browser/devtools/debugger/DebuggerUI.jsm
+++ b/browser/devtools/debugger/DebuggerUI.jsm
@@ -45,13 +45,7 @@ const Cc = Components.classes;
 const Ci = Components.interfaces;
 const Cu = Components.utils;
 
-const DBG_XUL = "chrome://browser/content/debugger.xul";
-const REMOTE_PROFILE_NAME = "_remote-debug";
-
-Cu.import("resource://gre/modules/devtools/dbg-server.jsm");
 Cu.import("resource://gre/modules/Services.jsm");
-Cu.import("resource://gre/modules/FileUtils.jsm");
-Cu.import("resource://gre/modules/XPCOMUtils.jsm");
 
 let EXPORTED_SYMBOLS = ["DebuggerUI"];
 
@@ -66,20 +60,6 @@ function DebuggerUI(aWindow) {
 }
 
 DebuggerUI.prototype = {
-  /**
-   * Called by the DebuggerPane to update the Debugger toggle switches with the
-   * debugger state.
-   */
-  refreshCommand: function DUI_refreshCommand() {
-    let selectedTab = this.chromeWindow.getBrowser().selectedTab;
-    let command = this.chromeWindow.document.getElementById("Tools:Debugger");
-
-    if (this.getDebugger(selectedTab) != null) {
-      command.setAttribute("checked", "true");
-    } else {
-      command.removeAttribute("checked");
-    }
-  },
 
   /**
    * Starts a debugger for the current tab, or stops it if already started.
@@ -92,22 +72,7 @@ DebuggerUI.prototype = {
       tab._scriptDebugger.close();
       return null;
     }
-    return new DebuggerPane(this, tab);
-  },
-
-  /**
-   * Starts a remote debugger in a new process, or stops it if already started.
-   * @see DebuggerProcess.constructor
-   * @return DebuggerProcess if the debugger is started, null if it's stopped.
-   */
-  toggleRemoteDebugger: function DUI_toggleRemoteDebugger(aOnClose, aOnRun) {
-    let win = this.chromeWindow;
-
-    if (win._remoteDebugger) {
-      win._remoteDebugger.close();
-      return null;
-    }
-    return new DebuggerProcess(win, aOnClose, aOnRun);
+    return new DebuggerPane(tab);
   },
 
   /**
@@ -115,7 +80,7 @@ DebuggerUI.prototype = {
    * @return DebuggerPane if a debugger exists for the tab, null otherwise
    */
   getDebugger: function DUI_getDebugger(aTab) {
-    return '_scriptDebugger' in aTab ? aTab._scriptDebugger : null;
+    return aTab._scriptDebugger;
   },
 
   /**
@@ -123,7 +88,7 @@ DebuggerUI.prototype = {
    * @return object
    */
   get preferences() {
-    return DebuggerPreferences;
+    return DebuggerUIPreferences;
   }
 };
 
@@ -133,25 +98,13 @@ DebuggerUI.prototype = {
  * @param XULElement aTab
  *        The tab in which to create the debugger.
  */
-function DebuggerPane(aDebuggerUI, aTab) {
-  this._globalUI = aDebuggerUI;
+function DebuggerPane(aTab) {
   this._tab = aTab;
-  this._initServer();
   this._create();
 }
 
 DebuggerPane.prototype = {
 
-  /**
-   * Initializes the debugger server.
-   */
-  _initServer: function DP__initServer() {
-    if (!DebuggerServer.initialized) {
-      DebuggerServer.init();
-      DebuggerServer.addBrowserActors();
-    }
-  },
-
   /**
    * Creates and initializes the widgets containing the debugger UI.
    */
@@ -165,7 +118,7 @@ DebuggerPane.prototype = {
     this._splitter.setAttribute("class", "hud-splitter");
 
     this._frame = ownerDocument.createElement("iframe");
-    this._frame.height = DebuggerPreferences.height;
+    this._frame.height = DebuggerUIPreferences.height;
 
     this._nbox = gBrowser.getNotificationBox(this._tab.linkedBrowser);
     this._nbox.appendChild(this._splitter);
@@ -186,9 +139,7 @@ DebuggerPane.prototype = {
       self.getBreakpoint = bkp.getBreakpoint;
     }, true);
 
-    this._frame.setAttribute("src", DBG_XUL);
-
-    this._globalUI.refreshCommand();
+    this._frame.setAttribute("src", "chrome://browser/content/debugger.xul");
   },
 
   /**
@@ -198,10 +149,10 @@ DebuggerPane.prototype = {
     if (!this._tab) {
       return;
     }
-    delete this._tab._scriptDebugger;
+    this._tab._scriptDebugger = null;
     this._tab = null;
 
-    DebuggerPreferences.height = this._frame.height;
+    DebuggerUIPreferences.height = this._frame.height;
     this._frame.removeEventListener("Debugger:Close", this.close, true);
     this._frame.removeEventListener("unload", this.close, true);
 
@@ -211,8 +162,6 @@ DebuggerPane.prototype = {
     this._splitter = null;
     this._frame = null;
     this._nbox = null;
-
-    this._globalUI.refreshCommand();
   },
 
   /**
@@ -237,112 +186,9 @@ DebuggerPane.prototype = {
 };
 
 /**
- * Creates a process that will hold the remote debugger.
- *
- * @param function aOnClose
- *        Optional, a function called when the process exits.
- * @param function aOnRun
- *        Optional, a function called when the process starts running.
- * @param nsIDOMWindow aWindow
- *        The chrome window for which the remote debugger instance is created.
+ * Various debugger UI preferences (currently just the pane height).
  */
-function DebuggerProcess(aWindow, aOnClose, aOnRun) {
-  this._win = aWindow;
-  this._closeCallback = aOnClose;
-  this._runCallback = aOnRun;
-  this._initProfile();
-  this._create();
-}
-
-DebuggerProcess.prototype = {
-
-  /**
-   * Initializes the debugger server.
-   */
-  _initServer: function RDP__initServer() {
-    if (!DebuggerServer.initialized) {
-      DebuggerServer.init();
-      DebuggerServer.addBrowserActors();
-    }
-    DebuggerServer.closeListener();
-    DebuggerServer.openListener(DebuggerPreferences.remotePort, false);
-  },
-
-  /**
-   * Initializes a profile for the remote debugger process.
-   */
-  _initProfile: function RDP__initProfile() {
-    let profileService = Cc["@mozilla.org/toolkit/profile-service;1"]
-      .createInstance(Ci.nsIToolkitProfileService);
-
-    let dbgProfileName;
-    try {
-      dbgProfileName = profileService.selectedProfile.name + REMOTE_PROFILE_NAME;
-    } catch(e) {
-      dbgProfileName = REMOTE_PROFILE_NAME;
-      Cu.reportError(e);
-    }
-
-    this._dbgProfile = profileService.createProfile(null, null, dbgProfileName);
-    profileService.flush();
-  },
-
-  /**
-   * Creates and initializes the profile & process for the remote debugger.
-   */
-  _create: function RDP__create() {
-    this._win._remoteDebugger = this;
-
-    let file = FileUtils.getFile("CurProcD",
-      [Services.appinfo.OS == "WINNT" ? "firefox.exe"
-                                      : "firefox-bin"]);
-
-    let process = Cc["@mozilla.org/process/util;1"].createInstance(Ci.nsIProcess);
-    process.init(file);
-
-    let args = [
-      "-no-remote", "-P", this._dbgProfile.name,
-      "-chrome", DBG_XUL,
-      "-width", DebuggerPreferences.remoteWinWidth,
-      "-height", DebuggerPreferences.remoteWinHeight];
-
-    process.runwAsync(args, args.length, { observe: this.close.bind(this) });
-    this._dbgProcess = process;
-
-    if (typeof this._runCallback === "function") {
-      this._runCallback.call({}, this);
-    }
-  },
-
-  /**
-   * Closes the remote debugger, removing the profile and killing the process.
-   */
-  close: function RDP_close() {
-    if (!this._win) {
-      return;
-    }
-    delete this._win._remoteDebugger;
-    this._win = null;
-
-    if (this._dbgProcess.isRunning) {
-      this._dbgProcess.kill();
-    }
-    if (this._dbgProfile) {
-      this._dbgProfile.remove(false);
-    }
-    if (typeof this._closeCallback === "function") {
-      this._closeCallback.call({}, this);
-    }
-
-    this._dbgProcess = null;
-    this._dbgProfile = null;
-  }
-};
-
-/**
- * Various debugger preferences.
- */
-let DebuggerPreferences = {
+let DebuggerUIPreferences = {
 
   /**
    * Gets the preferred height of the debugger pane.
@@ -364,35 +210,3 @@ let DebuggerPreferences = {
     this._height = value;
   }
 };
-
-/**
- * Gets the preferred width of the remote debugger window.
- * @return number
- */
-XPCOMUtils.defineLazyGetter(DebuggerPreferences, "remoteWinWidth", function() {
-  return Services.prefs.getIntPref("devtools.debugger.ui.remote-win.width");
-});
-
-/**
- * Gets the preferred height of the remote debugger window.
- * @return number
- */
-XPCOMUtils.defineLazyGetter(DebuggerPreferences, "remoteWinHeight", function() {
-  return Services.prefs.getIntPref("devtools.debugger.ui.remote-win.height");
-});
-
-/**
- * Gets the preferred default remote debugging host.
- * @return string
- */
-XPCOMUtils.defineLazyGetter(DebuggerPreferences, "remoteHost", function() {
-  return Services.prefs.getCharPref("devtools.debugger.remote-host");
-});
-
-/**
- * Gets the preferred default remote debugging port.
- * @return number
- */
-XPCOMUtils.defineLazyGetter(DebuggerPreferences, "remotePort", function() {
-  return Services.prefs.getIntPref("devtools.debugger.remote-port");
-});
diff --git a/browser/devtools/debugger/debugger-controller.js b/browser/devtools/debugger/debugger-controller.js
index 205b19828bd2..2632fb343987 100644
--- a/browser/devtools/debugger/debugger-controller.js
+++ b/browser/devtools/debugger/debugger-controller.js
@@ -114,7 +114,6 @@ let DebuggerController = {
 
     this.dispatchEvent("Debugger:Unloaded");
     this._disconnect();
-    this._isRemote && this._quitApp();
   },
 
   /**
@@ -122,10 +121,12 @@ let DebuggerController = {
    * wiring event handlers as necessary.
    */
   _connect: function DC__connect() {
-    let transport =
-      this._isRemote ? debuggerSocketConnect(Prefs.remoteHost, Prefs.remotePort)
-                     : DebuggerServer.connectPipe();
+    if (!DebuggerServer.initialized) {
+      DebuggerServer.init();
+      DebuggerServer.addBrowserActors();
+    }
 
+    let transport = DebuggerServer.connectPipe();
     let client = this.client = new DebuggerClient(transport);
 
     client.addListener("tabNavigated", this._onTabNavigated);
@@ -219,31 +220,6 @@ let DebuggerController = {
     }.bind(this));
   },
 
-  /**
-   * Returns true if this is a remote debugger instance.
-   * @return boolean
-   */
-  get _isRemote() {
-    return !window.parent.content;
-  },
-
-  /**
-   * Attempts to quit the current process if allowed.
-   */
-  _quitApp: function DC__quitApp() {
-    let canceled = Cc["@mozilla.org/supports-PRBool;1"]
-      .createInstance(Ci.nsISupportsPRBool);
-
-    Services.obs.notifyObservers(canceled, "quit-application-requested", null);
-
-    // Somebody canceled our quit request.
-    if (canceled.data) {
-      return;
-    }
-
-    Services.startup.quit(Ci.nsIAppStartup.eAttemptQuit);
-  },
-
   /**
    * Convenience method, dispatching a custom event.
    *
@@ -494,38 +470,6 @@ StackFrames.prototype = {
       this._addExpander(thisVar, frame.this);
     }
 
-    if (frame.environment) {
-      // Add nodes for every argument.
-      let variables = frame.environment.bindings.arguments;
-      for each (let variable in variables) {
-        let name = Object.getOwnPropertyNames(variable)[0];
-        let paramVar = localScope.addVar(name);
-        let paramVal = variable[name].value;
-        paramVar.setGrip(paramVal);
-        this._addExpander(paramVar, paramVal);
-      }
-
-      // Add nodes for every other variable in scope.
-      variables = frame.environment.bindings.variables;
-      for (let variable in variables) {
-        let paramVar = localScope.addVar(variable);
-        let paramVal = variables[variable].value;
-        paramVar.setGrip(paramVal);
-        this._addExpander(paramVar, paramVal);
-      }
-
-      // If we already found 'arguments', we are done here.
-      if ("arguments" in frame.environment.bindings.variables) {
-        // Signal that variables have been fetched.
-        DebuggerController.dispatchEvent("Debugger:FetchedVariables");
-        return;
-      }
-    }
-
-    // Sometimes in call frames with arguments we don't get 'arguments' in the
-    // environment (bug 746601) and we have to construct it manually. Note, that
-    // in this case arguments.callee will be absent, even in the cases where it
-    // shouldn't be.
     if (frame.arguments && frame.arguments.length > 0) {
       // Add "arguments".
       let argsVar = localScope.addVar("arguments");
@@ -535,20 +479,33 @@ StackFrames.prototype = {
       });
       this._addExpander(argsVar, frame.arguments);
 
-      // Signal that variables have been fetched.
-      DebuggerController.dispatchEvent("Debugger:FetchedVariables");
-    }
+      // Add variables for every argument.
+      let objClient = this.activeThread.pauseGrip(frame.callee);
+      objClient.getSignature(function SF_getSignature(aResponse) {
+        for (let i = 0, l = aResponse.parameters.length; i < l; i++) {
+          let param = aResponse.parameters[i];
+          let paramVar = localScope.addVar(param);
+          let paramVal = frame.arguments[i];
 
+          paramVar.setGrip(paramVal);
+          this._addExpander(paramVar, paramVal);
+        }
+
+        // Signal that call parameters have been fetched.
+        DebuggerController.dispatchEvent("Debugger:FetchedParameters");
+
+      }.bind(this));
+    }
   },
 
   /**
-   * Adds an 'onexpand' callback for a variable, lazily handling the addition of
+   * Adds a onexpand callback for a variable, lazily handling the addition of
    * new properties.
    */
   _addExpander: function SF__addExpander(aVar, aObject) {
     // No need for expansion for null and undefined values, but we do need them
     // for frame.arguments which is a regular array.
-    if (!aVar || !aObject || typeof aObject !== "object" ||
+    if (!aObject || typeof aObject !== "object" ||
         (aObject.type !== "object" && !Array.isArray(aObject))) {
       return;
     }
@@ -729,7 +686,7 @@ SourceScripts.prototype = {
    * Handler for the debugger client's unsolicited newScript notification.
    */
   _onNewScript: function SS__onNewScript(aNotification, aPacket) {
-    this._addScript({ url: aPacket.url, startLine: aPacket.startLine }, true);
+    this._addScript({ url: aPacket.url, startLine: aPacket.startLine });
   },
 
   /**
@@ -737,9 +694,8 @@ SourceScripts.prototype = {
    */
   _onScriptsAdded: function SS__onScriptsAdded() {
     for each (let script in this.activeThread.cachedScripts) {
-      this._addScript(script, false);
+      this._addScript(script);
     }
-    DebuggerView.Scripts.commitScripts();
   },
 
   /**
@@ -791,22 +747,6 @@ SourceScripts.prototype = {
     return aUrl;
   },
 
-  /**
-   * Gets the prePath for a script URL.
-   *
-   * @param string aUrl
-   *        The script url.
-   * @return string
-   *         The script prePath if the url is valid, null otherwise.
-   */
-  _getScriptPrePath: function SS__getScriptDomain(aUrl) {
-    try {
-      return Services.io.newURI(aUrl, null, null).prePath + "/";
-    } catch (e) {
-    }
-    return null;
-  },
-
   /**
    * Gets a unique, simplified label from a script url.
    * ex: a). ici://some.address.com/random/subrandom/
@@ -823,7 +763,7 @@ SourceScripts.prototype = {
    *        The script url.
    * @param string aHref
    *        The content location href to be used. If unspecified, it will
-   *        default to the script url prepath.
+   *        defalult to debugged panrent window location.
    * @return string
    *         The simplified label.
    */
@@ -834,18 +774,15 @@ SourceScripts.prototype = {
       return this._labelsCache[url];
     }
 
-    let content = window.parent.content;
-    let domain = content ? content.location.href : this._getScriptPrePath(aUrl);
-
-    let href = aHref || domain;
+    let href = aHref || window.parent.content.location.href;
     let pathElements = url.split("/");
     let label = pathElements.pop() || (pathElements.pop() + "/");
 
-    // If the label as a leaf name is already present in the scripts list.
+    // if the label as a leaf name is alreay present in the scripts list
     if (DebuggerView.Scripts.containsLabel(label)) {
       label = url.replace(href.substring(0, href.lastIndexOf("/") + 1), "");
 
-      // If the path/to/script is exactly the same, we're in different domains.
+      // if the path/to/script is exactly the same, we're in different domains
       if (DebuggerView.Scripts.containsLabel(label)) {
         label = url;
       }
@@ -863,16 +800,15 @@ SourceScripts.prototype = {
   },
 
   /**
-   * Add the specified script to the list.
-   *
-   * @param object aScript
-   *        The script object coming from the active thread.
-   * @param boolean aForceFlag
-   *        True to force the script to be immediately added.
+   * Add the specified script to the list and display it in the editor if the
+   * editor is empty.
    */
-  _addScript: function SS__addScript(aScript, aForceFlag) {
-    DebuggerView.Scripts.addScript(
-      this._getScriptLabel(aScript.url), aScript, aForceFlag);
+  _addScript: function SS__addScript(aScript) {
+    DebuggerView.Scripts.addScript(this._getScriptLabel(aScript.url), aScript);
+
+    if (DebuggerView.editor.getCharCount() == 0) {
+      this.showScript(aScript);
+    }
   },
 
   /**
@@ -940,7 +876,7 @@ SourceScripts.prototype = {
    * Handles notifications to load a source script from the cache or from a
    * local file.
    *
-   * XXX: It may be better to use nsITraceableChannel to get to the sources
+   * XXX: Tt may be better to use nsITraceableChannel to get to the sources
    * without relying on caching when we can (not for eval, etc.):
    * http://www.softwareishard.com/blog/firebug/nsitraceablechannel-intercept-http-traffic/
    */
@@ -1031,7 +967,7 @@ SourceScripts.prototype = {
    *        The failure status code.
    */
   _logError: function SS__logError(aUrl, aStatus) {
-    Cu.reportError(L10N.getFormatStr("loadingError", [aUrl, aStatus]));
+    Components.utils.reportError(L10N.getFormatStr("loadingError", [aUrl, aStatus]));
   },
 };
 
@@ -1322,27 +1258,6 @@ XPCOMUtils.defineLazyGetter(L10N, "stringBundle", function() {
   return Services.strings.createBundle(DBG_STRINGS_URI);
 });
 
-/**
- * Shortcuts for accessing various debugger preferences.
- */
-let Prefs = {};
-
-/**
- * Gets the preferred default remote debugging host.
- * @return string
- */
-XPCOMUtils.defineLazyGetter(Prefs, "remoteHost", function() {
-  return Services.prefs.getCharPref("devtools.debugger.remote-host");
-});
-
-/**
- * Gets the preferred default remote debugging port.
- * @return number
- */
-XPCOMUtils.defineLazyGetter(Prefs, "remotePort", function() {
-  return Services.prefs.getIntPref("devtools.debugger.remote-port");
-});
-
 /**
  * Preliminary setup for the DebuggerController object.
  */
diff --git a/browser/devtools/debugger/debugger-view.js b/browser/devtools/debugger/debugger-view.js
index 68cfca28ea5d..4620d6f3237e 100644
--- a/browser/devtools/debugger/debugger-view.js
+++ b/browser/devtools/debugger/debugger-view.js
@@ -90,7 +90,6 @@ let DebuggerView = {
  */
 function ScriptsView() {
   this._onScriptsChange = this._onScriptsChange.bind(this);
-  this._onScriptsSearch = this._onScriptsSearch.bind(this);
 }
 
 ScriptsView.prototype = {
@@ -104,14 +103,6 @@ ScriptsView.prototype = {
     }
   },
 
-  /**
-   * Removes the input in the searchbox and unhides all the scripts.
-   */
-  clearSearch: function DVS_clearSearch() {
-    this._searchbox.value = "";
-    this._onScriptsSearch({});
-  },
-
   /**
    * Checks whether the script with the specified URL is among the scripts
    * known to the debugger and shown in the list.
@@ -121,11 +112,6 @@ ScriptsView.prototype = {
    * @return boolean
    */
   contains: function DVS_contains(aUrl) {
-    if (this._tmpScripts.some(function(element) {
-      return element.script.url == aUrl;
-    })) {
-      return true;
-    }
     if (this._scripts.getElementsByAttribute("value", aUrl).length > 0) {
       return true;
     }
@@ -141,11 +127,6 @@ ScriptsView.prototype = {
    * @return boolean
    */
   containsLabel: function DVS_containsLabel(aLabel) {
-    if (this._tmpScripts.some(function(element) {
-      return element.label == aLabel;
-    })) {
-      return true;
-    }
     if (this._scripts.getElementsByAttribute("label", aLabel).length > 0) {
       return true;
     }
@@ -190,18 +171,6 @@ ScriptsView.prototype = {
            this._scripts.selectedItem.value : null;
   },
 
-  /**
-   * Returns the list of labels in the scripts container.
-   * @return array
-   */
-  get scriptLabels() {
-    let labels = [];
-    for (let i = 0, l = this._scripts.itemCount; i < l; i++) {
-      labels.push(this._scripts.getItemAtIndex(i).label);
-    }
-    return labels;
-  },
-
   /**
    * Returns the list of URIs for scripts in the page.
    * @return array
@@ -215,212 +184,50 @@ ScriptsView.prototype = {
   },
 
   /**
-   * Gets the number of visible (hidden=false) scripts in the container.
-   * @return number
-   */
-  get visibleItemsCount() {
-    let count = 0;
-    for (let i = 0, l = this._scripts.itemCount; i < l; i++) {
-      count += this._scripts.getItemAtIndex(i).hidden ? 0 : 1;
-    }
-    return count;
-  },
-
-  /**
-   * Prepares a script to be added to the scripts container. This allows
-   * for a large number of scripts to be batched up before being
-   * alphabetically sorted and added in the container.
-   * @see ScriptsView.commitScripts
-   *
-   * If aForceFlag is true, the script will be immediately inserted at the
-   * necessary position in the container so that all the scripts remain sorted.
-   * This can be much slower than batching up multiple scripts.
+   * Adds a script to the scripts container.
+   * If the script already exists (was previously added), null is returned.
+   * Otherwise, the newly created element is returned.
    *
    * @param string aLabel
    *        The simplified script location to be shown.
    * @param string aScript
    *        The source script.
-   * @param boolean aForceFlag
-   *        True to force the script to be immediately added.
+   * @return object
+   *         The newly created html node representing the added script.
    */
-  addScript: function DVS_addScript(aLabel, aScript, aForceFlag) {
-    // Batch the script to be added later.
-    if (!aForceFlag) {
-      this._tmpScripts.push({ label: aLabel, script: aScript });
-      return;
-    }
-
-    // Find the target position in the menulist and insert the script there.
-    for (let i = 0, l = this._scripts.itemCount; i < l; i++) {
-      if (this._scripts.getItemAtIndex(i).label > aLabel) {
-        this._createScriptElement(aLabel, aScript, i);
-        return;
-      }
-    }
-    // The script is alphabetically the last one.
-    this._createScriptElement(aLabel, aScript, -1, true);
-  },
-
-  /**
-   * Adds all the prepared scripts to the scripts container.
-   * If a script already exists (was previously added), nothing happens.
-   */
-  commitScripts: function DVS_commitScripts() {
-    let newScripts = this._tmpScripts;
-    this._tmpScripts = [];
-
-    if (!newScripts || !newScripts.length) {
-      return;
-    }
-    newScripts.sort(function(a, b) {
-      return a.label.toLowerCase() > b.label.toLowerCase();
-    });
-
-    for (let i = 0, l = newScripts.length; i < l; i++) {
-      let item = newScripts[i];
-      this._createScriptElement(item.label, item.script, -1, true);
-    }
-  },
-
-  /**
-   * Creates a custom script element and adds it to the scripts container.
-   * If the script with the specified label already exists, nothing happens.
-   *
-   * @param string aLabel
-   *        The simplified script location to be shown.
-   * @param string aScript
-   *        The source script.
-   * @param number aIndex
-   *        The index where to insert to new script in the container.
-   *        Pass -1 to append the script at the end.
-   * @param boolean aSelectIfEmptyFlag
-   *        True to set the newly created script as the currently selected item
-   *        if there are no other existing scripts in the container.
-   */
-  _createScriptElement: function DVS__createScriptElement(
-    aLabel, aScript, aIndex, aSelectIfEmptyFlag)
-  {
+  addScript: function DVS_addScript(aLabel, aScript) {
     // Make sure we don't duplicate anything.
-    if (aLabel == "null" || this.containsLabel(aLabel)) {
-      return;
+    if (this.containsLabel(aLabel)) {
+      return null;
     }
 
-    let scriptItem =
-      aIndex == -1 ? this._scripts.appendItem(aLabel, aScript.url)
-                   : this._scripts.insertItemAt(aIndex, aLabel, aScript.url);
+    let script = this._scripts.appendItem(aLabel, aScript.url);
+    script.setAttribute("tooltiptext", aScript.url);
+    script.setUserData("sourceScript", aScript, null);
 
-    scriptItem.setAttribute("tooltiptext", aScript.url);
-    scriptItem.setUserData("sourceScript", aScript, null);
-
-    if (this._scripts.itemCount == 1 && aSelectIfEmptyFlag) {
-      this._scripts.selectedItem = scriptItem;
-    }
+    this._scripts.selectedItem = script;
+    return script;
   },
 
   /**
-   * The click listener for the scripts container.
+   * The cached click listener for the scripts container.
    */
   _onScriptsChange: function DVS__onScriptsChange() {
     let script = this._scripts.selectedItem.getUserData("sourceScript");
-    this._preferredScript = script;
     DebuggerController.SourceScripts.showScript(script);
   },
 
   /**
-   * The search listener for the scripts search box.
-   */
-  _onScriptsSearch: function DVS__onScriptsSearch(e) {
-    let editor = DebuggerView.editor;
-    let scripts = this._scripts;
-    let rawValue = this._searchbox.value.toLowerCase();
-
-    let rawLength = rawValue.length;
-    let lastColon = rawValue.lastIndexOf(":");
-    let lastAt = rawValue.lastIndexOf("@");
-
-    let fileEnd = lastColon != -1 ? lastColon : lastAt != -1 ? lastAt : rawLength;
-    let lineEnd = lastAt != -1 ? lastAt : rawLength;
-
-    let file = rawValue.slice(0, fileEnd);
-    let line = window.parseInt(rawValue.slice(fileEnd + 1, lineEnd)) || -1;
-    let token = rawValue.slice(lineEnd + 1);
-
-    // Presume we won't find anything.
-    scripts.selectedItem = this._preferredScript;
-
-    // If we're not searching for a file anymore, unhide all the scripts.
-    if (!file) {
-      for (let i = 0, l = scripts.itemCount; i < l; i++) {
-        scripts.getItemAtIndex(i).hidden = false;
-      }
-    } else {
-      for (let i = 0, l = scripts.itemCount, found = false; i < l; i++) {
-        let item = scripts.getItemAtIndex(i);
-        let target = item.value.toLowerCase();
-
-        // Search is not case sensitive, and is tied to the url not the label.
-        if (target.match(file)) {
-          item.hidden = false;
-
-          if (!found) {
-            found = true;
-            scripts.selectedItem = item;
-          }
-        }
-        // Hide what doesn't match our search.
-        else {
-          item.hidden = true;
-        }
-      }
-    }
-    if (line > -1) {
-      editor.setCaretPosition(line - 1);
-    }
-    if (token) {
-      let offset = editor.find(token, { ignoreCase: true });
-      if (offset > -1) {
-        editor.setCaretPosition(0);
-        editor.setCaretOffset(offset);
-      }
-    }
-  },
-
-  /**
-   * The keyup listener for the scripts search box.
-   */
-  _onScriptsKeyUp: function DVS__onScriptsKeyUp(e) {
-    if (e.keyCode === e.DOM_VK_ESCAPE) {
-      DebuggerView.editor.focus();
-      return;
-    }
-
-    if (e.keyCode === e.DOM_VK_RETURN || e.keyCode === e.DOM_VK_ENTER) {
-      let editor = DebuggerView.editor;
-      let offset = editor.findNext(true);
-      if (offset > -1) {
-        editor.setCaretPosition(0);
-        editor.setCaretOffset(offset);
-      }
-    }
-  },
-
-  /**
-   * The cached scripts container and search box.
+   * The cached scripts container.
    */
   _scripts: null,
-  _searchbox: null,
 
   /**
    * Initialization function, called when the debugger is initialized.
    */
   initialize: function DVS_initialize() {
     this._scripts = document.getElementById("scripts");
-    this._searchbox = document.getElementById("scripts-search");
     this._scripts.addEventListener("select", this._onScriptsChange, false);
-    this._searchbox.addEventListener("select", this._onScriptsSearch, false);
-    this._searchbox.addEventListener("input", this._onScriptsSearch, false);
-    this._searchbox.addEventListener("keyup", this._onScriptsKeyUp, false);
-    this.commitScripts();
   },
 
   /**
@@ -428,11 +235,7 @@ ScriptsView.prototype = {
    */
   destroy: function DVS_destroy() {
     this._scripts.removeEventListener("select", this._onScriptsChange, false);
-    this._searchbox.removeEventListener("select", this._onScriptsSearch, false);
-    this._searchbox.removeEventListener("input", this._onScriptsSearch, false);
-    this._searchbox.removeEventListener("keyup", this._onScriptsKeyUp, false);
     this._scripts = null;
-    this._searchbox = null;
   }
 };
 
@@ -474,8 +277,6 @@ StackFramesView.prototype = {
     else {
       status.textContent = "";
     }
-
-    DebuggerView.Scripts.clearSearch();
   },
 
   /**
@@ -499,7 +300,7 @@ StackFramesView.prototype = {
 
     // The empty node should look grayed out to avoid confusion.
     item.className = "empty list-item";
-    item.appendChild(document.createTextNode(L10N.getStr("emptyStackText")));
+    item.appendChild(document.createTextNode(L10N.getStr("emptyText")));
 
     this._frames.appendChild(item);
   },
@@ -580,7 +381,7 @@ StackFramesView.prototype = {
    *        The frame depth specified by the debugger.
    */
   unhighlightFrame: function DVF_unhighlightFrame(aDepth) {
-    this.highlightFrame(aDepth, true);
+    this.highlightFrame(aDepth, true)
   },
 
   /**
diff --git a/browser/devtools/debugger/debugger.xul b/browser/devtools/debugger/debugger.xul
index f3d4d7e7a5a7..a396733a1da9 100644
--- a/browser/devtools/debugger/debugger.xul
+++ b/browser/devtools/debugger/debugger.xul
@@ -81,8 +81,6 @@
       <xul:button id="step-in">&debuggerUI.stepInButton;</xul:button>
       <xul:button id="step-out">&debuggerUI.stepOutButton;</xul:button>
       <xul:menulist id="scripts"/>
-      <xul:textbox id="scripts-search" type="search"
-                   emptytext="&debuggerUI.emptyFilterText;"/>
     </xul:toolbar>
     <div id="dbg-content" class="hbox flex">
       <div id="stack" class="vbox">
diff --git a/browser/devtools/debugger/test/Makefile.in b/browser/devtools/debugger/test/Makefile.in
index caae0ae85e40..6e5da8a604ad 100644
--- a/browser/devtools/debugger/test/Makefile.in
+++ b/browser/devtools/debugger/test/Makefile.in
@@ -46,7 +46,6 @@ include $(DEPTH)/config/autoconf.mk
 include $(topsrcdir)/config/rules.mk
 
 _BROWSER_TEST_FILES = \
-	browser_dbg_createRemote.js \
 	browser_dbg_debuggerstatement.js \
 	browser_dbg_listtabs.js \
 	browser_dbg_tabactor-01.js \
@@ -71,9 +70,6 @@ _BROWSER_TEST_FILES = \
 	browser_dbg_stack-05.js \
 	browser_dbg_location-changes.js \
 	browser_dbg_script-switching.js \
-	browser_dbg_scripts-sorting.js \
-	browser_dbg_scripts-searching-01.js \
-	browser_dbg_scripts-searching-02.js \
 	browser_dbg_pause-resume.js \
 	browser_dbg_update-editor-mode.js \
 	$(warning browser_dbg_select-line.js temporarily disabled due to oranges, see bug 726609) \
diff --git a/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js b/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
index 405ca7296018..ac6fa0bbecd2 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug723069_editor-breakpoints.js
@@ -23,44 +23,37 @@ function test()
   let SourceEditor = tempScope.SourceEditor;
   let scriptShown = false;
   let framesAdded = false;
-  let resumed = false;
-  let testStarted = false;
 
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
     gDebugger = gPane.debuggerWindow;
-    resumed = true;
-
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
-      executeSoon(startTest);
+      runTest();
     });
 
-    executeSoon(function() {
-      gDebuggee.firstCall();
-    });
+    gDebuggee.firstCall();
   });
 
-  function onScriptShown(aEvent)
-  {
-    scriptShown = aEvent.detail.url.indexOf("-02.js") != -1;
-    executeSoon(startTest);
-  }
+  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
+    let url = aEvent.detail.url;
+    if (url.indexOf("-02.js") != -1) {
+      scriptShown = true;
+      window.removeEventListener(aEvent.type, _onEvent);
+      runTest();
+    }
+  });
 
-  window.addEventListener("Debugger:ScriptShown", onScriptShown);
-
-  function startTest()
+  function runTest()
   {
-    if (scriptShown && framesAdded && resumed && !testStarted) {
-      window.removeEventListener("Debugger:ScriptShown", onScriptShown);
-      testStarted = true;
-      Services.tm.currentThread.dispatch({ run: performTest }, 0);
+    if (scriptShown && framesAdded) {
+      Services.tm.currentThread.dispatch({ run: onScriptShown }, 0);
     }
   }
 
-  function performTest()
+  function onScriptShown()
   {
     gScripts = gDebugger.DebuggerView.Scripts;
 
diff --git a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
index e9b8b9fdbbd1..385e124cd29b 100644
--- a/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
+++ b/browser/devtools/debugger/test/browser_dbg_bug731394_editor-contextmenu.js
@@ -21,43 +21,37 @@ function test()
   let contextMenu = null;
   let scriptShown = false;
   let framesAdded = false;
-  let resumed = false;
-  let testStarted = false;
 
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
     gDebugger = gPane.debuggerWindow;
-    resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
-      executeSoon(startTest);
-    });
-
-    executeSoon(function() {
-      gDebuggee.firstCall();
+      runTest();
     });
+    gDebuggee.firstCall();
   });
 
-  function onScriptShown(aEvent) {
-    scriptShown = aEvent.detail.url.indexOf("-02.js") != -1;
-    executeSoon(startTest);
-  }
+  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
+    let url = aEvent.detail.url;
+    if (url.indexOf("-02.js") != -1) {
+      scriptShown = true;
+      window.removeEventListener(aEvent.type, _onEvent);
+      runTest();
+    }
+  });
 
-  window.addEventListener("Debugger:ScriptShown", onScriptShown);
-
-  function startTest()
+  function runTest()
   {
-    if (scriptShown && framesAdded && resumed && !testStarted) {
-      testStarted = true;
-      window.removeEventListener("Debugger:ScriptShown", onScriptShown);
-      Services.tm.currentThread.dispatch({ run: performTest }, 0);
+    if (scriptShown && framesAdded) {
+      Services.tm.currentThread.dispatch({ run: onScriptShown }, 0);
     }
   }
 
-  function performTest()
+  function onScriptShown()
   {
     let scripts = gDebugger.DebuggerView.Scripts._scripts;
 
diff --git a/browser/devtools/debugger/test/browser_dbg_createRemote.js b/browser/devtools/debugger/test/browser_dbg_createRemote.js
deleted file mode 100644
index 1f0226ff9324..000000000000
--- a/browser/devtools/debugger/test/browser_dbg_createRemote.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-var gProcess = null;
-var gTab = null;
-var gDebuggee = null;
-
-function test() {
-  remote_debug_tab_pane(STACK_URL, aOnClosing, function(aTab, aDebuggee, aProcess) {
-    gTab = aTab;
-    gDebuggee = aDebuggee;
-    gProcess = aProcess;
-
-    testSimpleCall();
-  });
-}
-
-function testSimpleCall() {
-  Services.tm.currentThread.dispatch({ run: function() {
-
-    ok(gProcess._dbgProcess,
-      "The remote debugger process wasn't created properly!");
-    ok(gProcess._dbgProcess.isRunning,
-      "The remote debugger process isn't running!");
-    is(typeof gProcess._dbgProcess.pid, "number",
-      "The remote debugger process doesn't have a pid (?!)");
-
-    info("process location: " + gProcess._dbgProcess.location);
-    info("process pid: " + gProcess._dbgProcess.pid);
-    info("process name: " + gProcess._dbgProcess.processName);
-    info("process sig: " + gProcess._dbgProcess.processSignature);
-
-    ok(gProcess._dbgProfile,
-      "The remote debugger profile wasn't created properly!");
-    ok(gProcess._dbgProfile.localDir,
-      "The remote debugger profile doesn't have a localDir...");
-    ok(gProcess._dbgProfile.rootDir,
-      "The remote debugger profile doesn't have a rootDir...");
-    ok(gProcess._dbgProfile.name,
-      "The remote debugger profile doesn't have a name...");
-
-    info("profile localDir: " + gProcess._dbgProfile.localDir);
-    info("profile rootDir: " + gProcess._dbgProfile.rootDir);
-    info("profile name: " + gProcess._dbgProfile.name);
-
-    let profileService = Cc["@mozilla.org/toolkit/profile-service;1"]
-      .createInstance(Ci.nsIToolkitProfileService);
-
-    let profile = profileService.getProfileByName(gProcess._dbgProfile.name);
-
-    ok(profile,
-      "The remote debugger profile wasn't *actually* created properly!");
-    is(profile.localDir.path, gProcess._dbgProfile.localDir.path,
-      "The remote debugger profile doesn't have the correct localDir!");
-    is(profile.rootDir.path, gProcess._dbgProfile.rootDir.path,
-      "The remote debugger profile doesn't have the correct rootDir!");
-
-    DebuggerUI.toggleRemoteDebugger();
-  }}, 0);
-}
-
-function aOnClosing() {
-  ok(!gProcess._dbgProcess.isRunning,
-    "The remote debugger process isn't closed as it should be!");
-  is(gProcess._dbgProcess.exitValue, (Services.appinfo.OS == "WINNT" ? 0 : 256),
-    "The remote debugger process didn't die cleanly.");
-
-  info("process exit value: " + gProcess._dbgProcess.exitValue);
-
-  info("profile localDir: " + gProcess._dbgProfile.localDir.path);
-  info("profile rootDir: " + gProcess._dbgProfile.rootDir.path);
-  info("profile name: " + gProcess._dbgProfile.name);
-
-  executeSoon(function() {
-    finish();
-  });
-}
-
-registerCleanupFunction(function() {
-  removeTab(gTab);
-  gProcess = null;
-  gTab = null;
-  gDebuggee = null;
-});
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-01.js b/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
index 663ebfd60965..f92c0a04ffc6 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-01.js
@@ -85,8 +85,7 @@ function resumeAndFinish() {
   gDebugger.DebuggerController.activeThread.resume(function() {
     let vs = gDebugger.DebuggerView.Scripts;
     let ss = gDebugger.DebuggerController.SourceScripts;
-    vs.empty();
-    vs._scripts.removeEventListener("select", vs._onScriptsChange, false);
+    ss._onScriptsCleared();
 
     is(ss._trimUrlQuery("a/b/c.d?test=1&random=4"), "a/b/c.d",
       "Trimming the url query isn't done properly.");
@@ -102,11 +101,12 @@ function resumeAndFinish() {
       { href: "si://interesting.address.moc/random/x/y/", leaf: "script.js?a=1&b=2&c=3" }
     ];
 
+    vs._scripts.removeEventListener("select", vs._onScriptsChange, false);
+
     urls.forEach(function(url) {
       executeSoon(function() {
         let loc = url.href + url.leaf;
         vs.addScript(ss._getScriptLabel(loc, url.href), { url: loc });
-        vs.commitScripts();
       });
     });
 
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-07.js b/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
index 6c12ba93f76d..e0efb63fc4cb 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-07.js
@@ -27,10 +27,10 @@ function testFrameParameters()
 {
   dump("Started testFrameParameters!\n");
 
-  gDebugger.addEventListener("Debugger:FetchedVariables", function test() {
-    dump("Entered Debugger:FetchedVariables!\n");
+  gDebugger.addEventListener("Debugger:FetchedParameters", function test() {
+    dump("Entered Debugger:FetchedParameters!\n");
 
-    gDebugger.removeEventListener("Debugger:FetchedVariables", test, false);
+    gDebugger.removeEventListener("Debugger:FetchedParameters", test, false);
     Services.tm.currentThread.dispatch({ run: function() {
 
       dump("After currentThread.dispatch!\n");
@@ -52,42 +52,33 @@ function testFrameParameters()
       is(frames.querySelectorAll(".dbg-stackframe").length, 3,
         "Should have three frames.");
 
-      is(localNodes.length, 11,
+      is(localNodes.length, 8,
         "The localScope should contain all the created variable elements.");
 
       is(localNodes[0].querySelector(".info").textContent, "[object Proxy]",
         "Should have the right property value for 'this'.");
 
-      is(localNodes[1].querySelector(".info").textContent, "[object Object]",
+      is(localNodes[1].querySelector(".info").textContent, "[object Arguments]",
+        "Should have the right property value for 'arguments'.");
+
+      is(localNodes[2].querySelector(".info").textContent, "[object Object]",
         "Should have the right property value for 'aArg'.");
 
-      is(localNodes[2].querySelector(".info").textContent, '"beta"',
+      is(localNodes[3].querySelector(".info").textContent, '"beta"',
         "Should have the right property value for 'bArg'.");
 
-      is(localNodes[3].querySelector(".info").textContent, "3",
+      is(localNodes[4].querySelector(".info").textContent, "3",
         "Should have the right property value for 'cArg'.");
 
-      is(localNodes[4].querySelector(".info").textContent, "false",
+      is(localNodes[5].querySelector(".info").textContent, "false",
         "Should have the right property value for 'dArg'.");
 
-      is(localNodes[5].querySelector(".info").textContent, "null",
+      is(localNodes[6].querySelector(".info").textContent, "null",
         "Should have the right property value for 'eArg'.");
 
-      is(localNodes[6].querySelector(".info").textContent, "undefined",
+      is(localNodes[7].querySelector(".info").textContent, "undefined",
         "Should have the right property value for 'fArg'.");
 
-      is(localNodes[7].querySelector(".info").textContent, "1",
-        "Should have the right property value for 'a'.");
-
-      is(localNodes[8].querySelector(".info").textContent, "[object Object]",
-        "Should have the right property value for 'b'.");
-
-      is(localNodes[9].querySelector(".info").textContent, "[object Object]",
-        "Should have the right property value for 'c'.");
-
-      is(localNodes[10].querySelector(".info").textContent, "[object Arguments]",
-        "Should have the right property value for 'arguments'.");
-
       resumeAndFinish();
     }}, 0);
   }, false);
diff --git a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
index da5f18d1f2c3..fbbccf3fea1d 100644
--- a/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
+++ b/browser/devtools/debugger/test/browser_dbg_propertyview-08.js
@@ -27,10 +27,10 @@ function testFrameParameters()
 {
   dump("Started testFrameParameters!\n");
 
-  gDebugger.addEventListener("Debugger:FetchedVariables", function test() {
-    dump("Entered Debugger:FetchedVariables!\n");
+  gDebugger.addEventListener("Debugger:FetchedParameters", function test() {
+    dump("Entered Debugger:FetchedParameters!\n");
 
-    gDebugger.removeEventListener("Debugger:FetchedVariables", test, false);
+    gDebugger.removeEventListener("Debugger:FetchedParameters", test, false);
     Services.tm.currentThread.dispatch({ run: function() {
 
       dump("After currentThread.dispatch!\n");
@@ -50,17 +50,16 @@ function testFrameParameters()
       is(frames.querySelectorAll(".dbg-stackframe").length, 3,
         "Should have three frames.");
 
-      is(localNodes.length, 11,
+      is(localNodes.length, 8,
         "The localScope should contain all the created variable elements.");
 
       is(localNodes[0].querySelector(".info").textContent, "[object Proxy]",
         "Should have the right property value for 'this'.");
 
-      // Expand the '__proto__', 'arguments' and 'a' tree nodes. This causes
-      // their properties to be retrieved and displayed.
+      // Expand the __proto__ and arguments tree nodes. This causes their
+      // properties to be retrieved and displayed.
       localNodes[0].expand();
-      localNodes[9].expand();
-      localNodes[10].expand();
+      localNodes[1].expand();
 
       // Poll every few milliseconds until the properties are retrieved.
       // It's important to set the timer in the chrome window, because the
@@ -71,9 +70,7 @@ function testFrameParameters()
           ok(false, "Timed out while polling for the properties.");
           resumeAndFinish();
         }
-        if (!localNodes[0].fetched ||
-            !localNodes[9].fetched ||
-            !localNodes[10].fetched) {
+        if (!localNodes[0].fetched || !localNodes[1].fetched) {
           return;
         }
         window.clearInterval(intervalID);
@@ -85,26 +82,14 @@ function testFrameParameters()
                         .textContent.search(/object/) != -1,
           "__proto__ should be an object.");
 
-        is(localNodes[9].querySelector(".info").textContent, "[object Object]",
-          "Should have the right property value for 'c'.");
-
-        is(localNodes[9].querySelectorAll(".property > .title > .key")[1]
-                        .textContent, "a",
-          "Should have the right property name for 'a'.");
-
-        is(localNodes[9].querySelectorAll(".property > .title > .value")[1]
-                        .textContent, 1,
-          "Should have the right value for 'c.a'.");
-
-        is(localNodes[10].querySelector(".info").textContent,
-          "[object Arguments]",
+        is(localNodes[1].querySelector(".info").textContent, "[object Arguments]",
           "Should have the right property value for 'arguments'.");
 
-        is(localNodes[10].querySelector(".property > .title > .key")
+        is(localNodes[1].querySelector(".property > .title > .key")
                         .textContent, "length",
-          "Should have the right property name for 'length'.");
+          "Should have the right property name for length.");
 
-        is(localNodes[10].querySelector(".property > .title > .value")
+        is(localNodes[1].querySelector(".property > .title > .value")
                         .textContent, 5,
           "Should have the right argument length.");
 
@@ -119,8 +104,7 @@ function testFrameParameters()
 }
 
 function resumeAndFinish() {
-  let thread = gDebugger.DebuggerController.activeThread;
-  thread.addOneTimeListener("framescleared", function() {
+  gDebugger.DebuggerController.activeThread.addOneTimeListener("framescleared", function() {
     Services.tm.currentThread.dispatch({ run: function() {
       var frames = gDebugger.DebuggerView.StackFrames._frames;
 
@@ -131,7 +115,7 @@ function resumeAndFinish() {
     }}, 0);
   });
 
-  thread.resume();
+  gDebugger.DebuggerController.activeThread.resume();
 }
 
 registerCleanupFunction(function() {
diff --git a/browser/devtools/debugger/test/browser_dbg_script-switching.js b/browser/devtools/debugger/test/browser_dbg_script-switching.js
index a3548c4e89c9..7e876753e33c 100644
--- a/browser/devtools/debugger/test/browser_dbg_script-switching.js
+++ b/browser/devtools/debugger/test/browser_dbg_script-switching.js
@@ -8,6 +8,10 @@
 
 const TAB_URL = EXAMPLE_URL + "browser_dbg_script-switching.html";
 
+let tempScope = {};
+Cu.import("resource:///modules/source-editor.jsm", tempScope);
+let SourceEditor = tempScope.SourceEditor;
+
 var gPane = null;
 var gTab = null;
 var gDebuggee = null;
@@ -18,39 +22,33 @@ function test()
 {
   let scriptShown = false;
   let framesAdded = false;
-  let resumed = false;
-  let testStarted = false;
 
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
     gDebugger = gPane.debuggerWindow;
-    resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
-      executeSoon(startTest);
+      runTest();
     });
 
-    executeSoon(function() {
-      gDebuggee.firstCall();
-    });
+    gDebuggee.firstCall();
   });
 
-  function onScriptShown(aEvent)
-  {
-    scriptShown = aEvent.detail.url.indexOf("-02.js") != -1;
-    executeSoon(startTest);
-  }
+  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
+    let url = aEvent.detail.url;
+    if (url.indexOf("-02.js") != -1) {
+      scriptShown = true;
+      window.removeEventListener(aEvent.type, _onEvent);
+      runTest();
+    }
+  });
 
-  window.addEventListener("Debugger:ScriptShown", onScriptShown);
-
-  function startTest()
+  function runTest()
   {
-    if (scriptShown && framesAdded && resumed && !testStarted) {
-      window.removeEventListener("Debugger:ScriptShown", onScriptShown);
-      testStarted = true;
+    if (scriptShown && framesAdded) {
       Services.tm.currentThread.dispatch({ run: testScriptsDisplay }, 0);
     }
   }
@@ -81,6 +79,8 @@ function testScriptsDisplay() {
   ok(gDebugger.DebuggerView.Scripts.containsLabel(
     label2), "Second script label is incorrect.");
 
+  dump("Debugger editor text:\n" + gDebugger.editor.getText() + "\n");
+
   ok(gDebugger.editor.getText().search(/debugger/) != -1,
     "The correct script was loaded initially.");
 
@@ -100,6 +100,8 @@ function testScriptsDisplay() {
 
 function testSwitchPaused()
 {
+  dump("Debugger editor text:\n" + gDebugger.editor.getText() + "\n");
+
   ok(gDebugger.editor.getText().search(/debugger/) == -1,
     "The second script is no longer displayed.");
 
@@ -125,8 +127,6 @@ function testSwitchPaused()
 
 function testSwitchRunning()
 {
-  dump("Debugger editor text:\n" + gDebugger.editor.getText() + "\n");
-
   ok(gDebugger.editor.getText().search(/debugger/) != -1,
     "The second script is displayed again.");
 
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
deleted file mode 100644
index d085f9fb31b3..000000000000
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-01.js
+++ /dev/null
@@ -1,188 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-var gPane = null;
-var gTab = null;
-var gDebuggee = null;
-var gDebugger = null;
-var gEditor = null;
-var gScripts = null;
-var gSearchBox = null;
-var gMenulist = null;
-
-function test()
-{
-  let scriptShown = false;
-  let framesAdded = false;
-
-  debug_tab_pane(STACK_URL, function(aTab, aDebuggee, aPane) {
-    gTab = aTab;
-    gDebuggee = aDebuggee;
-    gPane = aPane;
-    gDebugger = gPane.debuggerWindow;
-
-    gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
-      framesAdded = true;
-      runTest();
-    });
-
-    gDebuggee.simpleCall();
-  });
-
-  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
-    window.removeEventListener(aEvent.type, _onEvent);
-    scriptShown = true;
-    runTest();
-  });
-
-  function runTest()
-  {
-    if (scriptShown && framesAdded) {
-      Services.tm.currentThread.dispatch({ run: testScriptSearching }, 0);
-    }
-  }
-}
-
-function testScriptSearching() {
-  gDebugger.DebuggerController.activeThread.resume(function() {
-    gEditor = gDebugger.DebuggerView.editor;
-    gScripts = gDebugger.DebuggerView.Scripts;
-    gSearchBox = gScripts._searchbox;
-    gMenulist = gScripts._scripts;
-
-    write(":12");
-    ok(gEditor.getCaretPosition().line == 11 &&
-       gEditor.getCaretPosition().col == 0,
-      "The editor didn't jump to the correct line.");
-
-    write("@debugger");
-    ok(gEditor.getCaretPosition().line == 2 &&
-       gEditor.getCaretPosition().col == 44,
-      "The editor didn't jump to the correct token. (1)");
-
-    EventUtils.sendKey("RETURN");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (2)");
-
-    EventUtils.sendKey("ENTER");
-    ok(gEditor.getCaretPosition().line == 12 &&
-       gEditor.getCaretPosition().col == 8,
-      "The editor didn't jump to the correct token. (3)");
-
-    EventUtils.sendKey("ENTER");
-    ok(gEditor.getCaretPosition().line == 19 &&
-       gEditor.getCaretPosition().col == 4,
-      "The editor didn't jump to the correct token. (4)");
-
-    EventUtils.sendKey("RETURN");
-    ok(gEditor.getCaretPosition().line == 2 &&
-       gEditor.getCaretPosition().col == 44,
-      "The editor didn't jump to the correct token. (5)");
-
-
-    write(":bogus@debugger;");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (7)");
-
-    write(":13@debugger;");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (7)");
-
-    write(":@debugger;");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (8)");
-
-    write("::@debugger;");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (9)");
-
-    write(":::@debugger;");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (10)");
-
-
-    write(":i am not a number");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't remain at the correct token. (11)");
-
-    write("@__i do not exist__");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't remain at the correct token. (12)");
-
-
-    write(":1:2:3:a:b:c:::12");
-    ok(gEditor.getCaretPosition().line == 11 &&
-       gEditor.getCaretPosition().col == 0,
-      "The editor didn't jump to the correct line. (13)");
-
-    write("@don't@find@me@instead@find@debugger");
-    ok(gEditor.getCaretPosition().line == 2 &&
-       gEditor.getCaretPosition().col == 44,
-      "The editor didn't jump to the correct token. (14)");
-
-    EventUtils.sendKey("RETURN");
-    ok(gEditor.getCaretPosition().line == 8 &&
-       gEditor.getCaretPosition().col == 2,
-      "The editor didn't jump to the correct token. (15)");
-
-    EventUtils.sendKey("ENTER");
-    ok(gEditor.getCaretPosition().line == 12 &&
-       gEditor.getCaretPosition().col == 8,
-      "The editor didn't jump to the correct token. (16)");
-
-    EventUtils.sendKey("RETURN");
-    ok(gEditor.getCaretPosition().line == 19 &&
-       gEditor.getCaretPosition().col == 4,
-      "The editor didn't jump to the correct token. (17)");
-
-    EventUtils.sendKey("ENTER");
-    ok(gEditor.getCaretPosition().line == 2 &&
-       gEditor.getCaretPosition().col == 44,
-      "The editor didn't jump to the correct token. (18)");
-
-
-    clear();
-    ok(gEditor.getCaretPosition().line == 2 &&
-       gEditor.getCaretPosition().col == 44,
-      "The editor didn't remain at the correct token. (19)");
-    is(gScripts.visibleItemsCount, 1,
-      "Not all the scripts are shown after the search. (20)");
-
-    closeDebuggerAndFinish(gTab);
-  });
-}
-
-function clear() {
-  gSearchBox.focus();
-  gSearchBox.value = "";
-}
-
-function write(text) {
-  clear();
-
-  for (let i = 0; i < text.length; i++) {
-    EventUtils.sendChar(text[i]);
-  }
-  dump("editor caret position: " + gEditor.getCaretPosition().toSource() + "\n");
-}
-
-registerCleanupFunction(function() {
-  removeTab(gTab);
-  gPane = null;
-  gTab = null;
-  gDebuggee = null;
-  gDebugger = null;
-  gEditor = null;
-  gScripts = null;
-  gSearchBox = null;
-  gMenulist = null;
-});
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js b/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
deleted file mode 100644
index 93400d37d6e8..000000000000
--- a/browser/devtools/debugger/test/browser_dbg_scripts-searching-02.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-const TAB_URL = EXAMPLE_URL + "browser_dbg_script-switching.html";
-
-var gPane = null;
-var gTab = null;
-var gDebuggee = null;
-var gDebugger = null;
-var gEditor = null;
-var gScripts = null;
-var gSearchBox = null;
-var gMenulist = null;
-
-function test()
-{
-  let scriptShown = false;
-  let framesAdded = false;
-
-  debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
-    gTab = aTab;
-    gDebuggee = aDebuggee;
-    gPane = aPane;
-    gDebugger = gPane.debuggerWindow;
-
-    gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
-      framesAdded = true;
-      runTest();
-    });
-
-    gDebuggee.firstCall();
-  });
-
-  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
-    let url = aEvent.detail.url;
-    if (url.indexOf("-02.js") != -1) {
-      scriptShown = true;
-      window.removeEventListener(aEvent.type, _onEvent);
-      runTest();
-    }
-  });
-
-  function runTest()
-  {
-    if (scriptShown && framesAdded) {
-      Services.tm.currentThread.dispatch({ run: testScriptSearching }, 0);
-    }
-  }
-}
-
-function testScriptSearching() {
-  gDebugger.DebuggerController.activeThread.resume(function() {
-    gEditor = gDebugger.DebuggerView.editor;
-    gScripts = gDebugger.DebuggerView.Scripts;
-    gSearchBox = gScripts._searchbox;
-    gMenulist = gScripts._scripts;
-
-    firstSearch();
-  });
-}
-
-function firstSearch() {
-  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
-    dump("Current script url:\n" + aEvent.detail.url + "\n");
-    dump("Debugger editor text:\n" + gEditor.getText() + "\n");
-
-    let url = aEvent.detail.url;
-    if (url.indexOf("-01.js") != -1) {
-      window.removeEventListener(aEvent.type, _onEvent);
-
-      executeSoon(function() {
-        dump("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n");
-        ok(gEditor.getCaretPosition().line == 4 &&
-           gEditor.getCaretPosition().col == 0,
-          "The editor didn't jump to the correct line. (1)");
-        is(gScripts.visibleItemsCount, 1,
-          "Not all the correct scripts are shown after the search. (1)");
-
-        secondSearch();
-      });
-    }
-  });
-  write(".*-01\.js:5");
-}
-
-function secondSearch() {
-  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
-    dump("Current script url:\n" + aEvent.detail.url + "\n");
-    dump("Debugger editor text:\n" + gEditor.getText() + "\n");
-
-    let url = aEvent.detail.url;
-    if (url.indexOf("-02.js") != -1) {
-      window.removeEventListener(aEvent.type, _onEvent);
-
-      executeSoon(function() {
-        dump("Editor caret position: " + gEditor.getCaretPosition().toSource() + "\n");
-        ok(gEditor.getCaretPosition().line == 5 &&
-           gEditor.getCaretPosition().col == 8,
-          "The editor didn't jump to the correct line. (2)");
-        is(gScripts.visibleItemsCount, 1,
-          "Not all the correct scripts are shown after the search. (2)");
-
-        finalCheck();
-      });
-    }
-  });
-  write(".*-02\.js@debugger;");
-}
-
-function finalCheck() {
-  clear();
-  ok(gEditor.getCaretPosition().line == 5 &&
-     gEditor.getCaretPosition().col == 8,
-    "The editor didn't remain at the correct token. (3)");
-  is(gScripts.visibleItemsCount, 2,
-    "Not all the scripts are shown after the search. (3)");
-
-  closeDebuggerAndFinish(gTab);
-}
-
-function clear() {
-  gSearchBox.focus();
-  gSearchBox.value = "";
-}
-
-function write(text) {
-  clear();
-
-  for (let i = 0; i < text.length; i++) {
-    EventUtils.sendChar(text[i]);
-  }
-  dump("editor caret position: " + gEditor.getCaretPosition().toSource() + "\n");
-}
-
-registerCleanupFunction(function() {
-  removeTab(gTab);
-  gPane = null;
-  gTab = null;
-  gDebuggee = null;
-  gDebugger = null;
-  gEditor = null;
-  gScripts = null;
-  gSearchBox = null;
-  gMenulist = null;
-});
diff --git a/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js b/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
deleted file mode 100644
index b2ae619ef5b7..000000000000
--- a/browser/devtools/debugger/test/browser_dbg_scripts-sorting.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/* vim:set ts=2 sw=2 sts=2 et: */
-/*
- * Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/
- */
-var gPane = null;
-var gTab = null;
-var gDebuggee = null;
-var gDebugger = null;
-
-function test() {
-  debug_tab_pane(STACK_URL, function(aTab, aDebuggee, aPane) {
-    gTab = aTab;
-    gDebuggee = aDebuggee;
-    gPane = aPane;
-    gDebugger = gPane.debuggerWindow;
-
-    testSimpleCall();
-  });
-}
-
-function testSimpleCall() {
-  gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
-    Services.tm.currentThread.dispatch({ run: function() {
-      resumeAndFinish();
-    }}, 0);
-  });
-
-  gDebuggee.simpleCall();
-}
-
-function resumeAndFinish() {
-  gDebugger.DebuggerController.activeThread.resume(function() {
-    checkScriptsOrder();
-    addScriptsAndCheckOrder(1, function() {
-      addScriptsAndCheckOrder(2, function() {
-        addScriptsAndCheckOrder(3, function() {
-          closeDebuggerAndFinish(gTab);
-        });
-      });
-    });
-  });
-}
-
-function addScriptsAndCheckOrder(method, callback) {
-  let vs = gDebugger.DebuggerView.Scripts;
-  let ss = gDebugger.DebuggerController.SourceScripts;
-  vs.empty();
-  vs._scripts.removeEventListener("select", vs._onScriptsChange, false);
-
-  let urls = [
-    { href: "ici://some.address.com/random/", leaf: "subrandom/" },
-    { href: "ni://another.address.org/random/subrandom/", leaf: "page.html" },
-    { href: "san://interesting.address.gro/random/", leaf: "script.js" },
-    { href: "si://interesting.address.moc/random/", leaf: "script.js" },
-    { href: "si://interesting.address.moc/random/", leaf: "x/script.js" },
-    { href: "si://interesting.address.moc/random/", leaf: "x/y/script.js?a=1" },
-    { href: "si://interesting.address.moc/random/x/", leaf: "y/script.js?a=1&b=2" },
-    { href: "si://interesting.address.moc/random/x/y/", leaf: "script.js?a=1&b=2&c=3" }
-  ];
-
-  urls.sort(function(a, b) {
-    return Math.random() - 0.5;
-  });
-
-  switch (method) {
-    case 1:
-      urls.forEach(function(url) {
-        let loc = url.href + url.leaf;
-        vs.addScript(ss._getScriptLabel(loc, url.href), { url: loc });
-      });
-      vs.commitScripts();
-      break;
-
-    case 2:
-      urls.forEach(function(url) {
-        let loc = url.href + url.leaf;
-        vs.addScript(ss._getScriptLabel(loc, url.href), { url: loc }, true);
-      });
-      break;
-
-    case 3:
-      let i = 0
-      for (; i < urls.length / 2; i++) {
-        let url = urls[i];
-        let loc = url.href + url.leaf;
-        vs.addScript(ss._getScriptLabel(loc, url.href), { url: loc });
-      }
-      vs.commitScripts();
-
-      for (; i < urls.length; i++) {
-        let url = urls[i];
-        let loc = url.href + url.leaf;
-        vs.addScript(ss._getScriptLabel(loc, url.href), { url: loc }, true);
-      }
-      break;
-  }
-
-  executeSoon(function() {
-    checkScriptsOrder(method);
-    callback();
-  });
-}
-
-function checkScriptsOrder(method) {
-  let labels = gDebugger.DebuggerView.Scripts.scriptLabels;
-  let sorted = labels.reduce(function(prev, curr, index, array) {
-    return array[index - 1] < array[index];
-  });
-
-  ok(sorted,
-    "Using method " + method + ", " +
-    "the scripts weren't in the correct order: " + labels.toSource());
-
-  return sorted;
-}
-
-registerCleanupFunction(function() {
-  removeTab(gTab);
-  gPane = null;
-  gTab = null;
-  gDebuggee = null;
-  gDebugger = null;
-});
diff --git a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
index 68b3c67358c1..972abbb5d04d 100644
--- a/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
+++ b/browser/devtools/debugger/test/browser_dbg_update-editor-mode.js
@@ -22,38 +22,32 @@ function test()
 {
   let scriptShown = false;
   let framesAdded = false;
-  let testStarted = false;
-  let resumed = false;
 
   debug_tab_pane(TAB_URL, function(aTab, aDebuggee, aPane) {
     gTab = aTab;
     gDebuggee = aDebuggee;
     gPane = aPane;
     gDebugger = gPane.debuggerWindow;
-    resumed = true;
 
     gDebugger.DebuggerController.activeThread.addOneTimeListener("framesadded", function() {
       framesAdded = true;
-      executeSoon(startTest);
-    });
-
-    executeSoon(function() {
-      gDebuggee.firstCall();
+      runTest();
     });
+    gDebuggee.firstCall();
   });
 
-  function onScriptShown(aEvent) {
-    scriptShown = aEvent.detail.url.indexOf("test-editor-mode") != -1;
-    executeSoon(startTest);
-  }
+  window.addEventListener("Debugger:ScriptShown", function _onEvent(aEvent) {
+    let url = aEvent.detail.url;
+    if (url.indexOf("editor-mode") != -1) {
+      scriptShown = true;
+      window.removeEventListener(aEvent.type, _onEvent);
+      runTest();
+    }
+  });
 
-  window.addEventListener("Debugger:ScriptShown", onScriptShown);
-
-  function startTest()
+  function runTest()
   {
-    if (scriptShown && framesAdded && resumed && !testStarted) {
-      window.removeEventListener("Debugger:ScriptShown", onScriptShown);
-      testStarted = true;
+    if (scriptShown && framesAdded) {
       Services.tm.currentThread.dispatch({ run: testScriptsDisplay }, 0);
     }
   }
diff --git a/browser/devtools/debugger/test/head.js b/browser/devtools/debugger/test/head.js
index 506072a909ac..49acd5f74a20 100644
--- a/browser/devtools/debugger/test/head.js
+++ b/browser/devtools/debugger/test/head.js
@@ -92,6 +92,7 @@ function debug_tab_pane(aURL, aOnDebugging)
 {
   let tab = addTab(aURL, function() {
     gBrowser.selectedTab = gTab;
+
     let debuggee = tab.linkedBrowser.contentWindow.wrappedJSObject;
 
     let pane = DebuggerUI.toggleDebugger();
@@ -105,17 +106,3 @@ function debug_tab_pane(aURL, aOnDebugging)
     }, true);
   });
 }
-
-function remote_debug_tab_pane(aURL, aOnClosing, aOnDebugging)
-{
-  let tab = addTab(aURL, function() {
-    gBrowser.selectedTab = gTab;
-    let debuggee = tab.linkedBrowser.contentWindow.wrappedJSObject;
-
-    DebuggerUI.toggleRemoteDebugger(aOnClosing, function dbgRan(process) {
-
-      // Wait for the remote debugging process to start...
-      aOnDebugging(tab, debuggee, process);
-    });
-  });
-}
diff --git a/browser/devtools/highlighter/inspector.jsm b/browser/devtools/highlighter/inspector.jsm
index a4ac9bbdc939..1bc4fa99e3ad 100644
--- a/browser/devtools/highlighter/inspector.jsm
+++ b/browser/devtools/highlighter/inspector.jsm
@@ -398,7 +398,7 @@ InspectorUI.prototype = {
    */
   get isInspectorOpen()
   {
-    return !!(this.toolbar && !this.toolbar.hidden && this.highlighter);
+    return this.toolbar && !this.toolbar.hidden && this.highlighter;
   },
 
   /**
@@ -647,7 +647,7 @@ InspectorUI.prototype = {
     if (!aKeepInspector)
       this.store.deleteInspector(this.winID);
 
-    this.inspectMenuitem.removeAttribute("checked");
+    this.inspectMenuitem.setAttribute("checked", false);
     this.browser = this.win = null; // null out references to browser and window
     this.winID = null;
     this.selection = null;
diff --git a/browser/devtools/jar.mn b/browser/devtools/jar.mn
index 10a680bd3a96..38795a34a19a 100644
--- a/browser/devtools/jar.mn
+++ b/browser/devtools/jar.mn
@@ -17,5 +17,3 @@ browser.jar:
     content/browser/debugger.css                  (debugger/debugger.css)
     content/browser/debugger-controller.js        (debugger/debugger-controller.js)
     content/browser/debugger-view.js              (debugger/debugger-view.js)
-    content/browser/devtools/gcli.css             (webconsole/gcli.css)
-    content/browser/devtools/gcliblank.xhtml      (webconsole/gcliblank.xhtml)
diff --git a/browser/devtools/shared/DeveloperToolbar.jsm b/browser/devtools/shared/DeveloperToolbar.jsm
deleted file mode 100644
index f8742b66da41..000000000000
--- a/browser/devtools/shared/DeveloperToolbar.jsm
+++ /dev/null
@@ -1,476 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the Firefox Developer Toolbar.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2012
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Dave Camp <dcamp@mozilla.com> (Original Author)
- *   Joe Walker <jwalker@mozilla.com>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-"use strict";
-
-Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
-Components.utils.import("resource://gre/modules/Services.jsm");
-
-let EXPORTED_SYMBOLS = [ "DeveloperToolbar", "loadCommands" ];
-
-XPCOMUtils.defineLazyGetter(this, "gcli", function () {
-  let obj = {};
-  Components.utils.import("resource:///modules/gcli.jsm", obj);
-  return obj.gcli;
-});
-
-let console = gcli._internal.console;
-
-/**
- * Load the various Command JSMs.
- * Should be called when the developer toolbar first opens.
- */
-function loadCommands()
-{
-  Components.utils.import("resource:///modules/GcliCommands.jsm", {});
-  Components.utils.import("resource:///modules/GcliTiltCommands.jsm", {});
-}
-
-
-
-let commandsLoaded = false;
-
-/**
- * A component to manage the global developer toolbar, which contains a GCLI
- * and buttons for various developer tools.
- * @param aChromeWindow The browser window to which this toolbar is attached
- * @param aToolbarElement See browser.xul:<toolbar id="developer-toolbar">
- */
-function DeveloperToolbar(aChromeWindow, aToolbarElement)
-{
-  if (!commandsLoaded) {
-    loadCommands();
-    commandsLoaded = true;
-  }
-
-  this._chromeWindow = aChromeWindow;
-
-  this._element = aToolbarElement;
-  this._element.hidden = true;
-  this._doc = this._element.ownerDocument;
-
-  this._command = this._doc.getElementById("Tools:DevToolbar");
-
-  aChromeWindow.getBrowser().tabContainer.addEventListener("TabSelect", this, false);
-}
-
-/**
- * Inspector notifications dispatched through the nsIObserverService
- */
-const NOTIFICATIONS = {
-  /** DeveloperToolbar.show() has been called */
-  SHOW: "developer-toolbar-show",
-
-  /** DeveloperToolbar.hide() has been called */
-  HIDE: "developer-toolbar-hide"
-};
-
-/**
- * Attach notification constants to the object prototype so tests etc can
- * use them without needing to import anything
- */
-DeveloperToolbar.prototype.NOTIFICATIONS = NOTIFICATIONS;
-
-/**
- * Is the toolbar open?
- */
-Object.defineProperty(DeveloperToolbar.prototype, 'visible', {
-  get: function DT_visible() {
-    return !this._element.hidden;
-  },
-  enumerable: true
-});
-
-/**
- * Called from browser.xul in response to menu-click or keyboard shortcut to
- * toggle the toolbar
- */
-DeveloperToolbar.prototype.toggle = function DT_toggle()
-{
-  if (this.visible) {
-    this.hide();
-  } else {
-    this.show();
-    this._input.focus();
-  }
-};
-
-/**
- * Even if the user has not clicked on 'Got it' in the intro, we only show it
- * once per session.
- * Warning this is slightly messed up because this.DeveloperToolbar is not the
- * same as this.DeveloperToolbar when in browser.js context.
- */
-DeveloperToolbar.introShownThisSession = false;
-
-/**
- * Show the developer toolbar
- */
-DeveloperToolbar.prototype.show = function DT_show()
-{
-  this._command.setAttribute("checked", "true");
-
-  this._input = this._doc.querySelector(".gclitoolbar-input-node");
-
-  this.tooltipPanel = new TooltipPanel(this._doc, this._input);
-  this.outputPanel = new OutputPanel(this._doc, this._input);
-
-  let contentDocument = this._chromeWindow.getBrowser().contentDocument;
-
-  this.display = gcli._internal.createDisplay({
-    contentDocument: contentDocument,
-    chromeDocument: this._doc,
-    chromeWindow: this._chromeWindow,
-
-    hintElement: this.tooltipPanel.hintElement,
-    inputElement: this._input,
-    completeElement: this._doc.querySelector(".gclitoolbar-complete-node"),
-    backgroundElement: this._doc.querySelector(".gclitoolbar-stack-node"),
-    outputDocument: this.outputPanel.document,
-
-    environment: {
-      chromeDocument: this._doc,
-      contentDocument: contentDocument
-    },
-
-    tooltipClass: 'gcliterm-tooltip',
-    eval: null,
-    scratchpad: null
-  });
-
-  this.display.onVisibilityChange.add(this.outputPanel._visibilityChanged, this.outputPanel);
-  this.display.onVisibilityChange.add(this.tooltipPanel._visibilityChanged, this.tooltipPanel);
-  this.display.onOutput.add(this.outputPanel._outputChanged, this.outputPanel);
-
-  this._element.hidden = false;
-  this._notify(NOTIFICATIONS.SHOW);
-
-  if (!DeveloperToolbar.introShownThisSession) {
-    this.display.maybeShowIntro();
-    DeveloperToolbar.introShownThisSession = true;
-  }
-};
-
-/**
- * Hide the developer toolbar
- */
-DeveloperToolbar.prototype.hide = function DT_hide()
-{
-  this._command.setAttribute("checked", "false");
-
-  this.display.onVisibilityChange.remove(this.outputPanel._visibilityChanged, this.outputPanel);
-  this.display.onVisibilityChange.remove(this.tooltipPanel._visibilityChanged, this.tooltipPanel);
-  this.display.onOutput.remove(this.outputPanel._outputChanged, this.outputPanel);
-  this.display.destroy();
-
-  // We could "delete this.display" etc if we have hard-to-track-down memory
-  // leaks as a belt-and-braces approach, however this prevents our DOM node
-  // hunter from looking in all the nooks and crannies, so it's better if we
-  // can be leak-free without
-
-  this.outputPanel.remove();
-  delete this.outputPanel;
-
-  this.tooltipPanel.remove();
-  delete this.tooltipPanel;
-
-  this._element.hidden = true;
-  this._notify(NOTIFICATIONS.HIDE);
-};
-
-/**
- * Utility for sending notifications
- * @param aTopic a NOTIFICATION constant
- */
-DeveloperToolbar.prototype._notify = function DT_notify(aTopic)
-{
-  let data = { toolbar: this };
-  data.wrappedJSObject = data;
-  Services.obs.notifyObservers(data, aTopic, null);
-};
-
-/**
- * Update various parts of the UI when the current tab changes
- * @param aEvent
- */
-DeveloperToolbar.prototype.handleEvent = function DT_handleEvent(aEvent)
-{
-  if (aEvent.type == "TabSelect") {
-    this._chromeWindow.HUDConsoleUI.refreshCommand();
-    this._chromeWindow.DebuggerUI.refreshCommand();
-
-    if (this.visible) {
-      let contentDocument = this._chromeWindow.getBrowser().contentDocument;
-
-      this.display.reattach({
-        contentDocument: contentDocument,
-        chromeWindow: this._chromeWindow,
-        environment: {
-          chromeDocument: this._doc,
-          contentDocument: contentDocument
-        },
-      });
-    }
-  }
-};
-
-/**
- * Add class="gcli-panel-inner-arrowcontent" to a panel's
- * |<xul:box class="panel-inner-arrowcontent">| so we can alter the styling
- * without complex CSS expressions.
- * @param aPanel The panel to affect
- */
-function getContentBox(aPanel)
-{
-  let container = aPanel.ownerDocument.getAnonymousElementByAttribute(
-          aPanel, "anonid", "container");
-  return container.querySelector(".panel-inner-arrowcontent");
-}
-
-/**
- * Helper function to calculate the sum of the vertical padding and margins
- * between a nested node |aNode| and an ancestor |aRoot|. Iff all of the
- * children of aRoot are 'only-childs' until you get to aNode then to avoid
- * scroll-bars, the 'correct' height of aRoot is verticalSpacing + aNode.height.
- * @param aNode The child node whose height is known.
- * @param aRoot The parent height whose height we can affect.
- * @return The sum of the vertical padding/margins in between aNode and aRoot.
- */
-function getVerticalSpacing(aNode, aRoot)
-{
-  let win = aNode.ownerDocument.defaultView;
-
-  function pxToNum(styles, property) {
-    return parseInt(styles.getPropertyValue(property).replace(/px$/, ''), 10);
-  }
-
-  let vertSpacing = 0;
-  do {
-    let styles = win.getComputedStyle(aNode);
-    vertSpacing += pxToNum(styles, "padding-top");
-    vertSpacing += pxToNum(styles, "padding-bottom");
-    vertSpacing += pxToNum(styles, "margin-top");
-    vertSpacing += pxToNum(styles, "margin-bottom");
-    vertSpacing += pxToNum(styles, "border-top-width");
-    vertSpacing += pxToNum(styles, "border-bottom-width");
-
-    let prev = aNode.previousSibling;
-    while (prev != null) {
-      vertSpacing += prev.clientHeight;
-      prev = prev.previousSibling;
-    }
-
-    let next = aNode.nextSibling;
-    while (next != null) {
-      vertSpacing += next.clientHeight;
-      next = next.nextSibling;
-    }
-
-    aNode = aNode.parentNode;
-  } while (aNode !== aRoot);
-
-  return vertSpacing + 9;
-}
-
-/**
- * Panel to handle command line output.
- * @param aChromeDoc document from which we can pull the parts we need.
- * @param aInput the input element that should get focus.
- */
-function OutputPanel(aChromeDoc, aInput)
-{
-  this._input = aInput;
-  this._panel = aChromeDoc.getElementById("gcli-output");
-  this._frame = aChromeDoc.getElementById("gcli-output-frame");
-  this._anchor = aChromeDoc.getElementById("developer-toolbar");
-
-  this._content = getContentBox(this._panel);
-  this._content.classList.add("gcli-panel-inner-arrowcontent");
-
-  this.document = this._frame.contentDocument;
-  this.document.body.classList.add("gclichrome-output");
-
-  this._div = this.document.querySelector("div");
-  this._div.classList.add('gcli-row-out');
-  this._div.setAttribute('aria-live', 'assertive');
-
-  this.displayedOutput = undefined;
-}
-
-/**
- * Display the OutputPanel.
- */
-OutputPanel.prototype.show = function OP_show()
-{
-  this._panel.ownerDocument.defaultView.setTimeout(function() {
-    this._resize();
-  }.bind(this), 0);
-
-  this._resize();
-  this._panel.openPopup(this._anchor, "before_end", -300, 0, false, false, null);
-
-  this._input.focus();
-};
-
-/**
- * Internal helper to set the height of the output panel to fit the available
- * content;
- */
-OutputPanel.prototype._resize = function CLP_resize()
-{
-  let vertSpacing = getVerticalSpacing(this._content, this._panel);
-  let idealHeight = this.document.body.scrollHeight + vertSpacing;
-  this._panel.sizeTo(400, Math.min(idealHeight, 500));
-};
-
-/**
- * Called by GCLI when a command is executed.
- */
-OutputPanel.prototype._outputChanged = function OP_outputChanged(aEvent)
-{
-  if (aEvent.output.hidden) {
-    return;
-  }
-
-  this.remove();
-
-  this.displayedOutput = aEvent.output;
-  this.update();
-
-  this.displayedOutput.onChange.add(this.update, this);
-  this.displayedOutput.onClose.add(this.remove, this);
-};
-
-/**
- * Called when displayed Output says it's changed or from outputChanged, which
- * happens when there is a new displayed Output.
- */
-OutputPanel.prototype.update = function OP_update()
-{
-  if (this.displayedOutput.data == null) {
-    while (this._div.hasChildNodes()) {
-      this._div.removeChild(this._div.firstChild);
-    }
-  } else {
-    this.displayedOutput.toDom(this._div);
-    this.show();
-  }
-};
-
-/**
- * Detach listeners from the currently displayed Output.
- */
-OutputPanel.prototype.remove = function OP_remove()
-{
-  this._panel.hidePopup();
-
-  if (this.displayedOutput) {
-    this.displayedOutput.onChange.remove(this.update, this);
-    this.displayedOutput.onClose.remove(this.remove, this);
-    delete this.displayedOutput;
-  }
-};
-
-/**
- * Called by GCLI to indicate that we should show or hide one either the
- * tooltip panel or the output panel.
- */
-OutputPanel.prototype._visibilityChanged = function OP_visibilityChanged(aEvent)
-{
-  if (aEvent.outputVisible === true) {
-    // this.show is called by _outputChanged
-  } else {
-    this._panel.hidePopup();
-  }
-};
-
-
-/**
- * Panel to handle tooltips.
- * @param aChromeDoc document from which we can pull the parts we need.
- * @param aInput the input element that should get focus.
- */
-function TooltipPanel(aChromeDoc, aInput)
-{
-  this._input = aInput;
-  this._panel = aChromeDoc.getElementById("gcli-tooltip");
-  this._frame = aChromeDoc.getElementById("gcli-tooltip-frame");
-  this._anchor = aChromeDoc.getElementById("developer-toolbar");
-
-  this._content = getContentBox(this._panel);
-  this._content.classList.add("gcli-panel-inner-arrowcontent");
-
-  this.document = this._frame.contentDocument;
-  this.document.body.classList.add("gclichrome-tooltip");
-
-  this.hintElement = this.document.querySelector("div");
-}
-
-/**
- * Display the TooltipPanel.
- */
-TooltipPanel.prototype.show = function TP_show()
-{
-  let vertSpacing = getVerticalSpacing(this._content, this._panel);
-  let idealHeight = this.document.body.scrollHeight + vertSpacing;
-  this._panel.sizeTo(350, Math.min(idealHeight, 500));
-  this._panel.openPopup(this._anchor, "before_start", 0, 0, false, false, null);
-
-  this._input.focus();
-};
-
-/**
- * Hide the TooltipPanel.
- */
-TooltipPanel.prototype.remove = function TP_remove()
-{
-  this._panel.hidePopup();
-};
-
-/**
- * Called by GCLI to indicate that we should show or hide one either the
- * tooltip panel or the output panel.
- */
-TooltipPanel.prototype._visibilityChanged = function TP_visibilityChanged(aEvent)
-{
-  if (aEvent.tooltipVisible === true) {
-    this.show();
-  } else {
-    this._panel.hidePopup();
-  }
-};
diff --git a/browser/devtools/shared/Templater.jsm b/browser/devtools/shared/Templater.jsm
index 119a8f98720e..0dcad782b368 100644
--- a/browser/devtools/shared/Templater.jsm
+++ b/browser/devtools/shared/Templater.jsm
@@ -42,11 +42,6 @@ var EXPORTED_SYMBOLS = [ "Templater", "template" ];
 Components.utils.import("resource://gre/modules/Services.jsm");
 const Node = Components.interfaces.nsIDOMNode;
 
-/**
- * For full documentation, see:
- * https://github.com/mozilla/domtemplate/blob/master/README.md
- */
-
 // WARNING: do not 'use_strict' without reading the notes in _envEval();
 
 /**
@@ -55,16 +50,8 @@ const Node = Components.interfaces.nsIDOMNode;
  * @param data Data to use in filling out the template
  * @param options Options to customize the template processing. One of:
  * - allowEval: boolean (default false) Basic template interpolations are
- *   either property paths (e.g. ${a.b.c.d}), or if allowEval=true then we
- *   allow arbitrary JavaScript
- * - stack: string or array of strings (default empty array) The template
- *   engine maintains a stack of tasks to help debug where it is. This allows
- *   this stack to be prefixed with a template name
- * - blankNullUndefined: By default DOMTemplate exports null and undefined
- *   values using the strings 'null' and 'undefined', which can be helpful for
- *   debugging, but can introduce unnecessary extra logic in a template to
- *   convert null/undefined to ''. By setting blankNullUndefined:true, this
- *   conversion is handled by DOMTemplate
+ * either property paths (e.g. ${a.b.c.d}), however if allowEval=true then we
+ * allow arbitrary JavaScript
  */
 function template(node, data, options) {
   var template = new Templater(options || {});
@@ -81,15 +68,7 @@ function Templater(options) {
     options = { allowEval: true };
   }
   this.options = options;
-  if (options.stack && Array.isArray(options.stack)) {
-    this.stack = options.stack;
-  }
-  else if (typeof options.stack === 'string') {
-    this.stack = [ options.stack ];
-  }
-  else {
-    this.stack = [];
-  }
+  this.stack = [];
 }
 
 /**
@@ -111,7 +90,7 @@ Templater.prototype._splitSpecial = /\uF001|\uF002/;
  * Cached regex used to detect if a script is capable of being interpreted
  * using Template._property() or if we need to use Template._envEval()
  */
-Templater.prototype._isPropertyScript = /^[_a-zA-Z0-9.]*$/;
+Templater.prototype._isPropertyScript = /^[a-zA-Z0-9.]*$/;
 
 /**
  * Recursive function to walk the tree processing the attributes as it goes.
@@ -174,11 +153,7 @@ Templater.prototype.processNode = function(node, data) {
           } else {
             // Replace references in all other attributes
             var newValue = value.replace(this._templateRegion, function(path) {
-              var insert = this._envEval(path.slice(2, -1), data, value);
-              if (this.options.blankNullUndefined && insert == null) {
-                insert = '';
-              }
-              return insert;
+              return this._envEval(path.slice(2, -1), data, value);
             }.bind(this));
             // Remove '_' prefix of attribute names so the DOM won't try
             // to use them before we've processed the template
@@ -202,7 +177,7 @@ Templater.prototype.processNode = function(node, data) {
       this.processNode(childNodes[j], data);
     }
 
-    if (node.nodeType === 3 /*Node.TEXT_NODE*/) {
+    if (node.nodeType === Node.TEXT_NODE) {
       this._processTextNode(node, data);
     }
   } finally {
@@ -372,27 +347,8 @@ Templater.prototype._processTextNode = function(node, data) {
         part = this._envEval(part.slice(1), data, node.data);
       }
       this._handleAsync(part, node, function(reply, siblingNode) {
-        var doc = siblingNode.ownerDocument;
-        if (reply == null) {
-          reply = this.options.blankNullUndefined ? '' : '' + reply;
-        }
-        if (typeof reply.cloneNode === 'function') {
-          // i.e. if (reply instanceof Element) { ...
-          reply = this._maybeImportNode(reply, doc);
-          siblingNode.parentNode.insertBefore(reply, siblingNode);
-        } else if (typeof reply.item === 'function' && reply.length) {
-          // if thing is a NodeList, then import the children
-          for (var i = 0; i < reply.length; i++) {
-            var child = this._maybeImportNode(reply.item(i), doc);
-            siblingNode.parentNode.insertBefore(child, siblingNode);
-          }
-        }
-        else {
-          // if thing isn't a DOM element then wrap its string value in one
-          reply = doc.createTextNode(reply.toString());
-          siblingNode.parentNode.insertBefore(reply, siblingNode);
-        }
-
+        reply = this._toNode(reply, siblingNode.ownerDocument);
+        siblingNode.parentNode.insertBefore(reply, siblingNode);
       }.bind(this));
     }, this);
     node.parentNode.removeChild(node);
@@ -400,13 +356,21 @@ Templater.prototype._processTextNode = function(node, data) {
 };
 
 /**
- * Return node or a import of node, if it's not in the given document
- * @param node The node that we want to be properly owned
- * @param doc The document that the given node should belong to
- * @return A node that belongs to the given document
+ * Helper to convert a 'thing' to a DOM Node.
+ * This is (obviously) a no-op for DOM Elements (which are detected using
+ * 'typeof thing.cloneNode !== "function"' (is there a better way that will
+ * work in all environments, including a .jsm?)
+ * Non DOM elements are converted to a string and wrapped in a TextNode.
  */
-Templater.prototype._maybeImportNode = function(node, doc) {
-  return node.ownerDocument === doc ? node : doc.importNode(node, true);
+Templater.prototype._toNode = function(thing, document) {
+  if (thing == null) {
+    thing = '' + thing;
+  }
+  // if thing isn't a DOM element then wrap its string value in one
+  if (typeof thing.cloneNode !== 'function') {
+    thing = document.createTextNode(thing.toString());
+  }
+  return thing;
 };
 
 /**
@@ -465,6 +429,7 @@ Templater.prototype._stripBraces = function(str) {
  * <tt>newValue</tt> is applied.
  */
 Templater.prototype._property = function(path, data, newValue) {
+  this.stack.push(path);
   try {
     if (typeof path === 'string') {
       path = path.split('.');
@@ -480,13 +445,12 @@ Templater.prototype._property = function(path, data, newValue) {
       return value;
     }
     if (!value) {
-      this._handleError('"' + path[0] + '" is undefined');
+      this._handleError('Can\'t find path=' + path);
       return null;
     }
     return this._property(path.slice(1), value, newValue);
-  } catch (ex) {
-    this._handleError('Path error with \'' + path + '\'', ex);
-    return '${' + path + '}';
+  } finally {
+    this.stack.pop();
   }
 };
 
@@ -505,7 +469,7 @@ Templater.prototype._property = function(path, data, newValue) {
  */
 Templater.prototype._envEval = function(script, data, frame) {
   try {
-    this.stack.push(frame.replace(/\s+/g, ' '));
+    this.stack.push(frame);
     if (this._isPropertyScript.test(script)) {
       return this._property(script, data);
     } else {
@@ -519,7 +483,8 @@ Templater.prototype._envEval = function(script, data, frame) {
       }
     }
   } catch (ex) {
-    this._handleError('Template error evaluating \'' + script + '\'', ex);
+    this._handleError('Template error evaluating \'' + script + '\'' +
+        ' environment=' + Object.keys(data).join(', '), ex);
     return '${' + script + '}';
   } finally {
     this.stack.pop();
@@ -533,7 +498,8 @@ Templater.prototype._envEval = function(script, data, frame) {
  * @param ex optional associated exception.
  */
 Templater.prototype._handleError = function(message, ex) {
-  this._logError(message + ' (In: ' + this.stack.join(' > ') + ')');
+  this._logError(message);
+  this._logError('In: ' + this.stack.join(' > '));
   if (ex) {
     this._logError(ex);
   }
diff --git a/browser/devtools/shared/test/Makefile.in b/browser/devtools/shared/test/Makefile.in
index 6eb1d0eee46d..53a4fb5b5060 100644
--- a/browser/devtools/shared/test/Makefile.in
+++ b/browser/devtools/shared/test/Makefile.in
@@ -49,21 +49,11 @@ include $(topsrcdir)/config/rules.mk
 _BROWSER_TEST_FILES = \
   browser_promise_basic.js \
   browser_templater_basic.js \
-  browser_toolbar_basic.js \
-  browser_gcli_commands.js \
-  browser_gcli_inspect.js \
-  browser_gcli_integrate.js \
-  browser_gcli_require.js \
-  browser_gcli_web.js \
-  browser_gcli_break.js \
   head.js \
   $(NULL)
 
 _BROWSER_TEST_PAGES = \
   browser_templater_basic.html \
-  browser_toolbar_basic.html \
-  browser_gcli_inspect.html \
-  browser_gcli_break.html \
   $(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/devtools/shared/test/browser_gcli_break.js b/browser/devtools/shared/test/browser_gcli_break.js
deleted file mode 100644
index 8e7621727abd..000000000000
--- a/browser/devtools/shared/test/browser_gcli_break.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that the break command works as it should
-
-const TEST_URI = "http://example.com/browser/browser/devtools/shared/test/browser_gcli_break.html";
-
-function test() {
-  DeveloperToolbarTest.test(TEST_URI, function(browser, tab) {
-    testBreakCommands();
-  });
-}
-
-function testBreakCommands() {
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "brea",
-    directTabText: "k",
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "break",
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "break add",
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "break add line",
-    emptyParameters: [ " <file>", " <line>" ],
-    status: "ERROR"
-  });
-
-  let pane = DebuggerUI.toggleDebugger();
-  pane._frame.addEventListener("Debugger:Connecting", function dbgConnected() {
-    pane._frame.removeEventListener("Debugger:Connecting", dbgConnected, true);
-
-    // Wait for the initial resume.
-    let client = pane.debuggerWindow.gClient;
-    client.addOneTimeListener("resumed", function() {
-      client.activeThread.addOneTimeListener("framesadded", function() {
-        DeveloperToolbarTest.checkInputStatus({
-          typed: "break add line " + TEST_URI + " " + content.wrappedJSObject.line0,
-          status: "VALID"
-        });
-        DeveloperToolbarTest.exec({
-          args: {
-            type: 'line',
-            file: TEST_URI,
-            line: content.wrappedJSObject.line0
-          },
-          completed: false
-        });
-
-        DeveloperToolbarTest.checkInputStatus({
-          typed: "break list",
-          status: "VALID"
-        });
-        DeveloperToolbarTest.exec();
-
-        client.activeThread.resume(function() {
-          DeveloperToolbarTest.checkInputStatus({
-            typed: "break del 0",
-            status: "VALID"
-          });
-          DeveloperToolbarTest.exec({
-            args: { breakid: 0 },
-            completed: false
-          });
-
-          finish();
-        });
-      });
-
-      // Trigger newScript notifications using eval.
-      content.wrappedJSObject.firstCall();
-    });
-  }, true);
-}
diff --git a/browser/devtools/shared/test/browser_gcli_commands.js b/browser/devtools/shared/test/browser_gcli_commands.js
deleted file mode 100644
index e762fd463c00..000000000000
--- a/browser/devtools/shared/test/browser_gcli_commands.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Test various GCLI commands
-
-let imported = {};
-Components.utils.import("resource:///modules/HUDService.jsm", imported);
-
-const TEST_URI = "data:text/html;charset=utf-8,gcli-commands";
-
-function test() {
-  DeveloperToolbarTest.test(TEST_URI, function(browser, tab) {
-    testEcho();
-    testConsoleClear();
-    testConsoleOpenClose(tab);
-
-    imported = undefined;
-    finish();
-  });
-}
-
-function testEcho() {
-  DeveloperToolbarTest.exec({
-    typed: "echo message",
-    args: { message: "message" },
-    outputMatch: /^message$/,
-  });
-}
-
-function testConsoleClear() {
-  DeveloperToolbarTest.exec({
-    typed: "console clear",
-    args: {},
-    blankOutput: true,
-  });
-}
-
-function testConsoleOpenClose(tab) {
-  DeveloperToolbarTest.exec({
-    typed: "console open",
-    args: {},
-    blankOutput: true,
-  });
-
-  let hud = imported.HUDService.getHudByWindow(content);
-  ok(hud.hudId in imported.HUDService.hudReferences, "console open");
-
-  DeveloperToolbarTest.exec({
-    typed: "console close",
-    args: {},
-    blankOutput: true,
-  });
-
-  ok(!(hud.hudId in imported.HUDService.hudReferences), "console closed");
-}
diff --git a/browser/devtools/shared/test/browser_gcli_inspect.js b/browser/devtools/shared/test/browser_gcli_inspect.js
deleted file mode 100644
index c3299c04a676..000000000000
--- a/browser/devtools/shared/test/browser_gcli_inspect.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that the inspect command works as it should
-
-const TEST_URI = "http://example.com/browser/browser/devtools/shared/test/browser_gcli_inspect.html";
-
-function test() {
-  DeveloperToolbarTest.test(TEST_URI, function(browser, tab) {
-    testInspect();
-
-    finish();
-  });
-}
-
-function testInspect() {
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspec",
-    directTabText: "t",
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect",
-    emptyParameters: [ " <node>" ],
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect h1",
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect span",
-    status: "ERROR"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect div",
-    status: "VALID"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect .someclass",
-    status: "VALID"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect #someid",
-    status: "VALID"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect button[disabled]",
-    status: "VALID"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect p>strong",
-    status: "VALID"
-  });
-
-  DeveloperToolbarTest.checkInputStatus({
-    typed: "inspect :root",
-    status: "VALID"
-  });
-}
diff --git a/browser/devtools/shared/test/browser_gcli_integrate.js b/browser/devtools/shared/test/browser_gcli_integrate.js
deleted file mode 100644
index a3fc53077789..000000000000
--- a/browser/devtools/shared/test/browser_gcli_integrate.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
- * http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that source URLs in the Web Console can be clicked to display the
-// standard View Source window.
-
-function test() {
-  testCreateCommands();
-  testRemoveCommands();
-}
-
-let tselarr = {
-  name: 'tselarr',
-  params: [
-    { name: 'num', type: { name: 'selection', data: [ '1', '2', '3' ] } },
-    { name: 'arr', type: { name: 'array', subtype: 'string' } },
-  ],
-  exec: function(args, env) {
-    return "flu " + args.num + "-" + args.arr.join("_");
-  }
-};
-
-function testCreateCommands() {
-  let gcliIndex = require("gcli/index");
-  gcliIndex.addCommand(tselarr);
-
-  let canon = require("gcli/canon");
-  let tselcmd = canon.getCommand("tselarr");
-  ok(tselcmd != null, "tselarr exists in the canon");
-  ok(tselcmd instanceof canon.Command, "canon storing commands");
-}
-
-function testRemoveCommands() {
-  let gcliIndex = require("gcli/index");
-  gcliIndex.removeCommand(tselarr);
-
-  let canon = require("gcli/canon");
-  let tselcmd = canon.getCommand("tselarr");
-  ok(tselcmd == null, "tselcmd removed from the canon");
-}
diff --git a/browser/devtools/shared/test/browser_templater_basic.js b/browser/devtools/shared/test/browser_templater_basic.js
index 376daee2215b..f9e36edf652c 100644
--- a/browser/devtools/shared/test/browser_templater_basic.js
+++ b/browser/devtools/shared/test/browser_templater_basic.js
@@ -3,15 +3,11 @@
 
 // Tests that the DOM Template engine works properly
 
-/*
- * These tests run both in Mozilla/Mochitest and plain browsers (as does
- * domtemplate)
- * We should endevour to keep the source in sync.
- */
-
-var imports = {};
-Cu.import("resource:///modules/devtools/Templater.jsm", imports);
-Cu.import("resource:///modules/devtools/Promise.jsm", imports);
+let tempScope = {};
+Cu.import("resource:///modules/devtools/Templater.jsm", tempScope);
+Cu.import("resource:///modules/devtools/Promise.jsm", tempScope);
+let template = tempScope.template;
+let Promise = tempScope.Promise;
 
 function test() {
   addTab("http://example.com/browser/browser/devtools/shared/test/browser_templater_basic.html", function() {
@@ -29,7 +25,7 @@ function runTest(index) {
   holder.innerHTML = options.template;
 
   info('Running ' + options.name);
-  imports.template(holder, options.data, options.options);
+  template(holder, options.data, options.options);
 
   if (typeof options.result == 'string') {
     is(holder.innerHTML, options.result, options.name);
@@ -242,43 +238,11 @@ var tests = [
     name: 'propertyFail',
     template: '<p>${Math.max(1, 2)}</p>',
     result: '<p>${Math.max(1, 2)}</p>'
-  };},
-
-  // Bug 723431: DOMTemplate should allow customisation of display of
-  // null/undefined values
-  function() { return {
-    name: 'propertyUndefAttrFull',
-    template: '<p>${nullvar}|${undefinedvar1}|${undefinedvar2}</p>',
-    data: { nullvar: null, undefinedvar1: undefined },
-    result: '<p>null|undefined|undefined</p>'
-  };},
-
-  function() { return {
-    name: 'propertyUndefAttrBlank',
-    template: '<p>${nullvar}|${undefinedvar1}|${undefinedvar2}</p>',
-    data: { nullvar: null, undefinedvar1: undefined },
-    options: { blankNullUndefined: true },
-    result: '<p>||</p>'
-  };},
-
-  function() { return {
-    name: 'propertyUndefAttrFull',
-    template: '<div><p value="${nullvar}"></p><p value="${undefinedvar1}"></p><p value="${undefinedvar2}"></p></div>',
-    data: { nullvar: null, undefinedvar1: undefined },
-    result: '<div><p value="null"></p><p value="undefined"></p><p value="undefined"></p></div>'
-  };},
-
-  function() { return {
-    name: 'propertyUndefAttrBlank',
-    template: '<div><p value="${nullvar}"></p><p value="${undefinedvar1}"></p><p value="${undefinedvar2}"></p></div>',
-    data: { nullvar: null, undefinedvar1: undefined },
-    options: { blankNullUndefined: true },
-    result: '<div><p value=""></p><p value=""></p><p value=""></p></div>'
   };}
 ];
 
 function delayReply(data) {
-  var p = new imports.Promise();
+  var p = new Promise();
   executeSoon(function() {
     p.resolve(data);
   });
diff --git a/browser/devtools/shared/test/browser_toolbar_basic.html b/browser/devtools/shared/test/browser_toolbar_basic.html
deleted file mode 100644
index 7ec012b0e41a..000000000000
--- a/browser/devtools/shared/test/browser_toolbar_basic.html
+++ /dev/null
@@ -1,35 +0,0 @@
-<!doctype html>
-<!-- Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/ -->
-
-<html>
-<head>
-  <meta charset="UTF-8">
-  <title>Developer Toolbar Tests</title>
-  <style type="text/css">
-  #single { color: red; }
-  </style>
-  <script type="text/javascript">var a=1;</script>
-</head>
-<body>
-
-<p id=single>
-1
-</p>
-
-<p class=twin>
-2a
-</p>
-
-<p class=twin>
-2b
-</p>
-
-<style>
-.twin { color: blue; }
-</style>
-<script>var b=2;</script>
-
-</body>
-</html>
-
diff --git a/browser/devtools/shared/test/browser_toolbar_basic.js b/browser/devtools/shared/test/browser_toolbar_basic.js
deleted file mode 100644
index 36f6af39cb07..000000000000
--- a/browser/devtools/shared/test/browser_toolbar_basic.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-// Tests that the developer toolbar works properly
-
-const URL = "http://example.com/browser/browser/devtools/shared/test/browser_toolbar_basic.html";
-
-function test() {
-  addTab(URL, function(browser, tab) {
-    info("Starting browser_toolbar_basic.js");
-    runTest();
-  });
-}
-
-function runTest() {
-  Services.obs.addObserver(checkOpen, DeveloperToolbar.NOTIFICATIONS.SHOW, false);
-  // TODO: reopen the window so the pref has a chance to take effect
-  // EventUtils.synthesizeKey("v", { ctrlKey: true, shiftKey: true });
-  DeveloperToolbarTest.show();
-}
-
-function checkOpen() {
-  Services.obs.removeObserver(checkOpen, DeveloperToolbar.NOTIFICATIONS.SHOW, false);
-  ok(DeveloperToolbar.visible, "DeveloperToolbar is visible");
-
-  Services.obs.addObserver(checkClosed, DeveloperToolbar.NOTIFICATIONS.HIDE, false);
-  // EventUtils.synthesizeKey("v", { ctrlKey: true, shiftKey: true });
-  DeveloperToolbarTest.hide();
-}
-
-function checkClosed() {
-  Services.obs.removeObserver(checkClosed, DeveloperToolbar.NOTIFICATIONS.HIDE, false);
-  ok(!DeveloperToolbar.visible, "DeveloperToolbar is not visible");
-
-  finish();
-}
diff --git a/browser/devtools/shared/test/head.js b/browser/devtools/shared/test/head.js
index efd9a062d2a3..56689d97b515 100644
--- a/browser/devtools/shared/test/head.js
+++ b/browser/devtools/shared/test/head.js
@@ -36,38 +36,23 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-let gcli;
-let console;
-let require;
-let define;
+let tab;
+let browser;
 
-(function() {
-  let tempScope = {};
-  Components.utils.import("resource:///modules/gcli.jsm", tempScope);
-
-  gcli = tempScope.gcli;
-  console = gcli._internal.console;
-  define = gcli._internal.define;
-  require = gcli._internal.require;
-})();
-
-/**
- * Open a new tab at a URL and call a callback on load
- */
 function addTab(aURL, aCallback)
 {
   waitForExplicitFinish();
 
+  function onTabLoad() {
+    browser.removeEventListener("load", onTabLoad, true);
+    aCallback();
+  }
+
   gBrowser.selectedTab = gBrowser.addTab();
   content.location = aURL;
 
-  let tab = gBrowser.selectedTab;
-  let browser = gBrowser.getBrowserForTab(tab);
-
-  function onTabLoad() {
-    browser.removeEventListener("load", onTabLoad, true);
-    aCallback(browser, tab);
-  }
+  tab = gBrowser.selectedTab;
+  browser = gBrowser.getBrowserForTab(tab);
 
   browser.addEventListener("load", onTabLoad, true);
 }
@@ -77,236 +62,6 @@ registerCleanupFunction(function tearDown() {
     gBrowser.removeCurrentTab();
   }
 
-  console = undefined;
-  define = undefined;
-  require = undefined;
-  gcli = undefined;
+  tab = undefined;
+  browser = undefined;
 });
-
-/**
- * Various functions for testing DeveloperToolbar
- */
-let DeveloperToolbarTest = {
-  /**
-   * Paranoid DeveloperToolbar.show();
-   */
-  show: function DTT_show() {
-    if (DeveloperToolbar.visible) {
-      ok(false, "DeveloperToolbar.visible at start of openDeveloperToolbar");
-    }
-    else {
-      DeveloperToolbar.show();
-    }
-  },
-
-  /**
-   * Paranoid DeveloperToolbar.hide();
-   */
-  hide: function DTT_hide() {
-    if (!DeveloperToolbar.visible) {
-      ok(false, "!DeveloperToolbar.visible at start of closeDeveloperToolbar");
-    }
-    else {
-      DeveloperToolbar.display.inputter.setInput("");
-      DeveloperToolbar.hide();
-    }
-  },
-
-  /**
-   * Check that we can parse command input.
-   * Doesn't execute the command, just checks that we grok the input properly:
-   * 
-   * DeveloperToolbarTest.checkInputStatus({
-   *   // Test inputs
-   *   typed: "ech",           // Required
-   *   cursor: 3,              // Optional cursor position
-   *
-   *   // Thing to check
-   *   status: "INCOMPLETE",   // One of "VALID", "ERROR", "INCOMPLETE"
-   *   emptyParameters: [ "<message>" ], // Still to type
-   *   directTabText: "o",     // Simple completion text
-   *   arrowTabText: "",       // When the completion is not an extension
-   * });
-   */
-  checkInputStatus: function DTT_checkInputStatus(test) {
-    if (test.typed) {
-      DeveloperToolbar.display.inputter.setInput(test.typed);
-    }
-    else {
-     ok(false, "Missing typed for " + JSON.stringify(test));
-     return;
-    }
-
-    if (test.cursor) {
-      DeveloperToolbar.display.inputter.setCursor(test.cursor)
-    }
-
-    if (test.status) {
-      is(DeveloperToolbar.display.requisition.getStatus().toString(),
-         test.status,
-         "status for " + test.typed);
-    }
-
-    if (test.emptyParameters == null) {
-      test.emptyParameters = [];
-    }
-
-    let completer = DeveloperToolbar.display.completer;
-    let realParams = completer.emptyParameters;
-    is(realParams.length, test.emptyParameters.length,
-       'emptyParameters.length for \'' + test.typed + '\'');
-
-    if (realParams.length === test.emptyParameters.length) {
-      for (let i = 0; i < realParams.length; i++) {
-        is(realParams[i].replace(/\u00a0/g, ' '), test.emptyParameters[i],
-           'emptyParameters[' + i + '] for \'' + test.typed + '\'');
-      }
-    }
-
-    if (test.directTabText) {
-      is(completer.directTabText, test.directTabText,
-         'directTabText for \'' + test.typed + '\'');
-    }
-    else {
-      is(completer.directTabText, '', 'directTabText for \'' + test.typed + '\'');
-    }
-
-    if (test.arrowTabText) {
-      is(completer.arrowTabText, ' \u00a0\u21E5 ' + test.arrowTabText,
-         'arrowTabText for \'' + test.typed + '\'');
-    }
-    else {
-      is(completer.arrowTabText, '', 'arrowTabText for \'' + test.typed + '\'');
-    }
-  },
-
-  /**
-   * Execute a command:
-   *
-   * DeveloperToolbarTest.exec({
-   *   // Test inputs
-   *   typed: "echo hi",        // Optional, uses existing if undefined
-   *
-   *   // Thing to check
-   *   args: { message: "hi" }, // Check that the args were understood properly
-   *   outputMatch: /^hi$/,     // Regex to test against textContent of output
-   *   blankOutput: true,       // Special checks when there is no output
-   * });
-   */
-  exec: function DTT_exec(test) {
-    test = test || {};
-
-    if (test.typed) {
-      DeveloperToolbar.display.inputter.setInput(test.typed);
-    }
-
-    let typed = DeveloperToolbar.display.inputter.getInputState().typed;
-    let output = DeveloperToolbar.display.requisition.exec();
-
-    is(typed, output.typed, 'output.command for: ' + typed);
-
-    if (test.completed !== false) {
-      ok(output.completed, 'output.completed false for: ' + typed);
-    }
-    else {
-      // It is actually an error if we say something is async and it turns
-      // out not to be? For now we're saying 'no'
-      // ok(!output.completed, 'output.completed true for: ' + typed);
-    }
-
-    if (test.args != null) {
-      is(Object.keys(test.args).length, Object.keys(output.args).length,
-         'arg count for ' + typed);
-
-      Object.keys(output.args).forEach(function(arg) {
-        let expectedArg = test.args[arg];
-        let actualArg = output.args[arg];
-
-        if (Array.isArray(expectedArg)) {
-          if (!Array.isArray(actualArg)) {
-            ok(false, 'actual is not an array. ' + typed + '/' + arg);
-            return;
-          }
-
-          is(expectedArg.length, actualArg.length,
-             'array length: ' + typed + '/' + arg);
-          for (let i = 0; i < expectedArg.length; i++) {
-            is(expectedArg[i], actualArg[i],
-               'member: "' + typed + '/' + arg + '/' + i);
-          }
-        }
-        else {
-          is(expectedArg, actualArg, 'typed: "' + typed + '" arg: ' + arg);
-        }
-      });
-    }
-
-    let displayed = DeveloperToolbar.outputPanel._div.textContent;
-
-    if (test.outputMatch) {
-      if (!test.outputMatch.test(displayed)) {
-        ok(false, "html output for " + typed + " (textContent sent to info)");
-        info("Actual textContent");
-        info(displayed);
-      }
-    }
-
-    if (test.blankOutput != null) {
-      if (!/^$/.test(displayed)) {
-        ok(false, "html output for " + typed + " (textContent sent to info)");
-        info("Actual textContent");
-        info(displayed);
-      }
-    }
-  },
-
-  /**
-   * Quick wrapper around the things you need to do to run DeveloperToolbar
-   * command tests:
-   * - Set the pref 'devtools.toolbar.enabled' to true
-   * - Add a tab pointing at |uri|
-   * - Open the DeveloperToolbar
-   * - Register a cleanup function to undo the above
-   * - Run the tests
-   *
-   * @param uri The uri of a page to load. Can be 'about:blank' or 'data:...'
-   * @param testFunc A function containing the tests to run. This should
-   * arrange for 'finish()' to be called on completion.
-   */
-  test: function DTT_test(uri, testFunc) {
-    let menuItem = document.getElementById("menu_devToolbar");
-    let command = document.getElementById("Tools:DevToolbar");
-    let appMenuItem = document.getElementById("appmenu_devToolbar");
-
-    registerCleanupFunction(function() {
-      DeveloperToolbarTest.hide();
-
-      // a.k.a Services.prefs.clearUserPref("devtools.toolbar.enabled");
-      if (menuItem) {
-        menuItem.hidden = true;
-      }
-      if (command) {
-        command.setAttribute("disabled", "true");
-      }
-      if (appMenuItem) {
-        appMenuItem.hidden = true;
-      }
-    });
-
-    // a.k.a: Services.prefs.setBoolPref("devtools.toolbar.enabled", true);
-    if (menuItem) {
-      menuItem.hidden = false;
-    }
-    if (command) {
-      command.removeAttribute("disabled");
-    }
-    if (appMenuItem) {
-      appMenuItem.hidden = false;
-    }
-
-    addTab(uri, function(browser, tab) {
-      DeveloperToolbarTest.show();
-      testFunc(browser, tab);
-    });
-  },
-};
diff --git a/browser/devtools/webconsole/GcliCommands.jsm b/browser/devtools/webconsole/GcliCommands.jsm
index 11a2b5ffcb15..470d1daa02ff 100644
--- a/browser/devtools/webconsole/GcliCommands.jsm
+++ b/browser/devtools/webconsole/GcliCommands.jsm
@@ -101,23 +101,11 @@ gcli.addCommand({
   name: "console close",
   description: gcli.lookup("consolecloseDesc"),
   exec: function Command_consoleClose(args, context) {
-    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab
+    let tab = HUDService.getHudReferenceById(context.environment.hudId).tab;
     HUDService.deactivateHUDForContext(tab);
   }
 });
 
-/**
- * 'console open' command
- */
-gcli.addCommand({
-  name: "console open",
-  description: gcli.lookup("consoleopenDesc"),
-  exec: function Command_consoleOpen(args, context) {
-    let tab = context.environment.chromeDocument.defaultView.gBrowser.selectedTab
-    HUDService.activateHUDForContext(tab);
-  }
-});
-
 /**
  * 'inspect' command
  */
diff --git a/browser/devtools/webconsole/HUDService.jsm b/browser/devtools/webconsole/HUDService.jsm
index 989e001492ea..bd3604188cb9 100644
--- a/browser/devtools/webconsole/HUDService.jsm
+++ b/browser/devtools/webconsole/HUDService.jsm
@@ -151,6 +151,24 @@ function LogFactory(aMessagePrefix)
   return log;
 }
 
+/**
+ * Load the various Command JSMs.
+ * Should be called when the console first opens.
+ *
+ * @return an object containing the EXPORTED_SYMBOLS from all the command
+ * modules. In general there is no reason when JSMs need to export symbols
+ * except when they need the host environment to inform them of things like the
+ * current window/document/etc.
+ */
+function loadCommands() {
+  let commandExports = {};
+
+  Cu.import("resource:///modules/GcliCommands.jsm", commandExports);
+  Cu.import("resource:///modules/GcliTiltCommands.jsm", commandExports);
+
+  return commandExports;
+}
+
 let log = LogFactory("*** HUDService:");
 
 const HUD_STRINGS_URI = "chrome://browser/locale/devtools/webconsole.properties";
@@ -1552,7 +1570,6 @@ HUD_SERVICE.prototype =
     if (procInstr.contexts.indexOf(hudId) == -1) {
       procInstr.contexts.push(hudId);
     }
-    HeadsUpDisplayUICommands.refreshCommand();
   },
 
   /**
@@ -1583,7 +1600,6 @@ HUD_SERVICE.prototype =
       this.unregisterDisplay(hudId);
 
       window.focus();
-      HeadsUpDisplayUICommands.refreshCommand();
     }
 
     // Remove this context from the list of contexts that need the GCLI CSS
@@ -3598,7 +3614,7 @@ HeadsUpDisplay.prototype = {
   {
     let usegcli = false;
     try {
-      // usegcli = Services.prefs.getBoolPref("devtools.gcli.enable");
+      usegcli = Services.prefs.getBoolPref("devtools.gcli.enable");
     }
     catch (ex) {}
 
@@ -6319,16 +6335,6 @@ ConsoleUtils = {
 //////////////////////////////////////////////////////////////////////////
 
 HeadsUpDisplayUICommands = {
-  refreshCommand: function UIC_refreshCommand() {
-    var window = HUDService.currentContext();
-    let command = window.document.getElementById("Tools:WebConsole");
-    if (this.getOpenHUD() != null) {
-      command.setAttribute("checked", true);
-    } else {
-      command.removeAttribute("checked");
-    }
-  },
-
   toggleHUD: function UIC_toggleHUD() {
     var window = HUDService.currentContext();
     var gBrowser = window.gBrowser;
@@ -6829,76 +6835,93 @@ function GcliTerm(aContentWindow, aHudId, aDocument, aConsole, aHintNode, aConso
   this.createUI();
   this.createSandbox();
 
-  this.gcliConsole = gcli._internal.createDisplay({
-    contentDocument: aContentWindow.document,
-    chromeDocument: this.document,
-    outputDocument: this.document,
-    chromeWindow: this.document.defaultView,
+  this.show = this.show.bind(this);
+  this.hide = this.hide.bind(this);
 
-    hintElement: this.hintNode,
-    inputElement: this.inputNode,
-    completeElement: this.completeNode,
-    backgroundElement: this.inputStack,
-    consoleWrap: aConsoleWrap,
-
-    eval: this.evalInSandbox.bind(this),
+  // Allow GCLI:Inputter to decide how and when to open a scratchpad window
+  let scratchpad = {
+    shouldActivate: function Scratchpad_shouldActivate(aEvent) {
+      return aEvent.shiftKey &&
+          aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_RETURN;
+    },
+    activate: function Scratchpad_activate(aValue) {
+      aValue = aValue.replace(/^\s*{\s*/, '');
+      ScratchpadManager.openScratchpad({ text: aValue });
+      return true;
+    },
+    linkText: stringBundle.GetStringFromName('scratchpad.linkText')
+  };
 
+  this.opts = {
     environment: {
+      hudId: this.hudId,
       chromeDocument: this.document,
       contentDocument: aContentWindow.document
     },
-
-    tooltipClass: 'gcliterm-tooltip',
-
-    // Allow GCLI:Inputter to decide how and when to open a scratchpad window
-    scratchpad: {
-      shouldActivate: function Scratchpad_shouldActivate(aEvent) {
-        return aEvent.shiftKey &&
-            aEvent.keyCode === Ci.nsIDOMKeyEvent.DOM_VK_RETURN;
-      },
-      activate: function Scratchpad_activate(aValue) {
-        aValue = aValue.replace(/^\s*{\s*/, '');
-        ScratchpadManager.openScratchpad({ text: aValue });
-        return true;
-      },
-      linkText: stringBundle.GetStringFromName('scratchpad.linkText')
+    chromeDocument: this.document,
+    contentDocument: aContentWindow.document,
+    jsEnvironment: {
+      globalObject: unwrap(aContentWindow),
+      evalFunction: this.evalInSandbox.bind(this)
     },
-  });
+    inputElement: this.inputNode,
+    completeElement: this.completeNode,
+    inputBackgroundElement: this.inputStack,
+    hintElement: this.hintNode,
+    consoleWrap: aConsoleWrap,
+    scratchpad: scratchpad,
+    gcliTerm: this
+  };
 
-  this.gcliConsole.onVisibilityChange.add(this.onVisibilityChange, this);
-  this.gcliConsole.onOutput.add(this.onOutput, this);
+  gcli._internal.commandOutputManager.addListener(this.onCommandOutput, this);
+  gcli._internal.createView(this.opts);
+
+  if (!commandExports) {
+    commandExports = loadCommands();
+  }
 }
 
 GcliTerm.prototype = {
   /**
-   * Show or remove the hint column from the display.
+   * Remove the hint column from the display.
    */
-  onVisibilityChange: function GcliTerm_onVisibilityChange(ev)
+  hide: function GcliTerm_hide()
   {
-    if (ev.visible) {
-      this.hintNode.parentNode.hidden = false;
+    let permaHint = false;
+    try {
+      permaHint = Services.prefs.getBoolPref("devtools.gcli.permaHint");
     }
-    else {
-      let permaHint = false;
-      try {
-        permaHint = Services.prefs.getBoolPref("devtools.gcli.permaHint");
-      }
-      catch (ex) {}
+    catch (ex) {}
 
-      if (!permaHint) {
-        this.hintNode.parentNode.hidden = true;
-      }
+    if (!permaHint) {
+      this.hintNode.parentNode.hidden = true;
     }
   },
 
+  /**
+   * Undo the effects of calling hide().
+   */
+  show: function GcliTerm_show()
+  {
+    this.hintNode.parentNode.hidden = false;
+  },
+
   /**
    * Destroy the GcliTerm object. Call this method to avoid memory leaks.
    */
   destroy: function Gcli_destroy()
   {
-    this.gcliConsole.onVisibilityChange.remove(this.onVisibilityChange, this);
-    this.gcliConsole.onOutput.remove(this.onOutput, this);
-    this.gcliConsole.destroy();
+    gcli._internal.removeView(this.opts);
+    gcli._internal.commandOutputManager.removeListener(this.onCommandOutput, this);
+
+    delete this.opts.chromeDocument;
+    delete this.opts.inputElement;
+    delete this.opts.completeElement;
+    delete this.opts.inputBackgroundElement;
+    delete this.opts.hintElement;
+    delete this.opts.contentDocument;
+    delete this.opts.jsEnvironment;
+    delete this.opts.gcliTerm;
 
     delete this.context;
     delete this.document;
@@ -6907,10 +6930,10 @@ GcliTerm.prototype = {
     delete this._window;
 
     delete this.sandbox;
-    delete this.element;
-    delete this.inputStack;
-    delete this.completeNode;
-    delete this.inputNode;
+    delete this.element
+    delete this.inputStack
+    delete this.completeNode
+    delete this.inputNode
   },
 
   /**
@@ -6927,13 +6950,11 @@ GcliTerm.prototype = {
     this.console = aConsole;
     this.createSandbox();
 
-    this.gcliConsole.reattach({
-      contentDocument: aContentWindow.document,
-      environment: {
-        chromeDocument: this.document,
-        contentDocument: aContentWindow.document
-      },
-    });
+    this.opts.environment.contentDocument = aContentWindow.document;
+    this.opts.contentDocument = aContentWindow.document;
+    this.opts.jsEnvironment.globalObject = unwrap(aContentWindow);
+
+    gcli._internal.reattachConsole(this.opts);
   },
 
   /**
@@ -6964,7 +6985,7 @@ GcliTerm.prototype = {
   /**
    * Called by GCLI/canon when command line output changes.
    */
-  onOutput: function Gcli_onOutput(aEvent)
+  onCommandOutput: function Gcli_onCommandOutput(aEvent)
   {
     // When we can update the history of the console, then we should stop
     // filtering incomplete reports.
diff --git a/browser/devtools/webconsole/gcli.css b/browser/devtools/webconsole/gcli.css
deleted file mode 100644
index b549a30b83ce..000000000000
--- a/browser/devtools/webconsole/gcli.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is the GCLI.
- *
- * The Initial Developer of the Original Code is
- * The Mozilla Foundation.
- * Portions created by the Initial Developer are Copyright (C) 2011
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Joe Walker <jwalker@mozilla.com> (original author)
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-.gclichrome-output {
-  max-width: 350px;
-}
-
-.gclichrome-tooltip {
-  max-width: 350px;
-}
-
-.gcli-help-name {
-  text-align: end;
-}
-
-.gcli-help-synopsis {
-  cursor: pointer;
-  display: inline-block;
-}
-
-.gcli-help-synopsis:before {
-  content: '\bb';
-}
-
-.gcli-menu-option {
-  overflow: hidden;
-  white-space: nowrap;
-  cursor: pointer;
-}
-
-.gcli-menu-template {
-  border-collapse: collapse;
-  width: 100%;
-}
-
-.gcli-menu-error {
-  overflow: hidden;
-  white-space: nowrap;
-}
-
diff --git a/browser/devtools/webconsole/gcli.jsm b/browser/devtools/webconsole/gcli.jsm
index 094e7ad4cc02..d62e65755a0e 100644
--- a/browser/devtools/webconsole/gcli.jsm
+++ b/browser/devtools/webconsole/gcli.jsm
@@ -36,7 +36,7 @@
  * - A build of GCLI itself, packaged using dryice
  * - suffix-gcli.jsm - code to require the gcli object for EXPORTED_SYMBOLS.
  *
- * See gcli.js for more details of this build.
+ * See Makefile.dryice.js for more details of this build.
  * For more details on dryice, see the https://github.com/mozilla/dryice
  *
  *******************************************************************************
@@ -57,11 +57,10 @@ var EXPORTED_SYMBOLS = [ "gcli" ];
 
 
 /**
- * Expose Node/HTMLElement objects. This allows us to use the Node constants
- * without resorting to hardcoded numbers
+ * Expose a Node object. This allows us to use the Node constants without
+ * resorting to hardcoded numbers
  */
 var Node = Components.interfaces.nsIDOMNode;
-var HTMLElement = Components.interfaces.nsIDOMHTMLElement;
 
 
 Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
@@ -229,7 +228,7 @@ var console = {};
 
     if (typeof aThing == "object") {
       var type = getCtorName(aThing);
-      if (aThing instanceof Node && aThing.tagName) {
+      if (type == "XULElement") {
         return debugElement(aThing);
       }
       type = (type == "Object" ? "" : type + " ");
@@ -293,8 +292,8 @@ var console = {};
         reply += "  " + aThing.message + "\n";
         reply += logProperty("stack", aThing.stack);
       }
-      else if (aThing instanceof Node && aThing.tagName) {
-        reply += "  " + debugElement(aThing) + "\n";
+      else if (type == "XULElement") {
+        reply += "  " + debugElement(aThing) + " (XUL)\n";
       }
       else {
         var keys = Object.getOwnPropertyNames(aThing);
@@ -692,7 +691,7 @@ var mozl10n = {};
 
 })(mozl10n);
 
-define('gcli/index', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/types/basic', 'gcli/types/command', 'gcli/types/javascript', 'gcli/types/node', 'gcli/types/resource', 'gcli/types/setting', 'gcli/types/selection', 'gcli/settings', 'gcli/ui/intro', 'gcli/ui/focus', 'gcli/ui/fields/basic', 'gcli/ui/fields/javascript', 'gcli/ui/fields/selection', 'gcli/commands/help', 'gcli/ui/ffdisplay'], function(require, exports, module) {
+define('gcli/index', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/types/basic', 'gcli/types/javascript', 'gcli/types/node', 'gcli/types/resource', 'gcli/cli', 'gcli/commands/help', 'gcli/ui/console'], function(require, exports, module) {
 
   // The API for use by command authors
   exports.addCommand = require('gcli/canon').addCommand;
@@ -702,27 +701,19 @@ define('gcli/index', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/types
 
   // Internal startup process. Not exported
   require('gcli/types/basic').startup();
-  require('gcli/types/command').startup();
   require('gcli/types/javascript').startup();
   require('gcli/types/node').startup();
   require('gcli/types/resource').startup();
-  require('gcli/types/setting').startup();
-  require('gcli/types/selection').startup();
-
-  require('gcli/settings').startup();
-  require('gcli/ui/intro').startup();
-  require('gcli/ui/focus').startup();
-  require('gcli/ui/fields/basic').startup();
-  require('gcli/ui/fields/javascript').startup();
-  require('gcli/ui/fields/selection').startup();
-
+  require('gcli/cli').startup();
   require('gcli/commands/help').startup();
 
-  // Some commands require customizing for Firefox before we include them
-  // require('gcli/cli').startup();
-  // require('gcli/commands/pref').startup();
+  var Requisition = require('gcli/cli').Requisition;
+  var Console = require('gcli/ui/console').Console;
 
-  var FFDisplay = require('gcli/ui/ffdisplay').FFDisplay;
+  var cli = require('gcli/cli');
+  var jstype = require('gcli/types/javascript');
+  var nodetype = require('gcli/types/node');
+  var resource = require('gcli/types/resource');
 
   /**
    * API for use by HUDService only.
@@ -743,12 +734,55 @@ define('gcli/index', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/types
      * - jsEnvironment.evalFunction: 'eval' in a sandbox
      * - inputElement: GCLITerm.inputNode
      * - completeElement: GCLITerm.completeNode
+     * - gcliTerm: GCLITerm
      * - hintElement: GCLITerm.hintNode
      * - inputBackgroundElement: GCLITerm.inputStack
      */
-    createDisplay: function(opts) {
-      return new FFDisplay(opts);
-    }
+    createView: function(opts) {
+      jstype.setGlobalObject(opts.jsEnvironment.globalObject);
+      nodetype.setDocument(opts.contentDocument);
+      cli.setEvalFunction(opts.jsEnvironment.evalFunction);
+      resource.setDocument(opts.contentDocument);
+
+      if (opts.requisition == null) {
+        opts.requisition = new Requisition(opts.environment, opts.chromeDocument);
+      }
+
+      opts.console = new Console(opts);
+    },
+
+    /**
+     * Called when the page to which we're attached changes
+     */
+    reattachConsole: function(opts) {
+      jstype.setGlobalObject(opts.jsEnvironment.globalObject);
+      nodetype.setDocument(opts.contentDocument);
+      cli.setEvalFunction(opts.jsEnvironment.evalFunction);
+
+      opts.requisition.environment = opts.environment;
+      opts.requisition.document = opts.chromeDocument;
+
+      opts.console.reattachConsole(opts);
+    },
+
+    /**
+     * Undo the effects of createView() to prevent memory leaks
+     */
+    removeView: function(opts) {
+      opts.console.destroy();
+      delete opts.console;
+
+      opts.requisition.destroy();
+      delete opts.requisition;
+
+      cli.unsetEvalFunction();
+      nodetype.unsetDocument();
+      jstype.unsetGlobalObject();
+      resource.unsetDocument();
+      resource.clearResourceCache();
+    },
+
+    commandOutputManager: require('gcli/canon').commandOutputManager
   };
 });
 /*
@@ -899,11 +933,16 @@ canon.Command = Command;
  */
 function Parameter(paramSpec, command, groupName) {
   this.command = command || { name: 'unnamed' };
-  this.paramSpec = paramSpec;
-  this.name = this.paramSpec.name;
-  this.type = this.paramSpec.type;
+
+  Object.keys(paramSpec).forEach(function(key) {
+    this[key] = paramSpec[key];
+  }, this);
+
+  this.description = 'description' in this ? this.description : undefined;
+  this.description = lookup(this.description, 'canonDescNone');
+  this.manual = 'manual' in this ? this.manual : undefined;
+  this.manual = lookup(this.manual);
   this.groupName = groupName;
-  this.defaultValue = this.paramSpec.defaultValue;
 
   if (!this.name) {
     throw new Error('In ' + this.command.name +
@@ -921,7 +960,7 @@ function Parameter(paramSpec, command, groupName) {
   // boolean parameters have an implicit defaultValue:false, which should
   // not be changed. See the docs.
   if (this.type instanceof BooleanType) {
-    if (this.defaultValue !== undefined) {
+    if ('defaultValue' in this) {
       console.error('In ' + this.command.name + '/' + this.name +
           ': boolean parameters can not have a defaultValue.' +
           ' Ignoring');
@@ -948,12 +987,6 @@ function Parameter(paramSpec, command, groupName) {
         ': ' + ex);
     }
   }
-
-  // Some typed (boolean, array) have a non 'undefined' blank value. Give the
-  // type a chance to override the default defaultValue of undefined
-  if (this.defaultValue === undefined) {
-    this.defaultValue = this.type.getBlank().value;
-  }
 }
 
 /**
@@ -968,64 +1001,21 @@ Parameter.prototype.isKnownAs = function(name) {
   return false;
 };
 
-/**
- * Read the default value for this parameter either from the parameter itself
- * (if this function has been over-ridden) or from the type, or from calling
- * parseString on an empty string
- */
-Parameter.prototype.getBlank = function() {
-  var conversion;
-
-  if (this.type.getBlank) {
-    return this.type.getBlank();
-  }
-
-  return this.type.parseString('');
-};
-
-/**
- * Resolve the manual for this parameter, by looking in the paramSpec
- * and doing a l10n lookup
- */
-Object.defineProperty(Parameter.prototype, 'manual', {
-  get: function() {
-    return lookup(this.paramSpec.manual || undefined);
-  },
-  enumerable: true
-});
-
-/**
- * Resolve the description for this parameter, by looking in the paramSpec
- * and doing a l10n lookup
- */
-Object.defineProperty(Parameter.prototype, 'description', {
-  get: function() {
-    return lookup(this.paramSpec.description || undefined, 'canonDescNone');
-  },
-  enumerable: true
-});
-
 /**
  * Is the user required to enter data for this parameter? (i.e. has
  * defaultValue been set to something other than undefined)
  */
-Object.defineProperty(Parameter.prototype, 'isDataRequired', {
-  get: function() {
-    return this.defaultValue === undefined;
-  },
-  enumerable: true
-});
+Parameter.prototype.isDataRequired = function() {
+  return this.defaultValue === undefined;
+};
 
 /**
  * Are we allowed to assign data to this parameter using positional
  * parameters?
  */
-Object.defineProperty(Parameter.prototype, 'isPositionalAllowed', {
-  get: function() {
-    return this.groupName == null;
-  },
-  enumerable: true
-});
+Parameter.prototype.isPositionalAllowed = function() {
+  return this.groupName == null;
+};
 
 canon.Parameter = Parameter;
 
@@ -1043,7 +1033,7 @@ canon.addCommand = function addCommand(commandSpec) {
   commandNames.push(commandSpec.name);
   commandNames.sort();
 
-  canon.onCanonChange();
+  canon.canonChange();
   return command;
 };
 
@@ -1060,7 +1050,7 @@ canon.removeCommand = function removeCommand(commandOrName) {
     return test !== name;
   });
 
-  canon.onCanonChange();
+  canon.canonChange();
 };
 
 /**
@@ -1092,7 +1082,7 @@ canon.getCommandNames = function getCommandNames() {
 /**
  * Enable people to be notified of changes to the list of commands
  */
-canon.onCanonChange = util.createEvent('canon.onCanonChange');
+canon.canonChange = util.createEvent('canon.canonChange');
 
 /**
  * CommandOutputManager stores the output objects generated by executed
@@ -1105,9 +1095,33 @@ canon.onCanonChange = util.createEvent('canon.onCanonChange');
  * soon.
  */
 function CommandOutputManager() {
-  this.onOutput = util.createEvent('CommandOutputManager.onOutput');
+  this._event = util.createEvent('CommandOutputManager');
 }
 
+/**
+ * Call this method to notify the manager (and therefore all listeners) of a
+ * new or updated command output.
+ * @param output The command output object that has been created or updated.
+ */
+CommandOutputManager.prototype.sendCommandOutput = function(output) {
+  this._event({ output: output });
+};
+
+/**
+ * Register a function to be called whenever there is a new command output
+ * object.
+ */
+CommandOutputManager.prototype.addListener = function(fn, ctx) {
+  this._event.add(fn, ctx);
+};
+
+/**
+ * Undo the effects of CommandOutputManager.addListener()
+ */
+CommandOutputManager.prototype.removeListener = function(fn, ctx) {
+  this._event.remove(fn, ctx);
+};
+
 canon.CommandOutputManager = CommandOutputManager;
 
 /**
@@ -1133,31 +1147,12 @@ define('gcli/util', ['require', 'exports', 'module' ], function(require, exports
 
 //------------------------------------------------------------------------------
 
-var eventDebug = false;
-
-/**
- * Useful way to create a name for a handler, used in createEvent()
- */
-function nameFunction(handler) {
-  var scope = handler.scope ? handler.scope.constructor.name + '.' : '';
-  var name = handler.func.name;
-  if (name) {
-    return scope + name;
-  }
-  for (var prop in handler.scope) {
-    if (handler.scope[prop] === handler.func) {
-      return scope + prop;
-    }
-  }
-  return scope + handler.func;
-}
-
 /**
  * Create an event.
  * For use as follows:
  *
  *   function Hat() {
- *     this.putOn = createEvent('Hat.putOn');
+ *     this.putOn = createEvent();
  *     ...
  *   }
  *   Hat.prototype.adorn = function(person) {
@@ -1174,40 +1169,18 @@ function nameFunction(handler) {
  */
 exports.createEvent = function(name) {
   var handlers = [];
-  var holdFire = false;
-  var heldEvents = [];
-  var eventCombiner = undefined;
 
   /**
    * This is how the event is triggered.
    * @param ev The event object to be passed to the event listeners
    */
   var event = function(ev) {
-    if (holdFire) {
-      heldEvents.push(ev);
-      if (eventDebug) {
-        console.log('Held fire: ' + name, ev);
-      }
-      return;
-    }
-
-    if (eventDebug) {
-      console.group('Fire: ' + name + ' to ' + handlers.length + ' listeners', ev);
-    }
-
     // Use for rather than forEach because it step debugs better, which is
     // important for debugging events
     for (var i = 0; i < handlers.length; i++) {
       var handler = handlers[i];
-      if (eventDebug) {
-        console.log(nameFunction(handler));
-      }
       handler.func.call(handler.scope, ev);
     }
-
-    if (eventDebug) {
-      console.groupEnd();
-    }
   };
 
   /**
@@ -1239,92 +1212,23 @@ exports.createEvent = function(name) {
     handlers = [];
   };
 
-  /**
-   * Temporarily prevent this event from firing.
-   * @see resumeFire(ev)
-   */
-  event.holdFire = function() {
-    if (eventDebug) {
-      console.group('Holding fire: ' + name);
-    }
-
-    holdFire = true;
-  };
-
-  /**
-   * Resume firing events.
-   * If there are heldEvents, then we fire one event to cover them all. If an
-   * event combining function has been provided then we use that to combine the
-   * events. Otherwise the last held event is used.
-   * @see holdFire()
-   */
-  event.resumeFire = function() {
-    if (eventDebug) {
-      console.groupEnd('Resume fire: ' + name);
-    }
-
-    if (holdFire !== true) {
-      throw new Error('Event not held: ' + name);
-    }
-
-    holdFire = false;
-    if (heldEvents.length === 0) {
-      return;
-    }
-
-    if (heldEvents.length === 1) {
-      event(heldEvents[0]);
-    }
-    else {
-      var first = heldEvents[0];
-      var last = heldEvents[heldEvents.length - 1];
-      if (eventCombiner) {
-        event(eventCombiner(first, last, heldEvents));
-      }
-      else {
-        event(last);
-      }
-    }
-
-    heldEvents = [];
-  };
-
-  /**
-   * When resumeFire has a number of events to combine, by default it just
-   * picks the last, however you can provide an eventCombiner which returns a
-   * combined event.
-   * eventCombiners will be passed 3 parameters:
-   * - first The first event to be held
-   * - last The last event to be held
-   * - all An array containing all the held events
-   * The return value from an eventCombiner is expected to be an event object
-   */
-  Object.defineProperty(event, 'eventCombiner', {
-    set: function(newEventCombiner) {
-      if (typeof newEventCombiner !== 'function') {
-        throw new Error('eventCombiner is not a function');
-      }
-      eventCombiner = newEventCombiner;
-    },
-
-    enumerable: true
-  });
-
   return event;
 };
 
 
 //------------------------------------------------------------------------------
 
+var dom = {};
+
 /**
  * XHTML namespace
  */
-exports.NS_XHTML = 'http://www.w3.org/1999/xhtml';
+dom.NS_XHTML = 'http://www.w3.org/1999/xhtml';
 
 /**
  * XUL namespace
  */
-exports.NS_XUL = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';
+dom.NS_XUL = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul';
 
 /**
  * Create an HTML or XHTML element depending on whether the document is HTML
@@ -1337,9 +1241,9 @@ exports.NS_XUL = 'http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul'
  * @param tag The name of the tag to create
  * @returns The created element
  */
-exports.createElement = function(doc, tag) {
-  if (exports.isXmlDocument(doc)) {
-    return doc.createElementNS(exports.NS_XHTML, tag);
+dom.createElement = function(doc, tag) {
+  if (dom.isXmlDocument(doc)) {
+    return doc.createElementNS(dom.NS_XHTML, tag);
   }
   else {
     return doc.createElement(tag);
@@ -1350,7 +1254,7 @@ exports.createElement = function(doc, tag) {
  * Remove all the child nodes from this node
  * @param elem The element that should have it's children removed
  */
-exports.clearElement = function(elem) {
+dom.clearElement = function(elem) {
   while (elem.hasChildNodes()) {
     elem.removeChild(elem.firstChild);
   }
@@ -1367,17 +1271,17 @@ var isAllWhitespace = /^\s*$/;
  * @param elem The element which should have blank whitespace trimmed
  * @param deep Should this node removal include child elements
  */
-exports.removeWhitespace = function(elem, deep) {
+dom.removeWhitespace = function(elem, deep) {
   var i = 0;
   while (i < elem.childNodes.length) {
     var child = elem.childNodes.item(i);
-    if (child.nodeType === 3 /*Node.TEXT_NODE*/ &&
+    if (child.nodeType === Node.TEXT_NODE &&
         isAllWhitespace.test(child.textContent)) {
       elem.removeChild(child);
     }
     else {
-      if (deep && child.nodeType === 1 /*Node.ELEMENT_NODE*/) {
-        exports.removeWhitespace(child, deep);
+      if (deep && child.nodeType === Node.ELEMENT_NODE) {
+        dom.removeWhitespace(child, deep);
       }
       i++;
     }
@@ -1389,31 +1293,11 @@ exports.removeWhitespace = function(elem, deep) {
  * it.
  * @param cssText The CSS declarations to append
  * @param doc The document element to work from
- * @param id Optional id to assign to the created style tag. If the id already
- * exists on the document, we do not add the CSS again.
  */
-exports.importCss = function(cssText, doc, id) {
-  if (!cssText) {
-    return undefined;
-  }
-
+dom.importCss = function(cssText, doc) {
   doc = doc || document;
 
-  if (!id) {
-    id = 'hash-' + hash(cssText);
-  }
-
-  var found = doc.getElementById(id);
-  if (found) {
-    if (found.tagName.toLowerCase() !== 'style') {
-      console.error('Warning: importCss passed id=' + id +
-              ', but that pre-exists (and isn\'t a style tag)');
-    }
-    return found;
-  }
-
-  var style = exports.createElement(doc, 'style');
-  style.id = id;
+  var style = dom.createElement(doc, 'style');
   style.appendChild(doc.createTextNode(cssText));
 
   var head = doc.getElementsByTagName('head')[0] || doc.documentElement;
@@ -1422,46 +1306,17 @@ exports.importCss = function(cssText, doc, id) {
   return style;
 };
 
-/**
- * Simple hash function which happens to match Java's |String.hashCode()|
- * Done like this because I we don't need crypto-security, but do need speed,
- * and I don't want to spend a long time working on it.
- * @see http://werxltd.com/wp/2010/05/13/javascript-implementation-of-javas-string-hashcode-method/
- */
-function hash(str) {
-  var hash = 0;
-  if (str.length == 0) {
-    return hash;
-  }
-  for (var i = 0; i < str.length; i++) {
-    var char = str.charCodeAt(i);
-    hash = ((hash << 5) - hash) + char;
-    hash = hash & hash; // Convert to 32bit integer
-  }
-  return hash;
-}
-
 /**
  * There are problems with innerHTML on XML documents, so we need to do a dance
  * using document.createRange().createContextualFragment() when in XML mode
  */
-exports.setContents = function(elem, contents) {
-  if (typeof HTMLElement !== 'undefined' && contents instanceof HTMLElement) {
-    exports.clearElement(elem);
-    elem.appendChild(contents);
-    return;
-  }
-
-  if (exports.isXmlDocument(elem.ownerDocument)) {
+dom.setInnerHtml = function(elem, html) {
+  if (dom.isXmlDocument(elem.ownerDocument)) {
     try {
-      var ns = elem.ownerDocument.documentElement.namespaceURI;
-      if (!ns) {
-        ns = exports.NS_XHTML;
-      }
-      exports.clearElement(elem);
-      contents = '<div xmlns="' + ns + '">' + contents + '</div>';
+      dom.clearElement(elem);
+      html = '<div xmlns="' + dom.NS_XHTML + '">' + html + '</div>';
       var range = elem.ownerDocument.createRange();
-      var child = range.createContextualFragment(contents).firstChild;
+      var child = range.createContextualFragment(html).firstChild;
       while (child.hasChildNodes()) {
         elem.appendChild(child.firstChild);
       }
@@ -1473,20 +1328,10 @@ exports.setContents = function(elem, contents) {
     }
   }
   else {
-    elem.innerHTML = contents;
+    elem.innerHTML = html;
   }
 };
 
-/**
- * Load some HTML into the given document and return a DOM element.
- * This utility assumes that the html has a single root (other than whitespace)
- */
-exports.toDom = function(document, html) {
-  var div = exports.createElement(document, 'div');
-  exports.setContents(div, html);
-  return div.children[0];
-};
-
 /**
  * How to detect if we're in an XML document.
  * In a Mozilla we check that document.xmlVersion = null, however in Chrome
@@ -1494,7 +1339,7 @@ exports.toDom = function(document, html) {
  * @param doc The document element to work from (defaulted to the global
  * 'document' if missing
  */
-exports.isXmlDocument = function(doc) {
+dom.isXmlDocument = function(doc) {
   doc = doc || document;
   // Best test for Firefox
   if (doc.contentType && doc.contentType != 'text/html') {
@@ -1507,6 +1352,8 @@ exports.isXmlDocument = function(doc) {
   return false;
 };
 
+exports.dom = dom;
+
 /**
  * Find the position of [element] in [nodeList].
  * @returns an index of the match, or -1 if there is no match
@@ -1525,7 +1372,7 @@ function positionInNodeList(element, nodeList) {
  * @returns a string such that ele.ownerDocument.querySelector(reply) === ele
  * and ele.ownerDocument.querySelectorAll(reply).length === 1
  */
-exports.findCssSelector = function(ele) {
+dom.findCssSelector = function(ele) {
   var document = ele.ownerDocument;
   if (ele.id && document.getElementById(ele.id) === ele) {
     return '#' + ele.id;
@@ -1575,41 +1422,19 @@ exports.findCssSelector = function(ele) {
 
   // So we can be unique w.r.t. our parent, and use recursion
   index = positionInNodeList(ele, ele.parentNode.children) + 1;
-  selector = exports.findCssSelector(ele.parentNode) + ' > ' +
+  selector = dom.findCssSelector(ele.parentNode) + ' > ' +
           tagName + ':nth-child(' + index + ')';
 
   return selector;
 };
 
-/**
- * Work out the path for images.
- */
-exports.createUrlLookup = function(callingModule) {
-  return function imageUrl(path) {
-    try {
-      return require('text!gcli/ui/' + path);
-    }
-    catch (ex) {
-      var filename = callingModule.id.split('/').pop() + '.js';
-
-      if (callingModule.uri.substr(-filename.length) !== filename) {
-        console.error('Can\'t work out path from module.uri/module.id');
-        return path;
-      }
-
-      if (callingModule.uri) {
-        var end = callingModule.uri.length - filename.length - 1;
-        return callingModule.uri.substr(0, end) + '/' + path;
-      }
-
-      return filename + '/' + path;
-    }
-  };
-};
-
-
 //------------------------------------------------------------------------------
 
+/**
+ * Various event utilities
+ */
+var event = {};
+
 /**
  * Keyboard handling is a mess. http://unixpapa.com/js/key.html
  * It would be good to use DOM L3 Keyboard events,
@@ -1623,10 +1448,10 @@ exports.createUrlLookup = function(callingModule) {
  * https://bugzilla.mozilla.org/show_bug.cgi?id=664991
  */
 if ('KeyEvent' in this) {
-  exports.KeyEvent = this.KeyEvent;
+  event.KeyEvent = this.KeyEvent;
 }
 else {
-  exports.KeyEvent = {
+  event.KeyEvent = {
     DOM_VK_CANCEL: 3,
     DOM_VK_HELP: 6,
     DOM_VK_BACK_SPACE: 8,
@@ -1745,6 +1570,8 @@ else {
   };
 }
 
+exports.event = event;
+
 
 });
 /*
@@ -1789,15 +1616,6 @@ exports.getPreferredLocales = function() {
 /** @see lookup() in lib/gcli/l10n.js */
 exports.lookup = function(key) {
   try {
-    // Our memory leak hunter walks reachable objects trying to work out what
-    // type of thing they are using object.constructor.name. If that causes
-    // problems then we can avoid the unknown-key-exception with the following:
-    /*
-    if (key === 'constructor') {
-      return { name: 'l10n-mem-leak-defeat' };
-    }
-    */
-
     return stringBundle.GetStringFromName(key);
   }
   catch (ex) {
@@ -1960,7 +1778,8 @@ Conversion.prototype.assign = function(assignment) {
  * Work out if there is information provided in the contained argument.
  */
 Conversion.prototype.isDataProvided = function() {
-  return !this.arg.isBlank();
+  var argProvided = this.arg.text !== '';
+  return this.value !== undefined || argProvided;
 };
 
 /**
@@ -1993,7 +1812,7 @@ Conversion.prototype.valueEquals = function(that) {
  * @param that The conversion to compare arguments with
  */
 Conversion.prototype.argEquals = function(that) {
-  return that == null ? false : this.arg.equals(that.arg);
+  return this.arg.equals(that.arg);
 };
 
 /**
@@ -2031,56 +1850,6 @@ Conversion.prototype.getPredictions = function() {
   return this.predictions || [];
 };
 
-/**
- * Accessor for a prediction by index.
- * This is useful above <tt>getPredictions()[index]</tt> because it normalizes
- * index to be within the bounds of the predictions, which means that the UI
- * can maintain an index of which prediction to choose without caring how many
- * predictions there are.
- * @param index The index of the prediction to choose
- */
-Conversion.prototype.getPredictionAt = function(index) {
-  if (index == null) {
-    return undefined;
-  }
-
-  var predictions = this.getPredictions();
-  if (predictions.length === 0) {
-    return undefined;
-  }
-
-  index = index % predictions.length;
-  if (index < 0) {
-    index = predictions.length + index;
-  }
-  return predictions[index];
-};
-
-/**
- * Accessor for a prediction by index.
- * This is useful above <tt>getPredictions()[index]</tt> because it normalizes
- * index to be within the bounds of the predictions, which means that the UI
- * can maintain an index of which prediction to choose without caring how many
- * predictions there are.
- * @param index The index of the prediction to choose
- */
-Conversion.prototype.constrainPredictionIndex = function(index) {
-  if (index == null) {
-    return undefined;
-  }
-
-  var predictions = this.getPredictions();
-  if (predictions.length === 0) {
-    return undefined;
-  }
-
-  index = index % predictions.length;
-  if (index < 0) {
-    index = predictions.length + index;
-  }
-  return index;
-};
-
 /**
  * ArrayConversion is a special Conversion, needed because arrays are converted
  * member by member rather then as a whole, which means we can track the
@@ -2221,23 +1990,11 @@ Type.prototype.decrement = function(value) {
 };
 
 /**
- * The 'blank value' of most types is 'undefined', but there are exceptions;
- * This allows types to specify a better conversion from empty string than
- * 'undefined'.
- * 2 known examples of this are boolean -> false and array -> []
+ * There is interesting information (like predictions) in a conversion of
+ * nothing, the output of this can sometimes be customized.
+ * @return Conversion
  */
-Type.prototype.getBlank = function() {
-  return this.parse(new Argument());
-};
-
-/**
- * This is something of a hack for the benefit of DeferredType which needs to
- * be able to lie about it's type for fields to accept it as one of their own.
- * Sub-types can ignore this unless they're DeferredType.
- */
-Type.prototype.getType = function() {
-  return this;
-};
+Type.prototype.getDefault = undefined;
 
 types.Type = Type;
 
@@ -2384,7 +2141,6 @@ Argument.prototype.beget = function(replText, options) {
   var prefix = this.prefix;
   var suffix = this.suffix;
 
-  // We need to add quotes when the replacement string has spaces or is empty
   var quote = (replText.indexOf(' ') >= 0 || replText.length == 0) ?
       '\'' : '';
 
@@ -2476,12 +2232,10 @@ argument.Argument = Argument;
 /**
  * ScriptArgument is a marker that the argument is designed to be Javascript.
  * It also implements the special rules that spaces after the { or before the
- * } are part of the pre/suffix rather than the content, and that they are
- * never 'blank' so they can be used by Requisition._split() and not raise an
- * ERROR status due to being blank.
+ * } are part of the pre/suffix rather than the content.
  */
 function ScriptArgument(text, prefix, suffix) {
-  this.text = text !== undefined ? text : '';
+  this.text = text;
   this.prefix = prefix !== undefined ? prefix : '';
   this.suffix = suffix !== undefined ? suffix : '';
 
@@ -2507,6 +2261,9 @@ ScriptArgument.prototype.beget = function(replText, options) {
   var prefix = this.prefix;
   var suffix = this.suffix;
 
+  var quote = (replText.indexOf(' ') >= 0 || replText.length == 0) ?
+      '\'' : '';
+
   if (options && options.normalize) {
     prefix = '{ ';
     suffix = ' }';
@@ -2515,15 +2272,6 @@ ScriptArgument.prototype.beget = function(replText, options) {
   return new ScriptArgument(replText, prefix, suffix);
 };
 
-/**
- * ScriptArguments are never blank due to the '{' and '}' and their special use
- * for the command argument requires them not to be blank even when there is
- * no text.
- */
-ScriptArgument.prototype.isBlank = function() {
-  return false;
-};
-
 argument.ScriptArgument = ScriptArgument;
 
 
@@ -2795,7 +2543,7 @@ argument.ArrayArgument = ArrayArgument;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/types/basic', ['require', 'exports', 'module' , 'gcli/l10n', 'gcli/types', 'gcli/types/spell', 'gcli/types/selection', 'gcli/argument'], function(require, exports, module) {
+define('gcli/types/basic', ['require', 'exports', 'module' , 'gcli/l10n', 'gcli/types', 'gcli/argument'], function(require, exports, module) {
 
 
 var l10n = require('gcli/l10n');
@@ -2804,8 +2552,6 @@ var Type = require('gcli/types').Type;
 var Status = require('gcli/types').Status;
 var Conversion = require('gcli/types').Conversion;
 var ArrayConversion = require('gcli/types').ArrayConversion;
-var Speller = require('gcli/types/spell').Speller;
-var SelectionType = require('gcli/types/selection').SelectionType;
 
 var Argument = require('gcli/argument').Argument;
 var TrueNamedArgument = require('gcli/argument').TrueNamedArgument;
@@ -2821,6 +2567,7 @@ exports.startup = function() {
   types.registerType(NumberType);
   types.registerType(BooleanType);
   types.registerType(BlankType);
+  types.registerType(SelectionType);
   types.registerType(DeferredType);
   types.registerType(ArrayType);
 };
@@ -2830,6 +2577,7 @@ exports.shutdown = function() {
   types.unregisterType(NumberType);
   types.unregisterType(BooleanType);
   types.unregisterType(BlankType);
+  types.unregisterType(SelectionType);
   types.unregisterType(DeferredType);
   types.unregisterType(ArrayType);
 };
@@ -2855,7 +2603,7 @@ StringType.prototype.stringify = function(value) {
 
 StringType.prototype.parse = function(arg) {
   if (arg.text == null || arg.text === '') {
-    return new Conversion(undefined, arg, Status.INCOMPLETE, '');
+    return new Conversion(null, arg, Status.INCOMPLETE, '');
   }
   return new Conversion(arg.text, arg);
 };
@@ -2897,7 +2645,7 @@ NumberType.prototype.getMin = function() {
       return this._min;
     }
   }
-  return undefined;
+  return 0;
 };
 
 NumberType.prototype.getMax = function() {
@@ -2914,25 +2662,23 @@ NumberType.prototype.getMax = function() {
 
 NumberType.prototype.parse = function(arg) {
   if (arg.text.replace(/\s/g, '').length === 0) {
-    return new Conversion(undefined, arg, Status.INCOMPLETE, '');
+    return new Conversion(null, arg, Status.INCOMPLETE, '');
   }
 
   var value = parseInt(arg.text, 10);
   if (isNaN(value)) {
-    return new Conversion(undefined, arg, Status.ERROR,
+    return new Conversion(null, arg, Status.ERROR,
         l10n.lookupFormat('typesNumberNan', [ arg.text ]));
   }
 
-  var max = this.getMax();
-  if (max != null && value > max) {
-    return new Conversion(undefined, arg, Status.ERROR,
-        l10n.lookupFormat('typesNumberMax', [ value, max ]));
+  if (this.getMax() != null && value > this.getMax()) {
+    return new Conversion(null, arg, Status.ERROR,
+        l10n.lookupFormat('typesNumberMax', [ value, this.getMax() ]));
   }
 
-  var min = this.getMin();
-  if (min != null && value < min) {
-    return new Conversion(undefined, arg, Status.ERROR,
-        l10n.lookupFormat('typesNumberMin', [ value, min ]));
+  if (value < this.getMin()) {
+    return new Conversion(null, arg, Status.ERROR,
+        l10n.lookupFormat('typesNumberMin', [ value, this.getMin() ]));
   }
 
   return new Conversion(value, arg);
@@ -2950,8 +2696,7 @@ NumberType.prototype.decrement = function(value) {
 
 NumberType.prototype.increment = function(value) {
   if (typeof value !== 'number' || isNaN(value)) {
-    var min = this.getMin();
-    return min != null ? min : 0;
+    return this.getMin();
   }
   var newValue = value + this._step;
   // Snap to the nearest incremental of the step
@@ -2969,11 +2714,11 @@ NumberType.prototype.increment = function(value) {
  */
 NumberType.prototype._boundsCheck = function(value) {
   var min = this.getMin();
-  if (min != null && value < min) {
+  if (value < min) {
     return min;
   }
   var max = this.getMax();
-  if (max != null && value > max) {
+  if (value > max) {
     return max;
   }
   return value;
@@ -2983,372 +2728,8 @@ NumberType.prototype.name = 'number';
 
 exports.NumberType = NumberType;
 
-
 /**
- * true/false values
- */
-function BooleanType(typeSpec) {
-  if (Object.keys(typeSpec).length > 0) {
-    throw new Error('BooleanType can not be customized');
-  }
-}
-
-BooleanType.prototype = Object.create(SelectionType.prototype);
-
-BooleanType.prototype.lookup = [
-  { name: 'false', value: false },
-  { name: 'true', value: true }
-];
-
-BooleanType.prototype.parse = function(arg) {
-  if (arg instanceof TrueNamedArgument) {
-    return new Conversion(true, arg);
-  }
-  if (arg instanceof FalseNamedArgument) {
-    return new Conversion(false, arg);
-  }
-  return SelectionType.prototype.parse.call(this, arg);
-};
-
-BooleanType.prototype.stringify = function(value) {
-  return '' + value;
-};
-
-BooleanType.prototype.getBlank = function() {
-  return new Conversion(false, new Argument(), Status.VALID, '', this.lookup);
-};
-
-BooleanType.prototype.name = 'boolean';
-
-exports.BooleanType = BooleanType;
-
-
-/**
- * A type for "we don't know right now, but hope to soon".
- */
-function DeferredType(typeSpec) {
-  if (typeof typeSpec.defer !== 'function') {
-    throw new Error('Instances of DeferredType need typeSpec.defer to be a function that returns a type');
-  }
-  Object.keys(typeSpec).forEach(function(key) {
-    this[key] = typeSpec[key];
-  }, this);
-}
-
-DeferredType.prototype = Object.create(Type.prototype);
-
-DeferredType.prototype.stringify = function(value) {
-  return this.defer().stringify(value);
-};
-
-DeferredType.prototype.parse = function(arg) {
-  return this.defer().parse(arg);
-};
-
-DeferredType.prototype.decrement = function(value) {
-  var deferred = this.defer();
-  return (deferred.decrement ? deferred.decrement(value) : undefined);
-};
-
-DeferredType.prototype.increment = function(value) {
-  var deferred = this.defer();
-  return (deferred.increment ? deferred.increment(value) : undefined);
-};
-
-DeferredType.prototype.increment = function(value) {
-  var deferred = this.defer();
-  return (deferred.increment ? deferred.increment(value) : undefined);
-};
-
-DeferredType.prototype.getType = function() {
-  return this.defer();
-};
-
-Object.defineProperty(DeferredType.prototype, 'isImportant', {
-  get: function() {
-    return this.defer().isImportant;
-  },
-  enumerable: true
-});
-
-DeferredType.prototype.name = 'deferred';
-
-exports.DeferredType = DeferredType;
-
-
-/**
- * 'blank' is a type for use with DeferredType when we don't know yet.
- * It should not be used anywhere else.
- */
-function BlankType(typeSpec) {
-  if (Object.keys(typeSpec).length > 0) {
-    throw new Error('BlankType can not be customized');
-  }
-}
-
-BlankType.prototype = Object.create(Type.prototype);
-
-BlankType.prototype.stringify = function(value) {
-  return '';
-};
-
-BlankType.prototype.parse = function(arg) {
-  return new Conversion(undefined, arg);
-};
-
-BlankType.prototype.name = 'blank';
-
-exports.BlankType = BlankType;
-
-
-/**
- * A set of objects of the same type
- */
-function ArrayType(typeSpec) {
-  if (!typeSpec.subtype) {
-    console.error('Array.typeSpec is missing subtype. Assuming string.' +
-        JSON.stringify(typeSpec));
-    typeSpec.subtype = 'string';
-  }
-
-  Object.keys(typeSpec).forEach(function(key) {
-    this[key] = typeSpec[key];
-  }, this);
-  this.subtype = types.getType(this.subtype);
-}
-
-ArrayType.prototype = Object.create(Type.prototype);
-
-ArrayType.prototype.stringify = function(values) {
-  // BUG 664204: Check for strings with spaces and add quotes
-  return values.join(' ');
-};
-
-ArrayType.prototype.parse = function(arg) {
-  if (arg instanceof ArrayArgument) {
-    var conversions = arg.getArguments().map(function(subArg) {
-      var conversion = this.subtype.parse(subArg);
-      // Hack alert. ArrayConversion needs to be able to answer questions
-      // about the status of individual conversions in addition to the
-      // overall state. This allows us to do that easily.
-      subArg.conversion = conversion;
-      return conversion;
-    }, this);
-    return new ArrayConversion(conversions, arg);
-  }
-  else {
-    console.error('non ArrayArgument to ArrayType.parse', arg);
-    throw new Error('non ArrayArgument to ArrayType.parse');
-  }
-};
-
-ArrayType.prototype.getBlank = function(values) {
-  return new ArrayConversion([], new ArrayArgument());
-};
-
-ArrayType.prototype.name = 'array';
-
-exports.ArrayType = ArrayType;
-
-
-});
-/*
- * Copyright (c) 2009 Panagiotis Astithas
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-define('gcli/types/spell', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-
-/**
- * A spell-checker based on the statistical algorithm described by Peter Norvig
- * in http://norvig.com/spell-correct.html, and converted to JavaScript by Past
- * http://past.github.com/speller/
- *
- * Usage requires a two-step process:
- * 1) call speller.train() one or more times with a large text to train the
- *    language model
- * 2) call speller.correct(word) to retrieve the correction for the specified
- *    word
- */
-function Speller() {
-  // A map of words to the count of times they were encountered during training.
-  this._nWords = {};
-}
-
-Speller.letters = "abcdefghijklmnopqrstuvwxyz".split("");
-
-/**
- * A function that trains the language model with the words in the supplied
- * text. Multiple invocation of this function can extend the training of the
- * model.
- */
-Speller.prototype.train = function(words) {
-  words.forEach(function(word) {
-    word = word.toLowerCase();
-    this._nWords[word] = this._nWords.hasOwnProperty(word) ?
-            this._nWords[word] + 1 :
-            1;
-  }, this);
-};
-
-/**
- * A function that returns the correction for the specified word.
- */
-Speller.prototype.correct = function(word) {
-  if (this._nWords.hasOwnProperty(word)) {
-    return word;
-  }
-
-  var candidates = {};
-  var list = this._edits(word);
-  list.forEach(function(edit) {
-    if (this._nWords.hasOwnProperty(edit)) {
-      candidates[this._nWords[edit]] = edit;
-    }
-  }, this);
-
-  if (this._countKeys(candidates) > 0) {
-    return candidates[this._max(candidates)];
-  }
-
-  list.forEach(function(edit) {
-    this._edits(edit).forEach(function(w) {
-      if (this._nWords.hasOwnProperty(w)) {
-        candidates[this._nWords[w]] = w;
-      }
-    }, this);
-  }, this);
-
-  return this._countKeys(candidates) > 0 ?
-      candidates[this._max(candidates)] :
-      null;
-};
-
-/**
- * A helper function that counts the keys in the supplied object.
- */
-Speller.prototype._countKeys = function(object) {
-  // return Object.keys(object).length; ?
-  var count = 0;
-  for (var attr in object) {
-    if (object.hasOwnProperty(attr)) {
-      count++;
-    }
-  }
-  return count;
-};
-
-/**
- * A helper function that returns the word with the most occurrences in the
- * language model, among the supplied candidates.
- * @param candidates
- */
-Speller.prototype._max = function(candidates) {
-  var arr = [];
-  for (var candidate in candidates) {
-    if (candidates.hasOwnProperty(candidate)) {
-      arr.push(candidate);
-    }
-  }
-  return Math.max.apply(null, arr);
-};
-
-/**
- * A function that returns the set of possible corrections of the specified
- * word. The edits can be deletions, insertions, alterations or transpositions.
- */
-Speller.prototype._edits = function(word) {
-  var results = [];
-
-  // Deletion
-  for (var i = 0; i < word.length; i++) {
-    results.push(word.slice(0, i) + word.slice(i + 1));
-  }
-
-  // Transposition
-  for (i = 0; i < word.length - 1; i++) {
-    results.push(word.slice(0, i) + word.slice(i + 1, i + 2)
-            + word.slice(i, i + 1) + word.slice(i + 2));
-  }
-
-  // Alteration
-  for (i = 0; i < word.length; i++) {
-    Speller.letters.forEach(function(l) {
-      results.push(word.slice(0, i) + l + word.slice(i + 1));
-    }, this);
-  }
-
-  // Insertion
-  for (i = 0; i <= word.length; i++) {
-    Speller.letters.forEach(function(l) {
-      results.push(word.slice(0, i) + l + word.slice(i));
-    }, this);
-  }
-
-  return results;
-};
-
-exports.Speller = Speller;
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/types/selection', ['require', 'exports', 'module' , 'gcli/l10n', 'gcli/types', 'gcli/types/spell', 'gcli/argument'], function(require, exports, module) {
-
-
-var l10n = require('gcli/l10n');
-var types = require('gcli/types');
-var Type = require('gcli/types').Type;
-var Status = require('gcli/types').Status;
-var Conversion = require('gcli/types').Conversion;
-var Speller = require('gcli/types/spell').Speller;
-var Argument = require('gcli/argument').Argument;
-
-
-/**
- * Registration and de-registration.
- */
-exports.startup = function() {
-  types.registerType(SelectionType);
-};
-
-exports.shutdown = function() {
-  types.unregisterType(SelectionType);
-};
-
-
-/**
- * A selection allows the user to pick a value from known set of options.
- * An option is made up of a name (which is what the user types) and a value
- * (which is passed to exec)
- * @param typeSpec Object containing properties that describe how this
- * selection functions. Properties include:
- * - lookup: An array of objects, one for each option, which contain name and
- *   value properties. lookup can be a function which returns this array
- * - data: An array of strings - alternative to 'lookup' where the valid values
- *   are strings. i.e. there is no mapping between what is typed and the value
- *   that is used by the program
- * - stringifyProperty: Conversion from value to string is generally a process
- *   of looking through all the valid options for a matching value, and using
- *   the associated name. However the name maybe available directly from the
- *   value using a property lookup. Setting 'stringifyProperty' allows
- *   SelectionType to take this shortcut.
+ * One of a known set of options
  */
 function SelectionType(typeSpec) {
   if (typeSpec) {
@@ -3360,16 +2741,12 @@ function SelectionType(typeSpec) {
 
 SelectionType.prototype = Object.create(Type.prototype);
 
-SelectionType.prototype.maxPredictions = 10;
-
 SelectionType.prototype.stringify = function(value) {
-  if (this.stringifyProperty != null) {
-    return value[this.stringifyProperty];
-  }
   var name = null;
   var lookup = this.getLookup();
   lookup.some(function(item) {
-    if (item.value === value) {
+    var test = (item.value == null) ? item : item.value;
+    if (test === value) {
       name = item.name;
       return true;
     }
@@ -3411,103 +2788,46 @@ SelectionType.prototype.getLookup = function() {
 SelectionType.prototype._dataToLookup = function(data) {
   return data.map(function(option) {
     return { name: option, value: option };
-  }, this);
+  });
 };
 
 /**
  * Return a list of possible completions for the given arg.
+ * This code is very similar to CommandType._findPredictions(). If you are
+ * making changes to this code, you should check there too.
  * @param arg The initial input to match
- * @return A trimmed array of string:value pairs
+ * @return A trimmed lookup table of string:value pairs
  */
 SelectionType.prototype._findPredictions = function(arg) {
   var predictions = [];
-  var lookup = this.getLookup();
-  var i, option;
-
-  // If the arg has a suffix then we're kind of 'done'. Only an exact match
-  // will do.
-  if (arg.suffix.length > 0) {
-    for (i = 0; i < lookup.length && predictions.length < this.maxPredictions; i++) {
-      option = lookup[i];
-      if (option.name === arg.text) {
-        this._addToPredictions(predictions, option, arg);
-      }
+  this.getLookup().forEach(function(item) {
+    if (item.name.indexOf(arg.text) === 0) {
+      predictions.push(item);
     }
-
-    return predictions;
-  }
-
-  // Start with prefix matching
-  for (i = 0; i < lookup.length && predictions.length < this.maxPredictions; i++) {
-    option = lookup[i];
-    if (option.name.indexOf(arg.text) === 0) {
-      this._addToPredictions(predictions, option, arg);
-    }
-  }
-
-  // Try infix matching if we get less half max matched
-  if (predictions.length < (this.maxPredictions / 2)) {
-    for (i = 0; i < lookup.length && predictions.length < this.maxPredictions; i++) {
-      option = lookup[i];
-      if (option.name.indexOf(arg.text) !== -1) {
-        if (predictions.indexOf(option) === -1) {
-          this._addToPredictions(predictions, option, arg);
-        }
-      }
-    }
-  }
-
-  // Try fuzzy matching if we don't get a prefix match
-  if (false && predictions.length === 0) {
-    var speller = new Speller();
-    var names = lookup.map(function(opt) {
-      return opt.name;
-    });
-    speller.train(names);
-    var corrected = speller.correct(arg.text);
-    if (corrected) {
-      lookup.forEach(function(opt) {
-        if (opt.name === corrected) {
-          predictions.push(opt);
-        }
-      }, this);
-    }
-  }
-
+  }, this);
   return predictions;
 };
 
-/**
- * Add an option to our list of predicted options.
- * We abstract out this portion of _findPredictions() because CommandType needs
- * to make an extra check before actually adding which SelectionType does not
- * need to make.
- */
-SelectionType.prototype._addToPredictions = function(predictions, option, arg) {
-  predictions.push(option);
-};
-
 SelectionType.prototype.parse = function(arg) {
   var predictions = this._findPredictions(arg);
 
-  if (predictions.length === 0) {
-    var msg = l10n.lookupFormat('typesSelectionNomatch', [ arg.text ]);
-    return new Conversion(undefined, arg, Status.ERROR, msg, predictions);
-  }
-
   // This is something of a hack it basically allows us to tell the
   // setting type to forget its last setting hack.
   if (this.noMatch) {
     this.noMatch();
   }
 
-  var value = predictions[0].value;
+  if (predictions.length > 0) {
+    if (predictions[0].name === arg.text) {
+      var value = predictions[0].value ? predictions[0].value : predictions[0];
+      return new Conversion(value, arg, Status.VALID, '', predictions);
+    }
 
-  if (predictions[0].name === arg.text) {
-    return new Conversion(value, arg, Status.VALID, '', predictions);
+    return new Conversion(null, arg, Status.INCOMPLETE, '', predictions);
   }
 
-  return new Conversion(undefined, arg, Status.INCOMPLETE, '', predictions);
+  var msg = l10n.lookupFormat('typesSelectionNomatch', [ arg.text ]);
+  return new Conversion(null, arg, Status.ERROR, msg, predictions);
 };
 
 /**
@@ -3574,110 +2894,161 @@ SelectionType.prototype.name = 'selection';
 exports.SelectionType = SelectionType;
 
 
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/types/command', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/l10n', 'gcli/types', 'gcli/types/selection'], function(require, exports, module) {
-
-
-var canon = require('gcli/canon');
-var l10n = require('gcli/l10n');
-var types = require('gcli/types');
-var SelectionType = require('gcli/types/selection').SelectionType;
-var Status = require('gcli/types').Status;
-var Conversion = require('gcli/types').Conversion;
-
-
 /**
- * Registration and de-registration.
+ * true/false values
  */
-exports.startup = function() {
-  types.registerType(CommandType);
-};
-
-exports.shutdown = function() {
-  types.unregisterType(CommandType);
-};
-
-
-/**
- * Select from the available commands.
- * This is very similar to a SelectionType, however the level of hackery in
- * SelectionType to make it handle Commands correctly was to high, so we
- * simplified.
- * If you are making changes to this code, you should check there too.
- */
-function CommandType() {
-  this.stringifyProperty = 'name';
+function BooleanType(typeSpec) {
+  if (Object.keys(typeSpec).length > 0) {
+    throw new Error('BooleanType can not be customized');
+  }
 }
 
-CommandType.prototype = Object.create(SelectionType.prototype);
+BooleanType.prototype = Object.create(SelectionType.prototype);
 
-CommandType.prototype.name = 'command';
+BooleanType.prototype.lookup = [
+  { name: 'true', value: true },
+  { name: 'false', value: false }
+];
 
-CommandType.prototype.lookup = function() {
-  var commands = canon.getCommands();
-  commands.sort(function(c1, c2) {
-    return c1.name.localeCompare(c2.name);
-  });
-  return commands.map(function(command) {
-    return { name: command.name, value: command };
-  }, this);
+BooleanType.prototype.parse = function(arg) {
+  if (arg instanceof TrueNamedArgument) {
+    return new Conversion(true, arg);
+  }
+  if (arg instanceof FalseNamedArgument) {
+    return new Conversion(false, arg);
+  }
+  return SelectionType.prototype.parse.call(this, arg);
 };
 
+BooleanType.prototype.stringify = function(value) {
+  return '' + value;
+};
+
+BooleanType.prototype.getDefault = function() {
+  return new Conversion(false, new Argument(''));
+};
+
+BooleanType.prototype.name = 'boolean';
+
+exports.BooleanType = BooleanType;
+
+
 /**
- * Add an option to our list of predicted options
+ * A type for "we don't know right now, but hope to soon".
  */
-CommandType.prototype._addToPredictions = function(predictions, option, arg) {
-  if (option.value.hidden) {
-    return;
+function DeferredType(typeSpec) {
+  if (typeof typeSpec.defer !== 'function') {
+    throw new Error('Instances of DeferredType need typeSpec.defer to be a function that returns a type');
   }
-  // The command type needs to exclude sub-commands when the CLI
-  // is blank, but include them when we're filtering. This hack
-  // excludes matches when the filter text is '' and when the
-  // name includes a space.
-  if (arg.text.length !== 0 || option.name.indexOf(' ') === -1) {
-    predictions.push(option);
+  Object.keys(typeSpec).forEach(function(key) {
+    this[key] = typeSpec[key];
+  }, this);
+}
+
+DeferredType.prototype = Object.create(Type.prototype);
+
+DeferredType.prototype.stringify = function(value) {
+  return this.defer().stringify(value);
+};
+
+DeferredType.prototype.parse = function(arg) {
+  return this.defer().parse(arg);
+};
+
+DeferredType.prototype.decrement = function(value) {
+  var deferred = this.defer();
+  return (deferred.decrement ? deferred.decrement(value) : undefined);
+};
+
+DeferredType.prototype.increment = function(value) {
+  var deferred = this.defer();
+  return (deferred.increment ? deferred.increment(value) : undefined);
+};
+
+DeferredType.prototype.increment = function(value) {
+  var deferred = this.defer();
+  return (deferred.increment ? deferred.increment(value) : undefined);
+};
+
+DeferredType.prototype.name = 'deferred';
+
+exports.DeferredType = DeferredType;
+
+
+/**
+ * 'blank' is a type for use with DeferredType when we don't know yet.
+ * It should not be used anywhere else.
+ */
+function BlankType(typeSpec) {
+  if (Object.keys(typeSpec).length > 0) {
+    throw new Error('BlankType can not be customized');
+  }
+}
+
+BlankType.prototype = Object.create(Type.prototype);
+
+BlankType.prototype.stringify = function(value) {
+  return '';
+};
+
+BlankType.prototype.parse = function(arg) {
+  return new Conversion(null, arg);
+};
+
+BlankType.prototype.name = 'blank';
+
+exports.BlankType = BlankType;
+
+
+/**
+ * A set of objects of the same type
+ */
+function ArrayType(typeSpec) {
+  if (!typeSpec.subtype) {
+    console.error('Array.typeSpec is missing subtype. Assuming string.' +
+        JSON.stringify(typeSpec));
+    typeSpec.subtype = 'string';
+  }
+
+  Object.keys(typeSpec).forEach(function(key) {
+    this[key] = typeSpec[key];
+  }, this);
+  this.subtype = types.getType(this.subtype);
+}
+
+ArrayType.prototype = Object.create(Type.prototype);
+
+ArrayType.prototype.stringify = function(values) {
+  // BUG 664204: Check for strings with spaces and add quotes
+  return values.join(' ');
+};
+
+ArrayType.prototype.parse = function(arg) {
+  if (arg instanceof ArrayArgument) {
+    var conversions = arg.getArguments().map(function(subArg) {
+      var conversion = this.subtype.parse(subArg);
+      // Hack alert. ArrayConversion needs to be able to answer questions
+      // about the status of individual conversions in addition to the
+      // overall state. This allows us to do that easily.
+      subArg.conversion = conversion;
+      return conversion;
+    }, this);
+    return new ArrayConversion(conversions, arg);
+  }
+  else {
+    console.error('non ArrayArgument to ArrayType.parse', arg);
+    throw new Error('non ArrayArgument to ArrayType.parse');
   }
 };
 
-CommandType.prototype.parse = function(arg) {
-  // Especially at startup, predictions live over the time that things change
-  // so we provide a completion function rather than completion values
-  var predictFunc = function() {
-    return this._findPredictions(arg);
-  }.bind(this);
-
-  var predictions = this._findPredictions(arg);
-
-  if (predictions.length === 0) {
-    var msg = l10n.lookupFormat('typesSelectionNomatch', [ arg.text ]);
-    return new Conversion(undefined, arg, Status.ERROR, msg, predictFunc);
-  }
-
-  var command = predictions[0].value;
-
-  if (predictions.length === 1) {
-    // Is it an exact match of an executable command,
-    // or just the only possibility?
-    if (command.name === arg.text && typeof command.exec === 'function') {
-      return new Conversion(command, arg, Status.VALID, '');
-    }
-    return new Conversion(undefined, arg, Status.INCOMPLETE, '', predictFunc);
-  }
-
-  // It's valid if the text matches, even if there are several options
-  if (predictions[0].name === arg.text) {
-    return new Conversion(command, arg, Status.VALID, '', predictFunc);
-  }
-
-  return new Conversion(undefined, arg, Status.INCOMPLETE, '', predictFunc);
+ArrayType.prototype.getDefault = function() {
+  return new ArrayConversion([], new ArrayArgument());
 };
 
+ArrayType.prototype.name = 'array';
+
+exports.ArrayType = ArrayType;
+
 
 });
 /*
@@ -3768,10 +3139,6 @@ JavascriptType.prototype.parse = function(arg) {
   var typed = arg.text;
   var scope = globalObject;
 
-  // No input is undefined
-  if (typed === '') {
-    return new Conversion(undefined, arg, Status.INCOMPLETE);
-  }
   // Just accept numbers
   if (!isNaN(parseFloat(typed)) && isFinite(typed)) {
     return new Conversion(typed, arg);
@@ -4311,7 +3678,8 @@ NodeType.prototype.stringify = function(value) {
 
 NodeType.prototype.parse = function(arg) {
   if (arg.text === '') {
-    return new Conversion(undefined, arg, Status.INCOMPLETE);
+    return new Conversion(null, arg, Status.INCOMPLETE,
+            l10n.lookup('nodeParseNone'));
   }
 
   var nodes;
@@ -4319,12 +3687,12 @@ NodeType.prototype.parse = function(arg) {
     nodes = doc.querySelectorAll(arg.text);
   }
   catch (ex) {
-    return new Conversion(undefined, arg, Status.ERROR,
+    return new Conversion(null, arg, Status.ERROR,
             l10n.lookup('nodeParseSyntax'));
   }
 
   if (nodes.length === 0) {
-    return new Conversion(undefined, arg, Status.INCOMPLETE,
+    return new Conversion(null, arg, Status.INCOMPLETE,
         l10n.lookup('nodeParseNone'));
   }
 
@@ -4332,14 +3700,16 @@ NodeType.prototype.parse = function(arg) {
     var node = nodes.item(0);
     node.__gcliQuery = arg.text;
 
-    host.flashNodes(node, true);
+    host.flashNode(node, 'green');
 
     return new Conversion(node, arg, Status.VALID, '');
   }
 
-  host.flashNodes(nodes, false);
+  Array.prototype.forEach.call(nodes, function(n) {
+    host.flashNode(n, 'red');
+  });
 
-  return new Conversion(undefined, arg, Status.ERROR,
+  return new Conversion(null, arg, Status.ERROR,
           l10n.lookupFormat('nodeParseMultiple', [ nodes.length ]));
 };
 
@@ -4355,31 +3725,15 @@ NodeType.prototype.name = 'node';
 
 define('gcli/host', ['require', 'exports', 'module' ], function(require, exports, module) {
 
-  XPCOMUtils.defineLazyGetter(this, "Highlighter", function() {
-    var tmp = {};
-    Components.utils.import("resource:///modules/highlighter.jsm", tmp);
-    return tmp.Highlighter;
-  });
 
-  /**
-   * The chromeWindow as as required by Highlighter, so it knows where to
-   * create temporary highlight nodes.
-   */
-  exports.chromeWindow = undefined;
-
-  /**
-   * Helper to turn a set of nodes background another color for 0.5 seconds.
-   * There is likely a better way to do this, but this will do for now.
-   */
-  exports.flashNodes = function(nodes, match) {
-    // Commented out until Bug 653545 is completed
-    /*
-    if (exports.chromeWindow == null) {
-      console.log('flashNodes has no chromeWindow. Skipping flash');
-    }
-    Highlighter.flashNodes(nodes, exports.chromeWindow, match);
-    */
-  };
+/**
+ * Helper to turn a node background it's complementary color for 1 second.
+ * There is likely a better way to do this, but this will do for now.
+ */
+exports.flashNode = function(node, color) {
+  // We avoid changing the DOM under firefox developer tools so this is a no-op
+  // In future we will use the multi-highlighter implemented in bug 653545.
+};
 
 
 });
@@ -4389,11 +3743,15 @@ define('gcli/host', ['require', 'exports', 'module' ], function(require, exports
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/types/resource', ['require', 'exports', 'module' , 'gcli/types', 'gcli/types/selection'], function(require, exports, module) {
+define('gcli/types/resource', ['require', 'exports', 'module' , 'gcli/host', 'gcli/l10n', 'gcli/types', 'gcli/types/basic'], function(require, exports, module) {
 
 
+var host = require('gcli/host');
+var l10n = require('gcli/l10n');
 var types = require('gcli/types');
-var SelectionType = require('gcli/types/selection').SelectionType;
+var SelectionType = require('gcli/types/basic').SelectionType;
+var Status = require('gcli/types').Status;
+var Conversion = require('gcli/types').Conversion;
 
 
 /**
@@ -4432,7 +3790,6 @@ exports.setDocument = function(document) {
  * Undo the effects of setDocument()
  */
 exports.unsetDocument = function() {
-  ResourceCache.clear();
   doc = undefined;
 };
 
@@ -4450,7 +3807,8 @@ exports.getDocument = function() {
  * Resource should not be used directly, but instead through a sub-class like
  * CssResource or ScriptResource.
  */
-function Resource(name, type, inline, element) {
+function Resource(id, name, type, inline, element) {
+  this.id = id;
   this.name = name;
   this.type = type;
   this.inline = inline;
@@ -4493,10 +3851,6 @@ CssResource.prototype.loadContents = function(callback) {
 
 CssResource._getAllStyles = function() {
   var resources = [];
-  if (doc == null) {
-    return resources;
-  }
-
   Array.prototype.forEach.call(doc.styleSheets, function(domSheet) {
     CssResource._getStyle(domSheet, resources);
   });
@@ -4569,10 +3923,6 @@ ScriptResource.prototype.loadContents = function(callback) {
 };
 
 ScriptResource._getAllScripts = function() {
-  if (doc == null) {
-    return [];
-  }
-
   var scriptNodes = doc.querySelectorAll('script');
   var resources = Array.prototype.map.call(scriptNodes, function(scriptNode) {
     var resource = ResourceCache.get(scriptNode);
@@ -4615,7 +3965,7 @@ function dedupe(resources, onDupe) {
 }
 
 /**
- * Use the Resource implementations to create a type based on SelectionType
+ * A CSS expression that refers to a single node
  */
 function ResourceType(typeSpec) {
   this.include = typeSpec.include;
@@ -4694,466 +4044,22 @@ var ResourceCache = {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/types/setting', ['require', 'exports', 'module' , 'gcli/settings', 'gcli/types', 'gcli/types/selection', 'gcli/types/basic'], function(require, exports, module) {
-
-
-var settings = require('gcli/settings');
-var types = require('gcli/types');
-var SelectionType = require('gcli/types/selection').SelectionType;
-var DeferredType = require('gcli/types/basic').DeferredType;
-
-
-/**
- * Registration and de-registration.
- */
-exports.startup = function() {
-  types.registerType(SettingType);
-  types.registerType(SettingValueType);
-};
-
-exports.shutdown = function() {
-  types.unregisterType(SettingType);
-  types.unregisterType(SettingValueType);
-};
-
-/**
- * This is a whole new level of nasty. 'setting' and 'settingValue' are a pair
- * for obvious reasons. settingValue is a deferred type - it defers to the type
- * of the setting, but how do we implement the defer function - how does it
- * work out its paired setting?
- * In another parallel universe we pass the requisition to all the parse
- * methods so we can extract the args in SettingValueType.parse, however that
- * seems like a lot of churn for a simple way to connect 2 things. So we're
- * hacking. SettingType tries to keep 'lastSetting' up to date.
- */
-var lastSetting = null;
-
-/**
- * A type for selecting a known setting
- */
-function SettingType(typeSpec) {
-  if (Object.keys(typeSpec).length > 0) {
-    throw new Error('SettingType can not be customized');
-  }
-}
-
-SettingType.prototype = Object.create(SelectionType.prototype);
-
-SettingType.prototype.lookup = function() {
-  return settings.getAll().map(function(setting) {
-    return { name: setting.name, value: setting };
-  });
-};
-
-SettingType.prototype.noMatch = function() {
-  lastSetting = null;
-};
-
-SettingType.prototype.stringify = function(option) {
-  lastSetting = option;
-  return SelectionType.prototype.stringify.call(this, option);
-};
-
-SettingType.prototype.parse = function(arg) {
-  var conversion = SelectionType.prototype.parse.call(this, arg);
-  lastSetting = conversion.value;
-  return conversion;
-};
-
-SettingType.prototype.name = 'setting';
-
-
-/**
- * A type for entering the value of a known setting
- */
-function SettingValueType(typeSpec) {
-  if (Object.keys(typeSpec).length > 0) {
-    throw new Error('SettingType can not be customized');
-  }
-}
-
-SettingValueType.prototype = Object.create(DeferredType.prototype);
-
-SettingValueType.prototype.defer = function() {
-  if (lastSetting != null) {
-    return lastSetting.type;
-  }
-  else {
-    return types.getType('blank');
-  }
-};
-
-SettingValueType.prototype.name = 'settingValue';
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/settings', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types'], function(require, exports, module) {
-
-var imports = {};
-
-Components.utils.import('resource://gre/modules/XPCOMUtils.jsm', imports);
-
-imports.XPCOMUtils.defineLazyGetter(imports, 'prefBranch', function() {
-  var prefService = Components.classes['@mozilla.org/preferences-service;1']
-          .getService(Components.interfaces.nsIPrefService);
-  return prefService.getBranch(null)
-          .QueryInterface(Components.interfaces.nsIPrefBranch2);
-});
-
-imports.XPCOMUtils.defineLazyGetter(imports, 'supportsString', function() {
-  return Components.classes["@mozilla.org/supports-string;1"]
-          .createInstance(Components.interfaces.nsISupportsString);
-});
+define('gcli/cli', ['require', 'exports', 'module' , 'gcli/util', 'gcli/canon', 'gcli/promise', 'gcli/types', 'gcli/types/basic', 'gcli/argument'], function(require, exports, module) {
 
 
 var util = require('gcli/util');
-var types = require('gcli/types');
-
-var allSettings = [];
-
-/**
- * No setup required because settings are pre-loaded with Mozilla,
- * but match API with main settings.js
- */
-exports.startup = function() {
-  imports.prefBranch.getChildList('').forEach(function(name) {
-    allSettings.push(new Setting(name));
-  }.bind(this));
-  allSettings.sort(function(s1, s2) {
-    return s1.name.localeCompare(s2.name);
-  }.bind(this));
-};
-
-exports.shutdown = function() {
-  allSettings = [];
-};
-
-/**
- *
- */
-var DEVTOOLS_PREFIX = 'devtools.gcli.';
-
-/**
- * A class to wrap up the properties of a preference.
- * @see toolkit/components/viewconfig/content/config.js
- */
-function Setting(prefSpec) {
-  if (typeof prefSpec === 'string') {
-    // We're coming from getAll() i.e. a full listing of prefs
-    this.name = prefSpec;
-    this.description = '';
-  }
-  else {
-    // A specific addition by GCLI
-    this.name = DEVTOOLS_PREFIX + prefSpec.name;
-
-    if (prefSpec.ignoreTypeDifference !== true && prefSpec.type) {
-      if (this.type.name !== prefSpec.type) {
-        throw new Error('Locally declared type (' + prefSpec.type + ') != ' +
-            'Mozilla declared type (' + this.type.name + ') for ' + this.name);
-      }
-    }
-
-    this.description = prefSpec.description;
-  }
-
-  this.onChange = util.createEvent('Setting.onChange');
-}
-
-/**
- * What type is this property: boolean/integer/string?
- */
-Object.defineProperty(Setting.prototype, 'type', {
-  get: function() {
-    switch (imports.prefBranch.getPrefType(this.name)) {
-      case imports.prefBranch.PREF_BOOL:
-        return types.getType('boolean');
-
-      case imports.prefBranch.PREF_INT:
-        return types.getType('number');
-
-      case imports.prefBranch.PREF_STRING:
-        return types.getType('string');
-
-      default:
-        throw new Error('Unknown type for ' + this.name);
-    }
-  },
-  enumerable: true
-});
-
-/**
- * What type is this property: boolean/integer/string?
- */
-Object.defineProperty(Setting.prototype, 'value', {
-  get: function() {
-    switch (imports.prefBranch.getPrefType(this.name)) {
-      case imports.prefBranch.PREF_BOOL:
-        return imports.prefBranch.getBoolPref(this.name);
-
-      case imports.prefBranch.PREF_INT:
-        return imports.prefBranch.getIntPref(this.name);
-
-      case imports.prefBranch.PREF_STRING:
-        var value = imports.prefBranch.getComplexValue(this.name,
-                Components.interfaces.nsISupportsString).data;
-        // Try in case it's a localized string (will throw an exception if not)
-        var isL10n = /^chrome:\/\/.+\/locale\/.+\.properties/.test(value);
-        if (!this.changed && isL10n) {
-          value = imports.prefBranch.getComplexValue(this.name,
-                  Components.interfaces.nsIPrefLocalizedString).data;
-        }
-        return value;
-
-      default:
-        throw new Error('Invalid value for ' + this.name);
-    }
-  },
-
-  set: function(value) {
-    if (imports.prefBranch.prefIsLocked(this.name)) {
-      throw new Error('Locked preference ' + this.name);
-    }
-
-    switch (imports.prefBranch.getPrefType(this.name)) {
-      case imports.prefBranch.PREF_BOOL:
-        imports.prefBranch.setBoolPref(this.name, value);
-        break;
-
-      case imports.prefBranch.PREF_INT:
-        imports.prefBranch.setIntPref(this.name, value);
-        break;
-
-      case imports.prefBranch.PREF_STRING:
-        imports.supportsString.data = value;
-        imports.prefBranch.setComplexValue(this.name,
-                Components.interfaces.nsISupportsString,
-                imports.supportsString);
-        break;
-
-      default:
-        throw new Error('Invalid value for ' + this.name);
-    }
-
-    Services.prefs.savePrefFile(null);
-  },
-
-  enumerable: true
-});
-
-
-/**
- * 'static' function to get an array containing all known Settings
- */
-exports.getAll = function(filter) {
-  if (filter == null) {
-    return allSettings;
-  }
-  return allSettings.filter(function(setting) {
-    return setting.name.indexOf(filter) !== -1;
-  });
-};
-
-/**
- * Add a new setting.
- */
-exports.addSetting = function(prefSpec) {
-  var setting = new Setting(prefSpec);
-  for (var i = 0; i < allSettings.length; i++) {
-    if (allSettings[i].name === setting.name) {
-      allSettings[i] = setting;
-    }
-  }
-  return setting;
-};
-
-/**
- * Remove a setting. A no-op in this case
- */
-exports.removeSetting = function(nameOrSpec) {
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/intro', ['require', 'exports', 'module' , 'gcli/settings', 'gcli/l10n', 'gcli/ui/view', 'gcli/cli', 'text!gcli/ui/intro.html'], function(require, exports, module) {
-
-  var settings = require('gcli/settings');
-  var l10n = require('gcli/l10n');
-  var view = require('gcli/ui/view');
-  var Output = require('gcli/cli').Output;
-
-  /**
-   * Record if the user has clicked on 'Got It!'
-   */
-  var hideIntroSettingSpec = {
-    name: 'hideIntro',
-    type: 'boolean',
-    description: l10n.lookup('hideIntroDesc')
-  };
-  var hideIntro;
-
-  /**
-   * Register (and unregister) the hide-intro setting
-   */
-  exports.startup = function() {
-    hideIntro = settings.addSetting(hideIntroSettingSpec);
-  };
-
-  exports.shutdown = function() {
-    settings.removeSetting(hideIntroSettingSpec);
-    hideIntro = undefined;
-  };
-
-  /**
-   * Called when the UI is ready to add a welcome message to the output
-   */
-  exports.maybeShowIntro = function(commandOutputManager) {
-    if (hideIntro.value) {
-      return;
-    }
-
-    var output = new Output();
-    commandOutputManager.onOutput({ output: output });
-
-    var viewData = view.createView({
-      html: require('text!gcli/ui/intro.html'),
-      data: {
-        showHideButton: true,
-        onGotIt: function(ev) {
-          hideIntro.value = true;
-          output.onClose();
-        }
-      }
-    });
-
-    output.complete(viewData);
-  };
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/view', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/domtemplate'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-var domtemplate = require('gcli/ui/domtemplate');
-
-
-/**
- * We want to avoid commands having to create DOM structures because that's
- * messy and because we're going to need to have command output displayed in
- * different documents. A View is a way to wrap an HTML template (for
- * domtemplate) in with the data and options to render the template, so anyone
- * can later run the template in the context of any document.
- * View also cuts out a chunk of boiler place code.
- * @param options The information needed to create the DOM from HTML. Includes:
- * - html (required): The HTML source, probably from a call to require
- * - options (default={}): The domtemplate options. See domtemplate for details
- * - data (default={}): The data to domtemplate. See domtemplate for details.
- * - css (default=none): Some CSS to be added to the final document. If 'css'
- *   is used, use of cssId is strongly recommended.
- * - cssId (default=none): An ID to prevent multiple CSS additions. See
- *   util.importCss for more details.
- * @return An object containing a single function 'appendTo()' which runs the
- * template adding the result to the specified element. Takes 2 parameters:
- * - element (required): the element to add to
- * - clear (default=false): if clear===true then remove all pre-existing
- *   children of 'element' before appending the results of this template.
- */
-exports.createView = function(options) {
-  if (options.html == null) {
-    throw new Error('options.html is missing');
-  }
-
-  return {
-    /**
-     * RTTI. Yeah.
-     */
-    isView: true,
-
-    /**
-     * Run the template against the document to which element belongs.
-     * @param element The element to append the result to
-     * @param clear Set clear===true to remove all children of element
-     */
-    appendTo: function(element, clear) {
-      // Strict check on the off-chance that we later think of other options
-      // and want to replace 'clear' with an 'options' parameter, but want to
-      // support backwards compat.
-      if (clear === true) {
-        util.clearElement(element);
-      }
-
-      element.appendChild(this.toDom(element.ownerDocument));
-    },
-
-    /**
-     * Actually convert the view data into a DOM suitable to be appended to
-     * an element
-     * @param document to use in realizing the template
-     */
-    toDom: function(document) {
-      if (options.css) {
-        util.importCss(options.css, document, options.cssId);
-      }
-
-      var child = util.toDom(document, options.html);
-      domtemplate.template(child, options.data || {}, options.options || {});
-      return child;
-    }
-  };
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/domtemplate', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-  var obj = {};
-  Components.utils.import('resource:///modules/devtools/Templater.jsm', obj);
-  exports.template = obj.template;
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/cli', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/view', 'gcli/canon', 'gcli/promise', 'gcli/types', 'gcli/types/basic', 'gcli/argument'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-var view = require('gcli/ui/view');
 
 var canon = require('gcli/canon');
 var Promise = require('gcli/promise').Promise;
 
+var types = require('gcli/types');
 var Status = require('gcli/types').Status;
 var Conversion = require('gcli/types').Conversion;
+var Type = require('gcli/types').Type;
 var ArrayType = require('gcli/types/basic').ArrayType;
 var StringType = require('gcli/types/basic').StringType;
 var BooleanType = require('gcli/types/basic').BooleanType;
+var SelectionType = require('gcli/types/basic').SelectionType;
 
 var Argument = require('gcli/argument').Argument;
 var ArrayArgument = require('gcli/argument').ArrayArgument;
@@ -5168,10 +4074,12 @@ var evalCommand;
  * Registration and de-registration.
  */
 exports.startup = function() {
+  types.registerType(CommandType);
   evalCommand = canon.addCommand(evalCommandSpec);
 };
 
 exports.shutdown = function() {
+  types.unregisterType(CommandType);
   canon.removeCommand(evalCommandSpec.name);
   evalCommand = undefined;
 };
@@ -5190,9 +4098,8 @@ exports.shutdown = function() {
  *
  * <h2>Events<h2>
  * Assignment publishes the following event:<ul>
- * <li>onAssignmentChange: Either the value or the text has changed. It is
- * likely that any UI component displaying this argument will need to be
- * updated.
+ * <li>assignmentChange: Either the value or the text has changed. It is likely
+ * that any UI component displaying this argument will need to be updated.
  * The event object looks like:
  * <tt>{ assignment: ..., conversion: ..., oldConversion: ... }</tt>
  * @constructor
@@ -5200,9 +4107,9 @@ exports.shutdown = function() {
 function Assignment(param, paramIndex) {
   this.param = param;
   this.paramIndex = paramIndex;
-  this.onAssignmentChange = util.createEvent('Assignment.onAssignmentChange');
+  this.assignmentChange = util.createEvent('Assignment.assignmentChange');
 
-  this.setBlank();
+  this.setDefault();
 }
 
 /**
@@ -5221,28 +4128,18 @@ Assignment.prototype.conversion = undefined;
 Assignment.prototype.paramIndex = undefined;
 
 /**
- * Easy accessor for conversion.arg.
- * This is a read-only property because writes to arg should be done through
- * the 'conversion' property.
+ * Easy accessor for conversion.arg
  */
-Object.defineProperty(Assignment.prototype, 'arg', {
-  get: function() {
-    return this.conversion.arg;
-  },
-  enumerable: true
-});
+Assignment.prototype.getArg = function() {
+  return this.conversion.arg;
+};
 
 /**
- * Easy accessor for conversion.value.
- * This is a read-only property because writes to value should be done through
- * the 'conversion' property.
+ * Easy accessor for conversion.value
  */
-Object.defineProperty(Assignment.prototype, 'value', {
-  get: function() {
-    return this.conversion.value;
-  },
-  enumerable: true
-});
+Assignment.prototype.getValue = function() {
+  return this.conversion.value;
+};
 
 /**
  * Easy (and safe) accessor for conversion.message
@@ -5279,7 +4176,7 @@ Assignment.prototype.setConversion = function(conversion) {
     return;
   }
 
-  this.onAssignmentChange({
+  this.assignmentChange({
     assignment: this,
     conversion: this.conversion,
     oldConversion: oldConversion
@@ -5287,10 +4184,22 @@ Assignment.prototype.setConversion = function(conversion) {
 };
 
 /**
- * Setup an empty value for the conversion by parsing an empty argument.
+ * Find a default value for the conversion either from the parameter, or from
+ * the type, or failing that by parsing an empty argument.
  */
-Assignment.prototype.setBlank = function() {
-  this.setConversion(this.param.type.getBlank());
+Assignment.prototype.setDefault = function() {
+  var conversion;
+  if (this.param.getDefault) {
+    conversion = this.param.getDefault();
+  }
+  else if (this.param.type.getDefault) {
+    conversion = this.param.type.getDefault();
+  }
+  else {
+    conversion = this.param.type.parse(new Argument());
+  }
+
+  this.setConversion(conversion);
 };
 
 /**
@@ -5324,20 +4233,35 @@ Assignment.prototype.ensureVisibleArgument = function() {
  * can narrow the search for status to a single argument.
  */
 Assignment.prototype.getStatus = function(arg) {
-  if (this.param.isDataRequired && !this.conversion.isDataProvided()) {
+  if (this.param.isDataRequired() && !this.conversion.isDataProvided()) {
     return Status.ERROR;
   }
 
   // Selection/Boolean types with a defined range of values will say that
   // '' is INCOMPLETE, but the parameter may be optional, so we don't ask
   // if the user doesn't need to enter something and hasn't done so.
-  if (!this.param.isDataRequired && this.arg.isBlank()) {
+  if (!this.param.isDataRequired() && this.getArg().isBlank()) {
     return Status.VALID;
   }
 
   return this.conversion.getStatus(arg);
 };
 
+/**
+ * Basically <tt>value = conversion.predictions[0])</tt> done in a safe way.
+ */
+Assignment.prototype.complete = function() {
+  var predictions = this.conversion.getPredictions();
+  if (predictions.length > 0) {
+    var arg = this.conversion.arg.beget(predictions[0].name);
+    if (!predictions[0].incomplete) {
+      arg.suffix = ' ';
+    }
+    var conversion = this.param.type.parse(arg);
+    this.setConversion(conversion);
+  }
+};
+
 /**
  * Replace the current value with the lower value if such a concept exists.
  */
@@ -5374,6 +4298,82 @@ Assignment.prototype.toString = function() {
 exports.Assignment = Assignment;
 
 
+/**
+ * Select from the available commands.
+ * This is very similar to a SelectionType, however the level of hackery in
+ * SelectionType to make it handle Commands correctly was to high, so we
+ * simplified.
+ * If you are making changes to this code, you should check there too.
+ */
+function CommandType() {
+}
+
+CommandType.prototype = Object.create(Type.prototype);
+
+CommandType.prototype.name = 'command';
+
+CommandType.prototype.decrement = SelectionType.prototype.decrement;
+CommandType.prototype.increment = SelectionType.prototype.increment;
+CommandType.prototype._findValue = SelectionType.prototype._findValue;
+
+CommandType.prototype.stringify = function(command) {
+  return command.name;
+};
+
+/**
+ * Trim a list of commands (as from canon.getCommands()) according to those
+ * that match the provided arg.
+ */
+CommandType.prototype._findPredictions = function(arg) {
+  var predictions = [];
+  canon.getCommands().forEach(function(command) {
+    if (command.name.indexOf(arg.text) === 0) {
+      // The command type needs to exclude sub-commands when the CLI
+      // is blank, but include them when we're filtering. This hack
+      // excludes matches when the filter text is '' and when the
+      // name includes a space.
+      if (arg.text.length !== 0 || command.name.indexOf(' ') === -1) {
+        predictions.push(command);
+      }
+    }
+  }, this);
+  return predictions;
+};
+
+CommandType.prototype.parse = function(arg) {
+  // Especially at startup, predictions live over the time that things change
+  // so we provide a completion function rather than completion values
+  var predictFunc = function() {
+    return this._findPredictions(arg);
+  }.bind(this);
+
+  var predictions = this._findPredictions(arg);
+
+  if (predictions.length === 0) {
+    return new Conversion(null, arg, Status.ERROR,
+        'Can\'t use \'' + arg.text + '\'.', predictFunc);
+  }
+
+  var command = predictions[0];
+
+  if (predictions.length === 1) {
+    // Is it an exact match of an executable command,
+    // or just the only possibility?
+    if (command.name === arg.text && typeof command.exec === 'function') {
+      return new Conversion(command, arg, Status.VALID, '');
+    }
+    return new Conversion(null, arg, Status.INCOMPLETE, '', predictFunc);
+  }
+
+  // It's valid if the text matches, even if there are several options
+  if (command.name === arg.text) {
+    return new Conversion(command, arg, Status.VALID, '', predictFunc);
+  }
+
+  return new Conversion(null, arg, Status.INCOMPLETE, '', predictFunc);
+};
+
+
 /**
  * How to dynamically execute JavaScript code
  */
@@ -5413,7 +4413,6 @@ var evalCommandSpec = {
       description: ''
     }
   ],
-  hidden: true,
   returnType: 'object',
   description: { key: 'cliEvalJavascript' },
   exec: function(args, context) {
@@ -5427,25 +4426,15 @@ var evalCommandSpec = {
  * This is a special assignment to reflect the command itself.
  */
 function CommandAssignment() {
-  var commandParamMetadata = { name: '__command', type: 'command' };
-  // This is a hack so that rather than reply with a generic description of the
-  // command assignment, we reply with the description of the assigned command,
-  // (using a generic term if there is no assigned command)
-  var self = this;
-  Object.defineProperty(commandParamMetadata, 'description', {
-    get: function() {
-      var value = self.value;
-      return value && value.description ?
-          value.description :
-          'The command to execute';
-    },
-    enumerable: true
+  this.param = new canon.Parameter({
+    name: '__command',
+    type: 'command',
+    description: 'The command to execute'
   });
-  this.param = new canon.Parameter(commandParamMetadata);
   this.paramIndex = -1;
-  this.onAssignmentChange = util.createEvent('CommandAssignment.onAssignmentChange');
+  this.assignmentChange = util.createEvent('CommandAssignment.assignmentChange');
 
-  this.setBlank();
+  this.setDefault();
 }
 
 CommandAssignment.prototype = Object.create(Assignment.prototype);
@@ -5453,13 +4442,11 @@ CommandAssignment.prototype = Object.create(Assignment.prototype);
 CommandAssignment.prototype.getStatus = function(arg) {
   return Status.combine(
     Assignment.prototype.getStatus.call(this, arg),
-    this.conversion.value && this.conversion.value.exec ?
-            Status.VALID : Status.INCOMPLETE
+    this.conversion.value && !this.conversion.value.exec ?
+      Status.INCOMPLETE : Status.VALID
   );
 };
 
-exports.CommandAssignment = CommandAssignment;
-
 
 /**
  * Special assignment used when ignoring parameters that don't have a home
@@ -5470,9 +4457,9 @@ function UnassignedAssignment() {
     type: 'string'
   });
   this.paramIndex = -1;
-  this.onAssignmentChange = util.createEvent('UnassignedAssignment.onAssignmentChange');
+  this.assignmentChange = util.createEvent('UnassignedAssignment.assignmentChange');
 
-  this.setBlank();
+  this.setDefault();
 }
 
 UnassignedAssignment.prototype = Object.create(Assignment.prototype);
@@ -5483,7 +4470,7 @@ UnassignedAssignment.prototype.getStatus = function(arg) {
 
 UnassignedAssignment.prototype.setUnassigned = function(args) {
   if (!args || args.length === 0) {
-    this.setBlank();
+    this.setDefault();
   }
   else {
     var conversion = this.param.type.parse(new MergedArgument(args));
@@ -5506,15 +4493,19 @@ UnassignedAssignment.prototype.setUnassigned = function(args) {
  * <h2>Events<h2>
  * <p>Requisition publishes the following events:
  * <ul>
- * <li>onAssignmentChange: This is a forward of the onAssignmentChange event on
- * Assignment. It is fired when any assignment (except the commandAssignment)
+ * <li>commandChange: The command has changed. It is likely that a UI
+ * structure will need updating to match the parameters of the new command.
+ * The event object looks like { command: A }
+ * <li>assignmentChange: This is a forward of the Assignment.assignmentChange
+ * event. It is fired when any assignment (except the commandAssignment)
  * changes.
- * <li>onTextChange: The text to be mirrored in a command line has changed.
+ * <li>inputChange: The text to be mirrored in a command line has changed.
+ * The event object looks like { newText: X }.
  * </ul>
  *
- * @param environment An optional opaque object passed to commands in the
- * Execution Context.
- * @param doc A DOM Document passed to commands using the Execution Context in
+ * @param environment An optional opaque object passed to commands using
+ * ExecutionContext.
+ * @param doc A DOM Document passed to commands using ExecutionContext in
  * order to allow creation of DOM nodes. If missing Requisition will use the
  * global 'document'.
  * @constructor
@@ -5552,17 +4543,18 @@ function Requisition(environment, doc) {
   // Used to store cli arguments that were not assigned to parameters
   this._unassigned = new UnassignedAssignment();
 
-  // Temporarily set this to true to prevent _assignmentChanged resetting
+  // Temporarily set this to true to prevent _onAssignmentChange resetting
   // argument positions
   this._structuralChangeInProgress = false;
 
-  this.commandAssignment.onAssignmentChange.add(this._commandAssignmentChanged, this);
-  this.commandAssignment.onAssignmentChange.add(this._assignmentChanged, this);
+  this.commandAssignment.assignmentChange.add(this._onCommandAssignmentChange, this);
+  this.commandAssignment.assignmentChange.add(this._onAssignmentChange, this);
 
   this.commandOutputManager = canon.commandOutputManager;
 
-  this.onAssignmentChange = util.createEvent('Requisition.onAssignmentChange');
-  this.onTextChange = util.createEvent('Requisition.onTextChange');
+  this.assignmentChange = util.createEvent('Requisition.assignmentChange');
+  this.commandChange = util.createEvent('Requisition.commandChange');
+  this.inputChange = util.createEvent('Requisition.inputChange');
 }
 
 /**
@@ -5575,8 +4567,8 @@ var MORE_THAN_THE_MOST_ARGS_POSSIBLE = 1000000;
  * Avoid memory leaks
  */
 Requisition.prototype.destroy = function() {
-  this.commandAssignment.onAssignmentChange.remove(this._commandAssignmentChanged, this);
-  this.commandAssignment.onAssignmentChange.remove(this._assignmentChanged, this);
+  this.commandAssignment.assignmentChange.remove(this._onCommandAssignmentChange, this);
+  this.commandAssignment.assignmentChange.remove(this._onAssignmentChange, this);
 
   delete this.document;
   delete this.environment;
@@ -5586,7 +4578,7 @@ Requisition.prototype.destroy = function() {
  * When any assignment changes, we might need to update the _args array to
  * match and inform people of changes to the typed input text.
  */
-Requisition.prototype._assignmentChanged = function(ev) {
+Requisition.prototype._onAssignmentChange = function(ev) {
   // Don't report an event if the value is unchanged
   if (ev.oldConversion != null &&
       ev.conversion.valueEquals(ev.oldConversion)) {
@@ -5597,9 +4589,9 @@ Requisition.prototype._assignmentChanged = function(ev) {
     return;
   }
 
-  this.onAssignmentChange(ev);
+  this.assignmentChange(ev);
 
-  // Both for argument position and the onTextChange event, we only care
+  // Both for argument position and the inputChange event, we only care
   // about changes to the argument.
   if (ev.conversion.argEquals(ev.oldConversion)) {
     return;
@@ -5611,12 +4603,12 @@ Requisition.prototype._assignmentChanged = function(ev) {
   // Do preceding arguments need to have dummy values applied so we don't
   // get a hole in the command line?
   var i;
-  if (ev.assignment.param.isPositionalAllowed) {
+  if (ev.assignment.param.isPositionalAllowed()) {
     for (i = 0; i < ev.assignment.paramIndex; i++) {
       var assignment = this.getAssignment(i);
-      if (assignment.param.isPositionalAllowed) {
+      if (assignment.param.isPositionalAllowed()) {
         if (assignment.ensureVisibleArgument()) {
-          this._args.push(assignment.arg);
+          this._args.push(assignment.getArg());
         }
       }
     }
@@ -5635,7 +4627,7 @@ Requisition.prototype._assignmentChanged = function(ev) {
   }
 
   if (index === MORE_THAN_THE_MOST_ARGS_POSSIBLE) {
-    this._args.push(ev.assignment.arg);
+    this._args.push(ev.assignment.getArg());
   }
   else {
     // Is there a way to do this that doesn't involve a loop?
@@ -5646,32 +4638,31 @@ Requisition.prototype._assignmentChanged = function(ev) {
   }
   this._structuralChangeInProgress = false;
 
-  this.onTextChange();
+  this.inputChange();
 };
 
 /**
  * When the command changes, we need to keep a bunch of stuff in sync
  */
-Requisition.prototype._commandAssignmentChanged = function(ev) {
-  // Assignments fire AssignmentChange events on any change, including minor
-  // things like whitespace change in arg prefix, so we ignore anything but
-  // an actual value change
-  if (ev.conversion.valueEquals(ev.oldConversion)) {
-    return;
-  }
-
+Requisition.prototype._onCommandAssignmentChange = function(ev) {
   this._assignments = {};
 
-  var command = this.commandAssignment.value;
+  var command = this.commandAssignment.getValue();
   if (command) {
     for (var i = 0; i < command.params.length; i++) {
       var param = command.params[i];
       var assignment = new Assignment(param, i);
-      assignment.onAssignmentChange.add(this._assignmentChanged, this);
+      assignment.assignmentChange.add(this._onAssignmentChange, this);
       this._assignments[param.name] = assignment;
     }
   }
   this.assignmentCount = Object.keys(this._assignments).length;
+
+  this.commandChange({
+    requisition: this,
+    oldValue: ev.oldValue,
+    newValue: command
+  });
 };
 
 /**
@@ -5715,7 +4706,7 @@ Requisition.prototype.getStatus = function() {
   var status = Status.VALID;
   this.getAssignments(true).forEach(function(assignment) {
     var assignStatus = assignment.getStatus();
-    if (assignStatus > status) {
+    if (assignment.getStatus() > status) {
       status = assignStatus;
     }
   }, this);
@@ -5732,9 +4723,7 @@ Requisition.prototype.getStatus = function() {
 Requisition.prototype.getArgsObject = function() {
   var args = {};
   this.getAssignments().forEach(function(assignment) {
-    args[assignment.param.name] = assignment.conversion.isDataProvided() ?
-            assignment.value :
-            assignment.param.defaultValue;
+    args[assignment.param.name] = assignment.getValue();
   }, this);
   return args;
 };
@@ -5743,7 +4732,7 @@ Requisition.prototype.getArgsObject = function() {
  * Access the arguments as an array.
  * @param includeCommand By default only the parameter arguments are
  * returned unless (includeCommand === true), in which case the list is
- * prepended with commandAssignment.arg
+ * prepended with commandAssignment.getArg()
  */
 Requisition.prototype.getAssignments = function(includeCommand) {
   var assignments = [];
@@ -5759,112 +4748,21 @@ Requisition.prototype.getAssignments = function(includeCommand) {
 /**
  * Reset all the assignments to their default values
  */
-Requisition.prototype.setBlankArguments = function() {
+Requisition.prototype.setDefaultArguments = function() {
   this.getAssignments().forEach(function(assignment) {
-    assignment.setBlank();
+    assignment.setDefault();
   }, this);
 };
 
-/**
- * Complete the argument at <tt>cursor</tt>.
- * Basically the same as:
- *   assignment = getAssignmentAt(cursor);
- *   assignment.value = assignment.conversion.predictions[0];
- * Except it's done safely, and with particular care to where we place the
- * space, which is complex, and annoying if we get it wrong.
- * @param cursor The cursor configuration. Should have start and end properties
- * which should be set to start and end of the selection.
- * @param predictionChoice The index of the prediction that we should choose.
- * This number is not bounded by the size of the prediction array, we take the
- * modulus to get it within bounds
- */
-Requisition.prototype.complete = function(cursor, predictionChoice) {
-  var assignment = this.getAssignmentAt(cursor.start);
-
-  var predictions = assignment.conversion.getPredictions();
-  if (predictions.length > 0) {
-    this.onTextChange.holdFire();
-
-    var prediction = assignment.conversion.getPredictionAt(predictionChoice);
-
-    // Mutate this argument to hold the completion
-    var arg = assignment.arg.beget(prediction.name);
-    var conversion = assignment.param.type.parse(arg);
-    assignment.setConversion(conversion);
-
-    // If this argument isn't assigned to anything (i.e. it was created by
-    // assignment.setBlank) we need to add it into the _args array so
-    // requisition.toString can make sense
-    if (this._args.indexOf(arg) === -1) {
-      this._args.push(arg);
-    }
-
-    if (prediction.incomplete) {
-      // This is the easy case - the prediction is incomplete - no need to add
-      // any spaces
-      return;
-    }
-
-    // The prediction reported !incomplete, which means it's complete so we
-    // should add a space to delimit this argument and let the user move-on.
-    // The question is, where does the space go? The obvious thing to do is to
-    // add it to the suffix of the completed argument, but that's wrong because
-    // spaces are attached to the start of the next argument rather than the
-    // end of the previous one (and this matters to getCurrentAssignment).
-    // However there might not be a next argument (if we've at the end of the
-    // input), in which case we really do use this one.
-    // Also if there is already a space in those positions, don't add another
-
-    var nextIndex = assignment.paramIndex + 1;
-    var nextAssignment = this.getAssignment(nextIndex);
-    if (nextAssignment) {
-      // Add a space onto the next argument (if there isn't one there already)
-      var nextArg = nextAssignment.conversion.arg;
-      if (nextArg.prefix.charAt(0) !== ' ') {
-        nextArg.prefix = ' ' + nextArg.prefix;
-        var nextConversion = nextAssignment.param.type.parse(nextArg);
-        nextAssignment.setConversion(nextConversion);
-
-        // If this argument isn't assigned to anything (i.e. it was created by
-        // assignment.setBlank) we need to add it into the _args array so
-        // requisition.toString can make sense
-        if (this._args.indexOf(nextArg) === -1) {
-          this._args.push(nextArg);
-        }
-      }
-    }
-    else {
-      // There is no next argument, this must be the last assignment, so just
-      // add the space to the prefix of this argument
-      var conversion = assignment.conversion;
-      var arg = conversion.arg;
-      if (arg.suffix.charAt(arg.suffix.length - 1) !== ' ') {
-        arg.suffix = arg.suffix + ' ';
-
-        // It's tempting to think - "we're calling setConversion twice in one
-        // call to complete, the first time to complete the text, the second
-        // to add a space, why not save the event cascade and do it once"
-        // However if we're setting up the command, the number of parameters
-        // changes as a result, so our call to getAssignment(nextIndex) will
-        // produce the wrong answer
-        assignment.setConversion(conversion);
-      }
-    }
-
-    this.onTextChange();
-    this.onTextChange.resumeFire();
-  }
-};
-
 /**
  * Extract a canonical version of the input
  */
 Requisition.prototype.toCanonicalString = function() {
   var line = [];
 
-  var cmd = this.commandAssignment.value ?
-      this.commandAssignment.value.name :
-      this.commandAssignment.arg.text;
+  var cmd = this.commandAssignment.getValue() ?
+      this.commandAssignment.getValue().name :
+      this.commandAssignment.getArg().text;
   line.push(cmd);
 
   Object.keys(this._assignments).forEach(function(name) {
@@ -5873,15 +4771,15 @@ Requisition.prototype.toCanonicalString = function() {
     // Bug 664377: This will cause problems if there is a non-default value
     // after a default value. Also we need to decide when to use
     // named parameters in place of positional params. Both can wait.
-    if (assignment.value !== assignment.param.defaultValue) {
+    if (assignment.getValue() !== assignment.param.defaultValue) {
       line.push(' ');
-      line.push(type.stringify(assignment.value));
+      line.push(type.stringify(assignment.getValue()));
     }
   }, this);
 
   // Canonically, if we've opened with a { then we should have a } to close
   if (cmd === '{') {
-    if (this.getAssignment(0).arg.suffix.indexOf('}') === -1) {
+    if (this.getAssignment(0).getArg().suffix.indexOf('}') === -1) {
       line.push(' }');
     }
   }
@@ -5946,24 +4844,6 @@ Requisition.prototype.toString = function() {
   return this.toCanonicalString();
 };
 
-/**
- * If the last character is whitespace then things that we suggest to add to
- * the end don't need a space prefix.
- * While this is quite a niche function, it has 2 benefits:
- * - it's more correct because we can distinguish between final whitespace that
- *   is part of an unclosed string, and parameter separating whitespace.
- * - also it's faster than toString() the whole thing and checking the end char
- * @return true iff the last character is interpreted as parameter separating
- * whitespace
- */
-Requisition.prototype.typedEndsWithWhitespace = function() {
-  if (this._args) {
-    return this._args.slice(-1)[0].suffix.slice(-1) === ' ';
-  }
-
-  return this.toCanonicalString().slice(-1) === ' ';
-};
-
 /**
  * Return an array of Status scores so we can create a marked up
  * version of the command line input.
@@ -6079,54 +4959,44 @@ Requisition.prototype.getAssignmentAt = function(cursor) {
 
 /**
  * Entry point for keyboard accelerators or anything else that wants to execute
- * a command. There are 3 ways to call <tt>exec()</tt>:
- * 1. Without any parameters. This assumes that the command to be executed has
- *    already been parsed by the requisition using <tt>update()</tt>.
- * 2. With a string parameter, or an object with a 'typed' property. This is
- *    effectively a shortcut for calling <tt>update(typed); exec();</tt>
- * 3. With input having a 'command' property which is either a command object
- *    (i.e. from canon.getCommand) or a string which can be passed to
- *    canon.getCommand() plus and optional 'args' property which contains the
- *    argument values as passed to command.exec. This method is significantly
- *    faster, and designed for use from keyboard shortcuts.
- * In addition to these properties, the input parameter can contain a 'hidden'
- * property which can be set to true to hide the output from the
- * CommandOutputManager.
- * @param input (optional) The command to execute. See above.
+ * a command.
+ * @param input Object containing data about how to execute the command.
+ * Properties of input include:
+ * - args: Arguments for the command
+ * - typed: The typed command
+ * - visible: Ensure that the output from this command is visible
  */
 Requisition.prototype.exec = function(input) {
   var command;
   var args;
-  var hidden = false;
-  if (input && input.hidden) {
-    hidden = true;
-  }
+  var visible = true;
 
   if (input) {
-    if (typeof input === 'string') {
-      this.update(input);
-    }
-    else if (typeof input.typed === 'string') {
-      this.update(input.typed);
-    }
-    else if (input.command != null) {
+    if (input.args != null) {
       // Fast track by looking up the command directly since passed args
       // means there is no command line to parse.
-      command = canon.getCommand(input.command);
+      command = canon.getCommand(input.typed);
       if (!command) {
-        console.error('Command not found: ' + input.command);
+        console.error('Command not found: ' + command);
       }
       args = input.args;
+
+      // Default visible to false since this is exec is probably the
+      // result of a keyboard shortcut
+      visible = 'visible' in input ? input.visible : false;
+    }
+    else {
+      this.update(input);
     }
   }
 
   if (!command) {
-    command = this.commandAssignment.value;
+    command = this.commandAssignment.getValue();
     args = this.getArgsObject();
   }
 
   if (!command) {
-    throw new Error('Unknown command');
+    return false;
   }
 
   // Display JavaScript input without the initial { or closing }
@@ -6137,46 +5007,59 @@ Requisition.prototype.exec = function(input) {
     typed = typed.replace(/\s*}\s*$/, '');
   }
 
-  var output = new Output({
+  var outputObject = {
     command: command,
     args: args,
     typed: typed,
     canonical: this.toCanonicalString(),
-    hidden: hidden
-  });
+    completed: false,
+    start: new Date()
+  };
 
-  this.commandOutputManager.onOutput({ output: output });
+  this.commandOutputManager.sendCommandOutput(outputObject);
+
+  var onComplete = function(output, error) {
+    if (visible) {
+      outputObject.end = new Date();
+      outputObject.duration = outputObject.end.getTime() - outputObject.start.getTime();
+      outputObject.error = error;
+      outputObject.output = output;
+      outputObject.completed = true;
+      this.commandOutputManager.sendCommandOutput(outputObject);
+    }
+  }.bind(this);
 
   try {
-    var context = exports.createExecutionContext(this);
+    var context = new ExecutionContext(this);
     var reply = command.exec(args, context);
 
     if (reply != null && reply.isPromise) {
       reply.then(
-          function(data) { output.complete(data); },
-          function(error) { output.error = true; output.complete(error); });
+        function(data) { onComplete(data, false); },
+        function(error) { onComplete(error, true); });
 
-      output.promise = reply;
       // Add progress to our promise and add a handler for it here
       // See bug 659300
     }
     else {
-      output.complete(reply);
+      onComplete(reply, false);
     }
   }
   catch (ex) {
     console.error(ex);
-    output.error = true;
-    output.complete(ex);
+    onComplete(ex, true);
   }
 
-  this.update('');
-  return output;
+  this.clear();
+  return true;
 };
 
 /**
  * Called by the UI when ever the user interacts with a command line input
- * @param typed The contents of the input field
+ * @param input A structure that details the state of the input field.
+ * It should look something like: { typed:a, cursor: { start:b, end:c } }
+ * Where a is the contents of the input field, and b and c are the start
+ * and end of the cursor/selection respectively.
  * <p>The general sequence is:
  * <ul>
  * <li>_tokenize(): convert _typed into _parts
@@ -6184,16 +5067,29 @@ Requisition.prototype.exec = function(input) {
  * <li>_assign(): convert _unparsedArgs into requisition
  * </ul>
  */
-Requisition.prototype.update = function(typed) {
+Requisition.prototype.update = function(input) {
+  if (input.cursor == null) {
+    input.cursor = { start: input.length, end: input.length };
+  }
+
   this._structuralChangeInProgress = true;
 
-  this._args = this._tokenize(typed);
+  this._args = this._tokenize(input.typed);
+
   var args = this._args.slice(0); // i.e. clone
   this._split(args);
   this._assign(args);
 
   this._structuralChangeInProgress = false;
-  this.onTextChange();
+
+  this.inputChange();
+};
+
+/**
+ * Empty the current buffer, and notify listeners that we're now empty
+ */
+Requisition.prototype.clear = function() {
+  this.update({ typed: '', cursor: { start: 0, end: 0 } });
 };
 
 /**
@@ -6443,7 +5339,7 @@ Requisition.prototype._split = function(args) {
   if (args[0] instanceof ScriptArgument) {
     // Special case: if the user enters { console.log('foo'); } then we need to
     // use the hidden 'eval' command
-    conversion = new Conversion(evalCommand, new ScriptArgument());
+    conversion = new Conversion(evalCommand, new Argument());
     this.commandAssignment.setConversion(conversion);
     return;
   }
@@ -6484,14 +5380,14 @@ Requisition.prototype._split = function(args) {
  * Work out which arguments are applicable to which parameters.
  */
 Requisition.prototype._assign = function(args) {
-  if (!this.commandAssignment.value) {
+  if (!this.commandAssignment.getValue()) {
     this._unassigned.setUnassigned(args);
     return;
   }
 
   if (args.length === 0) {
-    this.setBlankArguments();
-    this._unassigned.setBlank();
+    this.setDefaultArguments();
+    this._unassigned.setDefault();
     return;
   }
 
@@ -6512,7 +5408,7 @@ Requisition.prototype._assign = function(args) {
         new MergedArgument(args);
       var conversion = assignment.param.type.parse(arg);
       assignment.setConversion(conversion);
-      this._unassigned.setBlank();
+      this._unassigned.setDefault();
       return;
     }
   }
@@ -6574,8 +5470,8 @@ Requisition.prototype._assign = function(args) {
 
     // If not set positionally, and we can't set it non-positionally,
     // we have to default it to prevent previous values surviving
-    if (!assignment.param.isPositionalAllowed) {
-      assignment.setBlank();
+    if (!assignment.param.isPositionalAllowed()) {
+      assignment.setDefault();
       return;
     }
 
@@ -6607,119 +5503,28 @@ Requisition.prototype._assign = function(args) {
     assignment.setConversion(conversion);
   }, this);
 
-  this._unassigned.setUnassigned(args);
+  if (args.length > 0) {
+    this._unassigned.setUnassigned(args);
+  }
+  else {
+    this._unassigned.setDefault();
+  }
 };
 
 exports.Requisition = Requisition;
 
-/**
- * A simple object to hold information about the output of a command
- */
-function Output(options) {
-  options = options || {};
-  this.command = options.command || '';
-  this.args = options.args || {};
-  this.typed = options.typed || '';
-  this.canonical = options.canonical || '';
-  this.hidden = options.hidden === true ? true : false;
-
-  this.data = undefined;
-  this.completed = false;
-  this.error = false;
-  this.start = new Date();
-
-  this.onClose = util.createEvent('Output.onClose');
-  this.onChange = util.createEvent('Output.onChange');
-}
-
-/**
- * Called when there is data to display
- * @param data
- */
-Output.prototype.complete = function(data) {
-  this.data = data;
-
-  this.end = new Date();
-  this.duration = this.end.getTime() - this.start.getTime();
-  this.completed = true;
-
-  this.onChange({ output: this });
-};
-
-/**
- * Convert to a DOM element for display.
- * @param element The DOM node to which the data should be written. Existing
- * content of 'element' will be removed before 'outputData' is added.
- */
-Output.prototype.toDom = function(element) {
-  util.clearElement(element);
-  var document = element.ownerDocument;
-
-  var output = this.data;
-  if (output == null) {
-    return;
-  }
-
-  var node;
-  if (typeof HTMLElement !== 'undefined' && output instanceof HTMLElement) {
-    node = output;
-  }
-  else if (output.isView) {
-    node = output.toDom(document);
-  }
-  else {
-    if (this.command.returnType === 'terminal') {
-      node = util.createElement(document, 'textarea');
-      node.classList.add('gcli-row-terminal');
-      node.readOnly = true;
-    }
-    else {
-      node = util.createElement(document, 'p');
-    }
-
-    util.setContents(node, output.toString());
-  }
-
-  element.appendChild(node);
-};
-
-/**
- * Convert this object to a string so GCLI can be used in traditional character
- * based terminals.
- */
-Output.prototype.toString = function(document) {
-  var output = this.data;
-  if (output == null) {
-    return '';
-  }
-
-  if (typeof HTMLElement !== 'undefined' && output instanceof HTMLElement) {
-    return output.textContent;
-  }
-
-  if (output.isView) {
-    return output.toDom(document).textContent;
-  }
-
-  return output.toString();
-};
-
-exports.Output = Output;
 
 /**
  * Functions and data related to the execution of a command
  */
-exports.createExecutionContext = function(requisition) {
-  return {
-    exec: requisition.exec.bind(requisition),
-    update: requisition.update.bind(requisition),
-    document: requisition.document,
-    environment: requisition.environment,
-    createView: view.createView,
-    createPromise: function() {
-      return new Promise();
-    }
-  };
+function ExecutionContext(requisition) {
+  this.requisition = requisition;
+  this.environment = requisition.environment;
+  this.document = requisition.document;
+}
+
+ExecutionContext.prototype.createPromise = function() {
+  return new Promise();
 };
 
 
@@ -6736,20 +5541,270 @@ define('gcli/promise', ['require', 'exports', 'module' ], function(require, expo
   exports.Promise = Promise;
 
 });
-define("text!gcli/ui/intro.html", [], "\n" +
-  "<div>\n" +
-  "  <p>\n" +
-  "  GCLI is an experiment to create a highly usable <strong>graphical command\n" +
-  "  line</strong> for developers. It's not a JavaScript\n" +
-  "  <a href=\"https://en.wikipedia.org/wiki/Read�eval�print_loop\">REPL</a>, so\n" +
-  "  it focuses on speed of input over JavaScript syntax and a rich display over\n" +
-  "  monospace output.</p>\n" +
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gcli/commands/help', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/util', 'gcli/l10n', 'gcli/ui/domtemplate', 'text!gcli/commands/help.css', 'text!gcli/commands/help_intro.html', 'text!gcli/commands/help_list.html', 'text!gcli/commands/help_man.html'], function(require, exports, module) {
+var help = exports;
+
+
+var canon = require('gcli/canon');
+var util = require('gcli/util');
+var l10n = require('gcli/l10n');
+var domtemplate = require('gcli/ui/domtemplate');
+
+var helpCss = require('text!gcli/commands/help.css');
+var helpStyle = undefined;
+var helpIntroHtml = require('text!gcli/commands/help_intro.html');
+var helpIntroTemplate = undefined;
+var helpListHtml = require('text!gcli/commands/help_list.html');
+var helpListTemplate = undefined;
+var helpManHtml = require('text!gcli/commands/help_man.html');
+var helpManTemplate = undefined;
+
+/**
+ * 'help' command
+ * We delay definition of helpCommandSpec until help.startup() to ensure that
+ * the l10n strings have been loaded
+ */
+var helpCommandSpec;
+
+/**
+ * Registration and de-registration.
+ */
+help.startup = function() {
+
+  helpCommandSpec = {
+    name: 'help',
+    description: l10n.lookup('helpDesc'),
+    manual: l10n.lookup('helpManual'),
+    params: [
+      {
+        name: 'search',
+        type: 'string',
+        description: l10n.lookup('helpSearchDesc'),
+        manual: l10n.lookup('helpSearchManual'),
+        defaultValue: null
+      }
+    ],
+    returnType: 'html',
+
+    exec: function(args, context) {
+      help.onFirstUseStartup(context.document);
+
+      var match = canon.getCommand(args.search);
+      if (match) {
+        var clone = helpManTemplate.cloneNode(true);
+        domtemplate.template(clone, getManTemplateData(match, context),
+                { allowEval: true, stack: 'help_man.html' });
+        return clone;
+      }
+
+      var parent = util.dom.createElement(context.document, 'div');
+      if (!args.search) {
+        parent.appendChild(helpIntroTemplate.cloneNode(true));
+      }
+      parent.appendChild(helpListTemplate.cloneNode(true));
+      domtemplate.template(parent, getListTemplateData(args, context),
+              { allowEval: true, stack: 'help_intro.html | help_list.html' });
+      return parent;
+    }
+  };
+
+  canon.addCommand(helpCommandSpec);
+};
+
+help.shutdown = function() {
+  canon.removeCommand(helpCommandSpec);
+
+  helpListTemplate = undefined;
+  helpStyle.parentElement.removeChild(helpStyle);
+  helpStyle = undefined;
+};
+
+/**
+ * Called when the command is executed
+ */
+help.onFirstUseStartup = function(document) {
+  if (!helpIntroTemplate) {
+    helpIntroTemplate = util.dom.createElement(document, 'div');
+    util.dom.setInnerHtml(helpIntroTemplate, helpIntroHtml);
+  }
+  if (!helpListTemplate) {
+    helpListTemplate = util.dom.createElement(document, 'div');
+    util.dom.setInnerHtml(helpListTemplate, helpListHtml);
+  }
+  if (!helpManTemplate) {
+    helpManTemplate = util.dom.createElement(document, 'div');
+    util.dom.setInnerHtml(helpManTemplate, helpManHtml);
+  }
+  if (!helpStyle && helpCss != null) {
+    helpStyle = util.dom.importCss(helpCss, document);
+  }
+};
+
+/**
+ * Find an element within the passed element with the class gcli-help-command
+ * and update the requisition to contain this text.
+ */
+function updateCommand(element, context) {
+  context.requisition.update({
+    typed: element.querySelector('.gcli-help-command').textContent
+  });
+}
+
+/**
+ * Find an element within the passed element with the class gcli-help-command
+ * and execute this text.
+ */
+function executeCommand(element, context) {
+  context.requisition.exec({
+    visible: true,
+    typed: element.querySelector('.gcli-help-command').textContent
+  });
+}
+
+/**
+ * Create a block of data suitable to be passed to the help_list.html template
+ */
+function getListTemplateData(args, context) {
+  return {
+    l10n: l10n.propertyLookup,
+    lang: context.document.defaultView.navigator.language,
+
+    onclick: function(ev) {
+      updateCommand(ev.currentTarget, context);
+    },
+
+    ondblclick: function(ev) {
+      executeCommand(ev.currentTarget, context);
+    },
+
+    getHeading: function() {
+      return args.search == null ?
+              'Available Commands:' :
+              'Commands starting with \'' + args.search + '\':';
+    },
+
+    getMatchingCommands: function() {
+      var matching = canon.getCommands().filter(function(command) {
+        if (args.search && command.name.indexOf(args.search) !== 0) {
+          // Filtered out because they don't match the search
+          return false;
+        }
+        if (!args.search && command.name.indexOf(' ') != -1) {
+          // We don't show sub commands with plain 'help'
+          return false;
+        }
+        return true;
+      });
+      matching.sort();
+      return matching;
+    }
+  };
+}
+
+/**
+ * Create a block of data suitable to be passed to the help_man.html template
+ */
+function getManTemplateData(command, context) {
+  return {
+    l10n: l10n.propertyLookup,
+    lang: context.document.defaultView.navigator.language,
+
+    command: command,
+
+    onclick: function(ev) {
+      updateCommand(ev.currentTarget, context);
+    },
+
+    getTypeDescription: function(param) {
+      var input = '';
+      if (param.defaultValue === undefined) {
+        input = 'required';
+      }
+      else if (param.defaultValue === null) {
+        input = 'optional';
+      }
+      else {
+        input = param.defaultValue;
+      }
+      return '(' + param.type.name + ', ' + input + ')';
+    }
+  };
+}
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gcli/ui/domtemplate', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+  var obj = {};
+  Components.utils.import('resource:///modules/devtools/Templater.jsm', obj);
+  exports.template = obj.template;
+
+});
+define("text!gcli/commands/help.css", [], "");
+
+define("text!gcli/commands/help_intro.html", [], "\n" +
+  "<h2>${l10n.introHeader}</h2>\n" +
   "\n" +
-  "  <p>Type <span class=\"gcli-out-shortcut\">help</span> for a list of commands,\n" +
-  "  or press <code>F1/Escape</code> to show/hide command hints.</p>\n" +
+  "<p>\n" +
+  "</p>\n" +
+  "");
+
+define("text!gcli/commands/help_list.html", [], "\n" +
+  "<h3>${getHeading()}</h3>\n" +
   "\n" +
-  "  <button onclick=\"${onGotIt}\" if=\"${showHideButton}\">Got it!</button>\n" +
-  "</div>\n" +
+  "<table>\n" +
+  "  <tr foreach=\"command in ${getMatchingCommands()}\"\n" +
+  "      onclick=\"${onclick}\" ondblclick=\"${ondblclick}\">\n" +
+  "    <th class=\"gcli-help-name\">${command.name}</th>\n" +
+  "    <td class=\"gcli-help-arrow\">&#x2192;</td>\n" +
+  "    <td>\n" +
+  "      ${command.description}\n" +
+  "      <span class=\"gcli-out-shortcut gcli-help-command\">help ${command.name}</span>\n" +
+  "    </td>\n" +
+  "  </tr>\n" +
+  "</table>\n" +
+  "");
+
+define("text!gcli/commands/help_man.html", [], "\n" +
+  "<h3>${command.name}</h3>\n" +
+  "\n" +
+  "<h4 class=\"gcli-help-header\">\n" +
+  "  ${l10n.helpManSynopsis}:\n" +
+  "  <span class=\"gcli-help-synopsis\" onclick=\"${onclick}\">\n" +
+  "    <span class=\"gcli-help-command\">${command.name}</span>\n" +
+  "    <span foreach=\"param in ${command.params}\">\n" +
+  "      ${param.defaultValue !== undefined ? '[' + param.name + ']' : param.name}\n" +
+  "    </span>\n" +
+  "  </span>\n" +
+  "</h4>\n" +
+  "\n" +
+  "<h4 class=\"gcli-help-header\">${l10n.helpManDescription}:</h4>\n" +
+  "\n" +
+  "<p class=\"gcli-help-description\">\n" +
+  "  ${command.manual || command.description}\n" +
+  "</p>\n" +
+  "\n" +
+  "<h4 class=\"gcli-help-header\">${l10n.helpManParameters}:</h4>\n" +
+  "\n" +
+  "<ul class=\"gcli-help-parameter\">\n" +
+  "  <li if=\"${command.params.length === 0}\">${l10n.helpManNone}</li>\n" +
+  "  <li foreach=\"param in ${command.params}\">\n" +
+  "    <tt>${param.name}</tt> ${getTypeDescription(param)}\n" +
+  "    <br/>\n" +
+  "    ${param.manual || param.description}\n" +
+  "  </li>\n" +
+  "</ul>\n" +
   "");
 
 /*
@@ -6758,444 +5813,620 @@ define("text!gcli/ui/intro.html", [], "\n" +
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/ui/focus', ['require', 'exports', 'module' , 'gcli/util', 'gcli/settings', 'gcli/l10n', 'gcli/canon'], function(require, exports, module) {
+define('gcli/ui/console', ['require', 'exports', 'module' , 'gcli/ui/inputter', 'gcli/ui/arg_fetch', 'gcli/ui/menu', 'gcli/ui/focus'], function(require, exports, module) {
+
+var Inputter = require('gcli/ui/inputter').Inputter;
+var ArgFetcher = require('gcli/ui/arg_fetch').ArgFetcher;
+var CommandMenu = require('gcli/ui/menu').CommandMenu;
+var FocusManager = require('gcli/ui/focus').FocusManager;
+
+/**
+ * Console is responsible for generating the UI for GCLI, this implementation
+ * is a special case for use inside Firefox
+ */
+function Console(options) {
+  this.hintElement = options.hintElement;
+  this.gcliTerm = options.gcliTerm;
+  this.consoleWrap = options.consoleWrap;
+  this.requisition = options.requisition;
+
+  // Create a FocusManager for the various parts to register with
+  this.focusManager = new FocusManager({ document: options.chromeDocument });
+  this.focusManager.onFocus.add(this.gcliTerm.show, this.gcliTerm);
+  this.focusManager.onBlur.add(this.gcliTerm.hide, this.gcliTerm);
+  this.focusManager.addMonitoredElement(this.gcliTerm.hintNode, 'gcliTerm');
+
+  this.inputter = new Inputter({
+    document: options.chromeDocument,
+    requisition: options.requisition,
+    inputElement: options.inputElement,
+    completeElement: options.completeElement,
+    completionPrompt: '',
+    backgroundElement: options.backgroundElement,
+    focusManager: this.focusManager,
+    scratchpad: options.scratchpad
+  });
+
+  this.menu = new CommandMenu({
+    document: options.chromeDocument,
+    requisition: options.requisition,
+    menuClass: 'gcliterm-menu'
+  });
+  this.hintElement.appendChild(this.menu.element);
+
+  this.argFetcher = new ArgFetcher({
+    document: options.chromeDocument,
+    requisition: options.requisition,
+    argFetcherClass: 'gcliterm-argfetcher'
+  });
+  this.hintElement.appendChild(this.argFetcher.element);
+
+  this.chromeWindow = options.chromeDocument.defaultView;
+  this.resizer = this.resizer.bind(this);
+  this.chromeWindow.addEventListener('resize', this.resizer, false);
+  this.requisition.commandChange.add(this.resizer, this);
+}
+
+/**
+ * Called when the page to which we're attached changes
+ */
+Console.prototype.reattachConsole = function(options) {
+  this.chromeWindow.removeEventListener('resize', this.resizer, false);
+  this.chromeWindow = options.chromeDocument.defaultView;
+  this.chromeWindow.addEventListener('resize', this.resizer, false);
+
+  this.focusManager.document = options.chromeDocument;
+  this.inputter.document = options.chromeDocument;
+  this.inputter.completer.document = options.chromeDocument;
+  this.menu.document = options.chromeDocument;
+  this.argFetcher.document = options.chromeDocument;
+};
+
+/**
+ * Avoid memory leaks
+ */
+Console.prototype.destroy = function() {
+  this.chromeWindow.removeEventListener('resize', this.resizer, false);
+  delete this.resizer;
+  delete this.chromeWindow;
+  delete this.consoleWrap;
+
+  this.hintElement.removeChild(this.menu.element);
+  this.menu.destroy();
+  this.hintElement.removeChild(this.argFetcher.element);
+  this.argFetcher.destroy();
+
+  this.inputter.destroy();
+
+  this.focusManager.removeMonitoredElement(this.gcliTerm.hintNode, 'gcliTerm');
+  this.focusManager.onFocus.remove(this.gcliTerm.show, this.gcliTerm);
+  this.focusManager.onBlur.remove(this.gcliTerm.hide, this.gcliTerm);
+  this.focusManager.destroy();
+
+  delete this.gcliTerm;
+  delete this.hintElement;
+};
+
+/**
+ * Called on chrome window resize, or on divider slide
+ */
+Console.prototype.resizer = function() {
+  // Bug 705109: There are several numbers hard-coded in this function.
+  // This is simpler than calculating them, but error-prone when the UI setup,
+  // the styling or display settings change.
+
+  var parentRect = this.consoleWrap.getBoundingClientRect();
+  // Magic number: 64 is the size of the toolbar above the output area
+  var parentHeight = parentRect.bottom - parentRect.top - 64;
+
+  // Magic number: 100 is the size at which we decide the hints are too small
+  // to be useful, so we hide them
+  if (parentHeight < 100) {
+    this.hintElement.classList.add('gcliterm-hint-nospace');
+  }
+  else {
+    this.hintElement.classList.remove('gcliterm-hint-nospace');
+
+    var isMenuVisible = this.menu.element.style.display !== 'none';
+    if (isMenuVisible) {
+      this.menu.setMaxHeight(parentHeight);
+
+      // Magic numbers: 19 = height of a menu item, 22 = total vertical padding
+      // of container
+      var idealMenuHeight = (19 * this.menu.items.length) + 22;
+      if (idealMenuHeight > parentHeight) {
+        this.hintElement.classList.add('gcliterm-hint-scroll');
+      }
+      else {
+        this.hintElement.classList.remove('gcliterm-hint-scroll');
+      }
+    }
+    else {
+      this.argFetcher.setMaxHeight(parentHeight);
+
+      this.hintElement.style.overflowY = null;
+      this.hintElement.style.borderBottomColor = 'white';
+    }
+  }
+
+  // We also try to make the max-width of any GCLI elements so they don't
+  // extend outside the scroll area.
+  var doc = this.hintElement.ownerDocument;
+
+  var outputNode = this.hintElement.parentNode.parentNode.children[1];
+  var outputs = outputNode.getElementsByClassName('gcliterm-msg-body');
+  var listItems = outputNode.getElementsByClassName('hud-msg-node');
+
+  // This is an top-side estimate. We could try to calculate it, maybe using
+  // something along these lines http://www.alexandre-gomes.com/?p=115 However
+  // experience has shown this to be hard to get to work reliably
+  // Also we don't need to be precise. If we use a number that is too big then
+  // the only down-side is too great a right margin
+  var scrollbarWidth = 20;
+
+  if (listItems.length > 0) {
+    var parentWidth = outputNode.getBoundingClientRect().width - scrollbarWidth;
+    var otherWidth;
+    var body;
+
+    for (var i = 0; i < listItems.length; ++i) {
+      var listItem = listItems[i];
+      // a.k.a 'var otherWidth = 132'
+      otherWidth = 0;
+      body = null;
+
+      for (var j = 0; j < listItem.children.length; j++) {
+        var child = listItem.children[j];
+
+        if (child.classList.contains('gcliterm-msg-body')) {
+          body = child.children[0];
+        }
+        else {
+          otherWidth += child.getBoundingClientRect().width;
+        }
+
+        var styles = doc.defaultView.getComputedStyle(child, null);
+        otherWidth += parseInt(styles.borderLeftWidth, 10) +
+                      parseInt(styles.borderRightWidth, 10) +
+                      parseInt(styles.paddingLeft, 10) +
+                      parseInt(styles.paddingRight, 10) +
+                      parseInt(styles.marginLeft, 10) +
+                      parseInt(styles.marginRight, 10);
+      }
+
+      if (body) {
+        body.style.width = (parentWidth - otherWidth) + 'px';
+      }
+    }
+  }
+};
+
+exports.Console = Console;
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gcli/ui/inputter', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/types', 'gcli/history', 'gcli/ui/completer', 'text!gcli/ui/inputter.css'], function(require, exports, module) {
+var cliView = exports;
 
 
-var util = require('gcli/util');
-var settings = require('gcli/settings');
+var KeyEvent = require('gcli/util').event.KeyEvent;
+var dom = require('gcli/util').dom;
 var l10n = require('gcli/l10n');
-var canon = require('gcli/canon');
+
+var Status = require('gcli/types').Status;
+var History = require('gcli/history').History;
+var Completer = require('gcli/ui/completer').Completer;
+
+var inputterCss = require('text!gcli/ui/inputter.css');
+
 
 /**
- * Record how much help the user wants from the tooltip
+ * A wrapper to take care of the functions concerning an input element
  */
-var Eagerness = {
-  NEVER: 1,
-  SOMETIMES: 2,
-  ALWAYS: 3
-};
-var eagerHelperSettingSpec = {
-  name: 'eagerHelper',
-  type: {
-    name: 'selection',
-    lookup: [
-      { name: 'never', value: Eagerness.NEVER },
-      { name: 'sometimes', value: Eagerness.SOMETIMES },
-      { name: 'always', value: Eagerness.ALWAYS },
-    ]
-  },
-  defaultValue: 1,
-  description: l10n.lookup('eagerHelperDesc'),
-  ignoreTypeDifference: true
-};
-var eagerHelper;
+function Inputter(options) {
+  this.requisition = options.requisition;
+  this.scratchpad = options.scratchpad;
 
-/**
- * Register (and unregister) the hide-intro setting
- */
-exports.startup = function() {
-  eagerHelper = settings.addSetting(eagerHelperSettingSpec);
-};
+  // Suss out where the input element is
+  this.element = options.inputElement || 'gcli-input';
+  if (typeof this.element === 'string') {
+    this.document = options.document || document;
+    var name = this.element;
+    this.element = this.document.getElementById(name);
+    if (!this.element) {
+      throw new Error('No element with id=' + name + '.');
+    }
+  }
+  else {
+    // Assume we've been passed in the correct node
+    this.document = this.element.ownerDocument;
+  }
 
-exports.shutdown = function() {
-  settings.removeSetting(eagerHelperSettingSpec);
-  eagerHelper = undefined;
-};
+  if (inputterCss != null) {
+    this.style = dom.importCss(inputterCss, this.document);
+  }
 
-/**
- * FocusManager solves the problem of tracking focus among a set of nodes.
- * The specific problem we are solving is when the hint element must be visible
- * if either the command line or any of the inputs in the hint element has the
- * focus, and invisible at other times, without hiding and showing the hint
- * element even briefly as the focus changes between them.
- * It does this simply by postponing the hide events by 250ms to see if
- * something else takes focus.
- * @param options Object containing user customization properties, including:
- * - blurDelay (default=150ms)
- * - slowTypingDelay (default=3000ms)
- * - debug (default=false)
- * - commandOutputManager (default=canon.commandOutputManager)
- * @param components Object that links to other UI components. GCLI provided:
- * - document
- */
-function FocusManager(options, components) {
-  options = options || {};
+  this.element.spellcheck = false;
 
-  this._document = components.document || document;
-  this._debug = options.debug || false;
-  this._blurDelay = options.blurDelay || 150;
-  this._window = this._document.defaultView;
+  // Used to distinguish focus from TAB in CLI. See onKeyUp()
+  this.lastTabDownAt = 0;
 
-  this._commandOutputManager = options.commandOutputManager ||
-      canon.commandOutputManager;
-  this._commandOutputManager.onOutput.add(this._outputted, this);
+  // Used to effect caret changes. See _processCaretChange()
+  this._caretChange = null;
 
-  this._blurDelayTimeout = null; // Result of setTimeout in delaying a blur
-  this._monitoredElements = [];  // See addMonitoredElement()
+  // Ensure that TAB/UP/DOWN isn't handled by the browser
+  this.onKeyDown = this.onKeyDown.bind(this);
+  this.onKeyUp = this.onKeyUp.bind(this);
+  this.element.addEventListener('keydown', this.onKeyDown, false);
+  this.element.addEventListener('keyup', this.onKeyUp, false);
 
-  this._isError = false;
-  this._hasFocus = false;
-  this._helpRequested = false;
-  this._recentOutput = false;
+  this.completer = options.completer || new Completer(options);
+  this.completer.decorate(this);
 
-  // Be more helpful if the user pauses
-  // this._slowTyping = false;
-  // this._keyPressTimeout = null;
-  // this._onSlowTyping = this._onSlowTyping.bind(this);
-  // this._slowTypingDelay = options.slowTypingDelay || 3000;
+  // Use the provided history object, or instantiate our own
+  this.history = options.history || new History(options);
+  this._scrollingThroughHistory = false;
 
-  this.onVisibilityChange = util.createEvent('FocusManager.onVisibilityChange');
+  // Cursor position affects hint severity
+  this.onMouseUp = function(ev) {
+    this.completer.update(this.getInputState());
+  }.bind(this);
+  this.element.addEventListener('mouseup', this.onMouseUp, false);
 
-  this._focused = this._focused.bind(this);
-  this._document.addEventListener('focus', this._focused, true);
+  this.focusManager = options.focusManager;
+  if (this.focusManager) {
+    this.focusManager.addMonitoredElement(this.element, 'input');
+  }
 
-  eagerHelper.onChange.add(this._eagerHelperChanged, this);
+  this.requisition.inputChange.add(this.onInputChange, this);
 
-  this.isTooltipVisible = undefined;
-  this.isOutputVisible = undefined;
-  this._checkShow();
+  this.update();
 }
 
 /**
  * Avoid memory leaks
  */
-FocusManager.prototype.destroy = function() {
-  eagerHelper.onChange.remove(this._eagerHelperChanged, this);
-
-  this._document.removeEventListener('focus', this._focused, true);
-  this._commandOutputManager.onOutput.remove(this._outputted, this);
-
-  for (var i = 0; i < this._monitoredElements.length; i++) {
-    var monitor = this._monitoredElements[i];
-    console.error('Hanging monitored element: ', monitor.element);
-
-    monitor.element.removeEventListener('focus', monitor.onFocus, true);
-    monitor.element.removeEventListener('blur', monitor.onBlur, true);
+Inputter.prototype.destroy = function() {
+  this.requisition.inputChange.remove(this.onInputChange, this);
+  if (this.focusManager) {
+    this.focusManager.removeMonitoredElement(this.element, 'input');
   }
 
-  if (this._blurDelayTimeout) {
-    this._window.clearTimeout(this._blurDelayTimeout);
-    this._blurDelayTimeout = null;
+  this.element.removeEventListener('keydown', this.onKeyDown, false);
+  this.element.removeEventListener('keyup', this.onKeyUp, false);
+  delete this.onKeyDown;
+  delete this.onKeyUp;
+
+  this.history.destroy();
+  this.completer.destroy();
+
+  if (this.style) {
+    this.style.parentNode.removeChild(this.style);
+    delete this.style;
   }
 
-  // delete this._onSlowTyping;
-  delete this._focused;
-  delete this._document;
-  delete this._window;
-  delete this._commandOutputManager;
+  delete this.document;
+  delete this.element;
 };
 
 /**
- * The easy way to include an element in the set of things that are part of the
- * aggregate focus. Using [add|remove]MonitoredElement() is a simpler way of
- * option than calling report[Focus|Blur]()
- * @param element The element on which to track focus|blur events
- * @param where Optional source string for debugging only
+ * Utility to add an element into the DOM after the input element
  */
-FocusManager.prototype.addMonitoredElement = function(element, where) {
-  if (this._debug) {
-    console.log('FocusManager.addMonitoredElement(' + (where || 'unknown') + ')');
-  }
-
-  var monitor = {
-    element: element,
-    where: where,
-    onFocus: function() { this._reportFocus(where); }.bind(this),
-    onBlur: function() { this._reportBlur(where); }.bind(this)
-  };
-
-  element.addEventListener('focus', monitor.onFocus, true);
-  element.addEventListener('blur', monitor.onBlur, true);
-  this._monitoredElements.push(monitor);
+Inputter.prototype.appendAfter = function(element) {
+  this.element.parentNode.insertBefore(element, this.element.nextSibling);
 };
 
 /**
- * Undo the effects of addMonitoredElement()
- * @param element The element to stop tracking
- * @param where Optional source string for debugging only
+ * Handler for the Requisition.inputChange event
  */
-FocusManager.prototype.removeMonitoredElement = function(element, where) {
-  if (this._debug) {
-    console.log('FocusManager.removeMonitoredElement(' + (where || 'unknown') + ')');
+Inputter.prototype.onInputChange = function() {
+  if (this._caretChange == null) {
+    // We weren't expecting a change so this was requested by the hint system
+    // we should move the cursor to the end of the 'changed section', and the
+    // best we can do for that right now is the end of the current argument.
+    this._caretChange = Caret.TO_ARG_END;
+  }
+  this._setInputInternal(this.requisition.toString());
+};
+
+/**
+ * Internal function to set the input field to a value.
+ * This function checks to see if the current value is the same as the new
+ * value, and makes no changes if they are the same (except for caret/completer
+ * updating - see below). If changes are to be made, they are done in a timeout
+ * to avoid XUL bug 676520.
+ * This function assumes that the data model is up to date with the new value.
+ * It does attempts to leave the caret position in the same position in the
+ * input string unless this._caretChange === Caret.TO_ARG_END. This is required
+ * for completion events.
+ * It does not change the completer decoration unless this._updatePending is
+ * set. This is required for completion events.
+ */
+Inputter.prototype._setInputInternal = function(str, update) {
+  if (!this.document) {
+    return; // This can happen post-destroy()
   }
 
-  var newMonitoredElements = this._monitoredElements.filter(function(monitor) {
-    if (monitor.element === element) {
-      element.removeEventListener('focus', monitor.onFocus, true);
-      element.removeEventListener('blur', monitor.onBlur, true);
-      return false;
+  if (this.element.value && this.element.value === str) {
+    this._processCaretChange(this.getInputState(), false);
+    return;
+  }
+
+  // Updating in a timeout fixes a XUL issue (bug 676520) where textbox gives
+  // incorrect values for its content
+  this.document.defaultView.setTimeout(function() {
+    if (!this.document) {
+      return; // This can happen post-destroy()
     }
-    return true;
-  });
 
-  this._monitoredElements = newMonitoredElements;
-};
+    // Bug 678520 - We could do better caret handling by recording the caret
+    // position in terms of offset into an assignment, and then replacing into
+    // a similar place
+    var input = this.getInputState();
+    input.typed = str;
+    this._processCaretChange(input);
+    this.element.value = str;
 
-/**
- * Monitor for new command executions
- */
-FocusManager.prototype.updatePosition = function(dimensions) {
-  var ev = {
-    tooltipVisible: this.isTooltipVisible,
-    outputVisible: this.isOutputVisible
-  };
-  this.onVisibilityChange(ev);
-};
-
-/**
- * Monitor for new command executions
- */
-FocusManager.prototype._outputted = function(ev) {
-  this._recentOutput = true;
-  this._helpRequested = false;
-  this._checkShow();
-};
-
-/**
- * We take a focus event anywhere to be an indication that we might be about
- * to lose focus
- */
-FocusManager.prototype._focused = function() {
-  this._reportBlur('document');
-};
-
-/**
- * Some component has received a 'focus' event. This sets the internal status
- * straight away and informs the listeners
- * @param where Optional source string for debugging only
- */
-FocusManager.prototype._reportFocus = function(where) {
-  if (this._debug) {
-    console.log('FocusManager._reportFocus(' + (where || 'unknown') + ')');
-  }
-
-  // this._resetSlowTypingAlarm();
-
-  if (this._blurDelayTimeout) {
-    if (this._debug) {
-      console.log('FocusManager.cancelBlur');
+    if (update) {
+      this.update();
     }
-    this._window.clearTimeout(this._blurDelayTimeout);
-    this._blurDelayTimeout = null;
-  }
-
-  if (!this._hasFocus) {
-    this._hasFocus = true;
-  }
-  this._checkShow();
+  }.bind(this), 0);
 };
 
 /**
- * Some component has received a 'blur' event. This waits for a while to see if
- * we are going to get any subsequent 'focus' events and then sets the internal
- * status and informs the listeners
- * @param where Optional source string for debugging only
+ * Various ways in which we need to manipulate the caret/selection position.
+ * A value of null means we're not expecting a change
  */
-FocusManager.prototype._reportBlur = function(where) {
-  if (this._debug) {
-    console.log('FocusManager._reportBlur(' + where + ')');
-  }
+var Caret = {
+  /**
+   * We are expecting changes, but we don't need to move the cursor
+   */
+  NO_CHANGE: 0,
 
-  // this._cancelSlowTypingAlarm();
+  /**
+   * We want the entire input area to be selected
+   */
+  SELECT_ALL: 1,
 
-  if (this._hasFocus) {
-    if (this._blurDelayTimeout) {
-      if (this._debug) {
-        console.log('FocusManager.blurPending');
+  /**
+   * The whole input has changed - push the cursor to the end
+   */
+  TO_END: 2,
+
+  /**
+   * A part of the input has changed - push the cursor to the end of the
+   * changed section
+   */
+  TO_ARG_END: 3
+};
+
+/**
+ * If this._caretChange === Caret.TO_ARG_END, we alter the input object to move
+ * the selection start to the end of the current argument.
+ * @param input An object shaped like { typed:'', cursor: { start:0, end:0 }}
+ * @param forceUpdate Do we call this.completer.update even when the cursor has
+ * not changed (useful when input.typed has changed)
+ */
+Inputter.prototype._processCaretChange = function(input, forceUpdate) {
+  var start, end;
+  switch (this._caretChange) {
+    case Caret.SELECT_ALL:
+      start = 0;
+      end = input.typed.length;
+      break;
+
+    case Caret.TO_END:
+      start = input.typed.length;
+      end = input.typed.length;
+      break;
+
+    case Caret.TO_ARG_END:
+      // There could be a fancy way to do this involving assignment/arg math
+      // but it doesn't seem easy, so we cheat a move the cursor to just before
+      // the next space, or the end of the input
+      start = input.cursor.start;
+      do {
+        start++;
       }
-      return;
+      while (start < input.typed.length && input.typed[start - 1] !== ' ');
+
+      end = start;
+      break;
+
+    case null:
+    case Caret.NO_CHANGE:
+      start = input.cursor.start;
+      end = input.cursor.end;
+      break;
+  }
+
+  start = (start > input.typed.length) ? input.typed.length : start;
+  end = (end > input.typed.length) ? input.typed.length : end;
+
+  var newInput = { typed: input.typed, cursor: { start: start, end: end }};
+  if (start !== input.cursor.start || end !== input.cursor.end || forceUpdate) {
+    this.completer.update(newInput);
+  }
+
+  this.element.selectionStart = newInput.cursor.start;
+  this.element.selectionEnd = newInput.cursor.end;
+
+  this._caretChange = null;
+  return newInput;
+};
+
+/**
+ * Set the input field to a value.
+ * This function updates the data model and the completer decoration. It sets
+ * the caret to the end of the input. It does not make any similarity checks
+ * so calling this function with it's current value resets the cursor position.
+ * It does not execute the input or affect the history.
+ * This function should not be called internally, by Inputter and never as a
+ * result of a keyboard event on this.element or bug 676520 could be triggered.
+ */
+Inputter.prototype.setInput = function(str) {
+  this.element.value = str;
+  this.update();
+};
+
+/**
+ * Focus the input element
+ */
+Inputter.prototype.focus = function() {
+  this.element.focus();
+};
+
+/**
+ * Ensure certain keys (arrows, tab, etc) that we would like to handle
+ * are not handled by the browser
+ */
+Inputter.prototype.onKeyDown = function(ev) {
+  if (ev.keyCode === KeyEvent.DOM_VK_UP || ev.keyCode === KeyEvent.DOM_VK_DOWN) {
+    ev.preventDefault();
+  }
+  if (ev.keyCode === KeyEvent.DOM_VK_TAB) {
+    this.lastTabDownAt = 0;
+    if (!ev.shiftKey) {
+      ev.preventDefault();
+      // Record the timestamp of this TAB down so onKeyUp can distinguish
+      // focus from TAB in the CLI.
+      this.lastTabDownAt = ev.timeStamp;
     }
-
-    this._blurDelayTimeout = this._window.setTimeout(function() {
-      if (this._debug) {
-        console.log('FocusManager.blur');
+    if (ev.metaKey || ev.altKey || ev.crtlKey) {
+      if (this.document.commandDispatcher) {
+        this.document.commandDispatcher.advanceFocus();
       }
-      this._hasFocus = false;
-      this._checkShow();
-      this._blurDelayTimeout = null;
-    }.bind(this), this._blurDelay);
+      else {
+        this.element.blur();
+      }
+    }
   }
 };
 
 /**
- * Called on keypress or new focus. Sets off a timer to explode if the user
- * stops typing.
+ * The main keyboard processing loop
  */
-FocusManager.prototype._resetSlowTypingAlarm = function() {
-  // this._cancelSlowTypingAlarm();
-  // this._keyPressTimeout = this._window.setTimeout(this._onSlowTyping,
-  //                                                 this._slowTypingDelay);
-};
-
-/**
- * Don't kick off a slow typing alarm
- */
-FocusManager.prototype._cancelSlowTypingAlarm = function() {
-  // if (this._keyPressTimeout) {
-  //   this._window.clearTimeout(this._keyPressTimeout);
-  //   this._keyPressTimeout = null;
-  // }
-  // this._slowTyping = false;
-};
-
-/**
- * Called from the key-press timeout
- */
-FocusManager.prototype._onSlowTyping = function() {
-  // this._slowTyping = true;
-  // this._checkShow();
-};
-
-/**
- * The setting has changed
- */
-FocusManager.prototype._eagerHelperChanged = function() {
-  this._checkShow();
-};
-
-/**
- * The inputter tells us about keyboard events so we can decide to delay
- * showing the tooltip element, (or if the keypress is F1, show it now)
- */
-FocusManager.prototype.onInputChange = function(ev) {
-  // this._resetSlowTypingAlarm();
-  // this._slowTyping = false;
-  this._recentOutput = false;
-  this._checkShow();
-};
-
-/**
- * Generally called for something like a F1 key press, when the user explicitly
- * wants help
- */
-FocusManager.prototype.helpRequest = function() {
-  if (this._debug) {
-    console.log('FocusManager.helpRequest');
+Inputter.prototype.onKeyUp = function(ev) {
+  // Give the scratchpad (if enabled) a chance to activate
+  if (this.scratchpad && this.scratchpad.shouldActivate(ev)) {
+    if (this.scratchpad.activate(this.element.value)) {
+      this._setInputInternal('', true);
+    }
+    return;
   }
 
-  // this._cancelSlowTypingAlarm();
-  // this._slowTyping = true;
-  this._helpRequested = true;
-  this._recentOutput = false;
-  this._checkShow();
-};
-
-/**
- * Generally called for something like a ESC key press, when the user explicitly
- * wants to get rid of the help
- */
-FocusManager.prototype.removeHelp = function() {
-  if (this._debug) {
-    console.log('FocusManager.removeHelp');
+  // RETURN does a special exec/highlight thing
+  if (ev.keyCode === KeyEvent.DOM_VK_RETURN) {
+    var worst = this.requisition.getStatus();
+    // Deny RETURN unless the command might work
+    if (worst === Status.VALID) {
+      this._scrollingThroughHistory = false;
+      this.history.add(this.element.value);
+      this.requisition.exec();
+    }
+    // See bug 664135 - On pressing return with an invalid input, GCLI
+    // should select the incorrect part of the input for an easy fix
+    return;
   }
 
-  // this._cancelSlowTypingAlarm();
-  // this._slowTyping = false;
-  this._importantFieldFlag = false;
-  this._isError = false;
-  this._helpRequested = false;
-  this._recentOutput = false;
-  this._checkShow();
-};
-
-/**
- * Set to true whenever a field thinks it's output is important
- */
-FocusManager.prototype.setImportantFieldFlag = function(flag) {
-  if (this._debug) {
-    console.log('FocusManager.setImportantFieldFlag', flag);
+  if (ev.keyCode === KeyEvent.DOM_VK_TAB && !ev.shiftKey) {
+    // If the TAB keypress took the cursor from another field to this one,
+    // then they get the keydown/keypress, and we get the keyup. In this
+    // case we don't want to do any completion.
+    // If the time of the keydown/keypress of TAB was close (i.e. within
+    // 1 second) to the time of the keyup then we assume that we got them
+    // both, and do the completion.
+    if (this.lastTabDownAt + 1000 > ev.timeStamp) {
+      // It's possible for TAB to not change the input, in which case the
+      // onInputChange event will not fire, and the caret move will not be
+      // processed. So we check that this is done first
+      this._caretChange = Caret.TO_ARG_END;
+      this._processCaretChange(this.getInputState(), true);
+      this.getCurrentAssignment().complete();
+    }
+    this.lastTabDownAt = 0;
+    this._scrollingThroughHistory = false;
+    return;
   }
-  this._importantFieldFlag = flag;
-  this._checkShow();
-};
 
-/**
- * Set to true whenever a field thinks it's output is important
- */
-FocusManager.prototype.setError = function(isError) {
-  if (this._debug) {
-    console.log('FocusManager._isError', isError);
+  if (ev.keyCode === KeyEvent.DOM_VK_UP) {
+    if (this.element.value === '' || this._scrollingThroughHistory) {
+      this._scrollingThroughHistory = true;
+      this._setInputInternal(this.history.backward(), true);
+    }
+    else {
+      this.getCurrentAssignment().increment();
+    }
+    return;
   }
-  this._isError = isError;
-  this._checkShow();
+
+  if (ev.keyCode === KeyEvent.DOM_VK_DOWN) {
+    if (this.element.value === '' || this._scrollingThroughHistory) {
+      this._scrollingThroughHistory = true;
+      this._setInputInternal(this.history.forward(), true);
+    }
+    else {
+      this.getCurrentAssignment().decrement();
+    }
+    return;
+  }
+
+  this._scrollingThroughHistory = false;
+  this._caretChange = Caret.NO_CHANGE;
+  this.update();
 };
 
 /**
- * Helper to compare the current showing state with the value calculated by
- * _shouldShow() and take appropriate action
+ * Accessor for the assignment at the cursor.
+ * i.e Requisition.getAssignmentAt(cursorPos);
  */
-FocusManager.prototype._checkShow = function() {
-  var fire = false;
-  var ev = {
-    tooltipVisible: this.isTooltipVisible,
-    outputVisible: this.isOutputVisible
+Inputter.prototype.getCurrentAssignment = function() {
+  var start = this.element.selectionStart;
+  return this.requisition.getAssignmentAt(start);
+};
+
+/**
+ * Actually parse the input and make sure we're all up to date
+ */
+Inputter.prototype.update = function() {
+  var input = this.getInputState();
+  this.requisition.update(input);
+  this.completer.update(input);
+};
+
+/**
+ * Pull together an input object, which may include XUL hacks
+ */
+Inputter.prototype.getInputState = function() {
+  var input = {
+    typed: this.element.value,
+    cursor: {
+      start: this.element.selectionStart,
+      end: this.element.selectionEnd
+    }
   };
 
-  var showTooltip = this._shouldShowTooltip();
-  if (this.isTooltipVisible !== showTooltip.visible) {
-    ev.tooltipVisible = this.isTooltipVisible = showTooltip.visible;
-    fire = true;
+  // Workaround for potential XUL bug 676520 where textbox gives incorrect
+  // values for its content
+  if (input.typed == null) {
+    input = { typed: '', cursor: { start: 0, end: 0 } };
+    console.log('fixing input.typed=""', input);
   }
 
-  var showOutput = this._shouldShowOutput();
-  if (this.isOutputVisible !== showOutput.visible) {
-    ev.outputVisible = this.isOutputVisible = showOutput.visible;
-    fire = true;
+  // Workaround for a Bug 717268 (which is really a jsdom bug)
+  if (input.cursor.start == null) {
+    input.cursor.start = 0;
   }
 
-  if (fire) {
-    if (this._debug) {
-      console.debug('FocusManager.onVisibilityChange', ev);
-    }
-    this.onVisibilityChange(ev);
-  }
+  return input;
 };
 
-/**
- * Calculate if we should be showing or hidden taking into account all the
- * available inputs
- */
-FocusManager.prototype._shouldShowTooltip = function() {
-  if (eagerHelper.value === Eagerness.NEVER) {
-    return { visible: false, reason: 'eagerHelper !== NEVER' };
-  }
-
-  if (eagerHelper.value === Eagerness.ALWAYS) {
-    return { visible: true, reason: 'eagerHelper !== ALWAYS' };
-  }
-
-  if (this._isError) {
-    return { visible: true, reason: 'isError' };
-  }
-
-  if (this._helpRequested) {
-    return { visible: true, reason: 'helpRequested' };
-  }
-
-  if (this._importantFieldFlag) {
-    return { visible: true, reason: 'importantFieldFlag' };
-  }
-
-  // if (this._slowTyping) {
-  //   return { visible: true, reason: 'slowTyping' };
-  // }
-
-  return { visible: false, reason: 'default' };
-};
-
-/**
- * Calculate if we should be showing or hidden taking into account all the
- * available inputs
- */
-FocusManager.prototype._shouldShowOutput = function() {
-  if (this._recentOutput) {
-    return { visible: true, reason: 'recentOutput' };
-  }
-
-  return { visible: false, reason: 'default' };
-};
-
-exports.FocusManager = FocusManager;
+cliView.Inputter = Inputter;
 
 
 });
@@ -7205,10 +6436,554 @@ exports.FocusManager = FocusManager;
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/ui/fields/basic', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/argument', 'gcli/types', 'gcli/types/basic', 'gcli/ui/fields'], function(require, exports, module) {
+define('gcli/history', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+/**
+ * A History object remembers commands that have been entered in the past and
+ * provides an API for accessing them again.
+ * See Bug 681340: Search through history (like C-r in bash)?
+ */
+function History() {
+  // This is the actual buffer where previous commands are kept.
+  // 'this._buffer[0]' should always be equal the empty string. This is so
+  // that when you try to go in to the "future", you will just get an empty
+  // command.
+  this._buffer = [''];
+
+  // This is an index in to the history buffer which points to where we
+  // currently are in the history.
+  this._current = 0;
+}
+
+/**
+ * Avoid memory leaks
+ */
+History.prototype.destroy = function() {
+//  delete this._buffer;
+};
+
+/**
+ * Record and save a new command in the history.
+ */
+History.prototype.add = function(command) {
+  this._buffer.splice(1, 0, command);
+  this._current = 0;
+};
+
+/**
+ * Get the next (newer) command from history.
+ */
+History.prototype.forward = function() {
+  if (this._current > 0 ) {
+    this._current--;
+  }
+  return this._buffer[this._current];
+};
+
+/**
+ * Get the previous (older) item from history.
+ */
+History.prototype.backward = function() {
+  if (this._current < this._buffer.length - 1) {
+    this._current++;
+  }
+  return this._buffer[this._current];
+};
+
+exports.History = History;
+
+});/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gcli/ui/completer', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/domtemplate', 'text!gcli/ui/completer.html'], function(require, exports, module) {
 
 
-var util = require('gcli/util');
+var dom = require('gcli/util').dom;
+var domtemplate = require('gcli/ui/domtemplate');
+
+var completerHtml = require('text!gcli/ui/completer.html');
+
+/**
+ * Completer is an 'input-like' element that sits  an input element annotating
+ * it with visual goodness.
+ * @param {object} options An object that contains various options which
+ * customizes how the completer functions.
+ * Properties on the options object:
+ * - document (required) DOM document to be used in creating elements
+ * - requisition (required) A GCLI Requisition object whose state is monitored
+ * - completeElement (optional) An element to use
+ * - completionPrompt (optional) The prompt - defaults to '\u00bb'
+ *   (double greater-than, a.k.a right guillemet). The prompt is used directly
+ *   in a TextNode, so HTML entities are not allowed.
+ */
+function Completer(options) {
+  this.document = options.document || document;
+  this.requisition = options.requisition;
+  this.elementCreated = false;
+  this.scratchpad = options.scratchpad;
+  this.input = { typed: '', cursor: { start: 0, end: 0 } };
+
+  this.element = options.completeElement || 'gcli-row-complete';
+  if (typeof this.element === 'string') {
+    var name = this.element;
+    this.element = this.document.getElementById(name);
+
+    if (!this.element) {
+      this.elementCreated = true;
+      this.element = dom.createElement(this.document, 'div');
+      this.element.className = 'gcli-in-complete gcli-in-valid';
+      this.element.setAttribute('tabindex', '-1');
+      this.element.setAttribute('aria-live', 'polite');
+    }
+  }
+
+  this.completionPrompt = typeof options.completionPrompt === 'string'
+      ? options.completionPrompt
+      : '\u00bb';
+
+  if (options.inputBackgroundElement) {
+    this.backgroundElement = options.inputBackgroundElement;
+  }
+  else {
+    this.backgroundElement = this.element;
+  }
+
+  this.template = dom.createElement(this.document, 'div');
+  dom.setInnerHtml(this.template, completerHtml);
+  // Replace the temporary div we created with the template root
+  this.template = this.template.children[0];
+  // We want the spans to line up without the spaces in the template
+  dom.removeWhitespace(this.template, true);
+}
+
+/**
+ * Avoid memory leaks
+ */
+Completer.prototype.destroy = function() {
+  delete this.document;
+  delete this.element;
+  delete this.backgroundElement;
+  delete this.template;
+
+  if (this.elementCreated) {
+    this.document.defaultView.removeEventListener('resize', this.resizer, false);
+  }
+
+  delete this.inputter;
+};
+
+/**
+ * A list of the styles that decorate() should copy to make the completion
+ * element look like the input element. backgroundColor is a spiritual part of
+ * this list, but see comment in decorate().
+ */
+Completer.copyStyles = [ 'fontSize', 'fontFamily', 'fontWeight', 'fontStyle' ];
+
+/**
+ * Make ourselves visually similar to the input element, and make the input
+ * element transparent so our background shines through
+ */
+Completer.prototype.decorate = function(inputter) {
+  this.inputter = inputter;
+  var inputEle = inputter.element;
+
+  // If we were told which element to use, then assume it is already
+  // correctly positioned. Otherwise insert it alongside the input element
+  if (this.elementCreated) {
+    this.inputter.appendAfter(this.element);
+
+    var styles = this.document.defaultView.getComputedStyle(inputEle, null);
+    Completer.copyStyles.forEach(function(style) {
+      this.element.style[style] = styles[style];
+    }, this);
+
+    // The completer text is by default invisible so we make it the same color
+    // as the input background.
+    this.element.style.color = inputEle.style.backgroundColor;
+
+    // If there is a separate backgroundElement, then we make the element
+    // transparent, otherwise it inherits the color of the input node
+    // It's not clear why backgroundColor doesn't work when used from
+    // computedStyle, but it doesn't. Patches welcome!
+    this.element.style.backgroundColor = (this.backgroundElement != this.element) ?
+        'transparent' :
+        inputEle.style.backgroundColor;
+    inputEle.style.backgroundColor = 'transparent';
+
+    // Make room for the prompt
+    inputEle.style.paddingLeft = '20px';
+
+    this.resizer = this.resizer.bind(this);
+    this.document.defaultView.addEventListener('resize', this.resizer, false);
+    this.resizer();
+  }
+};
+
+/**
+ * Ensure that the completion element is the same size and the inputter element
+ */
+Completer.prototype.resizer = function() {
+  // Remove this when jsdom does getBoundingClientRect(). See Bug 717269
+  if (!this.inputter.element.getBoundingClientRect) {
+    return;
+  }
+
+  var rect = this.inputter.element.getBoundingClientRect();
+  // -4 to line up with 1px of padding and border, top and bottom
+  var height = rect.bottom - rect.top - 4;
+
+  this.element.style.top = rect.top + 'px';
+  this.element.style.height = height + 'px';
+  this.element.style.lineHeight = height + 'px';
+  this.element.style.left = rect.left + 'px';
+  this.element.style.width = (rect.right - rect.left) + 'px';
+};
+
+/**
+ * Is the completion given, a "strict" completion of the user inputted value?
+ * A completion is considered "strict" only if it the user inputted value is an
+ * exact prefix of the completion (ignoring leading whitespace)
+ */
+function isStrictCompletion(inputValue, completion) {
+  // Strip any leading whitespace from the user inputted value because the
+  // completion will never have leading whitespace.
+  inputValue = inputValue.replace(/^\s*/, '');
+  // Strict: "ec" -> "echo"
+  // Non-Strict: "ls *" -> "ls foo bar baz"
+  return completion.indexOf(inputValue) === 0;
+}
+
+/**
+ * Bring the completion element up to date with what the requisition says
+ */
+Completer.prototype.update = function(input) {
+  this.input = input;
+
+  var template = this.template.cloneNode(true);
+  domtemplate.template(template, this, { stack: 'completer.html' });
+
+  dom.clearElement(this.element);
+  while (template.hasChildNodes()) {
+    this.element.appendChild(template.firstChild);
+  }
+};
+
+/**
+ * A proxy to requisition.getInputStatusMarkup which converts space to &nbsp;
+ * in the string member (for HTML display) and converts status to an
+ * appropriate class name (i.e. lower cased, prefixed with gcli-in-)
+ */
+Object.defineProperty(Completer.prototype, 'statusMarkup', {
+  get: function() {
+    var markup = this.requisition.getInputStatusMarkup(this.input.cursor.start);
+    markup.forEach(function(member) {
+      member.string = member.string.replace(/ /g, '\u00a0'); // i.e. &nbsp;
+      member.className = 'gcli-in-' + member.status.toString().toLowerCase();
+    }, this);
+    return markup;
+  }
+});
+
+/**
+ * What text should we display as the tab text, and should it be given as a
+ * '-> full' or as 'suffix' (which depends on if the completion is a strict
+ * completion or not)
+ */
+Object.defineProperty(Completer.prototype, 'tabText', {
+  get: function() {
+    var current = this.requisition.getAssignmentAt(this.input.cursor.start);
+    var predictions = current.getPredictions();
+
+    if (this.input.typed.length === 0 || predictions.length === 0) {
+      return '';
+    }
+
+    var tab = predictions[0].name;
+    var existing = current.getArg().text;
+
+    if (isStrictCompletion(existing, tab) &&
+            this.input.cursor.start === this.input.typed.length) {
+      // Display the suffix of the prediction as the completion
+      var numLeadingSpaces = existing.match(/^(\s*)/)[0].length;
+      return tab.slice(existing.length - numLeadingSpaces);
+    }
+
+    // Display the '-> prediction' at the end of the completer element
+    return ' \u00a0\u21E5 ' + tab; // aka &nbsp;&rarr; the right arrow
+  }
+});
+
+/**
+ * The text for the 'jump to scratchpad' feature, or null if it is disabled
+ */
+Object.defineProperty(Completer.prototype, 'scratchLink', {
+  get: function() {
+    if (!this.scratchpad) {
+      return null;
+    }
+    var command = this.requisition.commandAssignment.getValue();
+    return command && command.name === '{' ? this.scratchpad.linkText : null;
+  }
+});
+
+/**
+ * Is the entered command a JS command with no closing '}'?
+ * TWEAK: This code should be considered for promotion to Requisition
+ */
+Object.defineProperty(Completer.prototype, 'unclosedJs', {
+  get: function() {
+    var command = this.requisition.commandAssignment.getValue();
+    var jsCommand = command && command.name === '{';
+    var unclosedJs = jsCommand &&
+        this.requisition.getAssignment(0).getArg().suffix.indexOf('}') === -1;
+    return unclosedJs;
+  }
+});
+
+exports.Completer = Completer;
+
+
+});
+define("text!gcli/ui/completer.html", [], "\n" +
+  "<div>\n" +
+  "  <span class=\"gcli-prompt\">${completionPrompt} </span>\n" +
+  "  <loop foreach=\"member in ${statusMarkup}\">\n" +
+  "    <span class=\"${member.className}\">${member.string}</span>\n" +
+  "  </loop>\n" +
+  "  <span class=\"gcli-in-ontab\">${tabText}</span>\n" +
+  "  <span class=\"gcli-in-closebrace\" if=\"${unclosedJs}\">}</span>\n" +
+  "  <div class=\"gcli-in-scratchlink\" if=\"${scratchLink}\">${scratchLink}</div>\n" +
+  "</div>\n" +
+  "");
+
+define("text!gcli/ui/inputter.css", [], "");
+
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gcli/ui/arg_fetch', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types', 'gcli/ui/field', 'gcli/ui/domtemplate', 'text!gcli/ui/arg_fetch.css', 'text!gcli/ui/arg_fetch.html'], function(require, exports, module) {
+var argFetch = exports;
+
+
+var dom = require('gcli/util').dom;
+var Status = require('gcli/types').Status;
+
+var getField = require('gcli/ui/field').getField;
+var domtemplate = require('gcli/ui/domtemplate');
+
+var editorCss = require('text!gcli/ui/arg_fetch.css');
+var argFetchHtml = require('text!gcli/ui/arg_fetch.html');
+
+
+/**
+ * A widget to display an inline dialog which allows the user to fill out
+ * the arguments to a command.
+ * @param options An object containing the customizations, which include:
+ * - document: The document to use in creating widgets
+ * - requisition: The Requisition to fill out
+ * - argFetcherClass: Custom class name when generating the top level element
+ *   which allows different layout systems
+ */
+function ArgFetcher(options) {
+  this.document = options.document || document;
+  this.requisition = options.requisition;
+
+  // FF can be really hard to debug if doc is null, so we check early on
+  if (!this.document) {
+    throw new Error('No document');
+  }
+
+  this.element =  dom.createElement(this.document, 'div');
+  this.element.className = options.argFetcherClass || 'gcli-argfetch';
+  // We cache the fields we create so we can destroy them later
+  this.fields = [];
+
+  // Populated by template
+  this.okElement = null;
+
+  // Pull the HTML into the DOM, but don't add it to the document
+  if (editorCss != null) {
+    this.style = dom.importCss(editorCss, this.document);
+  }
+
+  var templates = dom.createElement(this.document, 'div');
+  dom.setInnerHtml(templates, argFetchHtml);
+  this.reqTempl = templates.querySelector('.gcli-af-template');
+
+  this.requisition.commandChange.add(this.onCommandChange, this);
+  this.requisition.inputChange.add(this.onInputChange, this);
+
+  this.onCommandChange();
+}
+
+/**
+ * Avoid memory leaks
+ */
+ArgFetcher.prototype.destroy = function() {
+  this.requisition.inputChange.remove(this.onInputChange, this);
+  this.requisition.commandChange.remove(this.onCommandChange, this);
+
+  if (this.style) {
+    this.style.parentNode.removeChild(this.style);
+    delete this.style;
+  }
+
+  this.fields.forEach(function(field) { field.destroy(); });
+
+  delete this.document;
+  delete this.element;
+  delete this.okElement;
+  delete this.reqTempl;
+};
+
+/**
+ * Called whenever the command part of the requisition changes
+ */
+ArgFetcher.prototype.onCommandChange = function(ev) {
+  var command = this.requisition.commandAssignment.getValue();
+  if (!command || !command.exec) {
+    this.element.style.display = 'none';
+  }
+  else {
+    if (ev && ev.oldValue === ev.newValue) {
+      // Just the text has changed
+      return;
+    }
+
+    this.fields.forEach(function(field) { field.destroy(); });
+    this.fields = [];
+
+    var reqEle = this.reqTempl.cloneNode(true);
+    domtemplate.template(reqEle, this,
+            { allowEval: true, stack: 'arg_fetch.html' });
+    dom.clearElement(this.element);
+    this.element.appendChild(reqEle);
+
+    var status = this.requisition.getStatus();
+    this.okElement.disabled = (status === Status.VALID);
+
+    this.element.style.display = 'block';
+  }
+};
+
+/**
+ * Called whenever the text input of the requisition changes
+ */
+ArgFetcher.prototype.onInputChange = function(ev) {
+  var command = this.requisition.commandAssignment.getValue();
+  if (command && command.exec) {
+    var status = this.requisition.getStatus();
+    this.okElement.disabled = (status !== Status.VALID);
+  }
+};
+
+/**
+ * Called by the template process in #onCommandChange() to get an instance
+ * of field for each assignment.
+ */
+ArgFetcher.prototype.getInputFor = function(assignment) {
+  try {
+    var newField = getField(assignment.param.type, {
+      document: this.document,
+      type: assignment.param.type,
+      name: assignment.param.name,
+      requisition: this.requisition,
+      required: assignment.param.isDataRequired(),
+      named: !assignment.param.isPositionalAllowed()
+    });
+
+    // BUG 664198 - remove on delete
+    newField.fieldChanged.add(function(ev) {
+      assignment.setConversion(ev.conversion);
+    }, this);
+    assignment.assignmentChange.add(function(ev) {
+      newField.setConversion(ev.conversion);
+    }.bind(this));
+
+    this.fields.push(newField);
+    newField.setConversion(this.assignment.conversion);
+
+    // Bug 681894: we add the field as a property of the assignment so that
+    // #linkMessageElement() can call 'field.setMessageElement(element)'
+    assignment.field = newField;
+
+    return newField.element;
+  }
+  catch (ex) {
+    // This is called from within template() which can make tracing errors hard
+    // so we log here if anything goes wrong
+    console.error(ex);
+    return '';
+  }
+};
+
+/**
+ * Called by the template to setup an mutable message field
+ */
+ArgFetcher.prototype.linkMessageElement = function(assignment, element) {
+  // Bug 681894: See comment in getInputFor()
+  var field = assignment.field;
+  delete assignment.field;
+  if (field == null) {
+    console.error('Missing field for ' + assignment.param.name);
+    return 'Missing field';
+  }
+  field.setMessageElement(element);
+  return '';
+};
+
+/**
+ * Event handler added by the template menu.html
+ */
+ArgFetcher.prototype.onFormOk = function(ev) {
+  this.requisition.exec();
+};
+
+/**
+ * Event handler added by the template menu.html
+ */
+ArgFetcher.prototype.onFormCancel = function(ev) {
+  this.requisition.clear();
+};
+
+/**
+ * Change how much vertical space this dialog can take up
+ */
+ArgFetcher.prototype.setMaxHeight = function(height, isTooBig) {
+  this.fields.forEach(function(field) {
+    if (field.menu) {
+      // Magic number alert: 105 is roughly the size taken up by the rest of
+      // the dialog for the '{' command. We could spend ages calculating 105
+      // by doing math on the various components that contribute to the 105,
+      // but I don't think that would make it significantly less fragile under
+      // refactoring. Plus this works.
+      field.menu.setMaxHeight(height - 105);
+    }
+  });
+};
+
+argFetch.ArgFetcher = ArgFetcher;
+
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gcli/ui/field', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/argument', 'gcli/types', 'gcli/types/basic', 'gcli/types/javascript', 'gcli/ui/menu'], function(require, exports, module) {
+
+
+var dom = require('gcli/util').dom;
+var createEvent = require('gcli/util').createEvent;
+var KeyEvent = require('gcli/util').event.KeyEvent;
 var l10n = require('gcli/l10n');
 
 var Argument = require('gcli/argument').Argument;
@@ -7216,373 +6991,22 @@ var TrueNamedArgument = require('gcli/argument').TrueNamedArgument;
 var FalseNamedArgument = require('gcli/argument').FalseNamedArgument;
 var ArrayArgument = require('gcli/argument').ArrayArgument;
 
+var Status = require('gcli/types').Status;
 var Conversion = require('gcli/types').Conversion;
 var ArrayConversion = require('gcli/types').ArrayConversion;
 
 var StringType = require('gcli/types/basic').StringType;
 var NumberType = require('gcli/types/basic').NumberType;
 var BooleanType = require('gcli/types/basic').BooleanType;
+var BlankType = require('gcli/types/basic').BlankType;
+var SelectionType = require('gcli/types/basic').SelectionType;
 var DeferredType = require('gcli/types/basic').DeferredType;
 var ArrayType = require('gcli/types/basic').ArrayType;
+var JavascriptType = require('gcli/types/javascript').JavascriptType;
 
-var Field = require('gcli/ui/fields').Field;
-var fields = require('gcli/ui/fields');
+var Menu = require('gcli/ui/menu').Menu;
 
 
-/**
- * Registration and de-registration.
- */
-exports.startup = function() {
-  fields.addField(StringField);
-  fields.addField(NumberField);
-  fields.addField(BooleanField);
-  fields.addField(DeferredField);
-  fields.addField(ArrayField);
-};
-
-exports.shutdown = function() {
-  fields.removeField(StringField);
-  fields.removeField(NumberField);
-  fields.removeField(BooleanField);
-  fields.removeField(DeferredField);
-  fields.removeField(ArrayField);
-};
-
-
-/**
- * A field that allows editing of strings
- */
-function StringField(type, options) {
-  Field.call(this, type, options);
-  this.arg = new Argument();
-
-  this.element = util.createElement(this.document, 'input');
-  this.element.type = 'text';
-  this.element.classList.add('gcli-field');
-
-  this.onInputChange = this.onInputChange.bind(this);
-  this.element.addEventListener('keyup', this.onInputChange, false);
-
-  this.onFieldChange = util.createEvent('StringField.onFieldChange');
-}
-
-StringField.prototype = Object.create(Field.prototype);
-
-StringField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.element.removeEventListener('keyup', this.onInputChange, false);
-  delete this.element;
-  delete this.document;
-  delete this.onInputChange;
-};
-
-StringField.prototype.setConversion = function(conversion) {
-  this.arg = conversion.arg;
-  this.element.value = conversion.arg.text;
-  this.setMessage(conversion.message);
-};
-
-StringField.prototype.getConversion = function() {
-  // This tweaks the prefix/suffix of the argument to fit
-  this.arg = this.arg.beget(this.element.value, { prefixSpace: true });
-  return this.type.parse(this.arg);
-};
-
-StringField.claim = function(type) {
-  return type instanceof StringType ? Field.MATCH : Field.BASIC;
-};
-
-
-/**
- * A field that allows editing of numbers using an [input type=number] field
- */
-function NumberField(type, options) {
-  Field.call(this, type, options);
-  this.arg = new Argument();
-
-  this.element = util.createElement(this.document, 'input');
-  this.element.type = 'number';
-  if (this.type.max) {
-    this.element.max = this.type.max;
-  }
-  if (this.type.min) {
-    this.element.min = this.type.min;
-  }
-  if (this.type.step) {
-    this.element.step = this.type.step;
-  }
-
-  this.onInputChange = this.onInputChange.bind(this);
-  this.element.addEventListener('keyup', this.onInputChange, false);
-
-  this.onFieldChange = util.createEvent('NumberField.onFieldChange');
-}
-
-NumberField.prototype = Object.create(Field.prototype);
-
-NumberField.claim = function(type) {
-  return type instanceof NumberType ? Field.MATCH : Field.NO_MATCH;
-};
-
-NumberField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.element.removeEventListener('keyup', this.onInputChange, false);
-  delete this.element;
-  delete this.document;
-  delete this.onInputChange;
-};
-
-NumberField.prototype.setConversion = function(conversion) {
-  this.arg = conversion.arg;
-  this.element.value = conversion.arg.text;
-  this.setMessage(conversion.message);
-};
-
-NumberField.prototype.getConversion = function() {
-  this.arg = this.arg.beget(this.element.value, { prefixSpace: true });
-  return this.type.parse(this.arg);
-};
-
-
-/**
- * A field that uses a checkbox to toggle a boolean field
- */
-function BooleanField(type, options) {
-  Field.call(this, type, options);
-
-  this.name = options.name;
-  this.named = options.named;
-
-  this.element = util.createElement(this.document, 'input');
-  this.element.type = 'checkbox';
-  this.element.id = 'gcliForm' + this.name;
-
-  this.onInputChange = this.onInputChange.bind(this);
-  this.element.addEventListener('change', this.onInputChange, false);
-
-  this.onFieldChange = util.createEvent('BooleanField.onFieldChange');
-}
-
-BooleanField.prototype = Object.create(Field.prototype);
-
-BooleanField.claim = function(type) {
-  return type instanceof BooleanType ? Field.MATCH : Field.NO_MATCH;
-};
-
-BooleanField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.element.removeEventListener('change', this.onInputChange, false);
-  delete this.element;
-  delete this.document;
-  delete this.onInputChange;
-};
-
-BooleanField.prototype.setConversion = function(conversion) {
-  this.element.checked = conversion.value;
-  this.setMessage(conversion.message);
-};
-
-BooleanField.prototype.getConversion = function() {
-  var arg;
-  if (this.named) {
-    arg = this.element.checked ?
-            new TrueNamedArgument(this.name) :
-            new FalseNamedArgument();
-  }
-  else {
-    arg = new Argument(' ' + this.element.checked);
-  }
-  return this.type.parse(arg);
-};
-
-
-/**
- * A field that works with deferred types by delaying resolution until that
- * last possible time
- */
-function DeferredField(type, options) {
-  Field.call(this, type, options);
-  this.options = options;
-  this.requisition.onAssignmentChange.add(this.update, this);
-
-  this.element = util.createElement(this.document, 'div');
-  this.update();
-
-  this.onFieldChange = util.createEvent('DeferredField.onFieldChange');
-}
-
-DeferredField.prototype = Object.create(Field.prototype);
-
-DeferredField.prototype.update = function() {
-  var subtype = this.type.defer();
-  if (subtype === this.subtype) {
-    return;
-  }
-
-  if (this.field) {
-    this.field.onFieldChange.remove(this.fieldChanged, this);
-    this.field.destroy();
-  }
-
-  this.subtype = subtype;
-  this.field = fields.getField(subtype, this.options);
-  this.field.onFieldChange.add(this.fieldChanged, this);
-
-  util.clearElement(this.element);
-  this.element.appendChild(this.field.element);
-};
-
-DeferredField.claim = function(type) {
-  return type instanceof DeferredType ? Field.MATCH : Field.NO_MATCH;
-};
-
-DeferredField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.requisition.onAssignmentChange.remove(this.update, this);
-  delete this.element;
-  delete this.document;
-  delete this.onInputChange;
-};
-
-DeferredField.prototype.setConversion = function(conversion) {
-  this.field.setConversion(conversion);
-};
-
-DeferredField.prototype.getConversion = function() {
-  return this.field.getConversion();
-};
-
-Object.defineProperty(DeferredField.prototype, 'isImportant', {
-  get: function() {
-    return this.field.isImportant;
-  },
-  enumerable: true
-});
-
-
-/**
- * Adds add/delete buttons to a normal field allowing there to be many values
- * given for a parameter.
- */
-function ArrayField(type, options) {
-  Field.call(this, type, options);
-  this.options = options;
-
-  this._onAdd = this._onAdd.bind(this);
-  this.members = [];
-
-  // <div class=gcliArrayParent save="${element}">
-  this.element = util.createElement(this.document, 'div');
-  this.element.classList.add('gcli-array-parent');
-
-  // <button class=gcliArrayMbrAdd onclick="${_onAdd}" save="${addButton}">Add
-  this.addButton = util.createElement(this.document, 'button');
-  this.addButton.classList.add('gcli-array-member-add');
-  this.addButton.addEventListener('click', this._onAdd, false);
-  this.addButton.innerHTML = l10n.lookup('fieldArrayAdd');
-  this.element.appendChild(this.addButton);
-
-  // <div class=gcliArrayMbrs save="${mbrElement}">
-  this.container = util.createElement(this.document, 'div');
-  this.container.classList.add('gcli-array-members');
-  this.element.appendChild(this.container);
-
-  this.onInputChange = this.onInputChange.bind(this);
-
-  this.onFieldChange = util.createEvent('ArrayField.onFieldChange');
-}
-
-ArrayField.prototype = Object.create(Field.prototype);
-
-ArrayField.claim = function(type) {
-  return type instanceof ArrayType ? Field.MATCH : Field.NO_MATCH;
-};
-
-ArrayField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.addButton.removeEventListener('click', this._onAdd, false);
-};
-
-ArrayField.prototype.setConversion = function(conversion) {
-  // BUG 653568: this is too brutal - it removes focus from any the current field
-  util.clearElement(this.container);
-  this.members = [];
-
-  conversion.conversions.forEach(function(subConversion) {
-    this._onAdd(null, subConversion);
-  }, this);
-};
-
-ArrayField.prototype.getConversion = function() {
-  var conversions = [];
-  var arrayArg = new ArrayArgument();
-  for (var i = 0; i < this.members.length; i++) {
-    var conversion = this.members[i].field.getConversion();
-    conversions.push(conversion);
-    arrayArg.addArgument(conversion.arg);
-  }
-  return new ArrayConversion(conversions, arrayArg);
-};
-
-ArrayField.prototype._onAdd = function(ev, subConversion) {
-  // <div class=gcliArrayMbr save="${element}">
-  var element = util.createElement(this.document, 'div');
-  element.classList.add('gcli-array-member');
-  this.container.appendChild(element);
-
-  // ${field.element}
-  var field = fields.getField(this.type.subtype, this.options);
-  field.onFieldChange.add(function() {
-    var conversion = this.getConversion();
-    this.onFieldChange({ conversion: conversion });
-    this.setMessage(conversion.message);
-  }, this);
-
-  if (subConversion) {
-    field.setConversion(subConversion);
-  }
-  element.appendChild(field.element);
-
-  // <div class=gcliArrayMbrDel onclick="${_onDel}">
-  var delButton = util.createElement(this.document, 'button');
-  delButton.classList.add('gcli-array-member-del');
-  delButton.addEventListener('click', this._onDel, false);
-  delButton.innerHTML = l10n.lookup('fieldArrayDel');
-  element.appendChild(delButton);
-
-  var member = {
-    element: element,
-    field: field,
-    parent: this
-  };
-  member.onDelete = function() {
-    this.parent.container.removeChild(this.element);
-    this.parent.members = this.parent.members.filter(function(test) {
-      return test !== this;
-    });
-    this.parent.onInputChange();
-  }.bind(member);
-  delButton.addEventListener('click', member.onDelete, false);
-
-  this.members.push(member);
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/fields', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types/basic'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-var KeyEvent = require('gcli/util').KeyEvent;
-
-var BlankType = require('gcli/types/basic').BlankType;
-
 /**
  * A Field is a way to get input for a single parameter.
  * This class is designed to be inherited from. It's important that all
@@ -7651,17 +7075,17 @@ Field.prototype.setMessage = function(message) {
     if (message == null) {
       message = '';
     }
-    util.setContents(this.messageElement, message);
+    dom.setInnerHtml(this.messageElement, message);
   }
 };
 
 /**
  * Method to be called by subclasses when their input changes, which allows us
- * to properly pass on the onFieldChange event.
+ * to properly pass on the fieldChanged event.
  */
 Field.prototype.onInputChange = function(ev) {
   var conversion = this.getConversion();
-  this.onFieldChange({ conversion: conversion });
+  this.fieldChanged({ conversion: conversion });
   this.setMessage(conversion.message);
 
   if (ev.keyCode === KeyEvent.DOM_VK_RETURN) {
@@ -7669,12 +7093,6 @@ Field.prototype.onInputChange = function(ev) {
   }
 };
 
-/**
- * Some fields contain information that is more important to the user, for
- * example error messages and completion menus.
- */
-Field.prototype.isImportant = false;
-
 /**
  * 'static/abstract' method to allow implementations of Field to lay a claim
  * to a type. This allows claims of various strength to be weighted up.
@@ -7683,48 +7101,25 @@ Field.prototype.isImportant = false;
 Field.claim = function() {
   throw new Error('Field should not be used directly');
 };
-
-/**
- * About minimalism - If we're producing a dialog, we want a field for every
- * parameter. If we're providing a quick tooltip, we only want a field when
- * it's really going to help.
- * The getField() function takes an option of 'tooltip: true'. Fields are
- * expected to reply with a TOOLTIP_* constant if they should be shown in the
- * tooltip case.
- */
-Field.TOOLTIP_MATCH = 5;   // A best match, that works for a tooltip
-Field.TOOLTIP_DEFAULT = 4; // A default match that should show in a tooltip
-Field.MATCH = 3;           // Match, but ignorable if we're being minimalist
-Field.DEFAULT = 2;         // This is a default (non-minimalist) match
-Field.BASIC = 1;           // OK in an emergency. i.e. assume Strings
-Field.NO_MATCH = 0;        // This field can't help with the given type
-
-exports.Field = Field;
+Field.MATCH = 5;
+Field.DEFAULT_MATCH = 4;
+Field.IF_NOTHING_BETTER = 1;
+Field.NO_MATCH = 0;
 
 
 /**
- * Internal array of known fields
+ * Managing the current list of Fields
  */
 var fieldCtors = [];
-
-/**
- * Add a field definition by field constructor
- * @param fieldCtor Constructor function of new Field
- */
-exports.addField = function(fieldCtor) {
+function addField(fieldCtor) {
   if (typeof fieldCtor !== 'function') {
     console.error('addField erroring on ', fieldCtor);
     throw new Error('addField requires a Field constructor');
   }
   fieldCtors.push(fieldCtor);
-};
+}
 
-/**
- * Remove a Field definition
- * @param field A previously registered field, specified either with a field
- * name or from the field name
- */
-exports.removeField = function(field) {
+function removeField(field) {
   if (typeof field !== 'string') {
     fields = fields.filter(function(test) {
       return test !== field;
@@ -7738,22 +7133,9 @@ exports.removeField = function(field) {
     console.error('removeField erroring on ', field);
     throw new Error('removeField requires an instance of Field');
   }
-};
+}
 
-/**
- * Find the best possible matching field from the specification of the type
- * of field required.
- * @param type An instance of Type that we will represent
- * @param options A set of properties that we should attempt to match, and use
- * in the construction of the new field object:
- * - document: The document to use in creating new elements
- * - name: The parameter name, (i.e. assignment.param.name)
- * - requisition: The requisition we're monitoring,
- * - required: Is this a required parameter (i.e. param.isDataRequired)
- * - named: Is this a named parameters (i.e. !param.isPositionalAllowed)
- * @return A newly constructed field that best matches the input options
- */
-exports.getField = function(type, options) {
+function getField(type, options) {
   var ctor;
   var highestClaim = -1;
   fieldCtors.forEach(function(fieldCtor) {
@@ -7769,74 +7151,241 @@ exports.getField = function(type, options) {
     throw new Error('Can\'t find field for ' + type);
   }
 
-  if (options.tooltip && highestClaim < Field.TOOLTIP_DEFAULT) {
-    return new BlankField(type, options);
-  }
-
   return new ctor(type, options);
-};
+}
+
+exports.Field = Field;
+exports.addField = addField;
+exports.removeField = removeField;
+exports.getField = getField;
 
 
 /**
- * For use with deferred types that do not yet have anything to resolve to.
- * BlankFields are not for general use.
+ * A field that allows editing of strings
  */
-function BlankField(type, options) {
+function StringField(type, options) {
   Field.call(this, type, options);
+  this.arg = new Argument();
 
-  this.element = util.createElement(this.document, 'div');
+  this.element = dom.createElement(this.document, 'input');
+  this.element.type = 'text';
+  this.element.classList.add('gcli-field');
 
-  this.onFieldChange = util.createEvent('BlankField.onFieldChange');
+  this.onInputChange = this.onInputChange.bind(this);
+  this.element.addEventListener('keyup', this.onInputChange, false);
+
+  this.fieldChanged = createEvent('StringField.fieldChanged');
 }
 
-BlankField.prototype = Object.create(Field.prototype);
+StringField.prototype = Object.create(Field.prototype);
 
-BlankField.claim = function(type) {
-  return type instanceof BlankType ? Field.MATCH : Field.NO_MATCH;
+StringField.prototype.destroy = function() {
+  Field.prototype.destroy.call(this);
+  this.element.removeEventListener('keyup', this.onInputChange, false);
+  delete this.element;
+  delete this.document;
+  delete this.onInputChange;
 };
 
-BlankField.prototype.setConversion = function(conversion) {
+StringField.prototype.setConversion = function(conversion) {
+  this.arg = conversion.arg;
+  this.element.value = conversion.arg.text;
   this.setMessage(conversion.message);
 };
 
-BlankField.prototype.getConversion = function() {
-  return this.type.parse(new Argument());
+StringField.prototype.getConversion = function() {
+  // This tweaks the prefix/suffix of the argument to fit
+  this.arg = this.arg.beget(this.element.value, { prefixSpace: true });
+  return this.type.parse(this.arg);
 };
 
-exports.addField(BlankField);
+StringField.claim = function(type) {
+  return type instanceof StringType ? Field.MATCH : Field.IF_NOTHING_BETTER;
+};
 
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/fields/javascript', ['require', 'exports', 'module' , 'gcli/util', 'gcli/argument', 'gcli/types/javascript', 'gcli/ui/fields/menu', 'gcli/ui/fields'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-
-var Argument = require('gcli/argument').Argument;
-var JavascriptType = require('gcli/types/javascript').JavascriptType;
-
-var Menu = require('gcli/ui/fields/menu').Menu;
-var Field = require('gcli/ui/fields').Field;
-var fields = require('gcli/ui/fields');
+exports.StringField = StringField;
+addField(StringField);
 
 
 /**
- * Registration and de-registration.
+ * A field that allows editing of numbers using an [input type=number] field
  */
-exports.startup = function() {
-  fields.addField(JavascriptField);
+function NumberField(type, options) {
+  Field.call(this, type, options);
+  this.arg = new Argument();
+
+  this.element = dom.createElement(this.document, 'input');
+  this.element.type = 'number';
+  if (this.type.max) {
+    this.element.max = this.type.max;
+  }
+  if (this.type.min) {
+    this.element.min = this.type.min;
+  }
+  if (this.type.step) {
+    this.element.step = this.type.step;
+  }
+
+  this.onInputChange = this.onInputChange.bind(this);
+  this.element.addEventListener('keyup', this.onInputChange, false);
+
+  this.fieldChanged = createEvent('NumberField.fieldChanged');
+}
+
+NumberField.prototype = Object.create(Field.prototype);
+
+NumberField.claim = function(type) {
+  return type instanceof NumberType ? Field.MATCH : Field.NO_MATCH;
 };
 
-exports.shutdown = function() {
-  fields.removeField(JavascriptField);
+NumberField.prototype.destroy = function() {
+  Field.prototype.destroy.call(this);
+  this.element.removeEventListener('keyup', this.onInputChange, false);
+  delete this.element;
+  delete this.document;
+  delete this.onInputChange;
 };
 
+NumberField.prototype.setConversion = function(conversion) {
+  this.arg = conversion.arg;
+  this.element.value = conversion.arg.text;
+  this.setMessage(conversion.message);
+};
+
+NumberField.prototype.getConversion = function() {
+  this.arg = this.arg.beget(this.element.value, { prefixSpace: true });
+  return this.type.parse(this.arg);
+};
+
+exports.NumberField = NumberField;
+addField(NumberField);
+
+
+/**
+ * A field that uses a checkbox to toggle a boolean field
+ */
+function BooleanField(type, options) {
+  Field.call(this, type, options);
+
+  this.name = options.name;
+  this.named = options.named;
+
+  this.element = dom.createElement(this.document, 'input');
+  this.element.type = 'checkbox';
+  this.element.id = 'gcliForm' + this.name;
+
+  this.onInputChange = this.onInputChange.bind(this);
+  this.element.addEventListener('change', this.onInputChange, false);
+
+  this.fieldChanged = createEvent('BooleanField.fieldChanged');
+}
+
+BooleanField.prototype = Object.create(Field.prototype);
+
+BooleanField.claim = function(type) {
+  return type instanceof BooleanType ? Field.MATCH : Field.NO_MATCH;
+};
+
+BooleanField.prototype.destroy = function() {
+  Field.prototype.destroy.call(this);
+  this.element.removeEventListener('change', this.onInputChange, false);
+  delete this.element;
+  delete this.document;
+  delete this.onInputChange;
+};
+
+BooleanField.prototype.setConversion = function(conversion) {
+  this.element.checked = conversion.value;
+  this.setMessage(conversion.message);
+};
+
+BooleanField.prototype.getConversion = function() {
+  var value = this.element.checked;
+  var arg = this.named ?
+    value ? new TrueNamedArgument(this.name) : new FalseNamedArgument() :
+    new Argument(' ' + value);
+  return new Conversion(value, arg);
+};
+
+exports.BooleanField = BooleanField;
+addField(BooleanField);
+
+
+/**
+ * Model an instanceof SelectionType as a select input box.
+ * <p>There are 3 slightly overlapping concepts to be aware of:
+ * <ul>
+ * <li>value: This is the (probably non-string) value, known as a value by the
+ *   assignment
+ * <li>optValue: This is the text value as known by the DOM option element, as
+ *   in &lt;option value=???%gt...
+ * <li>optText: This is the contents of the DOM option element.
+ * </ul>
+ */
+function SelectionField(type, options) {
+  Field.call(this, type, options);
+
+  this.items = [];
+
+  this.element = dom.createElement(this.document, 'select');
+  this.element.classList.add('gcli-field');
+  this._addOption({
+    name: l10n.lookupFormat('fieldSelectionSelect', [ options.name ])
+  });
+  var lookup = this.type.getLookup();
+  lookup.forEach(this._addOption, this);
+
+  this.onInputChange = this.onInputChange.bind(this);
+  this.element.addEventListener('change', this.onInputChange, false);
+
+  this.fieldChanged = createEvent('SelectionField.fieldChanged');
+}
+
+SelectionField.prototype = Object.create(Field.prototype);
+
+SelectionField.claim = function(type) {
+  return type instanceof SelectionType ? Field.DEFAULT_MATCH : Field.NO_MATCH;
+};
+
+SelectionField.prototype.destroy = function() {
+  Field.prototype.destroy.call(this);
+  this.element.removeEventListener('change', this.onInputChange, false);
+  delete this.element;
+  delete this.document;
+  delete this.onInputChange;
+};
+
+SelectionField.prototype.setConversion = function(conversion) {
+  var index;
+  this.items.forEach(function(item) {
+    if (item.value && item.value === conversion.value) {
+      index = item.index;
+    }
+  }, this);
+  this.element.value = index;
+  this.setMessage(conversion.message);
+};
+
+SelectionField.prototype.getConversion = function() {
+  var item = this.items[this.element.value];
+  var arg = new Argument(item.name, ' ');
+  var value = item.value ? item.value : item;
+  return new Conversion(value, arg);
+};
+
+SelectionField.prototype._addOption = function(item) {
+  item.index = this.items.length;
+  this.items.push(item);
+
+  var option = dom.createElement(this.document, 'option');
+  option.innerHTML = item.name;
+  option.value = item.index;
+  this.element.appendChild(option);
+};
+
+exports.SelectionField = SelectionField;
+addField(SelectionField);
+
 
 /**
  * A field that allows editing of javascript
@@ -7847,40 +7396,35 @@ function JavascriptField(type, options) {
   this.onInputChange = this.onInputChange.bind(this);
   this.arg = new Argument('', '{ ', ' }');
 
-  this.element = util.createElement(this.document, 'div');
+  this.element = dom.createElement(this.document, 'div');
 
-  this.input = util.createElement(this.document, 'input');
+  this.input = dom.createElement(this.document, 'input');
   this.input.type = 'text';
   this.input.addEventListener('keyup', this.onInputChange, false);
   this.input.classList.add('gcli-field');
   this.input.classList.add('gcli-field-javascript');
   this.element.appendChild(this.input);
 
-  this.menu = new Menu({
-    document: this.document,
-    field: true,
-    type: type
-  });
+  this.menu = new Menu({ document: this.document, field: true });
   this.element.appendChild(this.menu.element);
 
   this.setConversion(this.type.parse(new Argument('')));
 
-  this.onFieldChange = util.createEvent('JavascriptField.onFieldChange');
+  this.fieldChanged = createEvent('JavascriptField.fieldChanged');
 
   // i.e. Register this.onItemClick as the default action for a menu click
-  this.menu.onItemClick.add(this.itemClicked, this);
+  this.menu.onItemClick = this.onItemClick.bind(this);
 }
 
 JavascriptField.prototype = Object.create(Field.prototype);
 
 JavascriptField.claim = function(type) {
-  return type instanceof JavascriptType ? Field.TOOLTIP_MATCH : Field.NO_MATCH;
+  return type instanceof JavascriptType ? Field.MATCH : Field.NO_MATCH;
 };
 
 JavascriptField.prototype.destroy = function() {
   Field.prototype.destroy.call(this);
   this.input.removeEventListener('keyup', this.onInputChange, false);
-  this.menu.onItemClick.remove(this.itemClicked, this);
   this.menu.destroy();
   delete this.element;
   delete this.input;
@@ -7919,15 +7463,18 @@ JavascriptField.prototype.setConversion = function(conversion) {
   this.setMessage(conversion.message);
 };
 
-JavascriptField.prototype.itemClicked = function(ev) {
-  this.onFieldChange(ev);
-  this.setMessage(ev.conversion.message);
+JavascriptField.prototype.onItemClick = function(ev) {
+  this.item = ev.currentTarget.item;
+  this.arg = this.arg.beget(this.item.complete, { normalize: true });
+  var conversion = this.type.parse(this.arg);
+  this.fieldChanged({ conversion: conversion });
+  this.setMessage(conversion.message);
 };
 
 JavascriptField.prototype.onInputChange = function(ev) {
   this.item = ev.currentTarget.item;
   var conversion = this.getConversion();
-  this.onFieldChange({ conversion: conversion });
+  this.fieldChanged({ conversion: conversion });
   this.setMessage(conversion.message);
 };
 
@@ -7939,6 +7486,207 @@ JavascriptField.prototype.getConversion = function() {
 
 JavascriptField.DEFAULT_VALUE = '__JavascriptField.DEFAULT_VALUE';
 
+exports.JavascriptField = JavascriptField;
+addField(JavascriptField);
+
+
+/**
+ * A field that works with deferred types by delaying resolution until that
+ * last possible time
+ */
+function DeferredField(type, options) {
+  Field.call(this, type, options);
+  this.options = options;
+  this.requisition.assignmentChange.add(this.update, this);
+
+  this.element = dom.createElement(this.document, 'div');
+  this.update();
+
+  this.fieldChanged = createEvent('DeferredField.fieldChanged');
+}
+
+DeferredField.prototype = Object.create(Field.prototype);
+
+DeferredField.prototype.update = function() {
+  var subtype = this.type.defer();
+  if (subtype === this.subtype) {
+    return;
+  }
+
+  if (this.field) {
+    this.field.destroy();
+  }
+
+  this.subtype = subtype;
+  this.field = getField(subtype, this.options);
+  this.field.fieldChanged.add(this.fieldChanged, this);
+
+  dom.clearElement(this.element);
+  this.element.appendChild(this.field.element);
+};
+
+DeferredField.claim = function(type) {
+  return type instanceof DeferredType ? Field.MATCH : Field.NO_MATCH;
+};
+
+DeferredField.prototype.destroy = function() {
+  Field.prototype.destroy.call(this);
+  this.requisition.assignmentChange.remove(this.update, this);
+  delete this.element;
+  delete this.document;
+  delete this.onInputChange;
+};
+
+DeferredField.prototype.setConversion = function(conversion) {
+  this.field.setConversion(conversion);
+};
+
+DeferredField.prototype.getConversion = function() {
+  return this.field.getConversion();
+};
+
+exports.DeferredField = DeferredField;
+addField(DeferredField);
+
+
+/**
+ * For use with deferred types that do not yet have anything to resolve to.
+ * BlankFields are not for general use.
+ */
+function BlankField(type, options) {
+  Field.call(this, type, options);
+
+  this.element = dom.createElement(this.document, 'div');
+
+  this.fieldChanged = createEvent('BlankField.fieldChanged');
+}
+
+BlankField.prototype = Object.create(Field.prototype);
+
+BlankField.claim = function(type) {
+  return type instanceof BlankType ? Field.MATCH : Field.NO_MATCH;
+};
+
+BlankField.prototype.setConversion = function() { };
+
+BlankField.prototype.getConversion = function() {
+  return new Conversion(null);
+};
+
+exports.BlankField = BlankField;
+addField(BlankField);
+
+
+/**
+ * Adds add/delete buttons to a normal field allowing there to be many values
+ * given for a parameter.
+ */
+function ArrayField(type, options) {
+  Field.call(this, type, options);
+  this.options = options;
+
+  this._onAdd = this._onAdd.bind(this);
+  this.members = [];
+
+  // <div class=gcliArrayParent save="${element}">
+  this.element = dom.createElement(this.document, 'div');
+  this.element.classList.add('gcli-array-parent');
+
+  // <button class=gcliArrayMbrAdd onclick="${_onAdd}" save="${addButton}">Add
+  this.addButton = dom.createElement(this.document, 'button');
+  this.addButton.classList.add('gcli-array-member-add');
+  this.addButton.addEventListener('click', this._onAdd, false);
+  this.addButton.innerHTML = l10n.lookup('fieldArrayAdd');
+  this.element.appendChild(this.addButton);
+
+  // <div class=gcliArrayMbrs save="${mbrElement}">
+  this.container = dom.createElement(this.document, 'div');
+  this.container.classList.add('gcli-array-members');
+  this.element.appendChild(this.container);
+
+  this.onInputChange = this.onInputChange.bind(this);
+
+  this.fieldChanged = createEvent('ArrayField.fieldChanged');
+}
+
+ArrayField.prototype = Object.create(Field.prototype);
+
+ArrayField.claim = function(type) {
+  return type instanceof ArrayType ? Field.MATCH : Field.NO_MATCH;
+};
+
+ArrayField.prototype.destroy = function() {
+  Field.prototype.destroy.call(this);
+  this.addButton.removeEventListener('click', this._onAdd, false);
+};
+
+ArrayField.prototype.setConversion = function(conversion) {
+  // BUG 653568: this is too brutal - it removes focus from any the current field
+  dom.clearElement(this.container);
+  this.members = [];
+
+  conversion.conversions.forEach(function(subConversion) {
+    this._onAdd(null, subConversion);
+  }, this);
+};
+
+ArrayField.prototype.getConversion = function() {
+  var conversions = [];
+  var arrayArg = new ArrayArgument();
+  for (var i = 0; i < this.members.length; i++) {
+    var conversion = this.members[i].field.getConversion();
+    conversions.push(conversion);
+    arrayArg.addArgument(conversion.arg);
+  }
+  return new ArrayConversion(conversions, arrayArg);
+};
+
+ArrayField.prototype._onAdd = function(ev, subConversion) {
+  // <div class=gcliArrayMbr save="${element}">
+  var element = dom.createElement(this.document, 'div');
+  element.classList.add('gcli-array-member');
+  this.container.appendChild(element);
+
+  // ${field.element}
+  var field = getField(this.type.subtype, this.options);
+  field.fieldChanged.add(function() {
+    var conversion = this.getConversion();
+    this.fieldChanged({ conversion: conversion });
+    this.setMessage(conversion.message);
+  }, this);
+
+  if (subConversion) {
+    field.setConversion(subConversion);
+  }
+  element.appendChild(field.element);
+
+  // <div class=gcliArrayMbrDel onclick="${_onDel}">
+  var delButton = dom.createElement(this.document, 'button');
+  delButton.classList.add('gcli-array-member-del');
+  delButton.addEventListener('click', this._onDel, false);
+  delButton.innerHTML = l10n.lookup('fieldArrayDel');
+  element.appendChild(delButton);
+
+  var member = {
+    element: element,
+    field: field,
+    parent: this
+  };
+  member.onDelete = function() {
+    this.parent.container.removeChild(this.element);
+    this.parent.members = this.parent.members.filter(function(test) {
+      return test !== this;
+    });
+    this.parent.onInputChange();
+  }.bind(member);
+  delButton.addEventListener('click', member.onDelete, false);
+
+  this.members.push(member);
+};
+
+exports.ArrayField = ArrayField;
+addField(ArrayField);
+
 
 });
 /*
@@ -7947,18 +7695,19 @@ JavascriptField.DEFAULT_VALUE = '__JavascriptField.DEFAULT_VALUE';
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/ui/fields/menu', ['require', 'exports', 'module' , 'gcli/util', 'gcli/argument', 'gcli/canon', 'gcli/ui/domtemplate', 'text!gcli/ui/fields/menu.css', 'text!gcli/ui/fields/menu.html'], function(require, exports, module) {
+define('gcli/ui/menu', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types', 'gcli/argument', 'gcli/canon', 'gcli/ui/domtemplate', 'text!gcli/ui/menu.css', 'text!gcli/ui/menu.html'], function(require, exports, module) {
 
 
-var util = require('gcli/util');
+var dom = require('gcli/util').dom;
 
+var Conversion = require('gcli/types').Conversion;
 var Argument = require('gcli/argument').Argument;
 var canon = require('gcli/canon');
 
 var domtemplate = require('gcli/ui/domtemplate');
 
-var menuCss = require('text!gcli/ui/fields/menu.css');
-var menuHtml = require('text!gcli/ui/fields/menu.html');
+var menuCss = require('text!gcli/ui/menu.css');
+var menuHtml = require('text!gcli/ui/menu.html');
 
 
 /**
@@ -7970,19 +7719,17 @@ var menuHtml = require('text!gcli/ui/fields/menu.html');
  * - document: The document to use in creating widgets
  * - menuClass: Custom class name when generating the top level element
  *   which allows different layout systems
- * - type: The version of SelectionType that we're picking an option from
  */
 function Menu(options) {
   options = options || {};
   this.document = options.document || document;
-  this.type = options.type;
 
   // FF can be really hard to debug if doc is null, so we check early on
   if (!this.document) {
     throw new Error('No document');
   }
 
-  this.element =  util.createElement(this.document, 'div');
+  this.element =  dom.createElement(this.document, 'div');
   this.element.classList.add(options.menuClass || 'gcli-menu');
   if (options && options.field) {
     this.element.classList.add(options.menuFieldClass || 'gcli-menu-field');
@@ -7990,142 +7737,64 @@ function Menu(options) {
 
   // Pull the HTML into the DOM, but don't add it to the document
   if (menuCss != null) {
-    util.importCss(menuCss, this.document, 'gcli-menu');
+    this.style = dom.importCss(menuCss, this.document);
   }
 
-  this.template = util.toDom(this.document, menuHtml);
-  this.templateOptions = { blankNullUndefined: true, stack: 'menu.html' };
+  var templates = dom.createElement(this.document, 'div');
+  dom.setInnerHtml(templates, menuHtml);
+  this.optTempl = templates.querySelector('.gcli-menu-template');
 
   // Contains the items that should be displayed
   this.items = null;
-
-  this.onItemClick = util.createEvent('Menu.onItemClick');
 }
 
 /**
  * Avoid memory leaks
  */
 Menu.prototype.destroy = function() {
+  if (this.style) {
+    this.style.parentNode.removeChild(this.style);
+    delete this.style;
+  }
+
   delete this.element;
   delete this.items;
-  delete this.template;
+  delete this.optTempl;
 };
 
 /**
  * The default is to do nothing when someone clicks on the menu.
+ * Plug an implementation in here before calling show() to do something useful.
  * This is called from template.html
  * @param ev The click event from the browser
  */
-Menu.prototype.onItemClickInternal = function(ev) {
-  var name = ev.currentTarget.querySelector('.gcli-menu-name').innerHTML;
-  var arg = new Argument(name);
-  arg.suffix = ' ';
-
-  var conversion = this.type.parse(arg);
-  this.onItemClick({ conversion: conversion });
+Menu.prototype.onItemClick = function(ev) {
 };
 
 /**
  * Display a number of items in the menu (or hide the menu if there is nothing
  * to display)
  * @param items The items to show in the menu
- * @param match Matching text to highlight in the output
+ * @param error An error message to display
  */
-Menu.prototype.show = function(items, match) {
-  this.items = items.filter(function(item) {
-    return item.hidden === undefined || item.hidden !== true;
-  }.bind(this));
+Menu.prototype.show = function(items, error) {
+  this.error = error;
+  this.items = items;
 
-  if (match) {
-    this.items = this.items.map(function(item) {
-      return gethighlightingProxy(item, match, this.template.ownerDocument);
-    }.bind(this));
-  }
-
-  if (this.items.length === 0) {
+  if (this.error == null && this.items.length === 0) {
     this.element.style.display = 'none';
     return;
   }
 
-  var options = this.template.cloneNode(true);
-  domtemplate.template(options, this, this.templateOptions);
+  var options = this.optTempl.cloneNode(true);
+  domtemplate.template(options, this, { allowEval: true, stack: 'menu.html' });
 
-  util.clearElement(this.element);
+  dom.clearElement(this.element);
   this.element.appendChild(options);
 
   this.element.style.display = 'block';
 };
 
-/**
- * Create a proxy around an item that highlights matching text
- */
-function gethighlightingProxy(item, match, document) {
-  if (typeof Proxy === 'undefined') {
-    return item;
-  }
-  return Proxy.create({
-    get: function(rcvr, name) {
-      var value = item[name];
-      if (name !== 'name') {
-        return value;
-      }
-
-      var startMatch = value.indexOf(match);
-      if (startMatch === -1) {
-        return value;
-      }
-
-      var before = value.substr(0, startMatch);
-      var after = value.substr(startMatch + match.length);
-      var parent = document.createElement('span');
-      parent.appendChild(document.createTextNode(before));
-      var highlight = document.createElement('span');
-      highlight.classList.add('gcli-menu-typed');
-      highlight.appendChild(document.createTextNode(match));
-      parent.appendChild(highlight);
-      parent.appendChild(document.createTextNode(after));
-      return parent;
-    }
-  });
-}
-
-/**
- * Highlight a given option
- */
-Menu.prototype.setChoiceIndex = function(choice) {
-  var nodes = this.element.querySelectorAll('.gcli-menu-option');
-  for (var i = 0; i < nodes.length; i++) {
-    nodes[i].classList.remove('gcli-menu-highlight');
-  }
-
-  if (choice == null) {
-    return;
-  }
-
-  if (nodes.length <= choice) {
-    console.error('Cant highlight ' + choice + '. Only ' + nodes.length + ' options');
-    return;
-  }
-
-  nodes.item(choice).classList.add('gcli-menu-highlight');
-};
-
-/**
- * Allow the inputter to use RETURN to chose the current menu item when
- * it can't execute the command line
- */
-Menu.prototype.selectChoice = function() {
-  var selected = this.element.querySelector('.gcli-menu-highlight .gcli-menu-name');
-  if (selected) {
-    var name = selected.innerHTML;
-    var arg = new Argument(name);
-    arg.suffix = ' ';
-
-    var conversion = this.type.parse(arg);
-    this.onItemClick({ conversion: conversion });
-  }
-};
-
 /**
  * Hide the menu
  */
@@ -8143,1919 +7812,330 @@ Menu.prototype.setMaxHeight = function(height) {
 exports.Menu = Menu;
 
 
-});
-define("text!gcli/ui/fields/menu.css", [], "");
+/**
+ * CommandMenu is a special menu that integrates with a Requisition to display
+ * available commands.
+ * @param options A way to customize the menu display. Valid options include
+ * those valid for Menu(), plus:
+ * - requisition: The Requisition to fill out (required)
+ */
+function CommandMenu(options) {
+  Menu.call(this, options);
+  this.requisition = options.requisition;
 
-define("text!gcli/ui/fields/menu.html", [], "\n" +
+  this.requisition.commandChange.add(this.onCommandChange, this);
+  canon.canonChange.add(this.onCommandChange, this);
+
+  this.onCommandChange();
+}
+
+CommandMenu.prototype = Object.create(Menu.prototype);
+
+/**
+ * Avoid memory leaks
+ */
+CommandMenu.prototype.destroy = function() {
+  this.requisition.commandChange.remove(this.onCommandChange, this);
+  canon.canonChange.remove(this.onCommandChange, this);
+
+  Menu.prototype.destroy.call(this);
+};
+
+/**
+ * We want to fill-in the clicked command in the cli input when the user clicks
+ */
+CommandMenu.prototype.onItemClick = function(ev) {
+  var type = this.requisition.commandAssignment.param.type;
+
+  var name = ev.currentTarget.querySelector('.gcli-menu-name').innerHTML;
+  var arg = new Argument(name);
+  arg.suffix = ' ';
+
+  var conversion = type.parse(arg);
+  this.requisition.commandAssignment.setConversion(conversion);
+};
+
+/**
+ * Update the various hint components to reflect the changed command
+ */
+CommandMenu.prototype.onCommandChange = function(ev) {
+  var command = this.requisition.commandAssignment.getValue();
+  if (!command || !command.exec) {
+    var error = this.requisition.commandAssignment.getMessage();
+    var predictions = this.requisition.commandAssignment.getPredictions();
+
+    if (predictions.length === 0) {
+      var commandType = this.requisition.commandAssignment.param.type;
+      var conversion = commandType.parse(new Argument());
+      predictions = conversion.getPredictions();
+    }
+
+    predictions.sort(function(command1, command2) {
+      return command1.name.localeCompare(command2.name);
+    });
+    var items = [];
+    predictions.forEach(function(item) {
+      if (item.description && !item.hidden) {
+        items.push(item);
+      }
+    }, this);
+
+    this.show(items, error);
+  }
+  else {
+    if (ev && ev.oldValue === ev.newValue) {
+      return; // Just the text has changed
+    }
+
+    this.hide();
+  }
+};
+
+exports.CommandMenu = CommandMenu;
+
+
+});
+define("text!gcli/ui/menu.css", [], "");
+
+define("text!gcli/ui/menu.html", [], "\n" +
   "<table class=\"gcli-menu-template\" aria-live=\"polite\">\n" +
   "  <tr class=\"gcli-menu-option\" foreach=\"item in ${items}\"\n" +
-  "      onclick=\"${onItemClickInternal}\" title=\"${item.manual}\">\n" +
+  "      onclick=\"${onItemClick}\" title=\"${item.manual || ''}\">\n" +
   "    <td class=\"gcli-menu-name\">${item.name}</td>\n" +
   "    <td class=\"gcli-menu-desc\">${item.description}</td>\n" +
   "  </tr>\n" +
+  "  <tr if=\"${error}\">\n" +
+  "    <td class=\"gcli-menu-error\" colspan=\"2\">${error}</td>\n" +
+  "  </tr>\n" +
   "</table>\n" +
   "");
 
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
+define("text!gcli/ui/arg_fetch.css", [], "");
 
-define('gcli/ui/fields/selection', ['require', 'exports', 'module' , 'gcli/util', 'gcli/l10n', 'gcli/argument', 'gcli/types', 'gcli/types/basic', 'gcli/types/selection', 'gcli/ui/fields/menu', 'gcli/ui/fields'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-var l10n = require('gcli/l10n');
-
-var Argument = require('gcli/argument').Argument;
-var Status = require('gcli/types').Status;
-var Conversion = require('gcli/types').Conversion;
-var BooleanType = require('gcli/types/basic').BooleanType;
-var SelectionType = require('gcli/types/selection').SelectionType;
-
-var Menu = require('gcli/ui/fields/menu').Menu;
-var Field = require('gcli/ui/fields').Field;
-var fields = require('gcli/ui/fields');
-
-
-/**
- * Registration and de-registration.
- */
-exports.startup = function() {
-  fields.addField(SelectionField);
-  fields.addField(SelectionTooltipField);
-};
-
-exports.shutdown = function() {
-  fields.removeField(SelectionField);
-  fields.removeField(SelectionTooltipField);
-};
-
-
-/**
- * Model an instanceof SelectionType as a select input box.
- * <p>There are 3 slightly overlapping concepts to be aware of:
- * <ul>
- * <li>value: This is the (probably non-string) value, known as a value by the
- *   assignment
- * <li>optValue: This is the text value as known by the DOM option element, as
- *   in &lt;option value=???%gt...
- * <li>optText: This is the contents of the DOM option element.
- * </ul>
- */
-function SelectionField(type, options) {
-  Field.call(this, type, options);
-
-  this.items = [];
-
-  this.element = util.createElement(this.document, 'select');
-  this.element.classList.add('gcli-field');
-  this._addOption({
-    name: l10n.lookupFormat('fieldSelectionSelect', [ options.name ])
-  });
-  var lookup = this.type.getLookup();
-  lookup.forEach(this._addOption, this);
-
-  this.onInputChange = this.onInputChange.bind(this);
-  this.element.addEventListener('change', this.onInputChange, false);
-
-  this.onFieldChange = util.createEvent('SelectionField.onFieldChange');
-}
-
-SelectionField.prototype = Object.create(Field.prototype);
-
-SelectionField.claim = function(type) {
-  if (type instanceof BooleanType) {
-    return Field.BASIC;
-  }
-  return type instanceof SelectionType ? Field.DEFAULT : Field.NO_MATCH;
-};
-
-SelectionField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.element.removeEventListener('change', this.onInputChange, false);
-  delete this.element;
-  delete this.document;
-  delete this.onInputChange;
-};
-
-SelectionField.prototype.setConversion = function(conversion) {
-  var index;
-  this.items.forEach(function(item) {
-    if (item.value && item.value === conversion.value) {
-      index = item.index;
-    }
-  }, this);
-  this.element.value = index;
-  this.setMessage(conversion.message);
-};
-
-SelectionField.prototype.getConversion = function() {
-  var item = this.items[this.element.value];
-  return this.type.parse(new Argument(item.name, ' '));
-};
-
-SelectionField.prototype._addOption = function(item) {
-  item.index = this.items.length;
-  this.items.push(item);
-
-  var option = util.createElement(this.document, 'option');
-  option.innerHTML = item.name;
-  option.value = item.index;
-  this.element.appendChild(option);
-};
-
-
-/**
- * A field that allows editing of javascript
- */
-function SelectionTooltipField(type, options) {
-  Field.call(this, type, options);
-
-  this.onInputChange = this.onInputChange.bind(this);
-  this.arg = new Argument();
-
-  this.menu = new Menu({ document: this.document, type: type });
-  this.element = this.menu.element;
-
-  this.onFieldChange = util.createEvent('SelectionTooltipField.onFieldChange');
-
-  // i.e. Register this.onItemClick as the default action for a menu click
-  this.menu.onItemClick.add(this.itemClicked, this);
-}
-
-SelectionTooltipField.prototype = Object.create(Field.prototype);
-
-SelectionTooltipField.claim = function(type) {
-  return type.getType() instanceof SelectionType ? Field.TOOLTIP_MATCH : Field.NO_MATCH;
-};
-
-SelectionTooltipField.prototype.destroy = function() {
-  Field.prototype.destroy.call(this);
-  this.menu.onItemClick.remove(this.itemClicked, this);
-  this.menu.destroy();
-  delete this.element;
-  delete this.document;
-  delete this.onInputChange;
-};
-
-SelectionTooltipField.prototype.setConversion = function(conversion) {
-  this.arg = conversion.arg;
-  var items = conversion.getPredictions().map(function(prediction) {
-    // If the prediction value is an 'item' (that is an object with a name and
-    // description) then use that, otherwise use the prediction itself, because
-    // at least that has a name.
-    return prediction.value.description ? prediction.value : prediction;
-  }, this);
-  this.menu.show(items, conversion.arg.text);
-  this.setMessage(conversion.message);
-};
-
-SelectionTooltipField.prototype.itemClicked = function(ev) {
-  this.onFieldChange(ev);
-  this.setMessage(ev.conversion.message);
-};
-
-SelectionTooltipField.prototype.onInputChange = function(ev) {
-  this.item = ev.currentTarget.item;
-  var conversion = this.getConversion();
-  this.onFieldChange({ conversion: conversion });
-  this.setMessage(conversion.message);
-};
-
-SelectionTooltipField.prototype.getConversion = function() {
-  // This tweaks the prefix/suffix of the argument to fit
-  this.arg = this.arg.beget('typed', { normalize: true });
-  return this.type.parse(this.arg);
-};
-
-/**
- * Allow the menu to highlight the correct prediction choice
- */
-SelectionTooltipField.prototype.setChoiceIndex = function(choice) {
-  this.menu.setChoiceIndex(choice);
-};
-
-/**
- * Allow the inputter to use RETURN to chose the current menu item when
- * it can't execute the command line
- */
-SelectionTooltipField.prototype.selectChoice = function() {
-  this.menu.selectChoice();
-};
-
-Object.defineProperty(SelectionTooltipField.prototype, 'isImportant', {
-  get: function() {
-    return this.type.name !== 'command';
-  },
-  enumerable: true
-});
-
-SelectionTooltipField.DEFAULT_VALUE = '__SelectionTooltipField.DEFAULT_VALUE';
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/commands/help', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/l10n', 'gcli/ui/view', 'text!gcli/commands/help_man.html', 'text!gcli/commands/help_list.html', 'text!gcli/commands/help.css'], function(require, exports, module) {
-var help = exports;
-
-
-var canon = require('gcli/canon');
-var l10n = require('gcli/l10n');
-var view = require('gcli/ui/view');
-
-// Storing the HTML on exports allows other builds to alter the help template
-// but still allowing dryice to do it's dependency thing properly
-exports.helpManHtml = require('text!gcli/commands/help_man.html');
-exports.helpListHtml = require('text!gcli/commands/help_list.html');
-exports.helpCss = require('text!gcli/commands/help.css');
-
-/**
- * 'help' command
- */
-var helpCommandSpec = {
-  name: 'help',
-  description: l10n.lookup('helpDesc'),
-  manual: l10n.lookup('helpManual'),
-  params: [
-    {
-      name: 'search',
-      type: 'string',
-      description: l10n.lookup('helpSearchDesc'),
-      manual: l10n.lookup('helpSearchManual'),
-      defaultValue: null
-    }
-  ],
-  returnType: 'html',
-
-  exec: function(args, context) {
-    var match = canon.getCommand(args.search || undefined);
-    if (match) {
-      return view.createView({
-        html: exports.helpManHtml,
-        options: { allowEval: true, stack: 'help_man.html' },
-        data: getManTemplateData(match, context),
-        css: exports.helpCss,
-        cssId: 'gcli-help'
-      });
-    }
-
-    return view.createView({
-      html: exports.helpListHtml,
-      options: { allowEval: true, stack: 'help_list.html' },
-      data: getListTemplateData(args, context),
-      css: exports.helpCss,
-      cssId: 'gcli-help'
-    });
-  }
-};
-
-/**
- * Registration and de-registration.
- */
-help.startup = function() {
-  canon.addCommand(helpCommandSpec);
-};
-
-help.shutdown = function() {
-  canon.removeCommand(helpCommandSpec);
-};
-
-/**
- * Find an element within the passed element with the class gcli-help-command
- * and update the requisition to contain this text.
- */
-function updateCommand(element, context) {
-  var typed = element.querySelector('.gcli-help-command').textContent;
-  context.update(typed);
-}
-
-/**
- * Find an element within the passed element with the class gcli-help-command
- * and execute this text.
- */
-function executeCommand(element, context) {
-  context.exec({
-    visible: true,
-    typed: element.querySelector('.gcli-help-command').textContent
-  });
-}
-
-/**
- * Create a block of data suitable to be passed to the help_list.html template
- */
-function getListTemplateData(args, context) {
-  return {
-    l10n: l10n.propertyLookup,
-    includeIntro: args.search == null,
-
-    onclick: function(ev) {
-      updateCommand(ev.currentTarget, context);
-    },
-
-    ondblclick: function(ev) {
-      executeCommand(ev.currentTarget, context);
-    },
-
-    getHeading: function() {
-      return args.search == null ?
-              'Available Commands:' :
-              'Commands starting with \'' + args.search + '\':';
-    },
-
-    getMatchingCommands: function() {
-      var matching = canon.getCommands().filter(function(command) {
-        if (command.hidden) {
-          return false;
-        }
-
-        if (args.search && command.name.indexOf(args.search) !== 0) {
-          // Filtered out because they don't match the search
-          return false;
-        }
-        if (!args.search && command.name.indexOf(' ') != -1) {
-          // We don't show sub commands with plain 'help'
-          return false;
-        }
-        return true;
-      });
-      matching.sort();
-      return matching;
-    }
-  };
-}
-
-/**
- * Create a block of data suitable to be passed to the help_man.html template
- */
-function getManTemplateData(command, context) {
-  var manTemplateData = {
-    l10n: l10n.propertyLookup,
-    command: command,
-
-    onclick: function(ev) {
-      updateCommand(ev.currentTarget, context);
-    },
-
-    ondblclick: function(ev) {
-      executeCommand(ev.currentTarget, context);
-    },
-
-    getTypeDescription: function(param) {
-      var input = '';
-      if (param.defaultValue === undefined) {
-        input = 'required';
-      }
-      else if (param.defaultValue === null) {
-        input = 'optional';
-      }
-      else {
-        input = param.defaultValue;
-      }
-      return '(' + param.type.name + ', ' + input + ')';
-    }
-  };
-
-  Object.defineProperty(manTemplateData, 'subcommands', {
-    get: function() {
-      var matching = canon.getCommands().filter(function(subcommand) {
-        return subcommand.name.indexOf(command.name) === 0 &&
-                subcommand.name !== command.name;
-      });
-      matching.sort();
-      return matching;
-    },
-    enumerable: true
-  });
-
-  return manTemplateData;
-}
-
-});
-define("text!gcli/commands/help_man.html", [], "\n" +
-  "<div>\n" +
-  "  <h3>${command.name}</h3>\n" +
-  "\n" +
-  "  <h4 class=\"gcli-help-header\">\n" +
-  "    ${l10n.helpManSynopsis}:\n" +
-  "    <span class=\"gcli-help-synopsis\" onclick=\"${onclick}\">\n" +
-  "      <span class=\"gcli-help-command\">${command.name}</span>\n" +
-  "      <span foreach=\"param in ${command.params}\">\n" +
-  "        ${param.defaultValue !== undefined ? '[' + param.name + ']' : param.name}\n" +
-  "      </span>\n" +
-  "    </span>\n" +
-  "  </h4>\n" +
-  "\n" +
-  "  <h4 class=\"gcli-help-header\">${l10n.helpManDescription}:</h4>\n" +
-  "\n" +
-  "  <p class=\"gcli-help-description\">\n" +
-  "    ${command.manual || command.description}\n" +
-  "  </p>\n" +
-  "\n" +
-  "  <div if=\"${command.exec}\">\n" +
-  "    <h4 class=\"gcli-help-header\">${l10n.helpManParameters}:</h4>\n" +
-  "\n" +
-  "    <ul class=\"gcli-help-parameter\">\n" +
-  "      <li if=\"${command.params.length === 0}\">${l10n.helpManNone}</li>\n" +
-  "      <li foreach=\"param in ${command.params}\">\n" +
-  "        <tt>${param.name}</tt> ${getTypeDescription(param)}\n" +
-  "        <br/>\n" +
-  "        ${param.manual || param.description}\n" +
-  "      </li>\n" +
-  "    </ul>\n" +
+define("text!gcli/ui/arg_fetch.html", [], "\n" +
+  "<!--\n" +
+  "Template for an Assignment.\n" +
+  "Evaluated each time the commandAssignment changes\n" +
+  "-->\n" +
+  "<div class=\"gcli-af-template\" aria-live=\"polite\">\n" +
+  "  <div>\n" +
+  "    <div class=\"gcli-af-cmddesc\">\n" +
+  "      ${requisition.commandAssignment.getValue().description}\n" +
+  "    </div>\n" +
+  "    <table class=\"gcli-af-params\">\n" +
+  "      <tbody foreach=\"assignment in ${requisition.getAssignments()}\">\n" +
+  "        <!-- Parameter -->\n" +
+  "        <tr>\n" +
+  "          <td class=\"gcli-af-paramname\">\n" +
+  "            <label for=\"gcliForm${assignment.param.name}\">\n" +
+  "              ${assignment.param.description ? assignment.param.description + ':' : ''}\n" +
+  "            </label>\n" +
+  "          </td>\n" +
+  "          <td>${getInputFor(assignment)}</td>\n" +
+  "          <td>\n" +
+  "            <span class=\"gcli-af-required\" if=\"${assignment.param.isDataRequired()}\">*</span>\n" +
+  "          </td>\n" +
+  "        </tr>\n" +
+  "        <tr>\n" +
+  "          <td class=\"gcli-af-error\" colspan=\"2\">\n" +
+  "            ${linkMessageElement(assignment, __element)}\n" +
+  "          </td>\n" +
+  "        </tr>\n" +
+  "      </tbody>\n" +
+  "      <tfoot>\n" +
+  "        <tr>\n" +
+  "          <td colspan=\"3\" class=\"gcli-af-submit\">\n" +
+  "            <input type=\"submit\" value=\"Cancel\" onclick=\"${onFormCancel}\"/>\n" +
+  "            <input type=\"submit\" value=\"OK\" onclick=\"${onFormOk}\" save=\"${okElement}\"/>\n" +
+  "          </td>\n" +
+  "        </tr>\n" +
+  "      </tfoot>\n" +
+  "    </table>\n" +
   "  </div>\n" +
-  "\n" +
-  "  <div if=\"${!command.exec}\">\n" +
-  "    <h4 class=\"gcli-help-header\">${l10n.subCommands}:</h4>\n" +
-  "\n" +
-  "    <ul class=\"gcli-help-${subcommands}\">\n" +
-  "      <li if=\"${subcommands.length === 0}\">${l10n.subcommandsNone}</li>\n" +
-  "      <li foreach=\"subcommand in ${subcommands}\">\n" +
-  "        <strong>${subcommand.name}</strong>:\n" +
-  "        ${subcommand.description}\n" +
-  "        <span class=\"gcli-help-synopsis\" onclick=\"${onclick}\" ondblclick=\"${ondblclick}\">\n" +
-  "          <span class=\"gcli-help-command\">help ${subcommand.name}</span>\n" +
-  "        </span>\n" +
-  "      </li>\n" +
-  "    </ul>\n" +
-  "  </div>\n" +
-  "\n" +
   "</div>\n" +
   "");
 
-define("text!gcli/commands/help_list.html", [], "\n" +
-  "<div>\n" +
-  "  <h3>${getHeading()}</h3>\n" +
-  "\n" +
-  "  <table>\n" +
-  "    <tr foreach=\"command in ${getMatchingCommands()}\"\n" +
-  "        onclick=\"${onclick}\" ondblclick=\"${ondblclick}\">\n" +
-  "      <th class=\"gcli-help-name\">${command.name}</th>\n" +
-  "      <td class=\"gcli-help-arrow\">&#x2192;</td>\n" +
-  "      <td>\n" +
-  "        ${command.description}\n" +
-  "        <span class=\"gcli-out-shortcut gcli-help-command\">help ${command.name}</span>\n" +
-  "      </td>\n" +
-  "    </tr>\n" +
-  "  </table>\n" +
-  "</div>\n" +
-  "");
-
-define("text!gcli/commands/help.css", [], "");
-
 /*
  * Copyright 2009-2011 Mozilla Foundation and contributors
  * Licensed under the New BSD license. See LICENSE.txt or:
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gcli/ui/ffdisplay', ['require', 'exports', 'module' , 'gcli/ui/inputter', 'gcli/ui/completer', 'gcli/ui/tooltip', 'gcli/ui/focus', 'gcli/cli', 'gcli/types/javascript', 'gcli/types/node', 'gcli/types/resource', 'gcli/host', 'gcli/ui/intro', 'gcli/canon'], function(require, exports, module) {
-
-var Inputter = require('gcli/ui/inputter').Inputter;
-var Completer = require('gcli/ui/completer').Completer;
-var Tooltip = require('gcli/ui/tooltip').Tooltip;
-var FocusManager = require('gcli/ui/focus').FocusManager;
-
-var Requisition = require('gcli/cli').Requisition;
-
-var cli = require('gcli/cli');
-var jstype = require('gcli/types/javascript');
-var nodetype = require('gcli/types/node');
-var resource = require('gcli/types/resource');
-var host = require('gcli/host');
-var intro = require('gcli/ui/intro');
-
-var commandOutputManager = require('gcli/canon').commandOutputManager;
-
-/**
- * Handy utility to inject the content document (i.e. for the viewed page,
- * not for chrome) into the various components.
- */
-function setContentDocument(document) {
-  if (document) {
-    // TODO: this unwrapping smells
-    // jstype.setGlobalObject(unwrap(document.defaultView));
-    nodetype.setDocument(document);
-    resource.setDocument(document);
-  }
-  else {
-    resource.unsetDocument();
-    nodetype.unsetDocument();
-    jstype.unsetGlobalObject();
-  }
-}
-
-/**
- * FFDisplay is responsible for generating the UI for GCLI, this implementation
- * is a special case for use inside Firefox
- * @param options A configuration object containing the following:
- * - contentDocument (optional)
- * - chromeDocument
- * - hintElement
- * - inputElement
- * - completeElement
- * - backgroundElement
- * - outputDocument
- * - consoleWrap (optional)
- * - eval (optional)
- * - environment
- * - scratchpad (optional)
- * - chromeWindow
- */
-function FFDisplay(options) {
-  if (options.eval) {
-    cli.setEvalFunction(options.eval);
-  }
-  setContentDocument(options.contentDocument);
-  host.chromeWindow = options.chromeWindow;
-
-  this.onOutput = commandOutputManager.onOutput;
-  this.requisition = new Requisition(options.environment, options.outputDocument);
-
-  // Create a FocusManager for the various parts to register with
-  this.focusManager = new FocusManager(options, {
-    // TODO: can we kill chromeDocument here?
-    document: options.chromeDocument
-  });
-  this.onVisibilityChange = this.focusManager.onVisibilityChange;
-
-  this.inputter = new Inputter(options, {
-    requisition: this.requisition,
-    focusManager: this.focusManager,
-    element: options.inputElement
-  });
-
-  this.completer = new Completer(options, {
-    requisition: this.requisition,
-    inputter: this.inputter,
-    backgroundElement: options.backgroundElement,
-    element: options.completeElement
-  });
-
-  this.tooltip = new Tooltip(options, {
-    requisition: this.requisition,
-    focusManager: this.focusManager,
-    inputter: this.inputter,
-    element: options.hintElement
-  });
-
-  this.inputter.tooltip = this.tooltip;
-
-  if (options.consoleWrap) {
-    this.consoleWrap = options.consoleWrap;
-    var win = options.consoleWrap.ownerDocument.defaultView;
-    this.resizer = this.resizer.bind(this);
-
-    win.addEventListener('resize', this.resizer, false);
-    this.requisition.onTextChange.add(this.resizer, this);
-  }
-
-  this.options = options;
-}
-
-/**
- * The main Display calls this as part of startup since it registers listeners
- * for output first. The firefox display can't do this, so it has to be a
- * separate method
- */
-FFDisplay.prototype.maybeShowIntro = function() {
-  intro.maybeShowIntro(commandOutputManager);
-};
-
-/**
- * Called when the page to which we're attached changes
- * @params options Object with the following properties:
- * - contentDocument: Points to the page that we should now work against
- * - environment: A replacement environment for Requisition use
- * - chromeWindow: Allow node type to create overlay
- */
-FFDisplay.prototype.reattach = function(options) {
-  setContentDocument(options.contentDocument);
-  host.chromeWindow = options.chromeWindow;
-  this.requisition.environment = options.environment;
-};
-
-/**
- * Avoid memory leaks
- */
-FFDisplay.prototype.destroy = function() {
-  if (this.consoleWrap) {
-    var win = this.options.consoleWrap.ownerDocument.defaultView;
-
-    this.requisition.onTextChange.remove(this.resizer, this);
-    win.removeEventListener('resize', this.resizer, false);
-  }
-
-  this.tooltip.destroy();
-  this.completer.destroy();
-  this.inputter.destroy();
-  this.focusManager.destroy();
-
-  this.requisition.destroy();
-
-  host.chromeWindow = undefined;
-  setContentDocument(null);
-  cli.unsetEvalFunction();
-
-  delete this.options;
-
-  // We could also delete the following objects if we have hard-to-track-down
-  // memory leaks, as a belt-and-braces approach, however this prevents our
-  // DOM node hunter script from looking in all the nooks and crannies, so it's
-  // better if we can be leak-free without deleting them:
-  // - consoleWrap, resizer, tooltip, completer, inputter,
-  // - focusManager, onVisibilityChange, requisition
-};
-
-/**
- * Called on chrome window resize, or on divider slide
- */
-FFDisplay.prototype.resizer = function() {
-  // Bug 705109: There are several numbers hard-coded in this function.
-  // This is simpler than calculating them, but error-prone when the UI setup,
-  // the styling or display settings change.
-
-  var parentRect = this.options.consoleWrap.getBoundingClientRect();
-  // Magic number: 64 is the size of the toolbar above the output area
-  var parentHeight = parentRect.bottom - parentRect.top - 64;
-
-  // Magic number: 100 is the size at which we decide the hints are too small
-  // to be useful, so we hide them
-  if (parentHeight < 100) {
-    this.options.hintElement.classList.add('gcliterm-hint-nospace');
-  }
-  else {
-    this.options.hintElement.classList.remove('gcliterm-hint-nospace');
-    this.options.hintElement.style.overflowY = null;
-    this.options.hintElement.style.borderBottomColor = 'white';
-  }
-
-  // We also try to make the max-width of any GCLI elements so they don't
-  // extend outside the scroll area.
-  var doc = this.options.hintElement.ownerDocument;
-
-  var outputNode = this.options.hintElement.parentNode.parentNode.children[1];
-  var outputs = outputNode.getElementsByClassName('gcliterm-msg-body');
-  var listItems = outputNode.getElementsByClassName('hud-msg-node');
-
-  // This is an top-side estimate. We could try to calculate it, maybe using
-  // something along these lines http://www.alexandre-gomes.com/?p=115 However
-  // experience has shown this to be hard to get to work reliably
-  // Also we don't need to be precise. If we use a number that is too big then
-  // the only down-side is too great a right margin
-  var scrollbarWidth = 20;
-
-  if (listItems.length > 0) {
-    var parentWidth = outputNode.getBoundingClientRect().width - scrollbarWidth;
-    var otherWidth;
-    var body;
-
-    for (var i = 0; i < listItems.length; ++i) {
-      var listItem = listItems[i];
-      // a.k.a 'var otherWidth = 132'
-      otherWidth = 0;
-      body = null;
-
-      for (var j = 0; j < listItem.children.length; j++) {
-        var child = listItem.children[j];
-
-        if (child.classList.contains('gcliterm-msg-body')) {
-          body = child.children[0];
-        }
-        else {
-          otherWidth += child.getBoundingClientRect().width;
-        }
-
-        var styles = doc.defaultView.getComputedStyle(child, null);
-        otherWidth += parseInt(styles.borderLeftWidth, 10) +
-                      parseInt(styles.borderRightWidth, 10) +
-                      parseInt(styles.paddingLeft, 10) +
-                      parseInt(styles.paddingRight, 10) +
-                      parseInt(styles.marginLeft, 10) +
-                      parseInt(styles.marginRight, 10);
-      }
-
-      if (body) {
-        body.style.width = (parentWidth - otherWidth) + 'px';
-      }
-    }
-  }
-};
-
-exports.FFDisplay = FFDisplay;
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/inputter', ['require', 'exports', 'module' , 'gcli/util', 'gcli/types', 'gcli/history', 'text!gcli/ui/inputter.css'], function(require, exports, module) {
+define('gcli/ui/focus', ['require', 'exports', 'module' , 'gcli/util'], function(require, exports, module) {
 
 
 var util = require('gcli/util');
-var KeyEvent = require('gcli/util').KeyEvent;
-
-var Status = require('gcli/types').Status;
-var History = require('gcli/history').History;
-
-var inputterCss = require('text!gcli/ui/inputter.css');
-
 
 /**
- * A wrapper to take care of the functions concerning an input element
- * @param options Object containing user customization properties, including:
- * - scratchpad (default=none)
- * - promptWidth (default=22px)
- * @param components Object that links to other UI components. GCLI provided:
- * - requisition
- * - focusManager
- * - element
+ * FocusManager solves the problem of tracking focus among a set of nodes.
+ * The specific problem we are solving is when the hint element must be visible
+ * if either the command line or any of the inputs in the hint element has the
+ * focus, and invisible at other times, without hiding and showing the hint
+ * element even briefly as the focus changes between them.
+ * It does this simply by postponing the hide events by 250ms to see if
+ * something else takes focus.
+ * @param options An optional object containing configuration values. Valid
+ * properties on the options object are:
+ * - document
+ * - blurDelay
+ * - debug
+ * - initialFocus
  */
-function Inputter(options, components) {
-  this.requisition = components.requisition;
-  this.focusManager = components.focusManager;
+function FocusManager(options) {
+  options = options || {};
 
-  this.element = components.element;
-  this.element.classList.add('gcli-in-input');
-  this.element.spellcheck = false;
+  this._debug = options.debug || false;
+  this._blurDelayTimeout = null; // Result of setTimeout in delaying a blur
+  this._monitoredElements = [];  // See addMonitoredElement()
 
-  this.document = this.element.ownerDocument;
+  this.hasFocus = false;
+  this.blurDelay = options.blurDelay || 250;
+  this.document = options.document || document;
 
-  this.scratchpad = options.scratchpad;
+  this.onFocus = util.createEvent('FocusManager.onFocus');
+  this.onBlur = util.createEvent('FocusManager.onBlur');
 
-  if (inputterCss != null) {
-    this.style = util.importCss(inputterCss, this.document, 'gcli-inputter');
-  }
-
-  // Used to distinguish focus from TAB in CLI. See onKeyUp()
-  this.lastTabDownAt = 0;
-
-  // Used to effect caret changes. See _processCaretChange()
-  this._caretChange = null;
-
-  // Ensure that TAB/UP/DOWN isn't handled by the browser
-  this.onKeyDown = this.onKeyDown.bind(this);
-  this.onKeyUp = this.onKeyUp.bind(this);
-  this.element.addEventListener('keydown', this.onKeyDown, false);
-  this.element.addEventListener('keyup', this.onKeyUp, false);
-
-  // Setup History
-  this.history = new History();
-  this._scrollingThroughHistory = false;
-
-  // Used when we're selecting which prediction to complete with
-  this._choice = null;
-  this.onChoiceChange = util.createEvent('Inputter.onChoiceChange');
-
-  // Cursor position affects hint severity
-  this.onMouseUp = this.onMouseUp.bind(this);
-  this.element.addEventListener('mouseup', this.onMouseUp, false);
-
-  if (this.focusManager) {
-    this.focusManager.addMonitoredElement(this.element, 'input');
-  }
-
-  this.requisition.onTextChange.add(this.textChanged, this);
-
-  this.assignment = this.requisition.getAssignmentAt(0);
-  this.onAssignmentChange = util.createEvent('Inputter.onAssignmentChange');
-  this.onInputChange = util.createEvent('Inputter.onInputChange');
-
-  this.onResize = util.createEvent('Inputter.onResize');
-  this.onWindowResize = this.onWindowResize.bind(this);
-  this.document.defaultView.addEventListener('resize', this.onWindowResize, false);
-
-  this.requisition.update(this.element.value || '');
+  // We take a focus event anywhere to be an indication that we might be about
+  // to lose focus
+  this._onDocumentFocus = function() {
+    this.reportBlur('document');
+  }.bind(this);
+  this.document.addEventListener('focus', this._onDocumentFocus, true);
 }
 
 /**
  * Avoid memory leaks
  */
-Inputter.prototype.destroy = function() {
-  this.document.defaultView.removeEventListener('resize', this.onWindowResize, false);
-
-  this.requisition.onTextChange.remove(this.textChanged, this);
-  if (this.focusManager) {
-    this.focusManager.removeMonitoredElement(this.element, 'input');
-  }
-
-  this.element.removeEventListener('mouseup', this.onMouseUp, false);
-  this.element.removeEventListener('keydown', this.onKeyDown, false);
-  this.element.removeEventListener('keyup', this.onKeyUp, false);
-
-  this.history.destroy();
-
-  if (this.style) {
-    this.style.parentNode.removeChild(this.style);
-    delete this.style;
-  }
-
-  delete this.onMouseUp;
-  delete this.onKeyDown;
-  delete this.onKeyUp;
-  delete this.onWindowResize;
-  delete this.tooltip;
+FocusManager.prototype.destroy = function() {
+  this.document.removeEventListener('focus', this._onDocumentFocus, true);
   delete this.document;
-  delete this.element;
-};
 
-/**
- * Make ourselves visually similar to the input element, and make the input
- * element transparent so our background shines through
- */
-Inputter.prototype.onWindowResize = function() {
-  // Mochitest sometimes causes resize after shutdown. See Bug 743190
-  if (!this.element) {
-    return;
+  for (var i = 0; i < this._monitoredElements.length; i++) {
+    var monitor = this._monitoredElements[i];
+    console.error('Hanging monitored element: ', monitor.element);
+
+    monitor.element.removeEventListener('focus', monitor.onFocus, true);
+    monitor.element.removeEventListener('blur', monitor.onBlur, true);
   }
 
-  // Simplify when jsdom does getBoundingClientRect(). See Bug 717269
-  var dimensions = this.getDimensions();
-  if (dimensions) {
-    this.onResize(dimensions);
+  if (this._blurDelayTimeout) {
+    clearTimeout(this._blurDelayTimeout);
+    this._blurDelayTimeout = null;
   }
 };
 
 /**
- * Make ourselves visually similar to the input element, and make the input
- * element transparent so our background shines through
+ * The easy way to include an element in the set of things that are part of the
+ * aggregate focus. Using [add|remove]MonitoredElement() is a simpler way of
+ * option than calling report[Focus|Blur]()
+ * @param element The element on which to track focus|blur events
+ * @param where Optional source string for debugging only
  */
-Inputter.prototype.getDimensions = function() {
-  // Remove this when jsdom does getBoundingClientRect(). See Bug 717269
-  if (!this.element.getBoundingClientRect) {
-    return undefined;
+FocusManager.prototype.addMonitoredElement = function(element, where) {
+  if (this._debug) {
+    console.log('FocusManager.addMonitoredElement(' + (where || 'unknown') + ')');
   }
 
-  var rect = this.element.getBoundingClientRect();
-  return {
-    top: rect.top + 1,
-    height: rect.bottom - rect.top - 1,
-    left: rect.left + 2,
-    width: rect.right - rect.left
-  };
-};
-
-/**
- * Handler for the input-element.onMouseUp event
- */
-Inputter.prototype.onMouseUp = function(ev) {
-  this._checkAssignment();
-};
-
-/**
- * Handler for the Requisition.textChanged event
- */
-Inputter.prototype.textChanged = function() {
-  if (!this.document) {
-    return; // This can happen post-destroy()
-  }
-
-  if (this._caretChange == null) {
-    // We weren't expecting a change so this was requested by the hint system
-    // we should move the cursor to the end of the 'changed section', and the
-    // best we can do for that right now is the end of the current argument.
-    this._caretChange = Caret.TO_ARG_END;
-  }
-
-  var newStr = this.requisition.toString();
-  var input = this.getInputState();
-
-  input.typed = newStr;
-  this._processCaretChange(input);
-
-  this.element.value = newStr;
-  this.onInputChange({ inputState: input });
-};
-
-/**
- * Various ways in which we need to manipulate the caret/selection position.
- * A value of null means we're not expecting a change
- */
-var Caret = {
-  /**
-   * We are expecting changes, but we don't need to move the cursor
-   */
-  NO_CHANGE: 0,
-
-  /**
-   * We want the entire input area to be selected
-   */
-  SELECT_ALL: 1,
-
-  /**
-   * The whole input has changed - push the cursor to the end
-   */
-  TO_END: 2,
-
-  /**
-   * A part of the input has changed - push the cursor to the end of the
-   * changed section
-   */
-  TO_ARG_END: 3
-};
-
-/**
- * If this._caretChange === Caret.TO_ARG_END, we alter the input object to move
- * the selection start to the end of the current argument.
- * @param input An object shaped like { typed:'', cursor: { start:0, end:0 }}
- */
-Inputter.prototype._processCaretChange = function(input) {
-  var start, end;
-  switch (this._caretChange) {
-    case Caret.SELECT_ALL:
-      start = 0;
-      end = input.typed.length;
-      break;
-
-    case Caret.TO_END:
-      start = input.typed.length;
-      end = input.typed.length;
-      break;
-
-    case Caret.TO_ARG_END:
-      // There could be a fancy way to do this involving assignment/arg math
-      // but it doesn't seem easy, so we cheat a move the cursor to just before
-      // the next space, or the end of the input
-      start = input.cursor.start;
-      do {
-        start++;
-      }
-      while (start < input.typed.length && input.typed[start - 1] !== ' ');
-
-      end = start;
-      break;
-
-    default:
-      start = input.cursor.start;
-      end = input.cursor.end;
-      break;
-  }
-
-  start = (start > input.typed.length) ? input.typed.length : start;
-  end = (end > input.typed.length) ? input.typed.length : end;
-
-  var newInput = {
-    typed: input.typed,
-    cursor: { start: start, end: end }
+  var monitor = {
+    element: element,
+    where: where,
+    onFocus: function() { this.reportFocus(where); }.bind(this),
+    onBlur: function() { this.reportBlur(where); }.bind(this)
   };
 
-  this.element.selectionStart = start;
-  this.element.selectionEnd = end;
-
-  this._checkAssignment(start);
-
-  this._caretChange = null;
-  return newInput;
+  element.addEventListener('focus', monitor.onFocus, true);
+  element.addEventListener('blur', monitor.onBlur, true);
+  this._monitoredElements.push(monitor);
 };
 
 /**
- * To be called internally whenever we think that the current assignment might
- * have changed, typically on mouse-clicks or key presses.
- * @param start Optional - if specified, the cursor position to use in working
- * out the current assignment. This is needed because setting the element
- * selection start is only recognised when the event loop has finished
+ * Undo the effects of addMonitoredElement()
+ * @param element The element to stop tracking
  */
-Inputter.prototype._checkAssignment = function(start) {
-  if (start == null) {
-    start = this.element.selectionStart;
-  }
-  var newAssignment = this.requisition.getAssignmentAt(start);
-  if (this.assignment !== newAssignment) {
-    this.assignment = newAssignment;
-    this.onAssignmentChange({ assignment: this.assignment });
-  }
+FocusManager.prototype.removeMonitoredElement = function(element) {
+  var monitor;
+  var matchIndex;
 
-  // This is slightly nasty - the focusManager generally relies on people
-  // telling it what it needs to know (which makes sense because the event
-  // system to do it with events would be unnecessarily complex). However
-  // requisition doesn't know about the focusManager either. So either one
-  // needs to know about the other, or a third-party needs to break the
-  // deadlock. These 2 lines are all we're quibbling about, so for now we hack
-  if (this.focusManager) {
-    var message = this.assignment.conversion.message;
-    this.focusManager.setError(message != null && message !== '');
-  }
-};
-
-/**
- * Set the input field to a value, for external use.
- * This function updates the data model. It sets the caret to the end of the
- * input. It does not make any similarity checks so calling this function with
- * it's current value resets the cursor position.
- * It does not execute the input or affect the history.
- * This function should not be called internally, by Inputter and never as a
- * result of a keyboard event on this.element or bug 676520 could be triggered.
- */
-Inputter.prototype.setInput = function(str) {
-  this.requisition.update(str);
-};
-
-/**
- * Counterpart to |setInput| for moving the cursor.
- * @param cursor An object shaped like { start: x, end: y }
- */
-Inputter.prototype.setCursor = function(cursor) {
-  this._caretChange = Caret.NO_CHANGE;
-  this._processCaretChange({ typed: this.element.value, cursor: cursor });
-};
-
-/**
- * Focus the input element
- */
-Inputter.prototype.focus = function() {
-  this.element.focus();
-  this._checkAssignment();
-};
-
-/**
- * Ensure certain keys (arrows, tab, etc) that we would like to handle
- * are not handled by the browser
- */
-Inputter.prototype.onKeyDown = function(ev) {
-  if (ev.keyCode === KeyEvent.DOM_VK_UP || ev.keyCode === KeyEvent.DOM_VK_DOWN) {
-    ev.preventDefault();
-    return;
-  }
-
-  // The following keys do not affect the state of the command line so we avoid
-  // informing the focusManager about keyboard events that involve these keys
-  if (ev.keyCode === KeyEvent.DOM_VK_F1 ||
-      ev.keyCode === KeyEvent.DOM_VK_ESCAPE ||
-      ev.keyCode === KeyEvent.DOM_VK_UP ||
-      ev.keyCode === KeyEvent.DOM_VK_DOWN) {
-    return;
-  }
-
-  if (this.focusManager) {
-    this.focusManager.onInputChange(ev);
-  }
-
-  if (ev.keyCode === KeyEvent.DOM_VK_TAB) {
-    this.lastTabDownAt = 0;
-    if (!ev.shiftKey) {
-      ev.preventDefault();
-      // Record the timestamp of this TAB down so onKeyUp can distinguish
-      // focus from TAB in the CLI.
-      this.lastTabDownAt = ev.timeStamp;
+  for (var i = 0; i < this._monitoredElements.length; i++) {
+    if (this._monitoredElements[i].element === element) {
+      monitor = this._monitoredElements[i];
+      matchIndex = i;
     }
-    if (ev.metaKey || ev.altKey || ev.crtlKey) {
-      if (this.document.commandDispatcher) {
-        this.document.commandDispatcher.advanceFocus();
-      }
-      else {
-        this.element.blur();
+  }
+
+  if (!monitor) {
+    if (this._debug) {
+      console.error('Missing monitor for element. ', element);
+    }
+    return;
+  }
+
+  this._monitoredElements.splice(matchIndex, 1);
+  element.removeEventListener('focus', monitor.onFocus, true);
+  element.removeEventListener('blur', monitor.onBlur, true);
+};
+
+/**
+ * Some component has received a 'focus' event. This sets the internal status
+ * straight away and informs the listeners
+ * @param where Optional source string for debugging only
+ */
+FocusManager.prototype.reportFocus = function(where) {
+  if (this._debug) {
+    console.log('FocusManager.reportFocus(' + (where || 'unknown') + ')');
+  }
+
+  if (this._blurDelayTimeout) {
+    if (this._debug) {
+      console.log('FocusManager.cancelBlur');
+    }
+    clearTimeout(this._blurDelayTimeout);
+    this._blurDelayTimeout = null;
+  }
+
+  if (!this.hasFocus) {
+    this.hasFocus = true;
+    this.onFocus();
+  }
+};
+
+/**
+ * Some component has received a 'blur' event. This waits for a while to see if
+ * we are going to get any subsequent 'focus' events and then sets the internal
+ * status and informs the listeners
+ * @param where Optional source string for debugging only
+ */
+FocusManager.prototype.reportBlur = function(where) {
+  if (this._debug) {
+    console.log('FocusManager.reportBlur(' + where + ')');
+  }
+
+  if (this.hasFocus) {
+    if (this._blurDelayTimeout) {
+      if (this._debug) {
+        console.log('FocusManager.blurPending');
       }
+      return;
     }
+
+    this._blurDelayTimeout = setTimeout(function() {
+      if (this._debug) {
+        console.log('FocusManager.blur');
+      }
+      this.hasFocus = false;
+      this.onBlur();
+      this._blurDelayTimeout = null;
+    }.bind(this), this.blurDelay);
   }
 };
 
-/**
- * The main keyboard processing loop
- */
-Inputter.prototype.onKeyUp = function(ev) {
-  if (this.focusManager && ev.keyCode === KeyEvent.DOM_VK_F1) {
-    this.focusManager.helpRequest();
-    return;
-  }
-
-  if (this.focusManager && ev.keyCode === KeyEvent.DOM_VK_ESCAPE) {
-    this.focusManager.removeHelp();
-    return;
-  }
-
-  if (ev.keyCode === KeyEvent.DOM_VK_UP) {
-    if (this.tooltip && this.tooltip.isMenuShowing) {
-      this.changeChoice(-1);
-    }
-    else if (this.element.value === '' || this._scrollingThroughHistory) {
-      this._scrollingThroughHistory = true;
-      this.requisition.update(this.history.backward());
-    }
-    else {
-      // If the user is on a valid value, then we increment the value, but if
-      // they've typed something that's not right we page through predictions
-      if (this.assignment.getStatus() === Status.VALID) {
-        this.assignment.increment();
-        // See notes on focusManager.onInputChange in onKeyDown
-        if (this.focusManager) {
-          this.focusManager.onInputChange(ev);
-        }
-      }
-      else {
-        this.changeChoice(-1);
-      }
-    }
-    return;
-  }
-
-  if (ev.keyCode === KeyEvent.DOM_VK_DOWN) {
-    if (this.tooltip && this.tooltip.isMenuShowing) {
-      this.changeChoice(+1);
-    }
-    else if (this.element.value === '' || this._scrollingThroughHistory) {
-      this._scrollingThroughHistory = true;
-      this.requisition.update(this.history.forward());
-    }
-    else {
-      // See notes above for the UP key
-      if (this.assignment.getStatus() === Status.VALID) {
-        this.assignment.decrement();
-        // See notes on focusManager.onInputChange in onKeyDown
-        if (this.focusManager) {
-          this.focusManager.onInputChange(ev);
-        }
-      }
-      else {
-        this.changeChoice(+1);
-      }
-    }
-    return;
-  }
-
-  // RETURN checks status and might exec
-  if (ev.keyCode === KeyEvent.DOM_VK_RETURN) {
-    var worst = this.requisition.getStatus();
-    // Deny RETURN unless the command might work
-    if (worst === Status.VALID) {
-      this._scrollingThroughHistory = false;
-      this.history.add(this.element.value);
-      this.requisition.exec();
-    }
-    else {
-      // If we can't execute the command, but there is a menu choice to use
-      // then use it.
-      this.tooltip.selectChoice();
-
-      // See bug 664135 - On pressing return with an invalid input, GCLI
-      // should select the incorrect part of the input for an easy fix
-    }
-
-    this._choice = null;
-    return;
-  }
-
-  if (ev.keyCode === KeyEvent.DOM_VK_TAB && !ev.shiftKey) {
-    // If the TAB keypress took the cursor from another field to this one,
-    // then they get the keydown/keypress, and we get the keyup. In this
-    // case we don't want to do any completion.
-    // If the time of the keydown/keypress of TAB was close (i.e. within
-    // 1 second) to the time of the keyup then we assume that we got them
-    // both, and do the completion.
-    if (this.lastTabDownAt + 1000 > ev.timeStamp) {
-      // It's possible for TAB to not change the input, in which case the
-      // textChanged event will not fire, and the caret move will not be
-      // processed. So we check that this is done first
-      this._caretChange = Caret.TO_ARG_END;
-      var inputState = this.getInputState();
-      this._processCaretChange(inputState);
-      if (this._choice == null) {
-        this._choice = 0;
-      }
-      this.requisition.complete(inputState.cursor, this._choice);
-    }
-    this.lastTabDownAt = 0;
-    this._scrollingThroughHistory = false;
-
-    this._choice = null;
-    this.onChoiceChange({ choice: this._choice });
-    return;
-  }
-
-  // Give the scratchpad (if enabled) a chance to activate
-  if (this.scratchpad && this.scratchpad.shouldActivate(ev)) {
-    if (this.scratchpad.activate(this.element.value)) {
-      this.requisition.update('');
-    }
-    return;
-  }
-
-  this._scrollingThroughHistory = false;
-  this._caretChange = Caret.NO_CHANGE;
-
-  this.requisition.update(this.element.value);
-
-  this._choice = null;
-  this.onChoiceChange({ choice: this._choice });
-};
-
-/**
- * Used by onKeyUp for UP/DOWN to change the current choice from an options
- * menu.
- */
-Inputter.prototype.changeChoice = function(amount) {
-  if (this._choice == null) {
-    this._choice = 0;
-  }
-  // There's an annoying up is down thing here, the menu is presented
-  // with the zeroth index at the top working down, so the UP arrow needs
-  // pick the choice below because we're working down
-  this._choice += amount;
-  this.onChoiceChange({ choice: this._choice });
-};
-
-/**
- * Accessor for the assignment at the cursor.
- * i.e Requisition.getAssignmentAt(cursorPos);
- */
-Inputter.prototype.getCurrentAssignment = function() {
-  var start = this.element.selectionStart;
-  return this.requisition.getAssignmentAt(start);
-};
-
-/**
- * Pull together an input object, which may include XUL hacks
- */
-Inputter.prototype.getInputState = function() {
-  var input = {
-    typed: this.element.value,
-    cursor: {
-      start: this.element.selectionStart,
-      end: this.element.selectionEnd
-    }
-  };
-
-  // Workaround for potential XUL bug 676520 where textbox gives incorrect
-  // values for its content
-  if (input.typed == null) {
-    input = { typed: '', cursor: { start: 0, end: 0 } };
-    console.log('fixing input.typed=""', input);
-  }
-
-  // Workaround for a Bug 717268 (which is really a jsdom bug)
-  if (input.cursor.start == null) {
-    input.cursor.start = 0;
-  }
-
-  return input;
-};
-
-exports.Inputter = Inputter;
+exports.FocusManager = FocusManager;
 
 
 });
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/history', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * A History object remembers commands that have been entered in the past and
- * provides an API for accessing them again.
- * See Bug 681340: Search through history (like C-r in bash)?
- */
-function History() {
-  // This is the actual buffer where previous commands are kept.
-  // 'this._buffer[0]' should always be equal the empty string. This is so
-  // that when you try to go in to the "future", you will just get an empty
-  // command.
-  this._buffer = [''];
-
-  // This is an index in to the history buffer which points to where we
-  // currently are in the history.
-  this._current = 0;
-}
-
-/**
- * Avoid memory leaks
- */
-History.prototype.destroy = function() {
-  delete this._buffer;
-};
-
-/**
- * Record and save a new command in the history.
- */
-History.prototype.add = function(command) {
-  this._buffer.splice(1, 0, command);
-  this._current = 0;
-};
-
-/**
- * Get the next (newer) command from history.
- */
-History.prototype.forward = function() {
-  if (this._current > 0 ) {
-    this._current--;
-  }
-  return this._buffer[this._current];
-};
-
-/**
- * Get the previous (older) item from history.
- */
-History.prototype.backward = function() {
-  if (this._current < this._buffer.length - 1) {
-    this._current++;
-  }
-  return this._buffer[this._current];
-};
-
-exports.History = History;
-
-});define("text!gcli/ui/inputter.css", [], "");
-
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/completer', ['require', 'exports', 'module' , 'gcli/util', 'gcli/ui/domtemplate', 'text!gcli/ui/completer.html'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-var domtemplate = require('gcli/ui/domtemplate');
-
-var completerHtml = require('text!gcli/ui/completer.html');
-
-/**
- * Completer is an 'input-like' element that sits  an input element annotating
- * it with visual goodness.
- * @param options Object containing user customization properties, including:
- * - scratchpad (default=none) A way to move JS content to custom JS editor
- * @param components Object that links to other UI components. GCLI provided:
- * - requisition: A GCLI Requisition object whose state is monitored
- * - element: Element to use as root
- * - autoResize: (default=false): Should we attempt to sync the dimensions of
- *   the complete element with the input element.
- */
-function Completer(options, components) {
-  this.requisition = components.requisition;
-  this.scratchpad = options.scratchpad;
-  this.input = { typed: '', cursor: { start: 0, end: 0 } };
-  this.choice = 0;
-
-  this.element = components.element;
-  this.element.classList.add('gcli-in-complete');
-  this.element.setAttribute('tabindex', '-1');
-  this.element.setAttribute('aria-live', 'polite');
-
-  this.document = this.element.ownerDocument;
-
-  this.inputter = components.inputter;
-
-  this.inputter.onInputChange.add(this.update, this);
-  this.inputter.onAssignmentChange.add(this.update, this);
-  this.inputter.onChoiceChange.add(this.update, this);
-
-  if (components.autoResize) {
-    this.inputter.onResize.add(this.resized, this);
-
-    var dimensions = this.inputter.getDimensions();
-    if (dimensions) {
-      this.resized(dimensions);
-    }
-  }
-
-  this.template = util.toDom(this.document, completerHtml);
-  // We want the spans to line up without the spaces in the template
-  util.removeWhitespace(this.template, true);
-
-  this.update();
-}
-
-/**
- * Avoid memory leaks
- */
-Completer.prototype.destroy = function() {
-  this.inputter.onInputChange.remove(this.update, this);
-  this.inputter.onAssignmentChange.remove(this.update, this);
-  this.inputter.onChoiceChange.remove(this.update, this);
-  this.inputter.onResize.remove(this.resized, this);
-
-  delete this.document;
-  delete this.element;
-  delete this.template;
-  delete this.inputter;
-};
-
-/**
- * Ensure that the completion element is the same size and the inputter element
- */
-Completer.prototype.resized = function(ev) {
-  this.element.style.top = ev.top + 'px';
-  this.element.style.height = ev.height + 'px';
-  this.element.style.lineHeight = ev.height + 'px';
-  this.element.style.left = ev.left + 'px';
-  this.element.style.width = ev.width + 'px';
-};
-
-/**
- * Is the completion given, a "strict" completion of the user inputted value?
- * A completion is considered "strict" only if it the user inputted value is an
- * exact prefix of the completion (ignoring leading whitespace)
- */
-function isStrictCompletion(inputValue, completion) {
-  // Strip any leading whitespace from the user inputted value because the
-  // completion will never have leading whitespace.
-  inputValue = inputValue.replace(/^\s*/, '');
-  // Strict: "ec" -> "echo"
-  // Non-Strict: "ls *" -> "ls foo bar baz"
-  return completion.indexOf(inputValue) === 0;
-}
-
-/**
- * Bring the completion element up to date with what the requisition says
- */
-Completer.prototype.update = function(ev) {
-  if (ev && ev.choice != null) {
-    this.choice = ev.choice;
-  }
-  this._preTemplateUpdate();
-
-  var template = this.template.cloneNode(true);
-  domtemplate.template(template, this, { stack: 'completer.html' });
-
-  util.clearElement(this.element);
-  while (template.hasChildNodes()) {
-    this.element.appendChild(template.firstChild);
-  }
-};
-
-/**
- * Update the state of a number of internal variables in preparation for
- * templating. Some of these properties are interdependent, so it makes sense
- * to do them in one go.
- */
-Completer.prototype._preTemplateUpdate = function() {
-  this.input = this.inputter.getInputState();
-
-  this.directTabText = '';
-  this.arrowTabText = '';
-
-  // What text should we display as the tab text, and should it be given as a
-  // '-> full' or as 'suffix' (which depends on if the completion is a strict
-  // completion or not)
-  if (this.input.typed.trim().length === 0) {
-    return;
-  }
-
-  var current = this.inputter.assignment;
-  var prediction = current.conversion.getPredictionAt(this.choice);
-  if (!prediction) {
-    return;
-  }
-
-  var tabText = prediction.name;
-  var existing = current.arg.text;
-
-  if (existing === tabText) {
-    return;
-  }
-
-  if (isStrictCompletion(existing, tabText) &&
-          this.input.cursor.start === this.input.typed.length) {
-    // Display the suffix of the prediction as the completion
-    var numLeadingSpaces = existing.match(/^(\s*)/)[0].length;
-
-    this.directTabText = tabText.slice(existing.length - numLeadingSpaces);
-  }
-  else {
-    // Display the '-> prediction' at the end of the completer element
-    // These JS escapes are aka &nbsp;&rarr; the right arrow
-    this.arrowTabText = ' \u00a0\u21E5 ' + tabText;
-  }
-};
-
-/**
- * A proxy to requisition.getInputStatusMarkup which converts space to &nbsp;
- * in the string member (for HTML display) and converts status to an
- * appropriate class name (i.e. lower cased, prefixed with gcli-in-)
- */
-Object.defineProperty(Completer.prototype, 'statusMarkup', {
-  get: function() {
-    var markup = this.requisition.getInputStatusMarkup(this.input.cursor.start);
-    markup.forEach(function(member) {
-      member.string = member.string.replace(/ /g, '\u00a0'); // i.e. &nbsp;
-      member.className = 'gcli-in-' + member.status.toString().toLowerCase();
-    }, this);
-    return markup;
-  },
-  enumerable: true
-});
-
-/**
- * The text for the 'jump to scratchpad' feature, or null if it is disabled
- */
-Object.defineProperty(Completer.prototype, 'scratchLink', {
-  get: function() {
-    if (!this.scratchpad) {
-      return null;
-    }
-    var command = this.requisition.commandAssignment.value;
-    return command && command.name === '{' ? this.scratchpad.linkText : null;
-  },
-  enumerable: true
-});
-
-/**
- * Is the entered command a JS command with no closing '}'?
- * TWEAK: This code should be considered for promotion to Requisition
- */
-Object.defineProperty(Completer.prototype, 'unclosedJs', {
-  get: function() {
-    var command = this.requisition.commandAssignment.value;
-    var jsCommand = command && command.name === '{';
-    var unclosedJs = jsCommand &&
-        this.requisition.getAssignment(0).arg.suffix.indexOf('}') === -1;
-    return unclosedJs;
-  },
-  enumerable: true
-});
-
-/**
- * Accessor for the list of parameters to be filled in
- */
-Object.defineProperty(Completer.prototype, 'emptyParameters', {
-  get: function() {
-    var typedEndSpace = this.requisition.typedEndsWithWhitespace();
-    // Cache computed property
-    var directTabText = this.directTabText;
-    // If this is the first blank assignment we might not need a space prefix
-    // also we skip [param] text if we have directTabText, but only for the
-    // first blank param.
-    var firstBlankParam = true;
-    var params = [];
-    this.requisition.getAssignments().forEach(function(assignment) {
-      if (!assignment.param.isPositionalAllowed) {
-        return;
-      }
-
-      if (!assignment.arg.isBlank()) {
-        if (directTabText !== '') {
-          firstBlankParam = false;
-        }
-        return;
-      }
-
-      if (directTabText !== '' && firstBlankParam) {
-        firstBlankParam = false;
-        return;
-      }
-
-      var text = (assignment.param.isDataRequired) ?
-          '<' + assignment.param.name + '>' :
-          '[' + assignment.param.name + ']';
-
-      // Add a space if we don't have one at the end of the input or if
-      // this isn't the first param we've mentioned
-      if (!typedEndSpace || !firstBlankParam) {
-        text = '\u00a0' + text; // i.e. &nbsp;
-      }
-
-      firstBlankParam = false;
-      params.push(text);
-    }.bind(this));
-    return params;
-  },
-  enumerable: true
-});
-
-exports.Completer = Completer;
-
-
-});
-define("text!gcli/ui/completer.html", [], "\n" +
-  "<description>\n" +
-  "  <loop foreach=\"member in ${statusMarkup}\">\n" +
-  "    <label class=\"${member.className}\">${member.string}</label>\n" +
-  "  </loop>\n" +
-  "  <label class=\"gcli-in-ontab\">${directTabText}</label>\n" +
-  "  <label class=\"gcli-in-todo\" foreach=\"param in ${emptyParameters}\">${param}</label>\n" +
-  "  <label class=\"gcli-in-ontab\">${arrowTabText}</label>\n" +
-  "  <label class=\"gcli-in-closebrace\" if=\"${unclosedJs}\">}</label>\n" +
-  "</description>\n" +
-  "");
-
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gcli/ui/tooltip', ['require', 'exports', 'module' , 'gcli/util', 'gcli/cli', 'gcli/ui/fields', 'gcli/ui/domtemplate', 'text!gcli/ui/tooltip.css', 'text!gcli/ui/tooltip.html'], function(require, exports, module) {
-
-
-var util = require('gcli/util');
-var CommandAssignment = require('gcli/cli').CommandAssignment;
-
-var fields = require('gcli/ui/fields');
-var domtemplate = require('gcli/ui/domtemplate');
-
-var tooltipCss = require('text!gcli/ui/tooltip.css');
-var tooltipHtml = require('text!gcli/ui/tooltip.html');
-
-
-/**
- * A widget to display an inline dialog which allows the user to fill out
- * the arguments to a command.
- * @param options Object containing user customization properties, including:
- * - tooltipClass (default='gcli-tooltip'): Custom class name when generating
- *   the top level element which allows different layout systems
- * @param components Object that links to other UI components. GCLI provided:
- * - requisition: The Requisition to fill out
- * - inputter: An instance of Inputter
- * - focusManager: Component to manage hiding/showing this element
- * - panelElement (optional): The element to show/hide on visibility events
- * - element: The root element to populate
- */
-function Tooltip(options, components) {
-  this.inputter = components.inputter;
-  this.requisition = components.requisition;
-  this.focusManager = components.focusManager;
-
-  this.element = components.element;
-  this.element.classList.add(options.tooltipClass || 'gcli-tooltip');
-  this.document = this.element.ownerDocument;
-
-  this.panelElement = components.panelElement;
-  if (this.panelElement) {
-    this.panelElement.classList.add('gcli-panel-hide');
-    this.focusManager.onVisibilityChange.add(this.visibilityChanged, this);
-  }
-  this.focusManager.addMonitoredElement(this.element, 'tooltip');
-
-  // We cache the fields we create so we can destroy them later
-  this.fields = [];
-
-  // Pull the HTML into the DOM, but don't add it to the document
-  if (tooltipCss != null) {
-    this.style = util.importCss(tooltipCss, this.document, 'gcli-tooltip');
-  }
-
-  this.template = util.toDom(this.document, tooltipHtml);
-  this.templateOptions = { blankNullUndefined: true, stack: 'tooltip.html' };
-
-  this.inputter.onChoiceChange.add(this.choiceChanged, this);
-  this.inputter.onAssignmentChange.add(this.assignmentChanged, this);
-
-  // We keep a track of which assignment the cursor is in
-  this.assignment = undefined;
-  this.assignmentChanged({ assignment: this.inputter.assignment });
-}
-
-/**
- * Avoid memory leaks
- */
-Tooltip.prototype.destroy = function() {
-  this.inputter.onAssignmentChange.remove(this.assignmentChanged, this);
-  this.inputter.onChoiceChange.remove(this.choiceChanged, this);
-
-  if (this.panelElement) {
-    this.focusManager.onVisibilityChange.remove(this.visibilityChanged, this);
-  }
-  this.focusManager.removeMonitoredElement(this.element, 'tooltip');
-
-  if (this.style) {
-    this.style.parentNode.removeChild(this.style);
-    delete this.style;
-  }
-
-  this.field.onFieldChange.remove(this.fieldChanged, this);
-  this.field.destroy();
-
-  delete this.errorEle;
-  delete this.descriptionEle;
-  delete this.highlightEle;
-
-  delete this.field;
-  delete this.focusManager;
-  delete this.document;
-  delete this.element;
-  delete this.panelElement;
-  delete this.template;
-};
-
-/**
- * The inputter acts on UP/DOWN if there is a menu showing
- */
-Object.defineProperty(Tooltip.prototype, 'isMenuShowing', {
-  get: function() {
-    return this.focusManager.isTooltipVisible &&
-           this.field != null &&
-           this.field.menu != null;
-  },
-  enumerable: true
-});
-
-/**
- * Called whenever the assignment that we're providing help with changes
- */
-Tooltip.prototype.assignmentChanged = function(ev) {
-  // This can be kicked off either by requisition doing an assign or by
-  // inputter noticing a cursor movement out of a command, so we should check
-  // that this really is a new assignment
-  if (this.assignment === ev.assignment) {
-    return;
-  }
-
-  if (this.assignment) {
-    this.assignment.onAssignmentChange.remove(this.assignmentContentsChanged, this);
-  }
-  this.assignment = ev.assignment;
-
-  if (this.field) {
-    this.field.onFieldChange.remove(this.fieldChanged, this);
-    this.field.destroy();
-  }
-
-  this.field = fields.getField(this.assignment.param.type, {
-    document: this.document,
-    name: this.assignment.param.name,
-    requisition: this.requisition,
-    required: this.assignment.param.isDataRequired,
-    named: !this.assignment.param.isPositionalAllowed,
-    tooltip: true
-  });
-
-  this.focusManager.setImportantFieldFlag(this.field.isImportant);
-
-  this.field.onFieldChange.add(this.fieldChanged, this);
-  this.assignment.onAssignmentChange.add(this.assignmentContentsChanged, this);
-
-  this.field.setConversion(this.assignment.conversion);
-
-  // Filled in by the template process
-  this.errorEle = undefined;
-  this.descriptionEle = undefined;
-  this.highlightEle = undefined;
-
-  var contents = this.template.cloneNode(true);
-  domtemplate.template(contents, this, this.templateOptions);
-  util.clearElement(this.element);
-  this.element.appendChild(contents);
-  this.element.style.display = 'block';
-
-  this.field.setMessageElement(this.errorEle);
-
-  this._updatePosition();
-};
-
-/**
- * Forward the event to the current field
- */
-Tooltip.prototype.choiceChanged = function(ev) {
-  if (this.field && this.field.setChoiceIndex) {
-    var choice = this.assignment.conversion.constrainPredictionIndex(ev.choice);
-    this.field.setChoiceIndex(choice);
-  }
-};
-
-/**
- * Allow the inputter to use RETURN to chose the current menu item when
- * it can't execute the command line
- */
-Tooltip.prototype.selectChoice = function(ev) {
-  if (this.field && this.field.selectChoice) {
-    this.field.selectChoice();
-  }
-};
-
-/**
- * Called by the onFieldChange event on the current Field
- */
-Tooltip.prototype.fieldChanged = function(ev) {
-  this.assignment.setConversion(ev.conversion);
-
-  var isError = ev.conversion.message != null && ev.conversion.message !== '';
-  this.focusManager.setError(isError);
-
-  // Nasty hack, the inputter won't know about the text change yet, so it will
-  // get it's calculations wrong. We need to wait until the current set of
-  // changes has had a chance to propagate
-  this.document.defaultView.setTimeout(function() {
-    this.inputter.focus();
-  }.bind(this), 10);
-};
-
-/**
- * Called by the onAssignmentChange event on the current Assignment
- */
-Tooltip.prototype.assignmentContentsChanged = function(ev) {
-  // Assignments fire AssignmentChange events on any change, including minor
-  // things like whitespace change in arg prefix, so we ignore anything but
-  // an actual value change.
-  if (ev.conversion.arg.text === ev.oldConversion.arg.text) {
-    return;
-  }
-
-  this.field.setConversion(ev.conversion);
-  util.setContents(this.descriptionEle, this.description);
-
-  this._updatePosition();
-};
-
-/**
- * Called to move the tooltip to the correct horizontal position
- */
-Tooltip.prototype._updatePosition = function() {
-  var dimensions = this.getDimensionsOfAssignment();
-
-  // 10 is roughly the width of a char
-  if (this.panelElement) {
-    this.panelElement.style.left = (dimensions.start * 10) + 'px';
-  }
-
-  this.focusManager.updatePosition(dimensions);
-};
-
-/**
- * Returns a object containing 'start' and 'end' properties which identify the
- * number of pixels from the left hand edge of the input element that represent
- * the text portion of the current assignment.
- */
-Tooltip.prototype.getDimensionsOfAssignment = function() {
-  var before = '';
-  var assignments = this.requisition.getAssignments(true);
-  for (var i = 0; i < assignments.length; i++) {
-    if (assignments[i] === this.assignment) {
-      break;
-    }
-    before += assignments[i].toString();
-  }
-  before += this.assignment.arg.prefix;
-
-  var startChar = before.length;
-  before += this.assignment.arg.text;
-  var endChar = before.length;
-
-  return { start: startChar, end: endChar };
-};
-
-/**
- * The description (displayed at the top of the hint area) should be blank if
- * we're entering the CommandAssignment (because it's obvious) otherwise it's
- * the parameter description.
- */
-Object.defineProperty(Tooltip.prototype, 'description', {
-  get: function() {
-    if (this.assignment instanceof CommandAssignment &&
-            this.assignment.value == null) {
-      return '';
-    }
-
-    var output = this.assignment.param.manual;
-    if (output) {
-      var wrapper = this.document.createElement('span');
-      util.setContents(wrapper, output);
-      if (!this.assignment.param.isDataRequired) {
-        var optional = this.document.createElement('span');
-        optional.appendChild(this.document.createTextNode(' (Optional)'));
-        wrapper.appendChild(optional);
-      }
-      return wrapper;
-    }
-
-    return this.assignment.param.description;
-  },
-  enumerable: true
-});
-
-/**
- * Tweak CSS to show/hide the output
- */
-Tooltip.prototype.visibilityChanged = function(ev) {
-  if (!this.panelElement) {
-    return;
-  }
-
-  if (ev.tooltipVisible) {
-    this.panelElement.classList.remove('gcli-panel-hide');
-  }
-  else {
-    this.panelElement.classList.add('gcli-panel-hide');
-  }
-};
-
-exports.Tooltip = Tooltip;
-
-
-});
-define("text!gcli/ui/tooltip.css", [], "");
-
-define("text!gcli/ui/tooltip.html", [], "\n" +
-  "<div class=\"gcli-tt\" aria-live=\"polite\">\n" +
-  "  <div class=\"gcli-tt-description\" save=\"${descriptionEle}\">${description}</div>\n" +
-  "  ${field.element}\n" +
-  "  <div class=\"gcli-tt-error\" save=\"${errorEle}\">${assignment.conversion.message}</div>\n" +
-  "  <div class=\"gcli-tt-highlight\" save=\"${highlightEle}\"></div>\n" +
-  "</div>\n" +
-  "");
-
 
 /*
  * require GCLI so it can be exported as declared in EXPORTED_SYMBOLS
- * The dependencies specified here should be the same as in gcli.js
+ * The dependencies specified here should be the same as in Makefile.dryice.js
  */
 var gcli = require("gcli/index");
diff --git a/browser/devtools/webconsole/gcliblank.xhtml b/browser/devtools/webconsole/gcliblank.xhtml
deleted file mode 100644
index c2e19cddbc7f..000000000000
--- a/browser/devtools/webconsole/gcliblank.xhtml
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-  "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
-  [
-    <!ENTITY % webConsoleDTD SYSTEM "chrome://browser/locale/devtools/webConsole.dtd">
-    %webConsoleDTD;
-  ]
->
-
-<!-- ***** BEGIN LICENSE BLOCK *****
-   - Version: MPL 1.1/GPL 2.0/LGPL 2.1
-   -
-   - The contents of this file are subject to the Mozilla Public License Version
-   - 1.1 (the "License"); you may not use this file except in compliance with
-   - the License. You may obtain a copy of the License at
-   - http://www.mozilla.org/MPL/
-   -
-   - Software distributed under the License is distributed on an "AS IS" basis,
-   - WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-   - for the specific language governing rights and limitations under the
-   - License.
-   -
-   - The Original Code is GCLI.
-   -
-   - The Initial Developer of the Original Code is
-   - Mozilla Foundation.
-   - Portions created by the Initial Developer are Copyright (C) 2010
-   - the Initial Developer. All Rights Reserved.
-   -
-   - Contributor(s):
-   -   Joe Walker <jwalker@mozilla.com>
-   -
-   - Alternatively, the contents of this file may be used under the terms of
-   - either the GNU General Public License Version 2 or later (the "GPL"), or
-   - the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-   - in which case the provisions of the GPL or the LGPL are applicable instead
-   - of those above. If you wish to allow use of your version of this file only
-   - under the terms of either the GPL or the LGPL, and not to allow others to
-   - use your version of this file under the terms of the MPL, indicate your
-   - decision by deleting the provisions above and replace them with the notice
-   - and other provisions required by the LGPL or the GPL. If you do not delete
-   - the provisions above, a recipient may use your version of this file under
-   - the terms of any one of the MPL, the GPL or the LGPL.
-   -
-   - ***** END LICENSE BLOCK ***** -->
-
-
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <link rel="stylesheet" href="chrome://global/skin/global.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://browser/content/devtools/gcli.css" type="text/css"/>
-  <link rel="stylesheet" href="chrome://browser/skin/devtools/gcli.css" type="text/css"/>
-</head>
-<body id="gclichrome-body">
-<div>
-</div>
-</body>
-</html>
diff --git a/browser/devtools/webconsole/test/Makefile.in b/browser/devtools/webconsole/test/Makefile.in
index 68d588538517..6c0b1d0c12d8 100644
--- a/browser/devtools/webconsole/test/Makefile.in
+++ b/browser/devtools/webconsole/test/Makefile.in
@@ -144,10 +144,17 @@ _BROWSER_TEST_FILES = \
 	browser_webconsole_bug_678816.js \
 	browser_webconsole_bug_664131_console_group.js \
 	browser_webconsole_bug_704295.js \
+	browser_gcli_commands.js \
+	browser_gcli_helpers.js \
+	browser_gcli_inspect.js \
+	browser_gcli_integrate.js \
+	browser_gcli_require.js \
+	browser_gcli_web.js \
 	browser_webconsole_bug_658368_time_methods.js \
 	browser_webconsole_bug_622303_persistent_filters.js \
 	browser_webconsole_window_zombie.js \
 	browser_cached_messages.js \
+	browser_gcli_break.js \
 	head.js \
 	$(NULL)
 
@@ -218,9 +225,11 @@ _BROWSER_TEST_PAGES = \
 	test-bug-646025-console-file-location.html \
 	test-bug-678816-content.js \
 	test-file-location.js \
+	browser_gcli_inspect.html \
 	test-bug-658368-time-methods.html \
 	test-webconsole-error-observer.html \
 	test-for-of.html \
+	browser_gcli_break.html \
 	$(NULL)
 
 libs:: $(_BROWSER_TEST_FILES)
diff --git a/browser/devtools/shared/test/browser_gcli_break.html b/browser/devtools/webconsole/test/browser_gcli_break.html
similarity index 81%
rename from browser/devtools/shared/test/browser_gcli_break.html
rename to browser/devtools/webconsole/test/browser_gcli_break.html
index 88e19d4ed7cc..4b20091f9219 100644
--- a/browser/devtools/shared/test/browser_gcli_break.html
+++ b/browser/devtools/webconsole/test/browser_gcli_break.html
@@ -1,8 +1,8 @@
 <!DOCTYPE HTML>
 <html>
-  <head>
+	<head>
     <meta charset="utf-8">
-    <title>Browser GCLI break command test</title>
+		<title>Browser GCLI break command test</title>
     <!-- Any copyright is dedicated to the Public Domain.
          http://creativecommons.org/publicdomain/zero/1.0/ -->
     <script type="text/javascript">
@@ -13,7 +13,7 @@
         eval("debugger;");
       }
     </script>
-  </head>
-  <body>
-  </body>
+	</head>
+	<body>
+	</body>
 </html>
diff --git a/browser/devtools/webconsole/test/browser_gcli_break.js b/browser/devtools/webconsole/test/browser_gcli_break.js
new file mode 100644
index 000000000000..ebac4b5fd6e4
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_gcli_break.js
@@ -0,0 +1,105 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// For more information on GCLI see:
+// - https://github.com/mozilla/gcli/blob/master/docs/index.md
+// - https://wiki.mozilla.org/DevTools/Features/GCLI
+
+// Tests that the break command works as it should
+
+let tempScope = {};
+Components.utils.import("resource:///modules/gcli.jsm", tempScope);
+let gcli = tempScope.gcli;
+
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/browser_gcli_break.html";
+registerCleanupFunction(function() {
+  gcliterm = undefined;
+  requisition = undefined;
+
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
+function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", true);
+  addTab(TEST_URI);
+  browser.addEventListener("DOMContentLoaded", onLoad, false);
+}
+
+let gcliterm;
+let requisition;
+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+
+  try {
+    openConsole();
+
+    let hud = HUDService.getHudByWindow(content);
+    gcliterm = hud.gcliterm;
+    requisition = gcliterm.opts.requisition;
+
+    testSetup();
+    testCreateCommands();
+  }
+  catch (ex) {
+    ok(false, "Caught exception: " + ex)
+    gcli._internal.console.error("Test Failure", ex);
+    closeConsole();
+    finishTest();
+  }
+}
+
+function testSetup() {
+  ok(gcliterm, "We have a GCLI term");
+  ok(requisition, "We have a Requisition");
+}
+
+function testCreateCommands() {
+  type("brea");
+  is(gcliterm.completeNode.textContent, " break", "Completion for 'brea'");
+  is(requisition.getStatus().toString(), "ERROR", "brea is ERROR");
+
+  type("break");
+  is(requisition.getStatus().toString(), "ERROR", "break is ERROR");
+
+  type("break add");
+  is(requisition.getStatus().toString(), "ERROR", "break add is ERROR");
+
+  type("break add line");
+  is(requisition.getStatus().toString(), "ERROR", "break add line is ERROR");
+
+  let pane = DebuggerUI.toggleDebugger();
+  pane._frame.addEventListener("Debugger:Connecting", function dbgConnected() {
+    pane._frame.removeEventListener("Debugger:Connecting", dbgConnected, true);
+
+    // Wait for the initial resume.
+    pane.debuggerWindow.gClient.addOneTimeListener("resumed", function() {
+      pane.debuggerWindow.gClient.activeThread.addOneTimeListener("framesadded", function() {
+        type("break add line " + TEST_URI + " " + content.wrappedJSObject.line0);
+        is(requisition.getStatus().toString(), "VALID", "break add line is VALID");
+        requisition.exec();
+
+        type("break list");
+        is(requisition.getStatus().toString(), "VALID", "break list is VALID");
+        requisition.exec();
+
+        pane.debuggerWindow.gClient.activeThread.resume(function() {
+          type("break del 0");
+          is(requisition.getStatus().toString(), "VALID", "break del 0 is VALID");
+          requisition.exec();
+
+          closeConsole();
+          finishTest();
+        });
+      });
+      // Trigger newScript notifications using eval.
+      content.wrappedJSObject.firstCall();
+    });
+  }, true);
+}
+
+function type(command) {
+  gcliterm.inputNode.value = command.slice(0, -1);
+  gcliterm.inputNode.focus();
+  EventUtils.synthesizeKey(command.slice(-1), {});
+}
diff --git a/browser/devtools/webconsole/test/browser_gcli_commands.js b/browser/devtools/webconsole/test/browser_gcli_commands.js
new file mode 100644
index 000000000000..1cb7c80168d9
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_gcli_commands.js
@@ -0,0 +1,80 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// For more information on GCLI see:
+// - https://github.com/mozilla/gcli/blob/master/docs/index.md
+// - https://wiki.mozilla.org/DevTools/Features/GCLI
+
+let tmp = {};
+Components.utils.import("resource:///modules/gcli.jsm", tmp);
+let gcli = tmp.gcli;
+
+let hud;
+let gcliterm;
+
+registerCleanupFunction(function() {
+  gcliterm = undefined;
+  hud = undefined;
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
+function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", true);
+  addTab("http://example.com/browser/browser/devtools/webconsole/test/browser_gcli_inspect.html");
+  browser.addEventListener("DOMContentLoaded", onLoad, false);
+}
+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+
+  openConsole();
+
+  hud = HUDService.getHudByWindow(content);
+  gcliterm = hud.gcliterm;
+
+  testEcho();
+
+  // gcli._internal.console.error("Command Tests Completed");
+}
+
+function testEcho() {
+  let nodes = exec("echo message");
+  is(nodes.length, 2, "after echo");
+  is(nodes[0].textContent, "echo message", "output 0");
+  is(nodes[1].textContent.trim(), "message", "output 1");
+
+  testConsoleClear();
+}
+
+function testConsoleClear() {
+  let nodes = exec("console clear");
+  is(nodes.length, 1, "after console clear 1");
+
+  executeSoon(function() {
+    let nodes = hud.outputNode.querySelectorAll("richlistitem");
+    is(nodes.length, 0, "after console clear 2");
+
+    testConsoleClose();
+  });
+}
+
+function testConsoleClose() {
+  ok(hud.hudId in HUDService.hudReferences, "console open");
+
+  exec("console close");
+
+  ok(!(hud.hudId in HUDService.hudReferences), "console closed");
+
+  finishTest();
+}
+
+function exec(command) {
+  gcliterm.clearOutput();
+  let nodes = hud.outputNode.querySelectorAll("richlistitem");
+  is(nodes.length, 0, "setup - " + command);
+
+  gcliterm.opts.console.inputter.setInput(command);
+  gcliterm.opts.requisition.exec();
+
+  return hud.outputNode.querySelectorAll("richlistitem");
+}
diff --git a/browser/devtools/webconsole/test/browser_gcli_helpers.js b/browser/devtools/webconsole/test/browser_gcli_helpers.js
new file mode 100644
index 000000000000..810905e9fefc
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_gcli_helpers.js
@@ -0,0 +1,124 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// For more information on GCLI see:
+// - https://github.com/mozilla/gcli/blob/master/docs/index.md
+// - https://wiki.mozilla.org/DevTools/Features/GCLI
+
+let tmp = {};
+Components.utils.import("resource:///modules/gcli.jsm", tmp);
+let gcli = tmp.gcli;
+
+let hud;
+let gcliterm;
+
+registerCleanupFunction(function() {
+  gcliterm = undefined;
+  hud = undefined;
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
+function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", true);
+  addTab("http://example.com/browser/browser/devtools/webconsole/test/test-console.html");
+  browser.addEventListener("DOMContentLoaded", onLoad, false);
+}
+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+
+  openConsole();
+  hud = HUDService.getHudByWindow(content);
+  gcliterm = hud.gcliterm;
+
+  testHelpers();
+  testScripts();
+
+  closeConsole();
+  finishTest();
+
+  // gcli._internal.console.error("Command Tests Completed");
+}
+
+function testScripts() {
+  check("{ 'id=' + $('header').getAttribute('id')", '"id=header"');
+  check("{ headerQuery = $$('h1')", "Instance of NodeList");
+  check("{ 'length=' + headerQuery.length", '"length=1"');
+
+  check("{ xpathQuery = $x('.//*', document.body);", 'Instance of Array');
+  check("{ 'headerFound='  + (xpathQuery[0] == headerQuery[0])", '"headerFound=true"');
+
+  check("{ 'keysResult=' + (keys({b:1})[0] == 'b')", '"keysResult=true"');
+  check("{ 'valuesResult=' + (values({b:1})[0] == 1)", '"valuesResult=true"');
+
+  check("{ [] instanceof Array", "true");
+  check("{ ({}) instanceof Object", "true");
+  check("{ document", "Instance of HTMLDocument");
+  check("{ null", "null");
+  check("{ undefined", undefined);
+
+  check("{ for (var x=0; x<9; x++) x;", "8");
+}
+
+function check(command, reply) {
+  gcliterm.clearOutput();
+  gcliterm.opts.console.inputter.setInput(command);
+  gcliterm.opts.requisition.exec();
+
+  let labels = hud.outputNode.querySelectorAll(".webconsole-msg-output");
+  if (reply === undefined) {
+    is(labels.length, 0, "results count for: " + command);
+  }
+  else {
+    is(labels.length, 1, "results count for: " + command);
+    is(labels[0].textContent.trim(), reply, "message for: " + command);
+  }
+
+  gcliterm.opts.console.inputter.setInput("");
+}
+
+function testHelpers() {
+  gcliterm.clearOutput();
+  gcliterm.opts.console.inputter.setInput("{ pprint({b:2, a:1})");
+  gcliterm.opts.requisition.exec();
+  // Doesn't conform to check() format
+  let label = hud.outputNode.querySelector(".webconsole-msg-output");
+  is(label.textContent.trim(), "a: 1\n  b: 2", "pprint() worked");
+
+  // no gcliterm.clearOutput() here as we clear the output using the clear() fn.
+  gcliterm.opts.console.inputter.setInput("{ clear()");
+  gcliterm.opts.requisition.exec();
+  ok(!hud.outputNode.querySelector(".hud-group"), "clear() worked");
+
+  // check that pprint(window) and keys(window) don't throw, bug 608358
+  gcliterm.clearOutput();
+  gcliterm.opts.console.inputter.setInput("{ pprint(window)");
+  gcliterm.opts.requisition.exec();
+  let labels = hud.outputNode.querySelectorAll(".webconsole-msg-output");
+  is(labels.length, 1, "one line of output for pprint(window)");
+
+  gcliterm.clearOutput();
+  gcliterm.opts.console.inputter.setInput("{ keys(window)");
+  gcliterm.opts.requisition.exec();
+  labels = hud.outputNode.querySelectorAll(".webconsole-msg-output");
+  is(labels.length, 1, "one line of output for keys(window)");
+
+  gcliterm.clearOutput();
+  gcliterm.opts.console.inputter.setInput("{ pprint('hi')");
+  gcliterm.opts.requisition.exec();
+  // Doesn't conform to check() format, bug 614561
+  label = hud.outputNode.querySelector(".webconsole-msg-output");
+  is(label.textContent.trim(), '0: "h"\n  1: "i"', 'pprint("hi") worked');
+
+  // Causes a memory leak. FIXME Bug 717892
+  /*
+  // check that pprint(function) shows function source, bug 618344
+  gcliterm.clearOutput();
+  gcliterm.opts.console.inputter.setInput("{ pprint(print)");
+  gcliterm.opts.requisition.exec();
+  label = hud.outputNode.querySelector(".webconsole-msg-output");
+  isnot(label.textContent.indexOf("SEVERITY_LOG"), -1, "pprint(function) shows function source");
+  */
+
+  gcliterm.clearOutput();
+}
diff --git a/browser/devtools/shared/test/browser_gcli_inspect.html b/browser/devtools/webconsole/test/browser_gcli_inspect.html
similarity index 100%
rename from browser/devtools/shared/test/browser_gcli_inspect.html
rename to browser/devtools/webconsole/test/browser_gcli_inspect.html
diff --git a/browser/devtools/webconsole/test/browser_gcli_inspect.js b/browser/devtools/webconsole/test/browser_gcli_inspect.js
new file mode 100644
index 000000000000..62445c01369e
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_gcli_inspect.js
@@ -0,0 +1,95 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// For more information on GCLI see:
+// - https://github.com/mozilla/gcli/blob/master/docs/index.md
+// - https://wiki.mozilla.org/DevTools/Features/GCLI
+
+// Tests that the inspect command works as it should
+
+let tempScope = {};
+Components.utils.import("resource:///modules/gcli.jsm", tempScope);
+let gcli = tempScope.gcli;
+
+registerCleanupFunction(function() {
+  gcliterm = undefined;
+  requisition = undefined;
+
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
+function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", true);
+  addTab("http://example.com/browser/browser/devtools/webconsole/test/browser_gcli_inspect.html");
+  browser.addEventListener("DOMContentLoaded", onLoad, false);
+}
+
+let gcliterm;
+let requisition;
+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+
+  try {
+    openConsole();
+
+    let hud = HUDService.getHudByWindow(content);
+    gcliterm = hud.gcliterm;
+    requisition = gcliterm.opts.requisition;
+
+    testSetup();
+    testCreateCommands();
+  }
+  catch (ex) {
+    ok(false, "Caught exception: " + ex)
+    gcli._internal.console.error("Test Failure", ex);
+  }
+  finally {
+    closeConsole();
+    finishTest();
+  }
+}
+
+function testSetup() {
+  ok(gcliterm, "We have a GCLI term");
+  ok(requisition, "We have a Requisition");
+}
+
+function testCreateCommands() {
+  type("inspec");
+  is(gcliterm.completeNode.textContent, " inspect", "Completion for \"inspec\"");
+  is(requisition.getStatus().toString(), "ERROR", "inspec is ERROR");
+
+  type("inspect");
+  is(requisition.getStatus().toString(), "ERROR", "inspect is ERROR");
+
+  type("inspect h1");
+  is(requisition.getStatus().toString(), "ERROR", "inspect h1 is ERROR");
+
+  type("inspect span");
+  is(requisition.getStatus().toString(), "ERROR", "inspect span is ERROR");
+
+  type("inspect div");
+  is(requisition.getStatus().toString(), "VALID", "inspect div is VALID");
+
+  type("inspect .someclass");
+  is(requisition.getStatus().toString(), "VALID", "inspect .someclass is VALID");
+
+  type("inspect #someid");
+  is(requisition.getStatus().toString(), "VALID", "inspect #someid is VALID");
+
+  type("inspect button[disabled]");
+  is(requisition.getStatus().toString(), "VALID", "inspect button[disabled] is VALID");
+
+  type("inspect p>strong");
+  is(requisition.getStatus().toString(), "VALID", "inspect p>strong is VALID");
+
+  type("inspect :root");
+  is(requisition.getStatus().toString(), "VALID", "inspect :root is VALID");
+}
+
+function type(command) {
+  gcliterm.inputNode.value = command.slice(0, -1);
+  gcliterm.inputNode.focus();
+  EventUtils.synthesizeKey(command.slice(-1), {});
+}
diff --git a/browser/devtools/webconsole/test/browser_gcli_integrate.js b/browser/devtools/webconsole/test/browser_gcli_integrate.js
new file mode 100644
index 000000000000..11cde6eb12f3
--- /dev/null
+++ b/browser/devtools/webconsole/test/browser_gcli_integrate.js
@@ -0,0 +1,106 @@
+/* Any copyright is dedicated to the Public Domain.
+ * http://creativecommons.org/publicdomain/zero/1.0/ */
+
+// For more information on GCLI see:
+// - https://github.com/mozilla/gcli/blob/master/docs/index.md
+// - https://wiki.mozilla.org/DevTools/Features/GCLI
+
+// Tests that source URLs in the Web Console can be clicked to display the
+// standard View Source window.
+
+let tempScope = {};
+Components.utils.import("resource:///modules/gcli.jsm", tempScope);
+let gcli = tempScope.gcli;
+let require = gcli._internal.require;
+
+const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
+
+registerCleanupFunction(function() {
+  require = undefined;
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
+function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", true);
+  addTab(TEST_URI);
+  browser.addEventListener("DOMContentLoaded", onLoad, false);
+}
+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+
+  try {
+    openConsole();
+
+    testCreateCommands();
+    testCallCommands();
+    testRemoveCommands();
+  }
+  catch (ex) {
+    gcli._internal.console.error('Test Failure', ex);
+    ok(false, '' + ex);
+  }
+  finally {
+    closeConsole();
+    finishTest();
+  }
+}
+
+let tselarr = {
+  name: 'tselarr',
+  params: [
+    { name: 'num', type: { name: 'selection', data: [ '1', '2', '3' ] } },
+    { name: 'arr', type: { name: 'array', subtype: 'string' } },
+  ],
+  exec: function(args, env) {
+    return "flu " + args.num + "-" + args.arr.join("_");
+  }
+};
+
+function testCreateCommands() {
+  let gcli = require("gcli/index");
+  gcli.addCommand(tselarr);
+
+  let canon = require("gcli/canon");
+  let tselcmd = canon.getCommand("tselarr");
+  ok(tselcmd != null, "tselarr exists in the canon");
+  ok(tselcmd instanceof canon.Command, "canon storing commands");
+}
+
+function testCallCommands() {
+  let hud = HUDService.getHudByWindow(content);
+  let gcliterm = hud.gcliterm;
+  ok(gcliterm, "We have a GCLI term");
+
+  // Test successful auto-completion
+  gcliterm.inputNode.value = "h";
+  gcliterm.inputNode.focus();
+  EventUtils.synthesizeKey("e", {});
+  is(gcliterm.completeNode.textContent, " help", "Completion for \"he\"");
+
+  // Test unsuccessful auto-completion
+  gcliterm.inputNode.value = "ec";
+  gcliterm.inputNode.focus();
+  EventUtils.synthesizeKey("d", {});
+  is(gcliterm.completeNode.textContent, " ecd", "Completion for \"ecd\"");
+
+  // Test a normal command's life cycle
+  gcliterm.opts.console.inputter.setInput("echo hello world");
+  gcliterm.opts.requisition.exec();
+
+  let nodes = hud.outputNode.querySelectorAll(".gcliterm-msg-body");
+
+  is(nodes.length, 1, "Right number of output nodes");
+  ok(/hello world/.test(nodes[0].textContent), "the command's output is correct.");
+
+  gcliterm.clearOutput();
+}
+
+function testRemoveCommands() {
+  let gcli = require("gcli/index");
+  gcli.removeCommand(tselarr);
+
+  let canon = require("gcli/canon");
+  let tselcmd = canon.getCommand("tselarr");
+  ok(tselcmd == null, "tselcmd removed from the canon");
+}
diff --git a/browser/devtools/shared/test/browser_gcli_require.js b/browser/devtools/webconsole/test/browser_gcli_require.js
similarity index 87%
rename from browser/devtools/shared/test/browser_gcli_require.js
rename to browser/devtools/webconsole/test/browser_gcli_require.js
index 515d9a0a78c7..5070b3b790ac 100644
--- a/browser/devtools/shared/test/browser_gcli_require.js
+++ b/browser/devtools/webconsole/test/browser_gcli_require.js
@@ -1,10 +1,25 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
+// For more information on GCLI see:
+// - https://github.com/mozilla/gcli/blob/master/docs/index.md
+// - https://wiki.mozilla.org/DevTools/Features/GCLI
+
 // Tests that source URLs in the Web Console can be clicked to display the
 // standard View Source window.
 
+var modules = { gcli: null };
+
+Components.utils.import("resource:///modules/gcli.jsm", modules);
+
+var define, require, console;
+
 function test() {
+
+  define = modules.gcli._internal.define;
+  require = modules.gcli._internal.require;
+  console = modules.gcli._internal.console;
+
   define('gclitest/requirable', [], function(require, exports, module) {
     exports.thing1 = 'thing1';
     exports.thing2 = 2;
@@ -28,6 +43,8 @@ function test() {
   testRecursive();
   testUncompilable();
 
+  finishTest();
+
   delete define.modules['gclitest/requirable'];
   delete define.globalDomain.modules['gclitest/requirable'];
   delete define.modules['gclitest/unrequirable'];
@@ -35,7 +52,11 @@ function test() {
   delete define.modules['gclitest/recurse'];
   delete define.globalDomain.modules['gclitest/recurse'];
 
-  finish();
+  define = null;
+  require = null;
+  console = null;
+
+  modules = null;
 }
 
 function testWorking() {
diff --git a/browser/devtools/shared/test/browser_gcli_web.js b/browser/devtools/webconsole/test/browser_gcli_web.js
similarity index 59%
rename from browser/devtools/shared/test/browser_gcli_web.js
rename to browser/devtools/webconsole/test/browser_gcli_web.js
index c0e2c4961b87..6145cf97fefc 100644
--- a/browser/devtools/shared/test/browser_gcli_web.js
+++ b/browser/devtools/webconsole/test/browser_gcli_web.js
@@ -19,7 +19,7 @@
  *
  * This test file is generated using a level 25 wizard spell cast on the
  * test files that run in the browser as part of GCLI's test suite.
- * For details of how to cast the spell, see GCLI's gcli.js
+ * For details of how to cast the spell, see GCLI's Makefile.dryice.js
  *
  * For more information on GCLI see:
  * - https://github.com/mozilla/gcli/blob/master/docs/index.md
@@ -41,6 +41,13 @@
  */
 
 ///////////////////////////////////////////////////////////////////////////////
+
+var obj = {};
+Components.utils.import("resource:///modules/gcli.jsm", obj);
+
+var define = obj.gcli._internal.define;
+var console = obj.gcli._internal.console;
+var Node = Components.interfaces.nsIDOMNode;
 /*
  * Copyright 2009-2011 Mozilla Foundation and contributors
  * Licensed under the New BSD license. See LICENSE.txt or:
@@ -51,46 +58,13 @@ define('gclitest/index', ['require', 'exports', 'module' , 'gclitest/suite'], fu
 
   var examiner = require('gclitest/suite').examiner;
 
-  // A minimum fake dom to get us through the JS tests
-  var fakeWindow = {
-    isFake: true,
-    document: { title: 'Fake DOM' }
-  };
-  fakeWindow.window = fakeWindow;
-  examiner.defaultOptions = {
-    window: fakeWindow,
-    hideExec: true
-  };
-
   /**
    * A simple proxy to examiner.run, for convenience - this is run from the
    * top level.
-   * @param options Lookup of options that customize test running. Includes:
-   * - window (default=undefined) A reference to the DOM window. If left
-   *   undefined then a reduced set of tests will run.
-   * - isNode (default=false) Are we running under NodeJS, specifically, are we
-   *   using JSDom, which isn't a 100% complete DOM implementation.
-   *   Some tests are skipped when using NodeJS.
-   * - display (default=undefined) A reference to a Display implementation.
-   *   A reduced set of tests will run if left undefined
-   * - detailedResultLog (default=false) do we output a test summary to
-   *   |console.log| on test completion.
-   * - hideExec (default=false) Set the |hidden| property in calls to
-   *   |requisition.exec()| which prevents the display from becoming messed up,
-   *   however use of hideExec restricts the set of tests that are run
    */
   exports.run = function(options) {
     examiner.run(options || {});
-
-    // A better set of default than those specified above, come from the set
-    // that are passed to run().
-    examiner.defaultOptions = {
-      window: options.window,
-      display: options.display,
-      hideExec: options.hideExec
-    };
   };
-
 });
 /*
  * Copyright 2009-2011 Mozilla Foundation and contributors
@@ -98,7 +72,7 @@ define('gclitest/index', ['require', 'exports', 'module' , 'gclitest/suite'], fu
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gclitest/suite', ['require', 'exports', 'module' , 'gcli/index', 'test/examiner', 'gclitest/testCli', 'gclitest/testCompletion', 'gclitest/testExec', 'gclitest/testHistory', 'gclitest/testJs', 'gclitest/testKeyboard', 'gclitest/testRequire', 'gclitest/testResource', 'gclitest/testScratchpad', 'gclitest/testSpell', 'gclitest/testSplit', 'gclitest/testTokenize', 'gclitest/testTooltip', 'gclitest/testTypes', 'gclitest/testUtil'], function(require, exports, module) {
+define('gclitest/suite', ['require', 'exports', 'module' , 'gcli/index', 'test/examiner', 'gclitest/testTokenize', 'gclitest/testSplit', 'gclitest/testCli', 'gclitest/testExec', 'gclitest/testKeyboard', 'gclitest/testScratchpad', 'gclitest/testHistory', 'gclitest/testRequire', 'gclitest/testResource', 'gclitest/testJs', 'gclitest/testUtil'], function(require, exports, module) {
 
   // We need to make sure GCLI is initialized before we begin testing it
   require('gcli/index');
@@ -108,20 +82,16 @@ define('gclitest/suite', ['require', 'exports', 'module' , 'gcli/index', 'test/e
   // It's tempting to want to unify these strings and make addSuite() do the
   // call to require(), however that breaks the build system which looks for
   // the strings passed to require
+  examiner.addSuite('gclitest/testTokenize', require('gclitest/testTokenize'));
+  examiner.addSuite('gclitest/testSplit', require('gclitest/testSplit'));
   examiner.addSuite('gclitest/testCli', require('gclitest/testCli'));
-  examiner.addSuite('gclitest/testCompletion', require('gclitest/testCompletion'));
   examiner.addSuite('gclitest/testExec', require('gclitest/testExec'));
-  examiner.addSuite('gclitest/testHistory', require('gclitest/testHistory'));
-  examiner.addSuite('gclitest/testJs', require('gclitest/testJs'));
   examiner.addSuite('gclitest/testKeyboard', require('gclitest/testKeyboard'));
+  examiner.addSuite('gclitest/testScratchpad', require('gclitest/testScratchpad'));
+  examiner.addSuite('gclitest/testHistory', require('gclitest/testHistory'));
   examiner.addSuite('gclitest/testRequire', require('gclitest/testRequire'));
   examiner.addSuite('gclitest/testResource', require('gclitest/testResource'));
-  examiner.addSuite('gclitest/testScratchpad', require('gclitest/testScratchpad'));
-  examiner.addSuite('gclitest/testSpell', require('gclitest/testSpell'));
-  examiner.addSuite('gclitest/testSplit', require('gclitest/testSplit'));
-  examiner.addSuite('gclitest/testTokenize', require('gclitest/testTokenize'));
-  examiner.addSuite('gclitest/testTooltip', require('gclitest/testTooltip'));
-  examiner.addSuite('gclitest/testTypes', require('gclitest/testTypes'));
+  examiner.addSuite('gclitest/testJs', require('gclitest/testJs'));
   examiner.addSuite('gclitest/testUtil', require('gclitest/testUtil'));
 
   exports.examiner = examiner;
@@ -164,30 +134,15 @@ examiner.addSuite = function(name, suite) {
   examiner.suites[name] = new Suite(name, suite);
 };
 
-/**
- * When run from an command, there are some options that we can't (and
- * shouldn't) specify, so we allow a set of default options, which are merged
- * with the specified options in |run()|.
- */
-examiner.defaultOptions = {};
-
-/**
- * Add properties to |options| from |examiner.defaultOptions| when |options|
- * does not have a value for a given name.
- */
-function mergeDefaultOptions(options) {
-  Object.keys(examiner.defaultOptions).forEach(function(name) {
-    if (options[name] == null) {
-      options[name] = examiner.defaultOptions[name];
-    }
-  });
-}
-
 /**
  * Run the tests defined in the test suite synchronously
+ * @param options How the tests are run. Properties include:
+ * - window: The browser window object to run the tests against
+ * - useFakeWindow: Use a test subset and a fake DOM to avoid a real document
+ * - detailedResultLog: console.log test passes and failures in more detail
  */
 examiner.run = function(options) {
-  mergeDefaultOptions(options);
+  examiner._checkOptions(options);
 
   Object.keys(examiner.suites).forEach(function(suiteName) {
     var suite = examiner.suites[suiteName];
@@ -195,7 +150,7 @@ examiner.run = function(options) {
   }.bind(this));
 
   if (options.detailedResultLog) {
-    examiner.detailedResultLog();
+    examiner.log();
   }
   else {
     console.log('Completed test suite');
@@ -204,18 +159,39 @@ examiner.run = function(options) {
   return examiner.suites;
 };
 
+/**
+ * Check the options object. There should be either useFakeWindow or a window.
+ * Setup the fake window if requested.
+ */
+examiner._checkOptions = function(options) {
+  if (options.useFakeWindow) {
+    // A minimum fake dom to get us through the JS tests
+    var doc = { title: 'Fake DOM' };
+    var fakeWindow = {
+      window: { document: doc },
+      document: doc
+    };
+
+    options.window = fakeWindow;
+  }
+
+  if (!options.window) {
+    throw new Error('Tests need either window or useFakeWindow');
+  }
+};
+
 /**
  * Run all the tests asynchronously
  */
 examiner.runAsync = function(options, callback) {
-  mergeDefaultOptions(options);
-  this._runAsyncInternal(0, options, callback);
+  examiner._checkOptions(options);
+  this.runAsyncInternal(0, options, callback);
 };
 
 /**
  * Run all the test suits asynchronously
  */
-examiner._runAsyncInternal = function(i, options, callback) {
+examiner.runAsyncInternal = function(i, options, callback) {
   if (i >= Object.keys(examiner.suites).length) {
     if (typeof callback === 'function') {
       callback();
@@ -226,11 +202,18 @@ examiner._runAsyncInternal = function(i, options, callback) {
   var suiteName = Object.keys(examiner.suites)[i];
   examiner.suites[suiteName].runAsync(options, function() {
     setTimeout(function() {
-      examiner._runAsyncInternal(i + 1, options, callback);
+      examiner.runAsyncInternal(i + 1, options, callback);
     }.bind(this), delay);
   }.bind(this));
 };
 
+/**
+ *
+ */
+examiner.reportToText = function() {
+  return JSON.stringify(examiner.toRemote());
+};
+
 /**
  * Create a JSON object suitable for serialization
  */
@@ -238,112 +221,47 @@ examiner.toRemote = function() {
   return {
     suites: Object.keys(examiner.suites).map(function(suiteName) {
       return examiner.suites[suiteName].toRemote();
-    }.bind(this)),
-    summary: {
-      checks: this.checks,
-      status: this.status
-    }
+    }.bind(this))
   };
 };
 
-/**
- * The number of checks in this set of test suites is the sum of the checks in
- * the test suites.
- */
-Object.defineProperty(examiner, 'checks', {
-  get: function() {
-    return  Object.keys(examiner.suites).reduce(function(current, suiteName) {
-      return current + examiner.suites[suiteName].checks;
-    }.bind(this), 0);
-  },
-  enumerable: true
-});
-
-/**
- * The status of this set of test suites is the worst of the statuses of the
- * contained test suites.
- */
-Object.defineProperty(examiner, 'status', {
-  get: function() {
-    return Object.keys(examiner.suites).reduce(function(status, suiteName) {
-      var suiteStatus = examiner.suites[suiteName].status;
-      return status.index > suiteStatus.index ? status : suiteStatus;
-    }.bind(this), stati.notrun);
-  },
-  enumerable: true
-});
-
 /**
  * Output a test summary to console.log
  */
-examiner.detailedResultLog = function() {
-  Object.keys(this.suites).forEach(function(suiteName) {
-    var suite = examiner.suites[suiteName];
-
-    console.log(suite.name + ': ' + suite.status.name + ' (funcs=' +
-            Object.keys(suite.tests).length +
-            ', checks=' + suite.checks + ')');
-
-    Object.keys(suite.tests).forEach(function(testName) {
-      var test = suite.tests[testName];
-      if (test.status !== stati.pass || test.failures.length !== 0) {
-        console.log('- ' + test.name + ': ' + test.status.name);
-        test.failures.forEach(function(failure) {
-          console.log('  - ' + failure.message);
-          if (failure.expected) {
-            console.log('    - Expected: ' + failure.expected);
-            console.log('    -   Actual: ' + failure.actual);
-          }
-        }.bind(this));
-      }
-    }.bind(this));
-  }.bind(this));
-
-  console.log();
-  console.log('Summary: ' + this.status.name + ' (' + this.checks + ' checks)');
+examiner.log = function() {
+  var remote = this.toRemote();
+  remote.suites.forEach(function(suite) {
+    console.log(suite.name);
+    suite.tests.forEach(function(test) {
+      console.log('- ' + test.name, test.status.name, test.message || '');
+    });
+  });
 };
 
 /**
  * Used by assert to record a failure against the current test
- * @param failure A set of properties describing the failure. Properties include:
- * - message (string, required) A message describing the test
- * - expected (optional) The expected data
- * - actual (optional) The actual data
  */
-examiner.recordFailure = function(failure) {
+examiner.recordError = function(message) {
   if (!currentTest) {
-    console.error('No currentTest for ' + failure.message);
+    console.error('No currentTest for ' + message);
     return;
   }
 
   currentTest.status = stati.fail;
-  currentTest.failures.push(failure);
-};
 
-/**
- * Used by assert to record a check pass
- */
-examiner.recordPass = function() {
-  if (!currentTest) {
-    console.error('No currentTest');
-    return;
+  if (Array.isArray(message)) {
+    currentTest.messages.push.apply(currentTest.messages, message);
+  }
+  else {
+    currentTest.messages.push(message);
   }
-
-  currentTest.checks++;
-};
-
-/**
- * When we want to note something alongside a test
- */
-examiner.log = function(message) {
-  currentTest.failures.push({ message: message });
 };
 
 /**
  * A suite is a group of tests
  */
 function Suite(suiteName, suite) {
-  this.name = suiteName.replace(/gclitest\//, '');
+  this.name = suiteName;
   this.suite = suite;
 
   this.tests = {};
@@ -359,8 +277,8 @@ function Suite(suiteName, suite) {
  * Run all the tests in this suite synchronously
  */
 Suite.prototype.run = function(options) {
-  if (!this._setup(options)) {
-    return;
+  if (typeof this.suite.setup == "function") {
+    this.suite.setup(options);
   }
 
   Object.keys(this.tests).forEach(function(testName) {
@@ -368,22 +286,23 @@ Suite.prototype.run = function(options) {
     test.run(options);
   }.bind(this));
 
-  this._shutdown(options);
+  if (typeof this.suite.shutdown == "function") {
+    this.suite.shutdown(options);
+  }
 };
 
 /**
  * Run all the tests in this suite asynchronously
  */
 Suite.prototype.runAsync = function(options, callback) {
-  if (!this._setup(options)) {
-    if (typeof callback === 'function') {
-      callback();
-    }
-    return;
+  if (typeof this.suite.setup == "function") {
+    this.suite.setup(options);
   }
 
-  this._runAsyncInternal(0, options, function() {
-    this._shutdown(options);
+  this.runAsyncInternal(0, options, function() {
+    if (typeof this.suite.shutdown == "function") {
+      this.suite.shutdown(options);
+    }
 
     if (typeof callback === 'function') {
       callback();
@@ -394,7 +313,7 @@ Suite.prototype.runAsync = function(options, callback) {
 /**
  * Function used by the async runners that can handle async recursion.
  */
-Suite.prototype._runAsyncInternal = function(i, options, callback) {
+Suite.prototype.runAsyncInternal = function(i, options, callback) {
   if (i >= Object.keys(this.tests).length) {
     if (typeof callback === 'function') {
       callback();
@@ -405,7 +324,7 @@ Suite.prototype._runAsyncInternal = function(i, options, callback) {
   var testName = Object.keys(this.tests)[i];
   this.tests[testName].runAsync(options, function() {
     setTimeout(function() {
-      this._runAsyncInternal(i + 1, options, callback);
+      this.runAsyncInternal(i + 1, options, callback);
     }.bind(this), delay);
   }.bind(this));
 };
@@ -422,88 +341,6 @@ Suite.prototype.toRemote = function() {
   };
 };
 
-/**
- * The number of checks in this suite is the sum of the checks in the contained
- * tests.
- */
-Object.defineProperty(Suite.prototype, 'checks', {
-  get: function() {
-    return Object.keys(this.tests).reduce(function(prevChecks, testName) {
-      return prevChecks + this.tests[testName].checks;
-    }.bind(this), 0);
-  },
-  enumerable: true
-});
-
-/**
- * The status of a test suite is the worst of the statuses of the contained
- * tests.
- */
-Object.defineProperty(Suite.prototype, 'status', {
-  get: function() {
-    return Object.keys(this.tests).reduce(function(prevStatus, testName) {
-      var suiteStatus = this.tests[testName].status;
-      return prevStatus.index > suiteStatus.index ? prevStatus : suiteStatus;
-    }.bind(this), stati.notrun);
-  },
-  enumerable: true
-});
-
-/**
- * Defensively setup the test suite
- */
-Suite.prototype._setup = function(options) {
-  if (typeof this.suite.setup !== 'function') {
-    return true;
-  }
-
-  try {
-    this.suite.setup(options);
-    return true;
-  }
-  catch (ex) {
-    this._logToAllTests(stati.notrun, '' + ex);
-    console.error(ex);
-    if (ex.stack) {
-      console.error(ex.stack);
-    }
-    return false;
-  }
-};
-
-/**
- * Defensively shutdown the test suite
- */
-Suite.prototype._shutdown = function(options) {
-  if (typeof this.suite.shutdown !== 'function') {
-    return true;
-  }
-
-  try {
-    this.suite.shutdown(options);
-    return true;
-  }
-  catch (ex) {
-    this._logToAllTests(stati.fail, '' + ex);
-    console.error(ex);
-    if (ex.stack) {
-      console.error(ex.stack);
-    }
-    return false;
-  }
-};
-
-/**
- * Something has gone wrong that affects all tests in this Suite
- */
-Suite.prototype._logToAllTests = function(status, message) {
-  Object.keys(this.tests).forEach(function(testName) {
-    var test = this.tests[testName];
-    test.status = status;
-    test.failures.push({ message: message });
-  }.bind(this));
-};
-
 
 /**
  * A test represents data about a single test function
@@ -514,9 +351,8 @@ function Test(suite, name, func) {
   this.func = func;
   this.title = name.replace(/^test/, '').replace(/([A-Z])/g, ' $1');
 
-  this.failures = [];
+  this.messages = [];
   this.status = stati.notrun;
-  this.checks = 0;
 }
 
 /**
@@ -525,15 +361,14 @@ function Test(suite, name, func) {
 Test.prototype.run = function(options) {
   currentTest = this;
   this.status = stati.executing;
-  this.failures = [];
-  this.checks = 0;
+  this.messages = [];
 
   try {
     this.func.apply(this.suite, [ options ]);
   }
   catch (ex) {
     this.status = stati.fail;
-    this.failures.push({ message: '' + ex });
+    this.messages.push('' + ex);
     console.error(ex);
     if (ex.stack) {
       console.error(ex.stack);
@@ -567,1868 +402,11 @@ Test.prototype.toRemote = function() {
     name: this.name,
     title: this.title,
     status: this.status,
-    failures: this.failures,
-    checks: this.checks
+    messages: this.messages
   };
 };
 
 
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testCli', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gclitest/commands', 'test/assert'], function(require, exports, module) {
-
-
-var Requisition = require('gcli/cli').Requisition;
-var Status = require('gcli/types').Status;
-var commands = require('gclitest/commands');
-
-var test = require('test/assert');
-
-exports.setup = function() {
-  commands.setup();
-};
-
-exports.shutdown = function() {
-  commands.shutdown();
-};
-
-
-var assign1;
-var assign2;
-var assignC;
-var requ;
-var debug = false;
-var status;
-var statuses;
-
-function update(input) {
-  if (!requ) {
-    requ = new Requisition();
-  }
-  requ.update(input.typed);
-
-  if (debug) {
-    console.log('####### TEST: typed="' + input.typed +
-        '" cur=' + input.cursor.start +
-        ' cli=', requ);
-  }
-
-  status = requ.getStatus();
-  assignC = requ.getAssignmentAt(input.cursor.start);
-  statuses = requ.getInputStatusMarkup(input.cursor.start).map(function(s) {
-    return Array(s.string.length + 1).join(s.status.toString()[0]);
-  }).join('');
-
-  if (requ.commandAssignment.value) {
-    assign1 = requ.getAssignment(0);
-    assign2 = requ.getAssignment(1);
-  }
-  else {
-    assign1 = undefined;
-    assign2 = undefined;
-  }
-}
-
-function verifyPredictionsContains(name, predictions) {
-  return predictions.every(function(prediction) {
-    return name === prediction.name;
-  }, this);
-}
-
-
-exports.testBlank = function() {
-  update({ typed: '', cursor: { start: 0, end: 0 } });
-  test.is(        '', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is(undefined, requ.commandAssignment.value);
-
-  update({ typed: ' ', cursor: { start: 1, end: 1 } });
-  test.is(        'V', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is(undefined, requ.commandAssignment.value);
-
-  update({ typed: ' ', cursor: { start: 0, end: 0 } });
-  test.is(        'V', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is(undefined, requ.commandAssignment.value);
-};
-
-exports.testIncompleteMultiMatch = function() {
-  update({ typed: 't', cursor: { start: 1, end: 1 } });
-  test.is(        'I', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.ok(assignC.getPredictions().length > 0);
-  verifyPredictionsContains('tsv', assignC.getPredictions());
-  verifyPredictionsContains('tsr', assignC.getPredictions());
-  test.is(undefined, requ.commandAssignment.value);
-};
-
-exports.testIncompleteSingleMatch = function() {
-  update({ typed: 'tselar', cursor: { start: 6, end: 6 } });
-  test.is(        'IIIIII', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is(1, assignC.getPredictions().length);
-  test.is('tselarr', assignC.getPredictions()[0].name);
-  test.is(undefined, requ.commandAssignment.value);
-};
-
-exports.testTsv = function() {
-  update({ typed: 'tsv', cursor: { start: 3, end: 3 } });
-  test.is(        'VVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is('tsv', requ.commandAssignment.value.name);
-
-  update({ typed: 'tsv ', cursor: { start: 4, end: 4 } });
-  test.is(        'VVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is(0, assignC.paramIndex);
-  test.is('tsv', requ.commandAssignment.value.name);
-
-  update({ typed: 'tsv ', cursor: { start: 2, end: 2 } });
-  test.is(        'VVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is('tsv', requ.commandAssignment.value.name);
-
-  update({ typed: 'tsv o', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVI', statuses);
-  test.is(Status.ERROR, status);
-  test.is(0, assignC.paramIndex);
-  test.ok(assignC.getPredictions().length >= 2);
-  test.is(commands.option1, assignC.getPredictions()[0].value);
-  test.is(commands.option2, assignC.getPredictions()[1].value);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('o', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsv option', cursor: { start: 10, end: 10 } });
-  test.is(        'VVVVIIIIII', statuses);
-  test.is(Status.ERROR, status);
-  test.is(0, assignC.paramIndex);
-  test.ok(assignC.getPredictions().length >= 2);
-  test.is(commands.option1, assignC.getPredictions()[0].value);
-  test.is(commands.option2, assignC.getPredictions()[1].value);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsv option', cursor: { start: 1, end: 1 } });
-  test.is(        'VVVVEEEEEE', statuses);
-  test.is(Status.ERROR, status);
-  test.is(-1, assignC.paramIndex);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsv option ', cursor: { start: 11, end: 11 } });
-  test.is(        'VVVVEEEEEEV', statuses);
-  test.is(Status.ERROR, status);
-  test.is(1, assignC.paramIndex);
-  test.is(0, assignC.getPredictions().length);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsv option1', cursor: { start: 11, end: 11 } });
-  test.is(        'VVVVVVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option1', assign1.arg.text);
-  test.is(commands.option1, assign1.value);
-  test.is(0, assignC.paramIndex);
-
-  update({ typed: 'tsv option1 ', cursor: { start: 12, end: 12 } });
-  test.is(        'VVVVVVVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option1', assign1.arg.text);
-  test.is(commands.option1, assign1.value);
-  test.is(1, assignC.paramIndex);
-
-  update({ typed: 'tsv option1 6', cursor: { start: 13, end: 13 } });
-  test.is(        'VVVVVVVVVVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option1', assign1.arg.text);
-  test.is(commands.option1, assign1.value);
-  test.is('6', assign2.arg.text);
-  test.is('6', assign2.value);
-  test.is('string', typeof assign2.value);
-  test.is(1, assignC.paramIndex);
-
-  update({ typed: 'tsv option2 6', cursor: { start: 13, end: 13 } });
-  test.is(        'VVVVVVVVVVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is('option2', assign1.arg.text);
-  test.is(commands.option2, assign1.value);
-  test.is('6', assign2.arg.text);
-  test.is(6, assign2.value);
-  test.is('number', typeof assign2.value);
-  test.is(1, assignC.paramIndex);
-};
-
-exports.testInvalid = function() {
-  update({ typed: 'zxjq', cursor: { start: 4, end: 4 } });
-  test.is(        'EEEE', statuses);
-  test.is('zxjq', requ.commandAssignment.arg.text);
-  test.is('', requ._unassigned.arg.text);
-  test.is(-1, assignC.paramIndex);
-
-  update({ typed: 'zxjq ', cursor: { start: 5, end: 5 } });
-  test.is(        'EEEEV', statuses);
-  test.is('zxjq', requ.commandAssignment.arg.text);
-  test.is('', requ._unassigned.arg.text);
-  test.is(-1, assignC.paramIndex);
-
-  update({ typed: 'zxjq one', cursor: { start: 8, end: 8 } });
-  test.is(        'EEEEVEEE', statuses);
-  test.is('zxjq', requ.commandAssignment.arg.text);
-  test.is('one', requ._unassigned.arg.text);
-};
-
-exports.testSingleString = function() {
-  update({ typed: 'tsr', cursor: { start: 3, end: 3 } });
-  test.is(        'VVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsr', requ.commandAssignment.value.name);
-  test.ok(assign1.arg.isBlank());
-  test.is(undefined, assign1.value);
-  test.is(undefined, assign2);
-
-  update({ typed: 'tsr ', cursor: { start: 4, end: 4 } });
-  test.is(        'VVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsr', requ.commandAssignment.value.name);
-  test.ok(assign1.arg.isBlank());
-  test.is(undefined, assign1.value);
-  test.is(undefined, assign2);
-
-  update({ typed: 'tsr h', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsr', requ.commandAssignment.value.name);
-  test.is('h', assign1.arg.text);
-  test.is('h', assign1.value);
-
-  update({ typed: 'tsr "h h"', cursor: { start: 9, end: 9 } });
-  test.is(        'VVVVVVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsr', requ.commandAssignment.value.name);
-  test.is('h h', assign1.arg.text);
-  test.is('h h', assign1.value);
-
-  update({ typed: 'tsr h h h', cursor: { start: 9, end: 9 } });
-  test.is(        'VVVVVVVVV', statuses);
-  test.is('tsr', requ.commandAssignment.value.name);
-  test.is('h h h', assign1.arg.text);
-  test.is('h h h', assign1.value);
-};
-
-exports.testSingleNumber = function() {
-  update({ typed: 'tsu', cursor: { start: 3, end: 3 } });
-  test.is(        'VVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsu', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsu ', cursor: { start: 4, end: 4 } });
-  test.is(        'VVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsu', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsu 1', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsu', requ.commandAssignment.value.name);
-  test.is('1', assign1.arg.text);
-  test.is(1, assign1.value);
-  test.is('number', typeof assign1.value);
-
-  update({ typed: 'tsu x', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVE', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsu', requ.commandAssignment.value.name);
-  test.is('x', assign1.arg.text);
-  test.is(undefined, assign1.value);
-};
-
-exports.testElement = function(options) {
-  update({ typed: 'tse', cursor: { start: 3, end: 3 } });
-  test.is(        'VVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tse', requ.commandAssignment.value.name);
-  test.ok(assign1.arg.isBlank());
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tse :root', cursor: { start: 9, end: 9 } });
-  test.is(        'VVVVVVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tse', requ.commandAssignment.value.name);
-  test.is(':root', assign1.arg.text);
-  if (!options.window.isFake) {
-    test.is(options.window.document.documentElement, assign1.value);
-  }
-
-  if (!options.window.isFake) {
-    var inputElement = options.window.document.getElementById('gcli-input');
-    if (inputElement) {
-      update({ typed: 'tse #gcli-input', cursor: { start: 15, end: 15 } });
-      test.is(        'VVVVVVVVVVVVVVV', statuses);
-      test.is(Status.VALID, status);
-      test.is('tse', requ.commandAssignment.value.name);
-      test.is('#gcli-input', assign1.arg.text);
-      test.is(inputElement, assign1.value);
-    }
-    else {
-      test.log('Skipping test that assumes gcli on the web');
-    }
-  }
-
-  update({ typed: 'tse #gcli-nomatch', cursor: { start: 17, end: 17 } });
-  // This is somewhat debatable because this input can't be corrected simply
-  // by typing so it's and error rather than incomplete, however without
-  // digging into the CSS engine we can't tell that so we default to incomplete
-  test.is(        'VVVVIIIIIIIIIIIII', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tse', requ.commandAssignment.value.name);
-  test.is('#gcli-nomatch', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tse #', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVE', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tse', requ.commandAssignment.value.name);
-  test.is('#', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tse .', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVE', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tse', requ.commandAssignment.value.name);
-  test.is('.', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tse *', cursor: { start: 5, end: 5 } });
-  test.is(        'VVVVE', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tse', requ.commandAssignment.value.name);
-  test.is('*', assign1.arg.text);
-  test.is(undefined, assign1.value);
-};
-
-exports.testNestedCommand = function() {
-  update({ typed: 'tsn', cursor: { start: 3, end: 3 } });
-  test.is(        'III', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn', requ.commandAssignment.arg.text);
-  test.is(undefined, assign1);
-
-  update({ typed: 'tsn ', cursor: { start: 4, end: 4 } });
-  test.is(        'IIIV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn', requ.commandAssignment.arg.text);
-  test.is(undefined, assign1);
-
-  update({ typed: 'tsn x', cursor: { start: 5, end: 5 } });
-  // Commented out while we try out fuzzy matching
-  // test.is(        'EEEVE', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn x', requ.commandAssignment.arg.text);
-  test.is(undefined, assign1);
-
-  update({ typed: 'tsn dif', cursor: { start: 7, end: 7 } });
-  test.is(        'VVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn dif', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsn dif ', cursor: { start: 8, end: 8 } });
-  test.is(        'VVVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn dif', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsn dif x', cursor: { start: 9, end: 9 } });
-  test.is(        'VVVVVVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsn dif', requ.commandAssignment.value.name);
-  test.is('x', assign1.arg.text);
-  test.is('x', assign1.value);
-
-  update({ typed: 'tsn ext', cursor: { start: 7, end: 7 } });
-  test.is(        'VVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn ext', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsn exte', cursor: { start: 8, end: 8 } });
-  test.is(        'VVVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn exte', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsn exten', cursor: { start: 9, end: 9 } });
-  test.is(        'VVVVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn exten', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'tsn extend', cursor: { start: 10, end: 10 } });
-  test.is(        'VVVVVVVVVV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn extend', requ.commandAssignment.value.name);
-  test.is('', assign1.arg.text);
-  test.is(undefined, assign1.value);
-
-  update({ typed: 'ts ', cursor: { start: 3, end: 3 } });
-  test.is(        'EEV', statuses);
-  test.is(Status.ERROR, status);
-  test.is('ts', requ.commandAssignment.arg.text);
-  test.is(undefined, assign1);
-};
-
-// From Bug 664203
-exports.testDeeplyNested = function() {
-  update({ typed: 'tsn deep down nested cmd', cursor: { start: 24, end: 24 } });
-  test.is(        'VVVVVVVVVVVVVVVVVVVVVVVV', statuses);
-  test.is(Status.VALID, status);
-  test.is('tsn deep down nested cmd', requ.commandAssignment.value.name);
-  test.is(undefined, assign1);
-
-  update({ typed: 'tsn deep down nested', cursor: { start: 20, end: 20 } });
-  test.is(        'IIIVIIIIVIIIIVIIIIII', statuses);
-  test.is(Status.ERROR, status);
-  test.is('tsn deep down nested', requ.commandAssignment.value.name);
-  test.is(undefined, assign1);
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/commands', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/util', 'gcli/types/selection', 'gcli/types/basic', 'gcli/types'], function(require, exports, module) {
-var commands = exports;
-
-
-var canon = require('gcli/canon');
-var util = require('gcli/util');
-
-var SelectionType = require('gcli/types/selection').SelectionType;
-var DeferredType = require('gcli/types/basic').DeferredType;
-var types = require('gcli/types');
-
-/**
- * Registration and de-registration.
- */
-commands.setup = function() {
-  // setup/shutdown need to register/unregister types, however that means we
-  // need to re-initialize commands.option1 and commands.option2 with the
-  // actual types
-  commands.option1.type = types.getType('string');
-  commands.option2.type = types.getType('number');
-
-  types.registerType(commands.optionType);
-  types.registerType(commands.optionValue);
-
-  canon.addCommand(commands.tsv);
-  canon.addCommand(commands.tsr);
-  canon.addCommand(commands.tse);
-  canon.addCommand(commands.tsj);
-  canon.addCommand(commands.tsb);
-  canon.addCommand(commands.tss);
-  canon.addCommand(commands.tsu);
-  canon.addCommand(commands.tsn);
-  canon.addCommand(commands.tsnDif);
-  canon.addCommand(commands.tsnExt);
-  canon.addCommand(commands.tsnExte);
-  canon.addCommand(commands.tsnExten);
-  canon.addCommand(commands.tsnExtend);
-  canon.addCommand(commands.tsnDeep);
-  canon.addCommand(commands.tsnDeepDown);
-  canon.addCommand(commands.tsnDeepDownNested);
-  canon.addCommand(commands.tsnDeepDownNestedCmd);
-  canon.addCommand(commands.tselarr);
-  canon.addCommand(commands.tsm);
-  canon.addCommand(commands.tsg);
-};
-
-commands.shutdown = function() {
-  canon.removeCommand(commands.tsv);
-  canon.removeCommand(commands.tsr);
-  canon.removeCommand(commands.tse);
-  canon.removeCommand(commands.tsj);
-  canon.removeCommand(commands.tsb);
-  canon.removeCommand(commands.tss);
-  canon.removeCommand(commands.tsu);
-  canon.removeCommand(commands.tsn);
-  canon.removeCommand(commands.tsnDif);
-  canon.removeCommand(commands.tsnExt);
-  canon.removeCommand(commands.tsnExte);
-  canon.removeCommand(commands.tsnExten);
-  canon.removeCommand(commands.tsnExtend);
-  canon.removeCommand(commands.tsnDeep);
-  canon.removeCommand(commands.tsnDeepDown);
-  canon.removeCommand(commands.tsnDeepDownNested);
-  canon.removeCommand(commands.tsnDeepDownNestedCmd);
-  canon.removeCommand(commands.tselarr);
-  canon.removeCommand(commands.tsm);
-  canon.removeCommand(commands.tsg);
-
-  types.deregisterType(commands.optionType);
-  types.deregisterType(commands.optionValue);
-};
-
-
-commands.option1 = { type: types.getType('string') };
-commands.option2 = { type: types.getType('number') };
-
-var lastOption = undefined;
-
-commands.optionType = new SelectionType({
-  name: 'optionType',
-  lookup: [
-    { name: 'option1', value: commands.option1 },
-    { name: 'option2', value: commands.option2 }
-  ],
-  noMatch: function() {
-    lastOption = undefined;
-  },
-  stringify: function(option) {
-    lastOption = option;
-    return SelectionType.prototype.stringify.call(this, option);
-  },
-  parse: function(arg) {
-    var conversion = SelectionType.prototype.parse.call(this, arg);
-    lastOption = conversion.value;
-    return conversion;
-  }
-});
-
-commands.optionValue = new DeferredType({
-  name: 'optionValue',
-  defer: function() {
-    if (lastOption && lastOption.type) {
-      return lastOption.type;
-    }
-    else {
-      return types.getType('blank');
-    }
-  }
-});
-
-commands.onCommandExec = util.createEvent('commands.onCommandExec');
-
-function createExec(name) {
-  return function(args, context) {
-    var data = {
-      command: commands[name],
-      args: args,
-      context: context
-    };
-    commands.onCommandExec(data);
-    return data;
-  };
-}
-
-commands.tsv = {
-  name: 'tsv',
-  params: [
-    { name: 'optionType', type: 'optionType' },
-    { name: 'optionValue', type: 'optionValue' }
-  ],
-  exec: createExec('tsv')
-};
-
-commands.tsr = {
-  name: 'tsr',
-  params: [ { name: 'text', type: 'string' } ],
-  exec: createExec('tsr')
-};
-
-commands.tse = {
-  name: 'tse',
-  params: [ { name: 'node', type: 'node' } ],
-  exec: createExec('tse')
-};
-
-commands.tsj = {
-  name: 'tsj',
-  params: [ { name: 'javascript', type: 'javascript' } ],
-  exec: createExec('tsj')
-};
-
-commands.tsb = {
-  name: 'tsb',
-  params: [ { name: 'toggle', type: 'boolean' } ],
-  exec: createExec('tsb')
-};
-
-commands.tss = {
-  name: 'tss',
-  exec: createExec('tss')
-};
-
-commands.tsu = {
-  name: 'tsu',
-  params: [ { name: 'num', type: { name: 'number', max: 10, min: -5, step: 3 } } ],
-  exec: createExec('tsu')
-};
-
-commands.tsn = {
-  name: 'tsn'
-};
-
-commands.tsnDif = {
-  name: 'tsn dif',
-  params: [ { name: 'text', type: 'string' } ],
-  exec: createExec('tsnDif')
-};
-
-commands.tsnExt = {
-  name: 'tsn ext',
-  params: [ { name: 'text', type: 'string' } ],
-  exec: createExec('tsnExt')
-};
-
-commands.tsnExte = {
-  name: 'tsn exte',
-  params: [ { name: 'text', type: 'string' } ],
-  exec: createExec('')
-};
-
-commands.tsnExten = {
-  name: 'tsn exten',
-  params: [ { name: 'text', type: 'string' } ],
-  exec: createExec('tsnExte')
-};
-
-commands.tsnExtend = {
-  name: 'tsn extend',
-  params: [ { name: 'text', type: 'string' } ],
-  exec: createExec('tsnExtend')
-};
-
-commands.tsnDeep = {
-  name: 'tsn deep',
-};
-
-commands.tsnDeepDown = {
-  name: 'tsn deep down',
-};
-
-commands.tsnDeepDownNested = {
-  name: 'tsn deep down nested',
-};
-
-commands.tsnDeepDownNestedCmd = {
-  name: 'tsn deep down nested cmd',
-  exec: createExec('tsnDeepDownNestedCmd')
-};
-
-commands.tselarr = {
-  name: 'tselarr',
-  params: [
-    { name: 'num', type: { name: 'selection', data: [ '1', '2', '3' ] } },
-    { name: 'arr', type: { name: 'array', subtype: 'string' } },
-  ],
-  exec: createExec('tselarr')
-};
-
-commands.tsm = {
-  name: 'tsm',
-  description: 'a 3-param test selection|string|number',
-  params: [
-    { name: 'abc', type: { name: 'selection', data: [ 'a', 'b', 'c' ] } },
-    { name: 'txt', type: 'string' },
-    { name: 'num', type: { name: 'number', max: 42, min: 0 } },
-  ],
-  exec: createExec('tsm')
-};
-
-commands.tsg = {
-  name: 'tsg',
-  description: 'a param group test',
-  params: [
-    { name: 'solo', type: { name: 'selection', data: [ 'aaa', 'bbb', 'ccc' ] } },
-    {
-      group: 'First',
-      params: [
-        { name: 'txt1', type: 'string', defaultValue: null },
-        { name: 'bool', type: 'boolean' }
-      ]
-    },
-    {
-      group: 'Second',
-      params: [
-        { name: 'txt2', type: 'string', defaultValue: 'd' },
-        { name: 'num', type: { name: 'number', min: 40 }, defaultValue: 42 }
-      ]
-    }
-  ],
-  exec: createExec('tsg')
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('test/assert', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-  exports.ok = ok;
-  exports.is = is;
-  exports.log = info;
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testCompletion', ['require', 'exports', 'module' , 'test/assert', 'gclitest/commands'], function(require, exports, module) {
-
-
-var test = require('test/assert');
-var commands = require('gclitest/commands');
-
-
-exports.setup = function() {
-  commands.setup();
-};
-
-exports.shutdown = function() {
-  commands.shutdown();
-};
-
-
-function type(typed, tests, options) {
-  var inputter = options.display.inputter;
-  var completer = options.display.completer;
-
-  inputter.setInput(typed);
-
-  if (tests.cursor) {
-    inputter.setCursor({ start: tests.cursor, end: tests.cursor });
-  }
-
-  if (tests.emptyParameters == null) {
-    tests.emptyParameters = [];
-  }
-
-  var realParams = completer.emptyParameters;
-  test.is(tests.emptyParameters.length, realParams.length,
-          'emptyParameters.length for \'' + typed + '\'');
-
-  if (realParams.length === tests.emptyParameters.length) {
-    for (var i = 0; i < realParams.length; i++) {
-      test.is(tests.emptyParameters[i], realParams[i].replace(/\u00a0/g, ' '),
-              'emptyParameters[' + i + '] for \'' + typed + '\'');
-    }
-  }
-
-  if (tests.directTabText) {
-    test.is(tests.directTabText, completer.directTabText,
-            'directTabText for \'' + typed + '\'');
-  }
-  else {
-    test.is('', completer.directTabText,
-            'directTabText for \'' + typed + '\'');
-  }
-
-  if (tests.arrowTabText) {
-    test.is(' \u00a0\u21E5 ' + tests.arrowTabText,
-            completer.arrowTabText,
-            'arrowTabText for \'' + typed + '\'');
-  }
-  else {
-    test.is('', completer.arrowTabText,
-            'arrowTabText for \'' + typed + '\'');
-  }
-}
-
-exports.testActivate = function(options) {
-  if (!options.display) {
-    test.log('No display. Skipping activate tests');
-    return;
-  }
-
-  type('', { }, options);
-
-  type(' ', { }, options);
-
-  type('tsr', {
-    emptyParameters: [ ' <text>' ]
-  }, options);
-
-  type('tsr ', {
-    emptyParameters: [ '<text>' ]
-  }, options);
-
-  type('tsr b', { }, options);
-
-  type('tsb', {
-    emptyParameters: [ ' [toggle]' ]
-  }, options);
-
-  type('tsm', {
-    emptyParameters: [ ' <abc>', ' <txt>', ' <num>' ]
-  }, options);
-
-  type('tsm ', {
-    emptyParameters: [ ' <txt>', ' <num>' ],
-    directTabText: 'a'
-  }, options);
-
-  type('tsm a', {
-    emptyParameters: [ ' <txt>', ' <num>' ]
-  }, options);
-
-  type('tsm a ', {
-    emptyParameters: [ '<txt>', ' <num>' ]
-  }, options);
-
-  type('tsm a  ', {
-    emptyParameters: [ '<txt>', ' <num>' ]
-  }, options);
-
-  type('tsm a  d', {
-    emptyParameters: [ ' <num>' ]
-  }, options);
-
-  type('tsm a "d d"', {
-    emptyParameters: [ ' <num>' ]
-  }, options);
-
-  type('tsm a "d ', {
-    emptyParameters: [ ' <num>' ]
-  }, options);
-
-  type('tsm a "d d" ', {
-    emptyParameters: [ '<num>' ]
-  }, options);
-
-  type('tsm a "d d ', {
-    emptyParameters: [ ' <num>' ]
-  }, options);
-
-  type('tsm d r', {
-    emptyParameters: [ ' <num>' ]
-  }, options);
-
-  type('tsm a d ', {
-    emptyParameters: [ '<num>' ]
-  }, options);
-
-  type('tsm a d 4', { }, options);
-
-  type('tsg', {
-    emptyParameters: [ ' <solo>' ]
-  }, options);
-
-  type('tsg ', {
-    directTabText: 'aaa'
-  }, options);
-
-  type('tsg a', {
-    directTabText: 'aa'
-  }, options);
-
-  type('tsg b', {
-    directTabText: 'bb'
-  }, options);
-
-  type('tsg d', { }, options);
-
-  type('tsg aa', {
-    directTabText: 'a'
-  }, options);
-
-  type('tsg aaa', { }, options);
-
-  type('tsg aaa ', { }, options);
-
-  type('tsg aaa d', { }, options);
-
-  type('tsg aaa dddddd', { }, options);
-
-  type('tsg aaa dddddd ', { }, options);
-
-  type('tsg aaa "d', { }, options);
-
-  type('tsg aaa "d d', { }, options);
-
-  type('tsg aaa "d d"', { }, options);
-
-  type('tsn ex ', { }, options);
-
-  type('selarr', {
-    arrowTabText: 'tselarr'
-  }, options);
-
-  type('tselar 1', { }, options);
-
-  type('tselar 1', {
-    cursor: 7
-  }, options);
-
-  type('tselar 1', {
-    cursor: 6,
-    arrowTabText: 'tselarr'
-  }, options);
-
-  type('tselar 1', {
-    cursor: 5,
-    arrowTabText: 'tselarr'
-  }, options);
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testExec', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/canon', 'gclitest/commands', 'gcli/types/node', 'test/assert'], function(require, exports, module) {
-
-
-var Requisition = require('gcli/cli').Requisition;
-var canon = require('gcli/canon');
-var commands = require('gclitest/commands');
-var nodetype = require('gcli/types/node');
-
-var test = require('test/assert');
-
-var actualExec;
-var actualOutput;
-var hideExec = false;
-
-exports.setup = function() {
-  commands.setup();
-  commands.onCommandExec.add(commandExeced);
-  canon.commandOutputManager.onOutput.add(commandOutputed);
-};
-
-exports.shutdown = function() {
-  commands.shutdown();
-  commands.onCommandExec.remove(commandExeced);
-  canon.commandOutputManager.onOutput.remove(commandOutputed);
-};
-
-function commandExeced(ev) {
-  actualExec = ev;
-}
-
-function commandOutputed(ev) {
-  actualOutput = ev.output;
-}
-
-function exec(command, expectedArgs) {
-  var environment = {};
-
-  var requisition = new Requisition(environment);
-  var outputObject = requisition.exec({ typed: command, hidden: hideExec });
-
-  test.is(command.indexOf(actualExec.command.name), 0, 'Command name: ' + command);
-
-  test.is(command, outputObject.typed, 'outputObject.command for: ' + command);
-  test.ok(outputObject.completed, 'outputObject.completed false for: ' + command);
-
-  if (expectedArgs == null) {
-    test.ok(false, 'expectedArgs == null for ' + command);
-    return;
-  }
-  if (actualExec.args == null) {
-    test.ok(false, 'actualExec.args == null for ' + command);
-    return;
-  }
-
-  test.is(Object.keys(expectedArgs).length, Object.keys(actualExec.args).length,
-          'Arg count: ' + command);
-  Object.keys(expectedArgs).forEach(function(arg) {
-    var expectedArg = expectedArgs[arg];
-    var actualArg = actualExec.args[arg];
-
-    if (Array.isArray(expectedArg)) {
-      if (!Array.isArray(actualArg)) {
-        test.ok(false, 'actual is not an array. ' + command + '/' + arg);
-        return;
-      }
-
-      test.is(expectedArg.length, actualArg.length,
-              'Array length: ' + command + '/' + arg);
-      for (var i = 0; i < expectedArg.length; i++) {
-        test.is(expectedArg[i], actualArg[i],
-                'Member: "' + command + '/' + arg + '/' + i);
-      }
-    }
-    else {
-      test.is(expectedArg, actualArg, 'Command: "' + command + '" arg: ' + arg);
-    }
-  });
-
-  test.is(environment, actualExec.context.environment, 'Environment');
-
-  if (!hideExec) {
-    test.is(false, actualOutput.error, 'output error is false');
-    test.is(command, actualOutput.typed, 'command is typed');
-    test.ok(typeof actualOutput.canonical === 'string', 'canonical exists');
-
-    test.is(actualExec.args, actualOutput.args, 'actualExec.args is actualOutput.args');
-  }
-}
-
-
-exports.testExec = function(options) {
-  hideExec = options.hideExec;
-
-  exec('tss', {});
-
-  // Bug 707008 - GCLI deferred types don't work properly
-  exec('tsv option1 10', { optionType: commands.option1, optionValue: '10' });
-  exec('tsv option2 10', { optionType: commands.option2, optionValue: 10 });
-
-  exec('tsr fred', { text: 'fred' });
-  exec('tsr fred bloggs', { text: 'fred bloggs' });
-  exec('tsr "fred bloggs"', { text: 'fred bloggs' });
-
-  exec('tsb', { toggle: false });
-  exec('tsb --toggle', { toggle: true });
-
-  exec('tsu 10', { num: 10 });
-  exec('tsu --num 10', { num: 10 });
-
-  // Bug 704829 - Enable GCLI Javascript parameters
-  // The answer to this should be 2
-  exec('tsj { 1 + 1 }', { javascript: '1 + 1' });
-
-  var origDoc = nodetype.getDocument();
-  nodetype.setDocument(mockDoc);
-  exec('tse :root', { node: mockBody });
-  nodetype.setDocument(origDoc);
-
-  exec('tsn dif fred', { text: 'fred' });
-  exec('tsn exten fred', { text: 'fred' });
-  exec('tsn extend fred', { text: 'fred' });
-
-  exec('tselarr 1', { num: '1', arr: [ ] });
-  exec('tselarr 1 a', { num: '1', arr: [ 'a' ] });
-  exec('tselarr 1 a b', { num: '1', arr: [ 'a', 'b' ] });
-
-  exec('tsm a 10 10', { abc: 'a', txt: '10', num: 10 });
-
-  // Bug 707009 - GCLI doesn't always fill in default parameters properly
-  exec('tsg aaa', { solo: 'aaa', txt1: null, bool: false, txt2: 'd', num: 42 });
-};
-
-var mockBody = {
-  style: {}
-};
-
-var mockDoc = {
-  querySelectorAll: function(css) {
-    if (css === ':root') {
-      return {
-        length: 1,
-        item: function(i) {
-          return mockBody;
-        }
-      };
-    }
-    throw new Error('mockDoc.querySelectorAll(\'' + css + '\') error');
-  }
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testHistory', ['require', 'exports', 'module' , 'test/assert', 'gcli/history'], function(require, exports, module) {
-
-var test = require('test/assert');
-var History = require('gcli/history').History;
-
-exports.setup = function() {
-};
-
-exports.shutdown = function() {
-};
-
-exports.testSimpleHistory = function () {
-  var history = new History({});
-  history.add('foo');
-  history.add('bar');
-  test.is('bar', history.backward());
-  test.is('foo', history.backward());
-
-  // Adding to the history again moves us back to the start of the history.
-  history.add('quux');
-  test.is('quux', history.backward());
-  test.is('bar', history.backward());
-  test.is('foo', history.backward());
-};
-
-exports.testBackwardsPastIndex = function () {
-  var history = new History({});
-  history.add('foo');
-  history.add('bar');
-  test.is('bar', history.backward());
-  test.is('foo', history.backward());
-
-  // Moving backwards past recorded history just keeps giving you the last
-  // item.
-  test.is('foo', history.backward());
-};
-
-exports.testForwardsPastIndex = function () {
-  var history = new History({});
-  history.add('foo');
-  history.add('bar');
-  test.is('bar', history.backward());
-  test.is('foo', history.backward());
-
-  // Going forward through the history again.
-  test.is('bar', history.forward());
-
-  // 'Present' time.
-  test.is('', history.forward());
-
-  // Going to the 'future' just keeps giving us the empty string.
-  test.is('', history.forward());
-};
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testJs', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gcli/types/javascript', 'gcli/canon', 'test/assert'], function(require, exports, module) {
-
-
-var Requisition = require('gcli/cli').Requisition;
-var Status = require('gcli/types').Status;
-var javascript = require('gcli/types/javascript');
-var canon = require('gcli/canon');
-
-var test = require('test/assert');
-
-var debug = false;
-var requ;
-
-var assign;
-var status;
-var statuses;
-var tempWindow;
-
-
-exports.setup = function(options) {
-  tempWindow = javascript.getGlobalObject();
-  javascript.setGlobalObject(options.window);
-
-  Object.defineProperty(options.window, 'donteval', {
-    get: function() {
-      test.ok(false, 'donteval should not be used');
-      return { cant: '', touch: '', 'this': '' };
-    },
-    enumerable: true,
-    configurable : true
-  });
-};
-
-exports.shutdown = function(options) {
-  delete options.window.donteval;
-
-  javascript.setGlobalObject(tempWindow);
-  tempWindow = undefined;
-};
-
-function input(typed) {
-  if (!requ) {
-    requ = new Requisition();
-  }
-  var cursor = { start: typed.length, end: typed.length };
-  requ.update(typed);
-
-  if (debug) {
-    console.log('####### TEST: typed="' + typed +
-        '" cur=' + cursor.start +
-        ' cli=', requ);
-  }
-
-  status = requ.getStatus();
-  statuses = requ.getInputStatusMarkup(cursor.start).map(function(s) {
-    return Array(s.string.length + 1).join(s.status.toString()[0]);
-  }).join('');
-
-  if (requ.commandAssignment.value) {
-    assign = requ.getAssignment(0);
-  }
-  else {
-    assign = undefined;
-  }
-}
-
-function predictionsHas(name) {
-  return assign.getPredictions().some(function(prediction) {
-    return name === prediction.name;
-  }, this);
-}
-
-function check(expStatuses, expStatus, expAssign, expPredict) {
-  test.is('{', requ.commandAssignment.value.name, 'is exec');
-
-  test.is(expStatuses, statuses, 'unexpected status markup');
-  test.is(expStatus.toString(), status.toString(), 'unexpected status');
-  test.is(expAssign, assign.value, 'unexpected assignment');
-
-  if (expPredict != null) {
-    var contains;
-    if (Array.isArray(expPredict)) {
-      expPredict.forEach(function(p) {
-        contains = predictionsHas(p);
-        test.ok(contains, 'missing prediction ' + p);
-      });
-    }
-    else if (typeof expPredict === 'number') {
-      contains = true;
-      test.is(assign.getPredictions().length, expPredict, 'prediction count');
-      if (assign.getPredictions().length !== expPredict) {
-        assign.getPredictions().forEach(function(prediction) {
-          test.log('actual prediction: ', prediction);
-        });
-      }
-    }
-    else {
-      contains = predictionsHas(expPredict);
-      test.ok(contains, 'missing prediction ' + expPredict);
-    }
-
-    if (!contains) {
-      test.log('Predictions: ' + assign.getPredictions().map(function(p) {
-        return p.name;
-      }).join(', '));
-    }
-  }
-}
-
-exports.testBasic = function(options) {
-  if (!canon.getCommand('{')) {
-    test.log('Skipping exec tests because { is not registered');
-    return;
-  }
-
-  input('{');
-  check('V', Status.ERROR, undefined);
-
-  input('{ ');
-  check('VV', Status.ERROR, undefined);
-
-  input('{ w');
-  check('VVI', Status.ERROR, 'w', 'window');
-
-  input('{ windo');
-  check('VVIIIII', Status.ERROR, 'windo', 'window');
-
-  input('{ window');
-  check('VVVVVVVV', Status.VALID, 'window');
-
-  input('{ window.d');
-  check('VVIIIIIIII', Status.ERROR, 'window.d', 'window.document');
-
-  input('{ window.document.title');
-  check('VVVVVVVVVVVVVVVVVVVVVVV', Status.VALID, 'window.document.title', 0);
-
-  input('{ d');
-  check('VVI', Status.ERROR, 'd', 'document');
-
-  input('{ document.title');
-  check('VVVVVVVVVVVVVVVV', Status.VALID, 'document.title', 0);
-
-  test.ok('donteval' in options.window, 'donteval exists');
-
-  input('{ don');
-  check('VVIII', Status.ERROR, 'don', 'donteval');
-
-  input('{ donteval');
-  check('VVVVVVVVVV', Status.VALID, 'donteval', 0);
-
-  /*
-  // This is a controversial test - technically we can tell that it's an error
-  // because 'donteval.' is a syntax error, however donteval is unsafe so we
-  // are playing safe by bailing out early. It's enough of a corner case that
-  // I don't think it warrants fixing
-  input('{ donteval.');
-  check('VVIIIIIIIII', Status.ERROR, 'donteval.', 0);
-  */
-
-  input('{ donteval.cant');
-  check('VVVVVVVVVVVVVVV', Status.VALID, 'donteval.cant', 0);
-
-  input('{ donteval.xxx');
-  check('VVVVVVVVVVVVVV', Status.VALID, 'donteval.xxx', 0);
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testKeyboard', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/canon', 'gclitest/commands', 'gcli/types/javascript', 'test/assert'], function(require, exports, module) {
-
-
-var Requisition = require('gcli/cli').Requisition;
-var canon = require('gcli/canon');
-var commands = require('gclitest/commands');
-var javascript = require('gcli/types/javascript');
-
-var test = require('test/assert');
-
-var tempWindow;
-var inputter;
-
-exports.setup = function(options) {
-  tempWindow = javascript.getGlobalObject();
-  javascript.setGlobalObject(options.window);
-
-  if (options.display) {
-    inputter = options.display.inputter;
-  }
-
-  commands.setup();
-};
-
-exports.shutdown = function(options) {
-  commands.shutdown();
-
-  inputter = undefined;
-  javascript.setGlobalObject(tempWindow);
-  tempWindow = undefined;
-};
-
-var COMPLETES_TO = 'complete';
-var KEY_UPS_TO = 'keyup';
-var KEY_DOWNS_TO = 'keydown';
-
-function check(initial, action, after, choice, cursor, expectedCursor) {
-  var requisition;
-  if (inputter) {
-    requisition = inputter.requisition;
-    inputter.setInput(initial);
-  }
-  else {
-    requisition = new Requisition();
-    requisition.update(initial);
-  }
-
-  if (cursor == null) {
-    cursor = initial.length;
-  }
-  var assignment = requisition.getAssignmentAt(cursor);
-  switch (action) {
-    case COMPLETES_TO:
-      requisition.complete({ start: cursor, end: cursor }, choice);
-      break;
-
-    case KEY_UPS_TO:
-      assignment.increment();
-      break;
-
-    case KEY_DOWNS_TO:
-      assignment.decrement();
-      break;
-  }
-
-  test.is(after, requisition.toString(),
-          initial + ' + ' + action + ' -> ' + after);
-
-  if (expectedCursor != null) {
-    if (inputter) {
-      test.is(expectedCursor, inputter.getInputState().cursor.start,
-              'Ending cursor position for \'' + initial + '\'');
-    }
-  }
-}
-
-exports.testComplete = function(options) {
-  if (!inputter) {
-    test.log('Missing display, reduced checks');
-  }
-
-  check('tsela', COMPLETES_TO, 'tselarr ', 0);
-  check('tsn di', COMPLETES_TO, 'tsn dif ', 0);
-  check('tsg a', COMPLETES_TO, 'tsg aaa ', 0);
-
-  check('tsn e', COMPLETES_TO, 'tsn extend ', -5);
-  check('tsn e', COMPLETES_TO, 'tsn ext ', -4);
-  check('tsn e', COMPLETES_TO, 'tsn exte ', -3);
-  check('tsn e', COMPLETES_TO, 'tsn exten ', -2);
-  check('tsn e', COMPLETES_TO, 'tsn extend ', -1);
-  check('tsn e', COMPLETES_TO, 'tsn ext ', 0);
-  check('tsn e', COMPLETES_TO, 'tsn exte ', 1);
-  check('tsn e', COMPLETES_TO, 'tsn exten ', 2);
-  check('tsn e', COMPLETES_TO, 'tsn extend ', 3);
-  check('tsn e', COMPLETES_TO, 'tsn ext ', 4);
-  check('tsn e', COMPLETES_TO, 'tsn exte ', 5);
-  check('tsn e', COMPLETES_TO, 'tsn exten ', 6);
-  check('tsn e', COMPLETES_TO, 'tsn extend ', 7);
-  check('tsn e', COMPLETES_TO, 'tsn ext ', 8);
-
-  if (!canon.getCommand('{')) {
-    test.log('Skipping exec tests because { is not registered');
-  }
-  else {
-    check('{ wind', COMPLETES_TO, '{ window', 0);
-    check('{ window.docum', COMPLETES_TO, '{ window.document', 0);
-
-    // Bug 717228: This fails under node
-    if (!options.isNode) {
-      check('{ window.document.titl', COMPLETES_TO, '{ window.document.title ', 0);
-    }
-    else {
-      test.log('Running under Node. Skipping tests due to bug 717228.');
-    }
-  }
-};
-
-exports.testInternalComplete = function(options) {
-  // Bug 664377
-  // check('tsela 1', COMPLETES_TO, 'tselarr 1', 0, 3, 8);
-};
-
-exports.testIncrDecr = function() {
-  check('tsu -70', KEY_UPS_TO, 'tsu -5');
-  check('tsu -7', KEY_UPS_TO, 'tsu -5');
-  check('tsu -6', KEY_UPS_TO, 'tsu -5');
-  check('tsu -5', KEY_UPS_TO, 'tsu -3');
-  check('tsu -4', KEY_UPS_TO, 'tsu -3');
-  check('tsu -3', KEY_UPS_TO, 'tsu 0');
-  check('tsu -2', KEY_UPS_TO, 'tsu 0');
-  check('tsu -1', KEY_UPS_TO, 'tsu 0');
-  check('tsu 0', KEY_UPS_TO, 'tsu 3');
-  check('tsu 1', KEY_UPS_TO, 'tsu 3');
-  check('tsu 2', KEY_UPS_TO, 'tsu 3');
-  check('tsu 3', KEY_UPS_TO, 'tsu 6');
-  check('tsu 4', KEY_UPS_TO, 'tsu 6');
-  check('tsu 5', KEY_UPS_TO, 'tsu 6');
-  check('tsu 6', KEY_UPS_TO, 'tsu 9');
-  check('tsu 7', KEY_UPS_TO, 'tsu 9');
-  check('tsu 8', KEY_UPS_TO, 'tsu 9');
-  check('tsu 9', KEY_UPS_TO, 'tsu 10');
-  check('tsu 10', KEY_UPS_TO, 'tsu 10');
-  check('tsu 100', KEY_UPS_TO, 'tsu -5');
-
-  check('tsu -70', KEY_DOWNS_TO, 'tsu 10');
-  check('tsu -7', KEY_DOWNS_TO, 'tsu 10');
-  check('tsu -6', KEY_DOWNS_TO, 'tsu 10');
-  check('tsu -5', KEY_DOWNS_TO, 'tsu -5');
-  check('tsu -4', KEY_DOWNS_TO, 'tsu -5');
-  check('tsu -3', KEY_DOWNS_TO, 'tsu -5');
-  check('tsu -2', KEY_DOWNS_TO, 'tsu -3');
-  check('tsu -1', KEY_DOWNS_TO, 'tsu -3');
-  check('tsu 0', KEY_DOWNS_TO, 'tsu -3');
-  check('tsu 1', KEY_DOWNS_TO, 'tsu 0');
-  check('tsu 2', KEY_DOWNS_TO, 'tsu 0');
-  check('tsu 3', KEY_DOWNS_TO, 'tsu 0');
-  check('tsu 4', KEY_DOWNS_TO, 'tsu 3');
-  check('tsu 5', KEY_DOWNS_TO, 'tsu 3');
-  check('tsu 6', KEY_DOWNS_TO, 'tsu 3');
-  check('tsu 7', KEY_DOWNS_TO, 'tsu 6');
-  check('tsu 8', KEY_DOWNS_TO, 'tsu 6');
-  check('tsu 9', KEY_DOWNS_TO, 'tsu 6');
-  check('tsu 10', KEY_DOWNS_TO, 'tsu 9');
-  check('tsu 100', KEY_DOWNS_TO, 'tsu 10');
-
-  // Bug 707007 - GCLI increment and decrement operations cycle through
-  // selection options in the wrong order
-  check('tselarr 1', KEY_DOWNS_TO, 'tselarr 2');
-  check('tselarr 2', KEY_DOWNS_TO, 'tselarr 3');
-  check('tselarr 3', KEY_DOWNS_TO, 'tselarr 1');
-
-  check('tselarr 3', KEY_UPS_TO, 'tselarr 2');
-};
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testRequire', ['require', 'exports', 'module' , 'test/assert', 'gclitest/requirable'], function(require, exports, module) {
-
-var test = require('test/assert');
-
-
-exports.testWorking = function() {
-  // There are lots of requirement tests that we could be doing here
-  // The fact that we can get anything at all working is a testament to
-  // require doing what it should - we don't need to test the
-  var requireable = require('gclitest/requirable');
-  test.is('thing1', requireable.thing1);
-  test.is(2, requireable.thing2);
-  test.ok(requireable.thing3 === undefined);
-};
-
-exports.testDomains = function() {
-  var requireable = require('gclitest/requirable');
-  test.ok(requireable.status === undefined);
-  requireable.setStatus(null);
-  test.is(null, requireable.getStatus());
-  test.ok(requireable.status === undefined);
-  requireable.setStatus('42');
-  test.is('42', requireable.getStatus());
-  test.ok(requireable.status === undefined);
-
-  if (define.Domain) {
-    var domain = new define.Domain();
-    var requireable2 = domain.require('gclitest/requirable');
-    test.is(undefined, requireable2.status);
-    test.is('initial', requireable2.getStatus());
-    requireable2.setStatus(999);
-    test.is(999, requireable2.getStatus());
-    test.is(undefined, requireable2.status);
-
-    test.is('42', requireable.getStatus());
-    test.is(undefined, requireable.status);
-  }
-};
-
-exports.testLeakage = function() {
-  var requireable = require('gclitest/requirable');
-  test.ok(requireable.setup === undefined);
-  test.ok(requireable.shutdown === undefined);
-  test.ok(requireable.testWorking === undefined);
-};
-
-exports.testMultiImport = function() {
-  var r1 = require('gclitest/requirable');
-  var r2 = require('gclitest/requirable');
-  test.is(r1, r2);
-};
-
-exports.testUncompilable = function() {
-  // This test is commented out because it breaks the RequireJS module
-  // loader and because it causes console output and because testing failure
-  // cases such as this is something of a luxury
-  // It's not totally clear how a module loader should perform with unusable
-  // modules, however at least it should go into a flat spin ...
-  // GCLI mini_require reports an error as it should
-  /*
-  if (define.Domain) {
-    try {
-      var unrequireable = require('gclitest/unrequirable');
-      t.fail();
-    }
-    catch (ex) {
-      console.error(ex);
-    }
-  }
-  */
-};
-
-exports.testRecursive = function() {
-  // See Bug 658583
-  /*
-  var recurse = require('gclitest/recurse');
-  */
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/requirable', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-  exports.thing1 = 'thing1';
-  exports.thing2 = 2;
-
-  var status = 'initial';
-  exports.setStatus = function(aStatus) { status = aStatus; };
-  exports.getStatus = function() { return status; };
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testResource', ['require', 'exports', 'module' , 'gcli/types/resource', 'gcli/types', 'test/assert'], function(require, exports, module) {
-
-
-var resource = require('gcli/types/resource');
-var types = require('gcli/types');
-var Status = require('gcli/types').Status;
-
-var test = require('test/assert');
-
-var tempDocument;
-
-exports.setup = function(options) {
-  tempDocument = resource.getDocument();
-  resource.setDocument(options.window.document);
-};
-
-exports.shutdown = function(options) {
-  resource.setDocument(tempDocument);
-  tempDocument = undefined;
-};
-
-exports.testPredictions = function(options) {
-  if (options.window.isFake) {
-    test.log('Skipping resource tests: options.window.isFake = true');
-    return;
-  }
-
-  var resource1 = types.getType('resource');
-  var predictions1 = resource1.parseString('').getPredictions();
-  test.ok(predictions1.length > 1, 'have resources');
-  predictions1.forEach(function(prediction) {
-    checkPrediction(resource1, prediction);
-  });
-
-  var resource2 = types.getType({ name: 'resource', include: 'text/javascript' });
-  var predictions2 = resource2.parseString('').getPredictions();
-  test.ok(predictions2.length > 1, 'have resources');
-  predictions2.forEach(function(prediction) {
-    checkPrediction(resource2, prediction);
-  });
-
-  var resource3 = types.getType({ name: 'resource', include: 'text/css' });
-  var predictions3 = resource3.parseString('').getPredictions();
-  // jsdom fails to support digging into stylesheets
-  if (!options.isNode) {
-    test.ok(predictions3.length >= 1, 'have resources');
-  }
-  else {
-    test.log('Running under Node. ' +
-             'Skipping checks due to jsdom document.stylsheets support.');
-  }
-  predictions3.forEach(function(prediction) {
-    checkPrediction(resource3, prediction);
-  });
-
-  var resource4 = types.getType({ name: 'resource' });
-  var predictions4 = resource4.parseString('').getPredictions();
-
-  test.is(predictions1.length, predictions4.length, 'type spec');
-  // Bug 734045
-  // test.is(predictions2.length + predictions3.length, predictions4.length, 'split');
-};
-
-function checkPrediction(res, prediction) {
-  var name = prediction.name;
-  var value = prediction.value;
-
-  var conversion = res.parseString(name);
-  test.is(conversion.getStatus(), Status.VALID, 'status VALID for ' + name);
-  test.is(conversion.value, value, 'value for ' + name);
-
-  var strung = res.stringify(value);
-  test.is(strung, name, 'stringify for ' + name);
-
-  test.is(typeof value.loadContents, 'function', 'resource for ' + name);
-  test.is(typeof value.element, 'object', 'resource for ' + name);
-}
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testScratchpad', ['require', 'exports', 'module' , 'test/assert'], function(require, exports, module) {
-
-
-var test = require('test/assert');
-
-var origScratchpad;
-
-exports.setup = function(options) {
-  if (options.display) {
-    origScratchpad = options.display.inputter.scratchpad;
-    options.display.inputter.scratchpad = stubScratchpad;
-  }
-};
-
-exports.shutdown = function(options) {
-  if (options.display) {
-    options.display.inputter.scratchpad = origScratchpad;
-  }
-};
-
-var stubScratchpad = {
-  shouldActivate: function(ev) {
-    return true;
-  },
-  activatedCount: 0,
-  linkText: 'scratchpad.linkText'
-};
-stubScratchpad.activate = function(value) {
-  stubScratchpad.activatedCount++;
-  return true;
-};
-
-
-exports.testActivate = function(options) {
-  if (!options.display) {
-    test.log('No display. Skipping scratchpad tests');
-    return;
-  }
-
-  var ev = {};
-  stubScratchpad.activatedCount = 0;
-  options.display.inputter.onKeyUp(ev);
-  test.is(1, stubScratchpad.activatedCount, 'scratchpad is activated');
-};
-
-
-});
-/*
- * Copyright (c) 2009 Panagiotis Astithas
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
- * SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION
- * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN
- * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-define('gclitest/testSpell', ['require', 'exports', 'module' , 'test/assert', 'gcli/types/spell'], function(require, exports, module) {
-
-var test = require('test/assert');
-var Speller = require('gcli/types/spell').Speller;
-
-exports.setup = function() {
-};
-
-exports.shutdown = function() {
-};
-
-exports.testSimple = function(options) {
-  var speller = new Speller();
-  speller.train(Object.keys(options.window));
-
-  test.is(speller.correct('document'), 'document');
-  test.is(speller.correct('documen'), 'document');
-  test.is(speller.correct('ocument'), 'document');
-  test.is(speller.correct('odcument'), 'document');
-
-  test.is(speller.correct('========='), null);
-};
-
-
-});
-/*
- * Copyright 2009-2011 Mozilla Foundation and contributors
- * Licensed under the New BSD license. See LICENSE.txt or:
- * http://opensource.org/licenses/BSD-3-Clause
- */
-
-define('gclitest/testSplit', ['require', 'exports', 'module' , 'test/assert', 'gclitest/commands', 'gcli/cli'], function(require, exports, module) {
-
-var test = require('test/assert');
-
-var commands = require('gclitest/commands');
-var Requisition = require('gcli/cli').Requisition;
-
-exports.setup = function() {
-  commands.setup();
-};
-
-exports.shutdown = function() {
-  commands.shutdown();
-};
-
-exports.testSimple = function() {
-  var args;
-  var requ = new Requisition();
-
-  args = requ._tokenize('s');
-  requ._split(args);
-  test.is(0, args.length);
-  test.is('s', requ.commandAssignment.arg.text);
-};
-
-exports.testFlatCommand = function() {
-  var args;
-  var requ = new Requisition();
-
-  args = requ._tokenize('tsv');
-  requ._split(args);
-  test.is(0, args.length);
-  test.is('tsv', requ.commandAssignment.value.name);
-
-  args = requ._tokenize('tsv a b');
-  requ._split(args);
-  test.is('tsv', requ.commandAssignment.value.name);
-  test.is(2, args.length);
-  test.is('a', args[0].text);
-  test.is('b', args[1].text);
-};
-
-exports.testJavascript = function() {
-  var args;
-  var requ = new Requisition();
-
-  args = requ._tokenize('{');
-  requ._split(args);
-  test.is(1, args.length);
-  test.is('', args[0].text);
-  test.is('', requ.commandAssignment.arg.text);
-  test.is('{', requ.commandAssignment.value.name);
-};
-
-// BUG 663081 - add tests for sub commands
-
 });
 /*
  * Copyright 2009-2011 Mozilla Foundation and contributors
@@ -2721,12 +699,24 @@ exports.testPathological = function() {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gclitest/testTooltip', ['require', 'exports', 'module' , 'test/assert', 'gclitest/commands'], function(require, exports, module) {
+define('test/assert', ['require', 'exports', 'module' ], function(require, exports, module) {
 
+  exports.ok = ok;
+  exports.is = is;
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testSplit', ['require', 'exports', 'module' , 'test/assert', 'gclitest/commands', 'gcli/cli'], function(require, exports, module) {
 
 var test = require('test/assert');
-var commands = require('gclitest/commands');
 
+var commands = require('gclitest/commands');
+var Requisition = require('gcli/cli').Requisition;
 
 exports.setup = function() {
   commands.setup();
@@ -2736,76 +726,286 @@ exports.shutdown = function() {
   commands.shutdown();
 };
 
+exports.testSimple = function() {
+  var args;
+  var requ = new Requisition();
 
-function type(typed, tests, options) {
-  var inputter = options.display.inputter;
-  var tooltip = options.display.tooltip;
+  args = requ._tokenize('s');
+  requ._split(args);
+  test.is(0, args.length);
+  test.is('s', requ.commandAssignment.getArg().text);
+};
 
-  inputter.setInput(typed);
-  if (tests.cursor) {
-    inputter.setCursor({ start: tests.cursor, end: tests.cursor });
+exports.testFlatCommand = function() {
+  var args;
+  var requ = new Requisition();
+
+  args = requ._tokenize('tsv');
+  requ._split(args);
+  test.is(0, args.length);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+
+  args = requ._tokenize('tsv a b');
+  requ._split(args);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is(2, args.length);
+  test.is('a', args[0].text);
+  test.is('b', args[1].text);
+};
+
+exports.testJavascript = function() {
+  var args;
+  var requ = new Requisition();
+
+  args = requ._tokenize('{');
+  requ._split(args);
+  test.is(1, args.length);
+  test.is('', args[0].text);
+  test.is('', requ.commandAssignment.getArg().text);
+  test.is('{', requ.commandAssignment.getValue().name);
+};
+
+// BUG 663081 - add tests for sub commands
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/commands', ['require', 'exports', 'module' , 'gcli/canon', 'gcli/util', 'gcli/types/basic', 'gcli/types'], function(require, exports, module) {
+var commands = exports;
+
+
+var canon = require('gcli/canon');
+var util = require('gcli/util');
+
+var SelectionType = require('gcli/types/basic').SelectionType;
+var DeferredType = require('gcli/types/basic').DeferredType;
+var types = require('gcli/types');
+
+/**
+ * Registration and de-registration.
+ */
+commands.setup = function() {
+  commands.option1.type = types.getType('number');
+  commands.option2.type = types.getType('boolean');
+
+  types.registerType(commands.optionType);
+  types.registerType(commands.optionValue);
+
+  canon.addCommand(commands.tsv);
+  canon.addCommand(commands.tsr);
+  canon.addCommand(commands.tse);
+  canon.addCommand(commands.tsj);
+  canon.addCommand(commands.tsb);
+  canon.addCommand(commands.tss);
+  canon.addCommand(commands.tsu);
+  canon.addCommand(commands.tsn);
+  canon.addCommand(commands.tsnDif);
+  canon.addCommand(commands.tsnExt);
+  canon.addCommand(commands.tsnExte);
+  canon.addCommand(commands.tsnExten);
+  canon.addCommand(commands.tsnExtend);
+  canon.addCommand(commands.tselarr);
+  canon.addCommand(commands.tsm);
+  canon.addCommand(commands.tsg);
+};
+
+commands.shutdown = function() {
+  canon.removeCommand(commands.tsv);
+  canon.removeCommand(commands.tsr);
+  canon.removeCommand(commands.tse);
+  canon.removeCommand(commands.tsj);
+  canon.removeCommand(commands.tsb);
+  canon.removeCommand(commands.tss);
+  canon.removeCommand(commands.tsu);
+  canon.removeCommand(commands.tsn);
+  canon.removeCommand(commands.tsnDif);
+  canon.removeCommand(commands.tsnExt);
+  canon.removeCommand(commands.tsnExte);
+  canon.removeCommand(commands.tsnExten);
+  canon.removeCommand(commands.tsnExtend);
+  canon.removeCommand(commands.tselarr);
+  canon.removeCommand(commands.tsm);
+  canon.removeCommand(commands.tsg);
+
+  types.deregisterType(commands.optionType);
+  types.deregisterType(commands.optionValue);
+};
+
+
+commands.option1 = { type: types.getType('string') };
+commands.option2 = { type: types.getType('number') };
+
+commands.optionType = new SelectionType({
+  name: 'optionType',
+  lookup: [
+    { name: 'option1', value: commands.option1 },
+    { name: 'option2', value: commands.option2 }
+  ],
+  noMatch: function() {
+    this.lastOption = null;
+  },
+  stringify: function(option) {
+    this.lastOption = option;
+    return SelectionType.prototype.stringify.call(this, option);
+  },
+  parse: function(arg) {
+    var conversion = SelectionType.prototype.parse.call(this, arg);
+    this.lastOption = conversion.value;
+    return conversion;
   }
+});
 
-  if (!options.isNode) {
-    if (tests.important) {
-      test.ok(tooltip.field.isImportant, 'Important for ' + typed);
+commands.optionValue = new DeferredType({
+  name: 'optionValue',
+  defer: function() {
+    if (commands.optionType.lastOption) {
+      return commands.optionType.lastOption.type;
     }
     else {
-      test.ok(!tooltip.field.isImportant, 'Not important for ' + typed);
-    }
-
-    if (tests.options) {
-      var names = tooltip.field.menu.items.map(function(item) {
-        return item.name.textContent ? item.name.textContent : item.name;
-      });
-      test.is(tests.options.join('|'), names.join('|'), 'Options for ' + typed);
-    }
-
-    if (tests.error) {
-      test.is(tests.error, tooltip.errorEle.textContent, 'Error for ' + typed);
-    }
-    else {
-      test.is('', tooltip.errorEle.textContent, 'No error for ' + typed);
+      return types.getType('blank');
     }
   }
+});
+
+commands.commandExec = util.createEvent('commands.commandExec');
+
+function createExec(name) {
+  return function(args, context) {
+    var data = {
+      command: commands[name],
+      args: args,
+      context: context
+    };
+    commands.commandExec(data);
+    return data;
+  };
 }
 
-exports.testActivate = function(options) {
-  if (!options.display) {
-    test.log('No display. Skipping activate tests');
-    return;
-  }
+commands.tsv = {
+  name: 'tsv',
+  params: [
+    { name: 'optionType', type: 'optionType' },
+    { name: 'optionValue', type: 'optionValue' }
+  ],
+  exec: createExec('tsv')
+};
 
-  if (options.isNode) {
-    test.log('Running under Node. Reduced checks due to JSDom.textContent');
-  }
+commands.tsr = {
+  name: 'tsr',
+  params: [ { name: 'text', type: 'string' } ],
+  exec: createExec('tsr')
+};
 
-  type(' ', { }, options);
+commands.tse = {
+  name: 'tse',
+  params: [ { name: 'node', type: 'node' } ],
+  exec: createExec('tse')
+};
 
-  type('tsb ', {
-    important: true,
-    options: [ 'false', 'true' ]
-  }, options);
+commands.tsj = {
+  name: 'tsj',
+  params: [ { name: 'javascript', type: 'javascript' } ],
+  exec: createExec('tsj')
+};
 
-  type('tsb t', {
-    important: true,
-    options: [ 'true' ]
-  }, options);
+commands.tsb = {
+  name: 'tsb',
+  params: [ { name: 'toggle', type: 'boolean' } ],
+  exec: createExec('tsb')
+};
 
-  type('tsb tt', {
-    important: true,
-    options: [ ],
-    error: 'Can\'t use \'tt\'.'
-  }, options);
+commands.tss = {
+  name: 'tss',
+  exec: createExec('tss')
+};
 
+commands.tsu = {
+  name: 'tsu',
+  params: [ { name: 'num', type: { name: 'number', max: 10, min: -5, step: 3 } } ],
+  exec: createExec('tsu')
+};
 
-  type('asdf', {
-    important: false,
-    options: [ ],
-    error: 'Can\'t use \'asdf\'.'
-  }, options);
+commands.tsn = {
+  name: 'tsn'
+};
 
-  type('', { }, options);
+commands.tsnDif = {
+  name: 'tsn dif',
+  params: [ { name: 'text', type: 'string' } ],
+  exec: createExec('tsnDif')
+};
+
+commands.tsnExt = {
+  name: 'tsn ext',
+  params: [ { name: 'text', type: 'string' } ],
+  exec: createExec('tsnExt')
+};
+
+commands.tsnExte = {
+  name: 'tsn exte',
+  params: [ { name: 'text', type: 'string' } ],
+  exec: createExec('')
+};
+
+commands.tsnExten = {
+  name: 'tsn exten',
+  params: [ { name: 'text', type: 'string' } ],
+  exec: createExec('tsnExte')
+};
+
+commands.tsnExtend = {
+  name: 'tsn extend',
+  params: [ { name: 'text', type: 'string' } ],
+  exec: createExec('tsnExtend')
+};
+
+commands.tselarr = {
+  name: 'tselarr',
+  params: [
+    { name: 'num', type: { name: 'selection', data: [ '1', '2', '3' ] } },
+    { name: 'arr', type: { name: 'array', subtype: 'string' } },
+  ],
+  exec: createExec('tselarr')
+};
+
+commands.tsm = {
+  name: 'tsm',
+  hidden: true,
+  description: 'a 3-param test selection|string|number',
+  params: [
+    { name: 'abc', type: { name: 'selection', data: [ 'a', 'b', 'c' ] } },
+    { name: 'txt', type: 'string' },
+    { name: 'num', type: { name: 'number', max: 42, min: 0 } },
+  ],
+  exec: createExec('tsm')
+};
+
+commands.tsg = {
+  name: 'tsg',
+  hidden: true,
+  description: 'a param group test',
+  params: [
+    { name: 'solo', type: { name: 'selection', data: [ 'aaa', 'bbb', 'ccc' ] } },
+    {
+      group: 'First',
+      params: [
+        { name: 'txt1', type: 'string', defaultValue: null },
+        { name: 'boolean1', type: 'boolean' }
+      ]
+    },
+    {
+      group: 'Second',
+      params: [
+        { name: 'txt2', type: 'string', defaultValue: 'd' },
+        { name: 'num2', type: { name: 'number', defaultValue: 42 } }
+      ]
+    }
+  ],
+  exec: createExec('tsg')
 };
 
 
@@ -2816,10 +1016,691 @@ exports.testActivate = function(options) {
  * http://opensource.org/licenses/BSD-3-Clause
  */
 
-define('gclitest/testTypes', ['require', 'exports', 'module' , 'test/assert', 'gcli/types'], function(require, exports, module) {
+define('gclitest/testCli', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gclitest/commands', 'test/assert'], function(require, exports, module) {
+
+
+var Requisition = require('gcli/cli').Requisition;
+var Status = require('gcli/types').Status;
+var commands = require('gclitest/commands');
 
 var test = require('test/assert');
-var types = require('gcli/types');
+
+exports.setup = function() {
+  commands.setup();
+};
+
+exports.shutdown = function() {
+  commands.shutdown();
+};
+
+
+var assign1;
+var assign2;
+var assignC;
+var requ;
+var debug = false;
+var status;
+var statuses;
+
+function update(input) {
+  if (!requ) {
+    requ = new Requisition();
+  }
+  requ.update(input);
+
+  if (debug) {
+    console.log('####### TEST: typed="' + input.typed +
+        '" cur=' + input.cursor.start +
+        ' cli=', requ);
+  }
+
+  status = requ.getStatus();
+  assignC = requ.getAssignmentAt(input.cursor.start);
+  statuses = requ.getInputStatusMarkup(input.cursor.start).map(function(s) {
+    return Array(s.string.length + 1).join(s.status.toString()[0]);
+  }).join('');
+
+  if (requ.commandAssignment.getValue()) {
+    assign1 = requ.getAssignment(0);
+    assign2 = requ.getAssignment(1);
+  }
+  else {
+    assign1 = undefined;
+    assign2 = undefined;
+  }
+}
+
+function verifyPredictionsContains(name, predictions) {
+  return predictions.every(function(prediction) {
+    return name === prediction.name;
+  }, this);
+}
+
+
+exports.testBlank = function() {
+  update({ typed: '', cursor: { start: 0, end: 0 } });
+  test.is(        '', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is(null, requ.commandAssignment.getValue());
+
+  update({ typed: ' ', cursor: { start: 1, end: 1 } });
+  test.is(        'V', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is(null, requ.commandAssignment.getValue());
+
+  update({ typed: ' ', cursor: { start: 0, end: 0 } });
+  test.is(        'V', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is(null, requ.commandAssignment.getValue());
+};
+
+exports.testIncompleteMultiMatch = function() {
+  update({ typed: 't', cursor: { start: 1, end: 1 } });
+  test.is(        'I', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.ok(assignC.getPredictions().length > 0);
+  verifyPredictionsContains('tsv', assignC.getPredictions());
+  verifyPredictionsContains('tsr', assignC.getPredictions());
+  test.is(null, requ.commandAssignment.getValue());
+};
+
+exports.testIncompleteSingleMatch = function() {
+  update({ typed: 'tselar', cursor: { start: 6, end: 6 } });
+  test.is(        'IIIIII', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is(1, assignC.getPredictions().length);
+  test.is('tselarr', assignC.getPredictions()[0].name);
+  test.is(null, requ.commandAssignment.getValue());
+};
+
+exports.testTsv = function() {
+  update({ typed: 'tsv', cursor: { start: 3, end: 3 } });
+  test.is(        'VVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+
+  update({ typed: 'tsv ', cursor: { start: 4, end: 4 } });
+  test.is(        'VVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is(0, assignC.paramIndex);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+
+  update({ typed: 'tsv ', cursor: { start: 2, end: 2 } });
+  test.is(        'VVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+
+  update({ typed: 'tsv o', cursor: { start: 5, end: 5 } });
+  test.is(        'VVVVI', statuses);
+  test.is(Status.ERROR, status);
+  test.is(0, assignC.paramIndex);
+  test.is(2, assignC.getPredictions().length);
+  test.is(commands.option1, assignC.getPredictions()[0].value);
+  test.is(commands.option2, assignC.getPredictions()[1].value);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('o', assign1.getArg().text);
+  test.is(null, assign1.getValue());
+
+  update({ typed: 'tsv option', cursor: { start: 10, end: 10 } });
+  test.is(        'VVVVIIIIII', statuses);
+  test.is(Status.ERROR, status);
+  test.is(0, assignC.paramIndex);
+  test.is(2, assignC.getPredictions().length);
+  test.is(commands.option1, assignC.getPredictions()[0].value);
+  test.is(commands.option2, assignC.getPredictions()[1].value);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option', assign1.getArg().text);
+  test.is(null, assign1.getValue());
+
+  update({ typed: 'tsv option', cursor: { start: 1, end: 1 } });
+  test.is(        'VVVVEEEEEE', statuses);
+  test.is(Status.ERROR, status);
+  test.is(-1, assignC.paramIndex);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option', assign1.getArg().text);
+  test.is(null, assign1.getValue());
+
+  update({ typed: 'tsv option ', cursor: { start: 11, end: 11 } });
+  test.is(        'VVVVEEEEEEV', statuses);
+  test.is(Status.ERROR, status);
+  test.is(1, assignC.paramIndex);
+  test.is(0, assignC.getPredictions().length);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option', assign1.getArg().text);
+  test.is(null, assign1.getValue());
+
+  update({ typed: 'tsv option1', cursor: { start: 11, end: 11 } });
+  test.is(        'VVVVVVVVVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option1', assign1.getArg().text);
+  test.is(commands.option1, assign1.getValue());
+  test.is(0, assignC.paramIndex);
+
+  update({ typed: 'tsv option1 ', cursor: { start: 12, end: 12 } });
+  test.is(        'VVVVVVVVVVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option1', assign1.getArg().text);
+  test.is(commands.option1, assign1.getValue());
+  test.is(1, assignC.paramIndex);
+
+  update({ typed: 'tsv option1 6', cursor: { start: 13, end: 13 } });
+  test.is(        'VVVVVVVVVVVVV', statuses);
+  test.is(Status.VALID, status);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option1', assign1.getArg().text);
+  test.is(commands.option1, assign1.getValue());
+  test.is('6', assign2.getArg().text);
+  test.is(6, assign2.getValue());
+  test.is('number', typeof assign2.getValue());
+  test.is(1, assignC.paramIndex);
+
+  update({ typed: 'tsv option2 6', cursor: { start: 13, end: 13 } });
+  test.is(        'VVVVVVVVVVVVE', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsv', requ.commandAssignment.getValue().name);
+  test.is('option2', assign1.getArg().text);
+  test.is(commands.option2, assign1.getValue());
+  test.is('6', assign2.getArg().text);
+  test.is(null, assign2.getValue());
+  test.is(1, assignC.paramIndex);
+};
+
+exports.testInvalid = function() {
+  update({ typed: 'fred', cursor: { start: 4, end: 4 } });
+  test.is(        'EEEE', statuses);
+  test.is('fred', requ.commandAssignment.getArg().text);
+  test.is('', requ._unassigned.getArg().text);
+  test.is(-1, assignC.paramIndex);
+
+  update({ typed: 'fred ', cursor: { start: 5, end: 5 } });
+  test.is(        'EEEEV', statuses);
+  test.is('fred', requ.commandAssignment.getArg().text);
+  test.is('', requ._unassigned.getArg().text);
+  test.is(-1, assignC.paramIndex);
+
+  update({ typed: 'fred one', cursor: { start: 8, end: 8 } });
+  test.is(        'EEEEVEEE', statuses);
+  test.is('fred', requ.commandAssignment.getArg().text);
+  test.is('one', requ._unassigned.getArg().text);
+};
+
+exports.testSingleString = function() {
+  update({ typed: 'tsr', cursor: { start: 3, end: 3 } });
+  test.is(        'VVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsr', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  //test.is(undefined, assign1.getValue());
+  test.is(undefined, assign2);
+
+  update({ typed: 'tsr ', cursor: { start: 4, end: 4 } });
+  test.is(        'VVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsr', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  //test.is(undefined, assign1.getValue());
+  test.is(undefined, assign2);
+
+  update({ typed: 'tsr h', cursor: { start: 5, end: 5 } });
+  test.is(        'VVVVV', statuses);
+  test.is(Status.VALID, status);
+  test.is('tsr', requ.commandAssignment.getValue().name);
+  test.is('h', assign1.getArg().text);
+  test.is('h', assign1.getValue());
+
+  update({ typed: 'tsr "h h"', cursor: { start: 9, end: 9 } });
+  test.is(        'VVVVVVVVV', statuses);
+  test.is(Status.VALID, status);
+  test.is('tsr', requ.commandAssignment.getValue().name);
+  test.is('h h', assign1.getArg().text);
+  test.is('h h', assign1.getValue());
+
+  update({ typed: 'tsr h h h', cursor: { start: 9, end: 9 } });
+  test.is(        'VVVVVVVVV', statuses);
+  test.is('tsr', requ.commandAssignment.getValue().name);
+  test.is('h h h', assign1.getArg().text);
+  test.is('h h h', assign1.getValue());
+};
+
+// BUG 664203: Add test to see that a command without mandatory param -> ERROR
+
+exports.testSingleNumber = function() {
+  update({ typed: 'tsu', cursor: { start: 3, end: 3 } });
+  test.is(        'VVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsu', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  test.is(null, assign1.getValue());
+
+  update({ typed: 'tsu ', cursor: { start: 4, end: 4 } });
+  test.is(        'VVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsu', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  test.is(null, assign1.getValue());
+
+  update({ typed: 'tsu 1', cursor: { start: 5, end: 5 } });
+  test.is(        'VVVVV', statuses);
+  test.is(Status.VALID, status);
+  test.is('tsu', requ.commandAssignment.getValue().name);
+  test.is('1', assign1.getArg().text);
+  test.is(1, assign1.getValue());
+  test.is('number', typeof assign1.getValue());
+
+  update({ typed: 'tsu x', cursor: { start: 5, end: 5 } });
+  test.is(        'VVVVE', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsu', requ.commandAssignment.getValue().name);
+  test.is('x', assign1.getArg().text);
+  test.is(null, assign1.getValue());
+};
+
+exports.testNestedCommand = function() {
+  update({ typed: 'tsn', cursor: { start: 3, end: 3 } });
+  test.is(        'III', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsn', requ.commandAssignment.getValue().name);
+  test.is(undefined, assign1);
+
+  update({ typed: 'tsn ', cursor: { start: 4, end: 4 } });
+  test.is(        'IIIV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsn', requ.commandAssignment.getValue().name);
+  test.is(undefined, assign1);
+
+  update({ typed: 'tsn x', cursor: { start: 5, end: 5 } });
+  test.is(        'EEEVE', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsn x', requ.commandAssignment.getArg().text);
+  test.is(undefined, assign1);
+
+  update({ typed: 'tsn dif', cursor: { start: 7, end: 7 } });
+  test.is(        'VVVVVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsn dif', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  //test.is(undefined, assign1.getValue());
+
+  update({ typed: 'tsn dif ', cursor: { start: 8, end: 8 } });
+  test.is(        'VVVVVVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsn dif', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  //test.is(undefined, assign1.getValue());
+
+  update({ typed: 'tsn dif x', cursor: { start: 9, end: 9 } });
+  test.is(        'VVVVVVVVV', statuses);
+  test.is(Status.VALID, status);
+  test.is('tsn dif', requ.commandAssignment.getValue().name);
+  test.is('x', assign1.getArg().text);
+  test.is('x', assign1.getValue());
+
+  update({ typed: 'tsn ext', cursor: { start: 7, end: 7 } });
+  test.is(        'VVVVVVV', statuses);
+  test.is(Status.ERROR, status);
+  test.is('tsn ext', requ.commandAssignment.getValue().name);
+  //test.is(undefined, assign1.getArg());
+  //test.is(undefined, assign1.getValue());
+};
+
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testExec', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gcli/canon', 'gclitest/commands', 'gcli/types/node', 'test/assert'], function(require, exports, module) {
+
+
+var Requisition = require('gcli/cli').Requisition;
+var Status = require('gcli/types').Status;
+var canon = require('gcli/canon');
+var commands = require('gclitest/commands');
+var nodetype = require('gcli/types/node');
+
+var test = require('test/assert');
+
+var actualExec;
+var actualOutput;
+
+exports.setup = function() {
+  commands.setup();
+  commands.commandExec.add(onCommandExec);
+  canon.commandOutputManager.addListener(onCommandOutput);
+};
+
+exports.shutdown = function() {
+  commands.shutdown();
+  commands.commandExec.remove(onCommandExec);
+  canon.commandOutputManager.removeListener(onCommandOutput);
+};
+
+function onCommandExec(ev) {
+  actualExec = ev;
+}
+
+function onCommandOutput(ev) {
+  actualOutput = ev.output;
+}
+
+function exec(command, expectedArgs) {
+  var environment = {};
+
+  var requisition = new Requisition(environment);
+  var reply = requisition.exec({ typed: command });
+
+  test.is(command.indexOf(actualExec.command.name), 0, 'Command name: ' + command);
+
+  if (reply !== true) {
+    test.ok(false, 'reply = false for command: ' + command);
+  }
+
+  if (expectedArgs == null) {
+    test.ok(false, 'expectedArgs == null for ' + command);
+    return;
+  }
+  if (actualExec.args == null) {
+    test.ok(false, 'actualExec.args == null for ' + command);
+    return;
+  }
+
+  test.is(Object.keys(expectedArgs).length, Object.keys(actualExec.args).length,
+          'Arg count: ' + command);
+  Object.keys(expectedArgs).forEach(function(arg) {
+    var expectedArg = expectedArgs[arg];
+    var actualArg = actualExec.args[arg];
+
+    if (Array.isArray(expectedArg)) {
+      if (!Array.isArray(actualArg)) {
+        test.ok(false, 'actual is not an array. ' + command + '/' + arg);
+        return;
+      }
+
+      test.is(expectedArg.length, actualArg.length,
+              'Array length: ' + command + '/' + arg);
+      for (var i = 0; i < expectedArg.length; i++) {
+        test.is(expectedArg[i], actualArg[i],
+                'Member: "' + command + '/' + arg + '/' + i);
+      }
+    }
+    else {
+      test.is(expectedArg, actualArg, 'Command: "' + command + '" arg: ' + arg);
+    }
+  });
+
+  test.is(environment, actualExec.context.environment, 'Environment');
+
+  test.is(false, actualOutput.error, 'output error is false');
+  test.is(command, actualOutput.typed, 'command is typed');
+  test.ok(typeof actualOutput.canonical === 'string', 'canonical exists');
+
+  test.is(actualExec.args, actualOutput.args, 'actualExec.args is actualOutput.args');
+}
+
+
+exports.testExec = function() {
+  exec('tss', {});
+
+  // Bug 707008 - GCLI defered types don't work properly
+  // exec('tsv option1 10', { optionType: commands.option1, optionValue: '10' });
+  // exec('tsv option2 10', { optionType: commands.option1, optionValue: 10 });
+
+  exec('tsr fred', { text: 'fred' });
+  exec('tsr fred bloggs', { text: 'fred bloggs' });
+  exec('tsr "fred bloggs"', { text: 'fred bloggs' });
+
+  exec('tsb', { toggle: false });
+  exec('tsb --toggle', { toggle: true });
+
+  exec('tsu 10', { num: 10 });
+  exec('tsu --num 10', { num: 10 });
+
+  // Bug 704829 - Enable GCLI Javascript parameters
+  // The answer to this should be 2
+  exec('tsj { 1 + 1 }', { javascript: '1 + 1' });
+
+  var origDoc = nodetype.getDocument();
+  nodetype.setDocument(mockDoc);
+  exec('tse :root', { node: mockBody });
+  nodetype.setDocument(origDoc);
+
+  exec('tsn dif fred', { text: 'fred' });
+  exec('tsn exten fred', { text: 'fred' });
+  exec('tsn extend fred', { text: 'fred' });
+
+  exec('tselarr 1', { num: '1', arr: [ ] });
+  exec('tselarr 1 a', { num: '1', arr: [ 'a' ] });
+  exec('tselarr 1 a b', { num: '1', arr: [ 'a', 'b' ] });
+
+  exec('tsm a 10 10', { abc: 'a', txt: '10', num: 10 });
+
+  // Bug 707009 - GCLI doesn't always fill in default parameters properly
+  // exec('tsg a', { solo: 'a', txt1: null, boolean1: false, txt2: 'd', num2: 42 });
+};
+
+var mockBody = {
+  style: {}
+};
+
+var mockDoc = {
+  querySelectorAll: function(css) {
+    if (css === ':root') {
+      return {
+        length: 1,
+        item: function(i) {
+          return mockBody;
+        }
+      };
+    }
+    throw new Error('mockDoc.querySelectorAll(\'' + css + '\') error');
+  }
+};
+
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testKeyboard', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gcli/canon', 'gclitest/commands', 'gcli/types/node', 'gcli/types/javascript', 'test/assert'], function(require, exports, module) {
+
+
+var Requisition = require('gcli/cli').Requisition;
+var Status = require('gcli/types').Status;
+var canon = require('gcli/canon');
+var commands = require('gclitest/commands');
+var nodetype = require('gcli/types/node');
+var javascript = require('gcli/types/javascript');
+
+var test = require('test/assert');
+
+var tempWindow;
+
+exports.setup = function(options) {
+  tempWindow = javascript.getGlobalObject();
+  javascript.setGlobalObject(options.window);
+
+  commands.setup();
+};
+
+exports.shutdown = function(options) {
+  commands.shutdown();
+
+  javascript.setGlobalObject(tempWindow);
+  tempWindow = undefined;
+};
+
+var COMPLETES_TO = 'complete';
+var KEY_UPS_TO = 'keyup';
+var KEY_DOWNS_TO = 'keydown';
+
+function check(initial, action, after) {
+  var requisition = new Requisition();
+  requisition.update({
+    typed: initial,
+    cursor: { start: initial.length, end: initial.length }
+  });
+  var assignment = requisition.getAssignmentAt(initial.length);
+  switch (action) {
+    case COMPLETES_TO:
+      assignment.complete();
+      break;
+
+    case KEY_UPS_TO:
+      assignment.increment();
+      break;
+
+    case KEY_DOWNS_TO:
+      assignment.decrement();
+      break;
+  }
+
+  test.is(after, requisition.toString(), initial + ' + ' + action + ' -> ' + after);
+}
+
+exports.testComplete = function(options) {
+  check('tsela', COMPLETES_TO, 'tselarr ');
+  check('tsn di', COMPLETES_TO, 'tsn dif ');
+  check('tsg a', COMPLETES_TO, 'tsg aaa ');
+
+  check('{ wind', COMPLETES_TO, '{ window');
+  check('{ window.docum', COMPLETES_TO, '{ window.document');
+
+  // Bug 717228: This fails under node
+  if (!options.isNode) {
+    check('{ window.document.titl', COMPLETES_TO, '{ window.document.title ');
+  }
+};
+
+exports.testIncrDecr = function() {
+  check('tsu -70', KEY_UPS_TO, 'tsu -5');
+  check('tsu -7', KEY_UPS_TO, 'tsu -5');
+  check('tsu -6', KEY_UPS_TO, 'tsu -5');
+  check('tsu -5', KEY_UPS_TO, 'tsu -3');
+  check('tsu -4', KEY_UPS_TO, 'tsu -3');
+  check('tsu -3', KEY_UPS_TO, 'tsu 0');
+  check('tsu -2', KEY_UPS_TO, 'tsu 0');
+  check('tsu -1', KEY_UPS_TO, 'tsu 0');
+  check('tsu 0', KEY_UPS_TO, 'tsu 3');
+  check('tsu 1', KEY_UPS_TO, 'tsu 3');
+  check('tsu 2', KEY_UPS_TO, 'tsu 3');
+  check('tsu 3', KEY_UPS_TO, 'tsu 6');
+  check('tsu 4', KEY_UPS_TO, 'tsu 6');
+  check('tsu 5', KEY_UPS_TO, 'tsu 6');
+  check('tsu 6', KEY_UPS_TO, 'tsu 9');
+  check('tsu 7', KEY_UPS_TO, 'tsu 9');
+  check('tsu 8', KEY_UPS_TO, 'tsu 9');
+  check('tsu 9', KEY_UPS_TO, 'tsu 10');
+  check('tsu 10', KEY_UPS_TO, 'tsu 10');
+  check('tsu 100', KEY_UPS_TO, 'tsu -5');
+
+  check('tsu -70', KEY_DOWNS_TO, 'tsu 10');
+  check('tsu -7', KEY_DOWNS_TO, 'tsu 10');
+  check('tsu -6', KEY_DOWNS_TO, 'tsu 10');
+  check('tsu -5', KEY_DOWNS_TO, 'tsu -5');
+  check('tsu -4', KEY_DOWNS_TO, 'tsu -5');
+  check('tsu -3', KEY_DOWNS_TO, 'tsu -5');
+  check('tsu -2', KEY_DOWNS_TO, 'tsu -3');
+  check('tsu -1', KEY_DOWNS_TO, 'tsu -3');
+  check('tsu 0', KEY_DOWNS_TO, 'tsu -3');
+  check('tsu 1', KEY_DOWNS_TO, 'tsu 0');
+  check('tsu 2', KEY_DOWNS_TO, 'tsu 0');
+  check('tsu 3', KEY_DOWNS_TO, 'tsu 0');
+  check('tsu 4', KEY_DOWNS_TO, 'tsu 3');
+  check('tsu 5', KEY_DOWNS_TO, 'tsu 3');
+  check('tsu 6', KEY_DOWNS_TO, 'tsu 3');
+  check('tsu 7', KEY_DOWNS_TO, 'tsu 6');
+  check('tsu 8', KEY_DOWNS_TO, 'tsu 6');
+  check('tsu 9', KEY_DOWNS_TO, 'tsu 6');
+  check('tsu 10', KEY_DOWNS_TO, 'tsu 9');
+  check('tsu 100', KEY_DOWNS_TO, 'tsu 10');
+
+  // Bug 707007 - GCLI increment and decrement operations cycle through
+  // selection options in the wrong order
+  check('tselarr 1', KEY_DOWNS_TO, 'tselarr 2');
+  check('tselarr 2', KEY_DOWNS_TO, 'tselarr 3');
+  check('tselarr 3', KEY_DOWNS_TO, 'tselarr 1');
+
+  check('tselarr 3', KEY_UPS_TO, 'tselarr 2');
+};
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testScratchpad', ['require', 'exports', 'module' , 'test/assert'], function(require, exports, module) {
+
+
+var test = require('test/assert');
+
+var origScratchpad;
+
+exports.setup = function(options) {
+  if (options.inputter) {
+    origScratchpad = options.inputter.scratchpad;
+    options.inputter.scratchpad = stubScratchpad;
+  }
+};
+
+exports.shutdown = function(options) {
+  if (options.inputter) {
+    options.inputter.scratchpad = origScratchpad;
+  }
+};
+
+var stubScratchpad = {
+  shouldActivate: function(ev) {
+    return true;
+  },
+  activatedCount: 0,
+  linkText: 'scratchpad.linkText'
+};
+stubScratchpad.activate = function(value) {
+  stubScratchpad.activatedCount++;
+  return true;
+};
+
+
+exports.testActivate = function(options) {
+  if (!options.inputter) {
+    console.log('No inputter. Skipping scratchpad tests');
+    return;
+  }
+
+  var ev = {};
+  stubScratchpad.activatedCount = 0;
+  options.inputter.onKeyUp(ev);
+  test.is(1, stubScratchpad.activatedCount, 'scratchpad is activated');
+};
+
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testHistory', ['require', 'exports', 'module' , 'test/assert', 'gcli/history'], function(require, exports, module) {
+
+var test = require('test/assert');
+var History = require('gcli/history').History;
 
 exports.setup = function() {
 };
@@ -2827,34 +1708,401 @@ exports.setup = function() {
 exports.shutdown = function() {
 };
 
-exports.testDefault = function(options) {
-  if (options.isNode) {
-    test.log('Running under Node. ' +
-             'Skipping tests due to issues with resource type.');
+exports.testSimpleHistory = function () {
+  var history = new History({});
+  history.add('foo');
+  history.add('bar');
+  test.is('bar', history.backward());
+  test.is('foo', history.backward());
+
+  // Adding to the history again moves us back to the start of the history.
+  history.add('quux');
+  test.is('quux', history.backward());
+  test.is('bar', history.backward());
+  test.is('foo', history.backward());
+};
+
+exports.testBackwardsPastIndex = function () {
+  var history = new History({});
+  history.add('foo');
+  history.add('bar');
+  test.is('bar', history.backward());
+  test.is('foo', history.backward());
+
+  // Moving backwards past recorded history just keeps giving you the last
+  // item.
+  test.is('foo', history.backward());
+};
+
+exports.testForwardsPastIndex = function () {
+  var history = new History({});
+  history.add('foo');
+  history.add('bar');
+  test.is('bar', history.backward());
+  test.is('foo', history.backward());
+
+  // Going forward through the history again.
+  test.is('bar', history.forward());
+
+  // 'Present' time.
+  test.is('', history.forward());
+
+  // Going to the 'future' just keeps giving us the empty string.
+  test.is('', history.forward());
+};
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testRequire', ['require', 'exports', 'module' , 'test/assert', 'gclitest/requirable'], function(require, exports, module) {
+
+var test = require('test/assert');
+
+
+exports.testWorking = function() {
+  // There are lots of requirement tests that we could be doing here
+  // The fact that we can get anything at all working is a testament to
+  // require doing what it should - we don't need to test the
+  var requireable = require('gclitest/requirable');
+  test.is('thing1', requireable.thing1);
+  test.is(2, requireable.thing2);
+  test.is(undefined, requireable.thing3);
+};
+
+exports.testDomains = function() {
+  var requireable = require('gclitest/requirable');
+  test.is(undefined, requireable.status);
+  requireable.setStatus(null);
+  test.is(null, requireable.getStatus());
+  test.is(undefined, requireable.status);
+  requireable.setStatus('42');
+  test.is('42', requireable.getStatus());
+  test.is(undefined, requireable.status);
+
+  if (define.Domain) {
+    var domain = new define.Domain();
+    var requireable2 = domain.require('gclitest/requirable');
+    test.is(undefined, requireable2.status);
+    test.is('initial', requireable2.getStatus());
+    requireable2.setStatus(999);
+    test.is(999, requireable2.getStatus());
+    test.is(undefined, requireable2.status);
+
+    test.is('42', requireable.getStatus());
+    test.is(undefined, requireable.status);
+  }
+};
+
+exports.testLeakage = function() {
+  var requireable = require('gclitest/requirable');
+  test.is(undefined, requireable.setup);
+  test.is(undefined, requireable.shutdown);
+  test.is(undefined, requireable.testWorking);
+};
+
+exports.testMultiImport = function() {
+  var r1 = require('gclitest/requirable');
+  var r2 = require('gclitest/requirable');
+  test.is(r1, r2);
+};
+
+exports.testUncompilable = function() {
+  // This test is commented out because it breaks the RequireJS module
+  // loader and because it causes console output and because testing failure
+  // cases such as this is something of a luxury
+  // It's not totally clear how a module loader should perform with unusable
+  // modules, however at least it should go into a flat spin ...
+  // GCLI mini_require reports an error as it should
+  /*
+  if (define.Domain) {
+    try {
+      var unrequireable = require('gclitest/unrequirable');
+      t.fail();
+    }
+    catch (ex) {
+      console.error(ex);
+    }
+  }
+  */
+};
+
+exports.testRecursive = function() {
+  // See Bug 658583
+  /*
+  var recurse = require('gclitest/recurse');
+  */
+};
+
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/requirable', ['require', 'exports', 'module' ], function(require, exports, module) {
+
+  exports.thing1 = 'thing1';
+  exports.thing2 = 2;
+
+  var status = 'initial';
+  exports.setStatus = function(aStatus) { status = aStatus; };
+  exports.getStatus = function() { return status; };
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testResource', ['require', 'exports', 'module' , 'gcli/types/resource', 'gcli/types', 'test/assert'], function(require, exports, module) {
+
+
+var resource = require('gcli/types/resource');
+var types = require('gcli/types');
+var Status = require('gcli/types').Status;
+
+var test = require('test/assert');
+
+var tempDocument;
+
+exports.setup = function(options) {
+  tempDocument = resource.getDocument();
+  resource.setDocument(options.window.document);
+};
+
+exports.shutdown = function(options) {
+  resource.setDocument(tempDocument);
+  tempDocument = undefined;
+};
+
+exports.testPredictions = function(options) {
+  if (options.useFakeWindow) {
+    console.log('Skipping resource tests: options.useFakeWindow = true');
     return;
   }
 
-  types.getTypeNames().forEach(function(name) {
-    if (name === 'selection') {
-      name = { name: 'selection', data: [ 'a', 'b' ] };
-    }
-    if (name === 'deferred') {
-      name = {
-        name: 'deferred',
-        defer: function() { return types.getType('string'); }
-      };
-    }
-    if (name === 'array') {
-      name = { name: 'array', subtype: 'string' };
-    }
-    var type = types.getType(name);
-    if (type.name !== 'boolean' && type.name !== 'array') {
-      test.ok(type.getBlank().value === undefined,
-              'default defined for ' + type.name);
-    }
+  var resource1 = types.getType('resource');
+  var predictions1 = resource1.parseString('').getPredictions();
+  test.ok(predictions1.length > 1, 'have resources');
+  predictions1.forEach(function(prediction) {
+    checkPrediction(resource1, prediction);
+  });
+
+  var resource2 = types.getType({ name: 'resource', include: 'text/javascript' });
+  var predictions2 = resource2.parseString('').getPredictions();
+  test.ok(predictions2.length > 1, 'have resources');
+  predictions2.forEach(function(prediction) {
+    checkPrediction(resource2, prediction);
+  });
+
+  var resource3 = types.getType({ name: 'resource', include: 'text/css' });
+  var predictions3 = resource3.parseString('').getPredictions();
+  // jsdom fails to support digging into stylesheets
+  if (!options.isNode) {
+    test.ok(predictions3.length > 1, 'have resources');
+  }
+  predictions3.forEach(function(prediction) {
+    checkPrediction(resource3, prediction);
+  });
+
+  var resource4 = types.getType({ name: 'resource' });
+  var predictions4 = resource4.parseString('').getPredictions();
+
+  test.is(predictions1.length, predictions4.length, 'type spec');
+  test.is(predictions2.length + predictions3.length, predictions4.length, 'split');
+};
+
+function checkPrediction(res, prediction) {
+  var name = prediction.name;
+  var value = prediction.value;
+
+  var conversion = res.parseString(name);
+  test.is(conversion.getStatus(), Status.VALID, 'status VALID for ' + name);
+  test.is(conversion.value, value, 'value for ' + name);
+
+  var strung = res.stringify(value);
+  test.is(strung, name, 'stringify for ' + name);
+
+  test.is(typeof value.loadContents, 'function', 'resource for ' + name);
+  test.is(typeof value.element, 'object', 'resource for ' + name);
+}
+
+});
+/*
+ * Copyright 2009-2011 Mozilla Foundation and contributors
+ * Licensed under the New BSD license. See LICENSE.txt or:
+ * http://opensource.org/licenses/BSD-3-Clause
+ */
+
+define('gclitest/testJs', ['require', 'exports', 'module' , 'gcli/cli', 'gcli/types', 'gcli/types/javascript', 'test/assert'], function(require, exports, module) {
+
+
+var Requisition = require('gcli/cli').Requisition;
+var Status = require('gcli/types').Status;
+var javascript = require('gcli/types/javascript');
+
+var test = require('test/assert');
+
+var debug = false;
+var requ;
+
+var assign;
+var status;
+var statuses;
+var tempWindow;
+
+
+exports.setup = function(options) {
+  tempWindow = javascript.getGlobalObject();
+  javascript.setGlobalObject(options.window);
+
+  Object.defineProperty(options.window, 'donteval', {
+    get: function() {
+      test.ok(false, 'donteval should not be used');
+      return { cant: '', touch: '', 'this': '' };
+    },
+    enumerable: true,
+    configurable : true
   });
 };
 
+exports.shutdown = function(options) {
+  delete options.window.donteval;
+
+  javascript.setGlobalObject(tempWindow);
+  tempWindow = undefined;
+};
+
+function input(typed) {
+  if (!requ) {
+    requ = new Requisition();
+  }
+  var cursor = { start: typed.length, end: typed.length };
+  var input = { typed: typed, cursor: cursor };
+  requ.update(input);
+
+  if (debug) {
+    console.log('####### TEST: typed="' + typed +
+        '" cur=' + cursor.start +
+        ' cli=', requ);
+  }
+
+  status = requ.getStatus();
+  statuses = requ.getInputStatusMarkup(input.cursor.start).map(function(s) {
+    return Array(s.string.length + 1).join(s.status.toString()[0]);
+  }).join('');
+
+  if (requ.commandAssignment.getValue()) {
+    assign = requ.getAssignment(0);
+  }
+  else {
+    assign = undefined;
+  }
+}
+
+function predictionsHas(name) {
+  return assign.getPredictions().some(function(prediction) {
+    return name === prediction.name;
+  }, this);
+}
+
+function check(expStatuses, expStatus, expAssign, expPredict) {
+  test.is('{', requ.commandAssignment.getValue().name, 'is exec');
+
+  test.is(expStatuses, statuses, 'unexpected status markup');
+  test.is(expStatus.toString(), status.toString(), 'unexpected status');
+  test.is(expAssign, assign.getValue(), 'unexpected assignment');
+
+  if (expPredict != null) {
+    var contains;
+    if (Array.isArray(expPredict)) {
+      expPredict.forEach(function(p) {
+        contains = predictionsHas(p);
+        test.ok(contains, 'missing prediction ' + p);
+      });
+    }
+    else if (typeof expPredict === 'number') {
+      contains = true;
+      test.is(assign.getPredictions().length, expPredict, 'prediction count');
+      if (assign.getPredictions().length !== expPredict) {
+        assign.getPredictions().forEach(function(prediction) {
+          console.log('actual prediction: ', prediction);
+        });
+      }
+    }
+    else {
+      contains = predictionsHas(expPredict);
+      test.ok(contains, 'missing prediction ' + expPredict);
+    }
+
+    if (!contains) {
+      console.log('Predictions: ' + assign.getPredictions().map(function(p) {
+        return p.name;
+      }).join(', '));
+    }
+  }
+}
+
+exports.testBasic = function(options) {
+  input('{');
+  check('V', Status.ERROR, '');
+
+  input('{ ');
+  check('VV', Status.ERROR, '');
+
+  input('{ w');
+  check('VVI', Status.ERROR, 'w', 'window');
+
+  input('{ windo');
+  check('VVIIIII', Status.ERROR, 'windo', 'window');
+
+  input('{ window');
+  check('VVVVVVVV', Status.VALID, 'window');
+
+  input('{ window.d');
+  check('VVIIIIIIII', Status.ERROR, 'window.d', 'window.document');
+
+  input('{ window.document.title');
+  check('VVVVVVVVVVVVVVVVVVVVVVV', Status.VALID, 'window.document.title', 0);
+
+  input('{ d');
+  check('VVI', Status.ERROR, 'd', 'document');
+
+  input('{ document.title');
+  check('VVVVVVVVVVVVVVVV', Status.VALID, 'document.title', 0);
+
+  test.ok('donteval' in options.window, 'donteval exists');
+
+  input('{ don');
+  check('VVIII', Status.ERROR, 'don', 'donteval');
+
+  input('{ donteval');
+  check('VVVVVVVVVV', Status.VALID, 'donteval', 0);
+
+  /*
+  // This is a controversial test - technically we can tell that it's an error
+  // because 'donteval.' is a syntax error, however donteval is unsafe so we
+  // are playing safe by bailing out early. It's enough of a corner case that
+  // I don't think it warrants fixing
+  input('{ donteval.');
+  check('VVIIIIIIIII', Status.ERROR, 'donteval.', 0);
+  */
+
+  input('{ donteval.cant');
+  check('VVVVVVVVVVVVVVV', Status.VALID, 'donteval.cant', 0);
+
+  input('{ donteval.xxx');
+  check('VVVVVVVVVVVVVV', Status.VALID, 'donteval.xxx', 0);
+};
+
+
 });
 /*
  * Copyright 2009-2011 Mozilla Foundation and contributors
@@ -2868,14 +2116,14 @@ var util = require('gcli/util');
 var test = require('test/assert');
 
 exports.testFindCssSelector = function(options) {
-  if (options.window.isFake) {
-    test.log('Skipping dom.findCssSelector tests due to window.isFake');
+  if (options.useFakeWindow) {
+    console.log('Skipping dom.findCssSelector tests due to useFakeWindow');
     return;
   }
 
   var nodes = options.window.document.querySelectorAll('*');
   for (var i = 0; i < nodes.length; i++) {
-    var selector = util.findCssSelector(nodes[i]);
+    var selector = util.dom.findCssSelector(nodes[i]);
     var matches = options.window.document.querySelectorAll(selector);
 
     test.is(matches.length, 1, 'multiple matches for ' + selector);
@@ -2886,54 +2134,86 @@ exports.testFindCssSelector = function(options) {
 
 });
 
-let testModuleNames = [
-  'gclitest/index',
-  'gclitest/suite',
-  'test/examiner',
-  'gclitest/testCli',
-  'gclitest/commands',
-  'test/assert',
-  'gclitest/testCompletion',
-  'gclitest/testExec',
-  'gclitest/testHistory',
-  'gclitest/testJs',
-  'gclitest/testKeyboard',
-  'gclitest/testRequire',
-  'gclitest/requirable',
-  'gclitest/testResource',
-  'gclitest/testScratchpad',
-  'gclitest/testSpell',
-  'gclitest/testSplit',
-  'gclitest/testTokenize',
-  'gclitest/testTooltip',
-  'gclitest/testTypes',
-  'gclitest/testUtil',
-];
+function undefine() {
+  delete define.modules['gclitest/index'];
+  delete define.modules['gclitest/suite'];
+  delete define.modules['test/examiner'];
+  delete define.modules['gclitest/testTokenize'];
+  delete define.modules['test/assert'];
+  delete define.modules['gclitest/testSplit'];
+  delete define.modules['gclitest/commands'];
+  delete define.modules['gclitest/testCli'];
+  delete define.modules['gclitest/testExec'];
+  delete define.modules['gclitest/testKeyboard'];
+  delete define.modules['gclitest/testScratchpad'];
+  delete define.modules['gclitest/testHistory'];
+  delete define.modules['gclitest/testRequire'];
+  delete define.modules['gclitest/requirable'];
+  delete define.modules['gclitest/testResource'];
+  delete define.modules['gclitest/testJs'];
+  delete define.modules['gclitest/testUtil'];
 
-// Cached so it still exists during cleanup until we need it to
-let localDefine;
-
-const TEST_URI = "data:text/html;charset=utf-8,gcli-web";
-
-function test() {
-  localDefine = define;
-
-  DeveloperToolbarTest.test(TEST_URI, function(browser, tab) {
-    var gclitest = define.globalDomain.require("gclitest/index");
-    gclitest.run({
-      display: DeveloperToolbar.display,
-      // window: browser.getBrowser().contentWindow
-    });
-
-    finish();
-  });
+  delete define.globalDomain.modules['gclitest/index'];
+  delete define.globalDomain.modules['gclitest/suite'];
+  delete define.globalDomain.modules['test/examiner'];
+  delete define.globalDomain.modules['gclitest/testTokenize'];
+  delete define.globalDomain.modules['test/assert'];
+  delete define.globalDomain.modules['gclitest/testSplit'];
+  delete define.globalDomain.modules['gclitest/commands'];
+  delete define.globalDomain.modules['gclitest/testCli'];
+  delete define.globalDomain.modules['gclitest/testExec'];
+  delete define.globalDomain.modules['gclitest/testKeyboard'];
+  delete define.globalDomain.modules['gclitest/testScratchpad'];
+  delete define.globalDomain.modules['gclitest/testHistory'];
+  delete define.globalDomain.modules['gclitest/testRequire'];
+  delete define.globalDomain.modules['gclitest/requirable'];
+  delete define.globalDomain.modules['gclitest/testResource'];
+  delete define.globalDomain.modules['gclitest/testJs'];
+  delete define.globalDomain.modules['gclitest/testUtil'];
 }
 
 registerCleanupFunction(function() {
-  testModuleNames.forEach(function(moduleName) {
-    delete localDefine.modules[moduleName];
-    delete localDefine.globalDomain.modules[moduleName];
-  });
-
-  localDefine = undefined;
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+  undefine();
+  obj = undefined;
+  define = undefined;
+  console = undefined;
+  Node = undefined;
 });
+
+function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", true);
+  addTab("http://example.com/browser/browser/devtools/webconsole/test/test-console.html");
+  browser.addEventListener("DOMContentLoaded", onLoad, false);
+}
+
+function onLoad() {
+  browser.removeEventListener("DOMContentLoaded", onLoad, false);
+  var failed = false;
+
+  try {
+    openConsole();
+
+    var gcliterm = HUDService.getHudByWindow(content).gcliterm;
+
+    var gclitest = define.globalDomain.require("gclitest/index");
+    gclitest.run({
+      window: gcliterm.document.defaultView,
+      inputter: gcliterm.opts.console.inputter,
+      requisition: gcliterm.opts.requistion
+    });
+  }
+  catch (ex) {
+    failed = ex;
+    console.error("Test Failure", ex);
+    ok(false, "" + ex);
+  }
+  finally {
+    closeConsole();
+    finish();
+  }
+
+  if (failed) {
+    throw failed;
+  }
+}
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_579412_input_focus.js b/browser/devtools/webconsole/test/browser_webconsole_bug_579412_input_focus.js
index 9e30ea7bb1c9..a51311e96745 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_579412_input_focus.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_579412_input_focus.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testInputFocus, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js b/browser/devtools/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
index d967bfab5a47..a32728d89903 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_580001_closing_after_completion.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testClosingAfterCompletion,
                            false);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_580400_groups.js b/browser/devtools/webconsole/test/browser_webconsole_bug_580400_groups.js
index 892a98bb8263..22f55d7f192e 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_580400_groups.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_580400_groups.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testGroups, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js b/browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
index 1b3e783f0c74..b6a093938c64 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_582201_duplicate_errors.js
@@ -43,7 +43,12 @@
 
 const TEST_DUPLICATE_ERROR_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-duplicate-error.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   expectUncaughtException();
   addTab(TEST_DUPLICATE_ERROR_URI);
   browser.addEventListener("DOMContentLoaded", testDuplicateErrors, false);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js b/browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
index 10429065c0b7..9b1feaa76e72 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_583816_No_input_and_Tab_key_pressed.js
@@ -39,7 +39,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/browser/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testCompletion, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
index 01e5f6c6b93a..fd66a8ac7b4b 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_keys.js
@@ -39,7 +39,12 @@
 const TEST_URI = "data:text/html;charset=utf-8,<p>bug 585991 - autocomplete popup keyboard usage test";
 let HUD;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js
index 2f86ef888912..30fec55f3a38 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_585991_autocomplete_popup.js
@@ -38,7 +38,12 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,<p>bug 585991 - autocomplete popup test";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_586388_select_all.js b/browser/devtools/webconsole/test/browser_webconsole_bug_586388_select_all.js
index fbd1eafb4676..c6d6a833fc6c 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_586388_select_all.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_586388_select_all.js
@@ -10,7 +10,12 @@
 
 const TEST_URI = "http://example.com/";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded",
                            testSelectionWhenMovingBetweenBoxes, false);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_587617_output_copy.js b/browser/devtools/webconsole/test/browser_webconsole_bug_587617_output_copy.js
index b64f8d3cf963..5acd242a4f00 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_587617_output_copy.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_587617_output_copy.js
@@ -10,7 +10,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_588342_document_focus.js b/browser/devtools/webconsole/test/browser_webconsole_bug_588342_document_focus.js
index 454e4d2557d9..0e164b44dc9c 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_588342_document_focus.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_588342_document_focus.js
@@ -11,7 +11,12 @@
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 588342";
 let fm, notificationBox, input;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   fm = Cc["@mozilla.org/focus-manager;1"].getService(Ci.nsIFocusManager);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoad, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_588967_input_expansion.js b/browser/devtools/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
index 62b3a57f19ef..63850e7711b0 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_588967_input_expansion.js
@@ -38,7 +38,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testInputExpansion, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js b/browser/devtools/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js
index 2f9f9143fc59..294bf58a6849 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_592442_closing_brackets.js
@@ -13,7 +13,12 @@
 // Tests that, when the user types an extraneous closing bracket, no error
 // appears.
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,test for bug 592442");
   browser.addEventListener("load", testExtraneousClosingBrackets, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_594477_clickable_output.js b/browser/devtools/webconsole/test/browser_webconsole_bug_594477_clickable_output.js
index 0ebea719e41d..41661d5c9cb6 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_594477_clickable_output.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_594477_clickable_output.js
@@ -154,7 +154,12 @@ function propertyPanelHidden(aEvent) {
   });
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoad1, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js b/browser/devtools/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js
index a65e8f44d6bd..d780d6814925 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_594497_history_arrow_keys.js
@@ -155,7 +155,12 @@ function performTests() {
   executeSoon(finishTest);
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 594497 and bug 619598");
   browser.addEventListener("load", tabLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js b/browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js
index 2c24a70e73c1..622fa7a5e7d5 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_595934_message_categories.js
@@ -172,6 +172,7 @@ function testNext() {
 }
 
 function testEnd() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
   Services.console.unregisterListener(TestObserver);
   output.removeEventListener("DOMNodeInserted", onDOMNodeInserted, false);
   output = jsterm = null;
@@ -191,6 +192,7 @@ function onDOMNodeInserted(aEvent) {
 }
 
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   registerCleanupFunction(testEnd);
 
   addTab("data:text/html;charset=utf-8,Web Console test for bug 595934 - message categories coverage.");
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_598357_jsterm_output.js b/browser/devtools/webconsole/test/browser_webconsole_bug_598357_jsterm_output.js
index a93740dddeba..c93a1ca54610 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_598357_jsterm_output.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_598357_jsterm_output.js
@@ -225,7 +225,12 @@ function testEnd() {
   executeSoon(finishTest);
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_601352_scroll.js b/browser/devtools/webconsole/test/browser_webconsole_bug_601352_scroll.js
index bd6d2d2d87e5..2fe68d6ecada 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_601352_scroll.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_601352_scroll.js
@@ -57,7 +57,12 @@ function tabLoad(aEvent) {
   });
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 601352");
   browser.addEventListener("load", tabLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_611795.js b/browser/devtools/webconsole/test/browser_webconsole_bug_611795.js
index 262f31c4ea8a..06906c4c8751 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_611795.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_611795.js
@@ -32,12 +32,17 @@ function onContentLoaded()
   finishTest();
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 /**
  * Unit test for bug 611795:
  * Repeated CSS messages get collapsed into one.
  */
 function test()
 {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", function() {
     browser.removeEventListener("load", arguments.callee, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js b/browser/devtools/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js
index e341f2d5eaf7..0cff16d50ea3 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_613280_jsterm_copy.js
@@ -8,7 +8,12 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 613280";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js b/browser/devtools/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js
index c151d2f8d1d1..e6af9978021a 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_614793_jsterm_scroll.js
@@ -36,7 +36,12 @@ function tabLoad(aEvent) {
   finishTest();
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 614793: jsterm result scroll");
   browser.addEventListener("load", tabLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_618311_close_panels.js b/browser/devtools/webconsole/test/browser_webconsole_bug_618311_close_panels.js
index 6ee6c51603df..d87b44cde017 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_618311_close_panels.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_618311_close_panels.js
@@ -38,7 +38,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", function() {
     browser.removeEventListener("load", arguments.callee, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_618311_private_browsing.js b/browser/devtools/webconsole/test/browser_webconsole_bug_618311_private_browsing.js
index ef13950cf90e..57e9e3227fef 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_618311_private_browsing.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_618311_private_browsing.js
@@ -41,7 +41,12 @@ const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/te
 let pb = Cc["@mozilla.org/privatebrowsing;1"].
          getService(Ci.nsIPrivateBrowsingService);
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 618311 (private browsing)");
 
   browser.addEventListener("load", function() {
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js b/browser/devtools/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
index 438be842caec..c0de76165513 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_621644_jsterm_dollar.js
@@ -42,7 +42,12 @@ function tabLoad(aEvent) {
   }, content);
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_626484_output_copy_order.js b/browser/devtools/webconsole/test/browser_webconsole_bug_626484_output_copy_order.js
index d92b3f9e65b2..d3c649cb851d 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_626484_output_copy_order.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_626484_output_copy_order.js
@@ -2,7 +2,12 @@
    http://creativecommons.org/publicdomain/zero/1.0/ */
 let itemsSet, HUD;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 626484");
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js b/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
index 7547ccca6a7d..3ce26e6baf52 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_632275_getters_document_width.js
@@ -3,7 +3,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-bug-632275-getters.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js b/browser/devtools/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
index acc25db198a1..e207ef827d8e 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_632347_iterators_generators.js
@@ -38,7 +38,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-bug-632347-iterators-generators.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_642615_autocomplete.js b/browser/devtools/webconsole/test/browser_webconsole_bug_642615_autocomplete.js
index c24183dc3af4..acc260e5f099 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_642615_autocomplete.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_642615_autocomplete.js
@@ -76,7 +76,12 @@ function tabLoad(aEvent) {
   EventUtils.synthesizeKey("u", {});
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js b/browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js
index f8f2aaf234d1..778282d27593 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_644419_log_limits.js
@@ -12,7 +12,12 @@ const TEST_URI = "http://example.com/browser/browser/devtools/" +
 
 var gOldPref, gHudId;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 644419: Console should " +
          "have user-settable log limits for each message category");
   browser.addEventListener("load", onLoad, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js b/browser/devtools/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js
index c65a365b22f6..7f4ff3251663 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_651501_document_body_autocomplete.js
@@ -13,7 +13,12 @@ let PropertyTreeView = tempScope.PropertyTreeView;
 let namesAndValuesOf = tempScope.namesAndValuesOf;
 let isNonNativeGetter = tempScope.isNonNativeGetter;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console autocompletion bug in document.body");
   browser.addEventListener("load", onLoad, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
index a093d8120c1a..b74864e157f1 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_653531_highlighter_console_helper.js
@@ -131,8 +131,13 @@ function finishUp() {
   finish();
 }
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test()
 {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   waitForExplicitFinish();
   gBrowser.selectedTab = gBrowser.addTab();
   gBrowser.selectedBrowser.addEventListener("load", function() {
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js b/browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js
index 995d77048c6b..3ab5b030174a 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_658368_time_methods.js
@@ -6,7 +6,12 @@
 
 // Tests that the Console API implements the time() and timeEnd() methods.
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("http://example.com/browser/browser/devtools/webconsole/" +
          "test/test-bug-658368-time-methods.html");
   openConsole();
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
index df72698b9b38..5857d2479214 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_660806_history_nav.js
@@ -4,7 +4,12 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,<p>bug 660806 - history navigation must not show the autocomplete popup";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", tabLoaded, true);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_664131_console_group.js b/browser/devtools/webconsole/test/browser_webconsole_bug_664131_console_group.js
index 4f4ab858d017..328ae92f678e 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_664131_console_group.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_664131_console_group.js
@@ -7,7 +7,12 @@
 // Tests that console.group/groupEnd works as intended.
 const GROUP_INDENT = 12;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab("data:text/html;charset=utf-8,Web Console test for bug 664131: Expand console " +
          "object with group methods");
   browser.addEventListener("load", onLoad, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_bug_704295.js b/browser/devtools/webconsole/test/browser_webconsole_bug_704295.js
index 909860eca655..d1bf40035ad5 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_bug_704295.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_bug_704295.js
@@ -40,7 +40,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testCompletion, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_chrome.js b/browser/devtools/webconsole/test/browser_webconsole_chrome.js
index eccb4f916c63..6969add0b2ef 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_chrome.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_chrome.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "chrome://browser/content/browser.xul";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testChrome, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_completion.js b/browser/devtools/webconsole/test/browser_webconsole_completion.js
index 3c651852e02d..8915e5063d48 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_completion.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_completion.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testCompletion, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_console_logging_api.js b/browser/devtools/webconsole/test/browser_webconsole_console_logging_api.js
index 4e082693d7bd..cae54dd95c81 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_console_logging_api.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_console_logging_api.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_consoleonpage.js b/browser/devtools/webconsole/test/browser_webconsole_consoleonpage.js
index fe0044717d93..8216a62ee08a 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_consoleonpage.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_consoleonpage.js
@@ -11,8 +11,13 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-own-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test()
 {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("load", function() {
     browser.removeEventListener("load", arguments.callee, true);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js b/browser/devtools/webconsole/test/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
index a611d49a5f9f..9d468063fca8 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_copying_multiple_messages_inserts_newlines_in_between.js
@@ -12,8 +12,13 @@
 
 const TEST_URI = "data:text/html;charset=utf-8,Web Console test for bug 586142";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test()
 {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", onLoad, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_execution_scope.js b/browser/devtools/webconsole/test/browser_webconsole_execution_scope.js
index 24e0158ccd04..8c3233735725 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_execution_scope.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_execution_scope.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testExecutionScope, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_for_of.js b/browser/devtools/webconsole/test/browser_webconsole_for_of.js
index c9678c2641ea..ee56076a623d 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_for_of.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_for_of.js
@@ -5,7 +5,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-for-of.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testForOf, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_history.js b/browser/devtools/webconsole/test/browser_webconsole_history.js
index 6aa7dec487bd..4273535ae3f7 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_history.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_history.js
@@ -46,7 +46,12 @@ const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/te
 const HISTORY_BACK = -1;
 const HISTORY_FORWARD = 1;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testHistory, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_hud_getters.js b/browser/devtools/webconsole/test/browser_webconsole_hud_getters.js
index b46056af5373..8a34850e454d 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_hud_getters.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_hud_getters.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testHUDGetters, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_js_input_and_output_styling.js b/browser/devtools/webconsole/test/browser_webconsole_js_input_and_output_styling.js
index 25611706f7fa..d1d8c98e8206 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_js_input_and_output_styling.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_js_input_and_output_styling.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testJSInputAndOutputStyling,
                            false);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_js_input_expansion.js b/browser/devtools/webconsole/test/browser_webconsole_js_input_expansion.js
index 86fffa48bdad..12b5a6bd7c7f 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_js_input_expansion.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_js_input_expansion.js
@@ -42,7 +42,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testJSInputExpansion, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_jsterm.js b/browser/devtools/webconsole/test/browser_webconsole_jsterm.js
index c80aba6f2783..31dd11f2f862 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_jsterm.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_jsterm.js
@@ -43,7 +43,12 @@ const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/te
 
 let jsterm;
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testJSTerm, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_null_and_undefined_output.js b/browser/devtools/webconsole/test/browser_webconsole_null_and_undefined_output.js
index 57c5873ed978..2f0790f47c8e 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_null_and_undefined_output.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_null_and_undefined_output.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testNullAndUndefinedOutput,
                            false);
diff --git a/browser/devtools/webconsole/test/browser_webconsole_output_order.js b/browser/devtools/webconsole/test/browser_webconsole_output_order.js
index 57ff7b9030c8..cc2baaed9100 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_output_order.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_output_order.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testOutputOrder, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_property_panel.js b/browser/devtools/webconsole/test/browser_webconsole_property_panel.js
index fdc53feaacc0..46ab207c92e0 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_property_panel.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_property_panel.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testPropertyPanel, false);
 }
diff --git a/browser/devtools/webconsole/test/browser_webconsole_property_provider.js b/browser/devtools/webconsole/test/browser_webconsole_property_provider.js
index 6ed892826500..ff02071c91d7 100644
--- a/browser/devtools/webconsole/test/browser_webconsole_property_provider.js
+++ b/browser/devtools/webconsole/test/browser_webconsole_property_provider.js
@@ -43,7 +43,12 @@
 
 const TEST_URI = "http://example.com/browser/browser/devtools/webconsole/test/test-console.html";
 
+registerCleanupFunction(function() {
+  Services.prefs.clearUserPref("devtools.gcli.enable");
+});
+
 function test() {
+  Services.prefs.setBoolPref("devtools.gcli.enable", false);
   addTab(TEST_URI);
   browser.addEventListener("DOMContentLoaded", testPropertyProvider, false);
 }
diff --git a/browser/locales/en-US/chrome/browser/browser.dtd b/browser/locales/en-US/chrome/browser/browser.dtd
index 9a0d0c5e4d99..9fb4864bc09d 100644
--- a/browser/locales/en-US/chrome/browser/browser.dtd
+++ b/browser/locales/en-US/chrome/browser/browser.dtd
@@ -215,15 +215,6 @@ can reach it easily. -->
 
 <!ENTITY inspectCloseButton.tooltiptext "Close Inspector">
 
-<!ENTITY devToolbarCloseButton.tooltiptext "Close Developer Toolbar">
-<!ENTITY devToolbarMenu.label "Developer Toolbar">
-<!ENTITY devToolbarMenu.accesskey "v">
-<!ENTITY devToolbar.commandkey "v">
-
-<!ENTITY webConsoleButton.label "Web Console">
-<!ENTITY inspectorButton.label "Inspector">
-<!ENTITY scriptsButton.label "Scripts">
-
 <!ENTITY inspectorHTMLCopyInner.label       "Copy Inner HTML">
 <!ENTITY inspectorHTMLCopyInner.accesskey   "I">
 
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
index 936d1795ad1d..5c4649e18e27 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.dtd
@@ -11,10 +11,6 @@
   -  application menu item that opens the debugger UI. -->
 <!ENTITY debuggerMenu.label          "Script Debugger">
 
-<!-- LOCALIZATION NOTE (remoteDebuggerMenu.label): This is the label for the
-  -  application menu item that opens the remote debugger UI. -->
-<!ENTITY remoteDebuggerMenu.label    "Remote Debugger">
-
 <!-- LOCALIZATION NOTE (debuggerMenu.commandkey): This is the command key that
   -  launches the debugger UI. Do not translate this one! -->
 <!ENTITY debuggerMenu.commandkey     "S">
@@ -48,7 +44,3 @@
   -  widget that displays the variables in the various available scopes in the
   -  debugger. -->
 <!ENTITY debuggerUI.propertiesTitle  "Scope variables">
-
-<!-- LOCALIZATION NOTE (debuggerUI.emptyFilterText): This is the text that
-  -  appears in the filter text box when it is empty. -->
-<!ENTITY debuggerUI.emptyFilterText  "Filter scripts">
diff --git a/browser/locales/en-US/chrome/browser/devtools/debugger.properties b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
index 77e7738c882a..90642b1581c0 100644
--- a/browser/locales/en-US/chrome/browser/devtools/debugger.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/debugger.properties
@@ -38,9 +38,9 @@ withScope=With block
 # pane as a header on container for identifiers in a closure scope.
 closureScope=Closure
 
-# LOCALIZATION NOTE (emptyStackText): The text that is displayed in the stack
-# frames list when there are no frames to display.
-emptyStackText=No stacks to display.
+# LOCALIZATION NOTE (emptyText): The text that is displayed in the stack frames
+# list when there are no frames to display.
+emptyText=Empty
 
 # LOCALIZATION NOTE (loadingText): The text that is displayed in the script
 # editor when the laoding process has started but there is no file to display
diff --git a/browser/locales/en-US/chrome/browser/devtools/gcli.properties b/browser/locales/en-US/chrome/browser/devtools/gcli.properties
index 04dd1898640e..a0c335d1003e 100644
--- a/browser/locales/en-US/chrome/browser/devtools/gcli.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/gcli.properties
@@ -113,7 +113,7 @@ helpSearchDesc=Search string
 # LOCALIZATION NOTE (helpSearchManual): A fuller description of the 'search'
 # parameter to the 'help' command. Displayed when the user asks for help on
 # what it does.
-helpSearchManual=<strong>search string</strong> to use in narrowing down the displayed commands. Regular expressions not supported.
+helpSearchManual=A search string to use in narrowing down the list of commands that are displayed to the user. Any part of the command name can match, regular expressions are not supported.
 
 # LOCALIZATION NOTE (helpManSynopsis): A heading shown at the top of a help
 # page for a command in the console It labels a summary of the parameters to
@@ -132,120 +132,9 @@ helpManParameters=Parameters
 # heading in a help page for a command which has no parameters.
 helpManNone=None
 
-# LOCALIZATION NOTE (subCommands): Text shown as part of the output of the
-# 'help' command when the command in question has sub-commands, before a list
-# of the matching sub-commands
-subCommands=Sub-Commands
-
-# LOCALIZATION NOTE (subCommandsNone): Text shown as part of the output of the
-# 'help' command when the command in question should have sub-commands but in
-# fact has none
-subCommandsNone=None
-
-# LOCALIZATION NOTE (prefDesc): A very short description of the 'pref'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefManual for a
-# fuller description of what it does.
-prefDesc=Commands to control settings
-
-# LOCALIZATION NOTE (prefManual): A fuller description of the 'pref' command.
-# Displayed when the user asks for help on what it does.
-prefManual=Commands to display and alter preferences both for GCLI and the surrounding environment
-
-# LOCALIZATION NOTE (prefListDesc): A very short description of the 'pref
-# list' command. This string is designed to be shown in a menu alongside the
-# command name, which is why it should be as short as possible. See
-# prefListManual for a fuller description of what it does.
-prefListDesc=Display available settings
-
-# LOCALIZATION NOTE (prefListManual): A fuller description of the 'pref list'
-# command. Displayed when the user asks for help on what it does.
-prefListManual=Display a list of preferences, optionally filtered when using the 'search' parameter
-
-# LOCALIZATION NOTE (prefListSearchDesc): A short description of the 'search'
-# parameter to the 'pref list' command. See prefListSearchManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefListSearchDesc=Filter the list of settings displayed
-
-# LOCALIZATION NOTE (prefListSearchManual): A fuller description of the
-# 'search' parameter to the 'pref list' command. Displayed when the user asks
-# for help on what it does.
-prefListSearchManual=Search for the given string in the list of available preferences
-
-# LOCALIZATION NOTE (prefSetDesc): A very short description of the 'pref set'
-# command. This string is designed to be shown in a menu alongside the command
-# name, which is why it should be as short as possible. See prefSetManual for
-# a fuller description of what it does.
-prefSetDesc=Alter a setting
-
-# LOCALIZATION NOTE (prefSetManual): A fuller description of the 'pref set'
-# command. Displayed when the user asks for help on what it does.
-prefSetManual=Alter preferences defined by the environment
-
-# LOCALIZATION NOTE (prefSetSettingDesc): A short description of the 'setting'
-# parameter to the 'pref set' command. See prefSetSettingManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefSetSettingDesc=Setting to alter
-
-# LOCALIZATION NOTE (prefSetSettingManual): A fuller description of the
-# 'setting' parameter to the 'pref set' command. Displayed when the user asks
-# for help on what it does.
-prefSetSettingManual=The name of the setting to alter.
-
-# LOCALIZATION NOTE (prefSetValueDesc): A short description of the 'value'
-# parameter to the 'pref set' command. See prefSetValueManual for a fuller
-# description of what it does. This string is designed to be shown in a dialog
-# with restricted space, which is why it should be as short as possible.
-prefSetValueDesc=New value for setting
-
-# LOCALIZATION NOTE (prefSetValueManual): A fuller description of the 'value'
-# parameter to the 'pref set' command. Displayed when the user asks for help
-# on what it does.
-prefSetValueManual=The new value for the specified setting
-
-# LOCALIZATION NOTE (prefSetCheckHeading): Title displayed to the user the
-# first time they try to alter a setting This is displayed directly above
-# prefSetCheckBody and prefSetCheckGo.
-prefSetCheckHeading=This might void your warranty!
-
-# LOCALIZATION NOTE (prefSetCheckBody): The main text of the warning displayed
-# to the user the first time they try to alter a setting. See also
-# prefSetCheckHeading and prefSetCheckGo.
-prefSetCheckBody=Changing these advanced settings can be harmful to the stability, security, and performance of this application. You should only continue if you are sure of what you are doing.
-
-# LOCALIZATION NOTE (prefSetCheckGo): The text to enable preference editing.
-# Displayed in a button directly under prefSetCheckHeading and
-# prefSetCheckBody
-prefSetCheckGo=I'll be careful, I promise!
-
-# LOCALIZATION NOTE (prefOutputFilter): Displayed in the output from the 'pref
-# list' command as a label to an input element that allows the user to filter
-# the results
-prefOutputFilter=Filter
-
-# LOCALIZATION NOTE (prefOutputName): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the names of the
-# available preferences
-prefOutputName=Name
-
-# LOCALIZATION NOTE (prefOutputValue): Displayed in the output from the 'pref
-# list' command as a heading to a table. The column contains the values of the
-# available preferences
-prefOutputValue=Value
-
-# LOCALIZATION NOTE (hideIntroDesc): Short description of the 'hideIntro'
-# setting. Displayed when the user asks for help on the settings.
-hideIntroDesc=Show the initial welcome message
-
-# LOCALIZATION NOTE (eagerHelperDesc): Short description of the 'eagerHelper'
-# setting. Displayed when the user asks for help on the settings.
-eagerHelperDesc=How eager are the tooltips
-
-# LOCALIZATION NOTE (allowSetDesc): Short description of the 'allowSetDesc'
-# setting. Displayed when the user asks for help on the settings.
-allowSetDesc=Has the user enabled the 'pref set' command?
+# LOCALIZATION NOTE (introHeader): The heading displayed at the top of the
+# output for the help command
+introHeader=Welcome to Firefox Developer Tools
 
 # LOCALIZATION NOTE (introBody): The text displayed at the top of the output
 # for the help command, just before the list of commands. This text is wrapped
diff --git a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
index 67490300c3de..52bda7698688 100644
--- a/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
+++ b/browser/locales/en-US/chrome/browser/devtools/gclicommands.properties
@@ -264,11 +264,6 @@ breakNotFound=Breakpoint was not found
 # alongside the command name, which is why it should be as short as possible.
 consolecloseDesc=Close the console
 
-# LOCALIZATION NOTE (consoleopenDesc) A very short description of the
-# 'console open' command. This string is designed to be shown in a menu
-# alongside the command name, which is why it should be as short as possible.
-consoleopenDesc=Open the console
-
 # LOCALIZATION NOTE (editDesc) A very short description of the 'edit'
 # command. See editManual for a fuller description of what it does. This
 # string is designed to be shown in a menu alongside the command name, which
diff --git a/browser/themes/gnomestripe/browser.css b/browser/themes/gnomestripe/browser.css
index bb97941c3194..4d23d73fcdbc 100644
--- a/browser/themes/gnomestripe/browser.css
+++ b/browser/themes/gnomestripe/browser.css
@@ -1729,7 +1729,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .alltabs-item[tabIsVisible] {
   /* box-shadow instead of background-color to work around native styling */
-  box-shadow: inset -5px 0 ThreeDShadow;
+  box-shadow: inset 0 0 0 2em hsla(0,0%,50%,.15);
 }
 
 /* Sidebar */
@@ -2411,70 +2411,3 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   margin-bottom: -3px;
   position: relative;
 }
-
-.gcli-panel-inner-arrowcontent {
-  padding: 0;
-}
-
-.gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
-  font-family: monospace;
-}
-
-.gclitoolbar-input-node {
-  background-color: transparent;
-  -moz-appearance: none;
-  border: none;
-  padding: 0 0 0 22px;
-}
-
-.gclitoolbar-complete-node {
-  background-color: transparent;
-  color: transparent;
-  height: 100%;
-  line-height: 100%;
-  padding: 10px 0 0 27px;
-  margin: 0;
-}
-
-.gclitoolbar-prompt {
-  color: hsl(25,78%,50%);
-  -moz-appearance: textfield;
-  font-size: 150%;
-  font-weight: bold;
-  line-height: 100%;
-  padding-top: 1px;
-  padding-left: 3px;
-}
-
-.gcli-in-incomplete,
-.gcli-in-error,
-.gcli-in-ontab,
-.gcli-in-todo,
-.gcli-in-closebrace,
-.gcli-in-param,
-.gcli-in-valid {
-  margin: 0;
-  padding: 0;
-}
-
-.gcli-in-incomplete {
-  border-bottom: 2px dotted #999;
-}
-
-.gcli-in-error {
-  border-bottom: 2px dotted #F00;
-}
-
-.gcli-in-ontab {
-  color: hsl(200,40%,70%);
-}
-
-.gcli-in-todo {
-  color: hsl(48,28%,76%);
-}
-
-.gcli-in-closebrace {
-  color: hsl(0,0%,80%);
-}
diff --git a/browser/themes/gnomestripe/devtools/gcli.css b/browser/themes/gnomestripe/devtools/gcli.css
index a013aa09edcc..b4ad81890098 100644
--- a/browser/themes/gnomestripe/devtools/gcli.css
+++ b/browser/themes/gnomestripe/devtools/gcli.css
@@ -35,47 +35,290 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#gclichrome-body {
-  margin: 0;
-  padding: 0;
-  font: message-box;
+/* From: $GCLI/mozilla/gcli/ui/gcliterm.css */
+
+/* Bug 678152 calls for UX review which will fix the color names */
+
+.gcliterm-input-node,
+.gcliterm-complete-node {
+  border: none;
+  -moz-appearance: none;
+  height: 100%;
+  vertical-align: middle;
+  background-color: transparent;
 }
 
-.gcli-row-out {
-  padding: 0 5px;
-  line-height: 1.2em;
-  border-top: none;
-  border-bottom: none;
+.gcliterm-input-node {
+  padding-top: 2px;
+  padding-bottom: 0;
+  -moz-padding-start: 16px;
+  -moz-padding-end: 0;
 }
 
-.gcli-row-out p,
-.gcli-row-out h1,
-.gcli-row-out h2,
-.gcli-row-out h3 {
-  margin: 5px 0;
+.gcliterm-complete-node {
+  color: #FFF;
+  padding-top: 4px;
+  padding-bottom: 2px;
+  -moz-padding-start: 21px;
+  -moz-padding-end: 4px;
 }
 
+.gcliterm-stack-node {
+  background: url("chrome://browser/skin/devtools/commandline.png") 4px center no-repeat;
+  width: 100%;
+}
+
+.gcliterm-argfetcher {
+  display: -moz-box;
+  -moz-box-flex: 1;
+}
+
+.gcliterm-hint-node {
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid #FFF;
+  border-left: 1px solid threedshadow;
+  border-right: 1px solid threedshadow;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+  margin-bottom: -1px;
+}
+
+.gcliterm-hint-parent {
+  width: 300px;
+  padding: 10px 10px 0;
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid threedshadow;
+}
+
+.gcliterm-menu {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border-bottom-color: white;
+}
+
+.gcliterm-hint-scroll {
+  overflow-y: scroll;
+  border-bottom-color: threedshadow;
+}
+
+.gcliterm-hint-nospace {
+  display: none;
+}
+
+.gcliterm-msg-body {
+  margin-top: 0;
+  margin-bottom: 3px;
+  -moz-margin-start: 3px;
+  -moz-margin-end: 6px;
+  list-style-image: none;
+}
+
+/* Extract from display.css, we only want these 2 rules */
+
 .gcli-out-shortcut {
   border: 1px solid #999;
   border-radius: 3px;
-  padding: 1px 4px 0;
+  padding: 0 4px;
   margin: 0 4px;
-  font-size: 80%;
-  font-family: monospace;
+  font-size: 70%;
+  color: #666;
   cursor: pointer;
   vertical-align: bottom;
-  white-space: pre;
-  background-color: #fff;
 }
 
 .gcli-out-shortcut:before {
   color: #66F;
   content: '\bb';
+  padding: 0 2px;
 }
 
+/*
+ * The language of a console is not en_US or any other common language
+ * (i.e we don't attempt to translate 'console.log(x)')
+ * So we fix .gcliterm-input-node/.gcliterm-complete-node elements to be ltr.
+ * As a result we also want the hints to pop up on the left (above the prompt)
+ */
+.gcliterm-input-node,
+.gcliterm-complete-node,
+.gcliterm-display {
+  direction: ltr;
+}
+
+/*
+ * We want the stuff under .gcliterm-display to obey normal direction rules
+ * so we need to swap back when the document is in rtl mode.
+ * The selectors below are faster, but equivalent to:
+ * .gcliterm-display > *:-moz-locale-dir(rtl) {
+ *   direction: rtl;
+ * }
+ * In non-performance critical situations the above is preferred due to it's
+ * greater resilience to refactoring
+ */
+.gcliterm-hint-parent:-moz-locale-dir(rtl),
+.hud-output-node:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
+
+/* From: $GCLI/mozilla/gcli/ui/gcliterm-gnomestripe.css */
+
+.gcliterm-input-node,
+.gcliterm-complete-node {
+  font: 12px "DejaVu Sans Mono", monospace;
+}
+
+.gcli-out-shortcut {
+  font-family: "DejaVu Sans Mono", monospace;
+}
+
+/* From: $GCLI/lib/gcli/ui/arg_fetch.css */
+
+.gcli-argfetch {
+  width: 100%;
+  -moz-box-sizing: border-box;
+}
+
+.gcli-af-cmddesc {
+  font-weight: bold;
+  text-align: center;
+  margin-bottom: 5px;
+  padding: 3px 10px 0;
+}
+
+.gcli-af-params {
+  padding: 0 10px;
+  width: 100%;
+  -moz-box-sizing: border-box;
+}
+
+.gcli-af-paramname {
+  text-align: right;
+  font-size: 90%;
+}
+
+.gcli-af-required {
+  font-size: 90%;
+  color: #f66;
+  -moz-padding-start: 5px;
+}
+
+.gcli-af-error {
+  font-size: 80%;
+  color: #900;
+}
+
+.gcli-af-submit {
+  text-align: right;
+}
+
+.gcli-field {
+  width: 100%;
+}
+
+.gcli-field-javascript {
+  margin-bottom: 0;
+}
+
+/* From: $GCLI/lib/gcli/ui/menu.css */
+
+.gcli-menu {
+  width: 100%;
+  overflow: hidden;
+}
+
+.gcli-menu-field {
+  border: 1px solid #aaa;
+  border-top: 0;
+  border-bottom-right-radius: 5px;
+  border-bottom-left-radius: 5px;
+  max-height: 300px;
+  margin: 0 3px;
+  padding: 0;
+}
+
+.gcli-menu-template {
+  border-collapse: collapse;
+  width: 100%;
+  margin: 10px 0;
+}
+
+.gcli-menu-option {
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: pointer;
+  padding: 2px;
+}
+
+.gcli-menu-option:hover {
+  background-color: rgb(230, 230, 230);
+}
+
+.gcli-menu-name {
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 2px;
+}
+
+.gcli-menu-desc {
+  font-size: 80%;
+  color: #999;
+}
+
+.gcli-menu-error {
+  overflow: hidden;
+  white-space: nowrap;
+  padding-top: 8px;
+  padding-bottom: 2px;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 2px;
+  font-size: 80%;
+  color: red;
+}
+
+/* From: $GCLI/lib/gcli/ui/inputter.css */
+
+.gcli-in-complete {
+  position: absolute;
+  z-index: -1000;
+  border: 1px transparent solid;
+  padding: 1px 1px 1px 2px;
+  color: #DDD;
+}
+
+.gcli-in-incomplete {
+  border-bottom: 2px dotted #999;
+}
+
+.gcli-in-error {
+  border-bottom: 2px dotted #F00;
+}
+
+.gcli-in-ontab {
+  color: #999;
+}
+
+.gcli-in-closebrace {
+  color: #999;
+}
+
+.gcli-prompt {
+  color: #66F;
+  font-weight: bold;
+}
+
+.gcli-in-scratchlink {
+  float: right;
+  font-size: 85%;
+  color: #888;
+  padding-right: 10px;
+}
 
 /* From: $GCLI/lib/gcli/commands/help.css */
 
+.gcli-help-name {
+  text-align: end;
+}
+
 .gcli-help-arrow {
   font-size: 70%;
   color: #AAA;
@@ -88,10 +331,14 @@
   margin: 0 10px;
   border: 1px solid #999;
   border-radius: 3px;
+  color: #666;
+  cursor: pointer;
+  display: inline-block;
 }
 
 .gcli-help-synopsis:before {
   color: #66F;
+  content: '\bb';
 }
 
 .gcli-help-description {
@@ -107,34 +354,3 @@
 .gcli-help-header {
   margin: 10px 0 6px;
 }
-
-
-/* From: $GCLI/lib/gcli/ui/fields/menu.css */
-
-.gcli-menu-name {
-  -moz-padding-start: 8px;
-}
-
-.gcli-menu-desc {
-  -moz-padding-end: 8px;
-  color: #999;
-}
-
-.gcli-menu-option:hover {
-  background-color: #EEE;
-}
-
-.gcli-menu-highlight,
-.gcli-menu-highlight.gcli-menu-option:hover {
-  background-color: #DDD;
-}
-
-.gcli-menu-error {
-  padding: 8px 10px 2px;
-  font-size: 80%;
-  color: red;
-}
-
-.gcli-menu-typed {
-  color: hsl(25,78%,50%);
-}
diff --git a/browser/themes/pinstripe/browser.css b/browser/themes/pinstripe/browser.css
index d3dd0b0b6454..14dd21eb0c14 100644
--- a/browser/themes/pinstripe/browser.css
+++ b/browser/themes/pinstripe/browser.css
@@ -2171,7 +2171,7 @@ toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
 
 .alltabs-item[tabIsVisible] {
   /* box-shadow instead of background-color to work around native styling */
-  box-shadow: inset -5px 0 ThreeDShadow;
+  box-shadow: inset 0 0 0 2em hsla(0,0%,50%,.15);
 }
 
 /* Tabstrip close button */
@@ -3145,67 +3145,3 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   margin-bottom: -3px;
   position: relative;
 }
-
-.gcli-panel-inner-arrowcontent {
-  padding: 0;
-}
-
-.gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
-  font-family: Menlo, Monaco, monospace;
-}
-
-.gclitoolbar-input-node {
-  background-color: transparent;
-  -moz-appearance: none;
-  border: none;
-  padding: 0 0 0 12px;
-}
-
-.gclitoolbar-complete-node {
-  background-color: transparent;
-  color: transparent;
-  height: 100%;
-  padding: 7px 0 0 18px;
-}
-
-.gclitoolbar-prompt {
-  color: hsl(25,78%,50%);
-  -moz-appearance: textfield;
-  font-size: 150%;
-  font-weight: bold;
-  line-height: 100%;
-  padding-top: 2px;
-}
-
-.gcli-in-incomplete,
-.gcli-in-error,
-.gcli-in-ontab,
-.gcli-in-todo,
-.gcli-in-closebrace,
-.gcli-in-param,
-.gcli-in-valid {
-  margin: 0;
-  padding: 0;
-}
-
-.gcli-in-incomplete {
-  border-bottom: 2px dotted #999;
-}
-
-.gcli-in-error {
-  border-bottom: 2px dotted #F00;
-}
-
-.gcli-in-ontab {
-  color: hsl(200,40%,70%);
-}
-
-.gcli-in-todo {
-  color: hsl(48,28%,76%);
-}
-
-.gcli-in-closebrace {
-  color: hsl(0,0%,80%);
-}
diff --git a/browser/themes/pinstripe/devtools/gcli.css b/browser/themes/pinstripe/devtools/gcli.css
index 8c46a1ab956f..0ed593d86e4f 100644
--- a/browser/themes/pinstripe/devtools/gcli.css
+++ b/browser/themes/pinstripe/devtools/gcli.css
@@ -35,75 +35,314 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#gclichrome-body {
-  margin: 0;
-  padding: 0;
-  font: message-box;
-  color: #fff;
+/* From: $GCLI/mozilla/gcli/ui/gcliterm.css */
+
+/* Bug 678152 calls for UX review which will fix the color names */
+
+.gcliterm-input-node,
+.gcliterm-complete-node {
+  border: none;
+  -moz-appearance: none;
+  height: 100%;
+  vertical-align: middle;
+  background-color: transparent;
 }
 
-.gcli-row-out {
-  padding: 0 5px;
-  line-height: 1.2em;
-  border-top: none;
-  border-bottom: none;
-  color: hsl(210,30%,85%);
+.gcliterm-input-node {
+  padding-top: 2px;
+  padding-bottom: 0;
+  -moz-padding-start: 16px;
+  -moz-padding-end: 0;
 }
 
-.gcli-row-out p,
-.gcli-row-out h1,
-.gcli-row-out h2,
-.gcli-row-out h3 {
-  margin: 5px 0;
+.gcliterm-complete-node {
+  color: #FFF;
+  padding-top: 4px;
+  padding-bottom: 2px;
+  -moz-padding-start: 21px;
+  -moz-padding-end: 4px;
 }
 
-.gcli-row-out h1,
-.gcli-row-out h2,
-.gcli-row-out h3,
-.gcli-row-out th,
-.gcli-row-out strong {
-  color: #fff;
+.gcliterm-stack-node {
+  background: url("chrome://browser/skin/devtools/commandline.png") 4px center no-repeat;
+  width: 100%;
 }
 
+.gcliterm-argfetcher {
+  display: -moz-box;
+  -moz-box-flex: 1;
+}
+
+.gcliterm-hint-node {
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid #FFF;
+  border-left: 1px solid threedshadow;
+  border-right: 1px solid threedshadow;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+  margin-bottom: -1px;
+}
+
+.gcliterm-hint-parent {
+  width: 300px;
+  padding: 10px 10px 0;
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid threedshadow;
+}
+
+.gcliterm-menu {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border-bottom-color: white;
+}
+
+.gcliterm-hint-scroll {
+  overflow-y: scroll;
+  border-bottom-color: threedshadow;
+}
+
+.gcliterm-hint-nospace {
+  display: none;
+}
+
+.gcliterm-msg-body {
+  margin-top: 0;
+  margin-bottom: 3px;
+  -moz-margin-start: 3px;
+  -moz-margin-end: 6px;
+  list-style-image: none;
+}
+
+/* Extract from display.css, we only want these 2 rules */
+
 .gcli-out-shortcut {
   border: 1px solid #999;
   border-radius: 3px;
-  padding: 1px 4px 0;
+  padding: 0 4px;
   margin: 0 4px;
-  font-size: 80%;
-  font-family: Menlo, Monaco, monospace;
+  font-size: 70%;
+  color: #666;
   cursor: pointer;
   vertical-align: bottom;
-  white-space: pre;
-  color: #000;
-  background-color: #fff;
 }
 
 .gcli-out-shortcut:before {
   color: #66F;
   content: '\bb';
+  padding: 0 2px;
 }
 
+/*
+ * The language of a console is not en_US or any other common language
+ * (i.e we don't attempt to translate 'console.log(x)')
+ * So we fix .gcliterm-input-node/.gcliterm-complete-node elements to be ltr.
+ * As a result we also want the hints to pop up on the left (above the prompt)
+ */
+.gcliterm-input-node,
+.gcliterm-complete-node,
+.gcliterm-display {
+  direction: ltr;
+}
+
+/*
+ * We want the stuff under .gcliterm-display to obey normal direction rules
+ * so we need to swap back when the document is in rtl mode.
+ * The selectors below are faster, but equivalent to:
+ * .gcliterm-display > *:-moz-locale-dir(rtl) {
+ *   direction: rtl;
+ * }
+ * In non-performance critical situations the above is preferred due to it's
+ * greater resilience to refactoring
+ */
+.gcliterm-hint-parent:-moz-locale-dir(rtl),
+.hud-output-node:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
+
+/* From: $GCLI/mozilla/gcli/ui/gcliterm-pinstripe.css */
+
+.gcliterm-input-node,
+.gcliterm-complete-node {
+  font: 11px Menlo, Monaco, monospace;
+}
+
+.gcliterm-complete-node {
+  padding-top: 6px !important;
+}
+
+.gcli-out-shortcut {
+  font-family: Menlo, Monaco, monospace;
+}
+
+/* From: $GCLI/lib/gcli/ui/arg_fetch.css */
+
+.gcli-argfetch {
+  width: 100%;
+  -moz-box-sizing: border-box;
+}
+
+.gcli-af-cmddesc {
+  font-weight: bold;
+  text-align: center;
+  margin-bottom: 5px;
+  padding: 3px 10px 0;
+}
+
+.gcli-af-params {
+  padding: 0 10px;
+  width: 100%;
+  -moz-box-sizing: border-box;
+}
+
+.gcli-af-paramname {
+  text-align: right;
+  font-size: 90%;
+}
+
+.gcli-af-required {
+  font-size: 90%;
+  color: #f66;
+  -moz-padding-start: 5px;
+}
+
+.gcli-af-error {
+  font-size: 80%;
+  color: #900;
+}
+
+.gcli-af-submit {
+  text-align: right;
+}
+
+.gcli-field {
+  width: 100%;
+}
+
+.gcli-field-javascript {
+  margin-bottom: 0;
+}
+
+/* From: $GCLI/lib/gcli/ui/menu.css */
+
+.gcli-menu {
+  width: 100%;
+  overflow: hidden;
+}
+
+.gcli-menu-field {
+  border: 1px solid #aaa;
+  border-top: 0;
+  border-bottom-right-radius: 5px;
+  border-bottom-left-radius: 5px;
+  max-height: 300px;
+  margin: 0 3px;
+  padding: 0;
+}
+
+.gcli-menu-template {
+  border-collapse: collapse;
+  width: 100%;
+  margin: 10px 0;
+}
+
+.gcli-menu-option {
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: pointer;
+  padding: 2px;
+}
+
+.gcli-menu-option:hover {
+  background-color: rgb(230, 230, 230);
+}
+
+.gcli-menu-name {
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 2px;
+}
+
+.gcli-menu-desc {
+  font-size: 80%;
+  color: #999;
+}
+
+.gcli-menu-error {
+  overflow: hidden;
+  white-space: nowrap;
+  padding-top: 8px;
+  padding-bottom: 2px;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 2px;
+  font-size: 80%;
+  color: red;
+}
+
+/* From: $GCLI/lib/gcli/ui/inputter.css */
+
+.gcli-in-complete {
+  position: absolute;
+  z-index: -1000;
+  border: 1px transparent solid;
+  padding: 1px 1px 1px 2px;
+  color: #DDD;
+}
+
+.gcli-in-incomplete {
+  border-bottom: 2px dotted #999;
+}
+
+.gcli-in-error {
+  border-bottom: 2px dotted #F00;
+}
+
+.gcli-in-ontab {
+  color: #999;
+}
+
+.gcli-in-closebrace {
+  color: #999;
+}
+
+.gcli-prompt {
+  color: #66F;
+  font-weight: bold;
+}
+
+.gcli-in-scratchlink {
+  float: right;
+  font-size: 85%;
+  color: #888;
+  padding-right: 10px;
+}
 
 /* From: $GCLI/lib/gcli/commands/help.css */
 
+.gcli-help-name {
+  text-align: end;
+}
+
 .gcli-help-arrow {
   font-size: 70%;
   color: #AAA;
 }
 
 .gcli-help-synopsis {
-  font-family: Menlo, Monaco, monospace;
+  font-family: monospace;
   font-weight: normal;
   padding: 0 3px;
   margin: 0 10px;
   border: 1px solid #999;
   border-radius: 3px;
-  color: #000;
+  color: #666;
+  cursor: pointer;
+  display: inline-block;
 }
 
 .gcli-help-synopsis:before {
   color: #66F;
+  content: '\bb';
 }
 
 .gcli-help-description {
@@ -119,36 +358,3 @@
 .gcli-help-header {
   margin: 10px 0 6px;
 }
-
-
-/* From: $GCLI/lib/gcli/ui/fields/menu.css */
-
-.gcli-menu-name {
-  -moz-padding-start: 8px;
-}
-
-.gcli-menu-desc {
-  -moz-padding-end: 8px;
-  color: #999;
-}
-
-.gcli-menu-option:hover {
-  background-image: url(background-noise-toolbar.png),
-                    -moz-linear-gradient(top, hsl(210,11%,22%), hsl(210,11%,18%));
-}
-
-.gcli-menu-highlight,
-.gcli-menu-highlight.gcli-menu-option:hover {
-  background-image: url(background-noise-toolbar.png),
-                    -moz-linear-gradient(top, hsl(210,11%,18%), hsl(210,11%,14%));
-}
-
-.gcli-menu-error {
-  padding: 8px 10px 2px;
-  font-size: 80%;
-  color: red;
-}
-
-.gcli-menu-typed {
-  color: hsl(25,78%,50%);
-}
diff --git a/browser/themes/winstripe/browser.css b/browser/themes/winstripe/browser.css
index 49cf55d8e71c..f4c87ca88958 100644
--- a/browser/themes/winstripe/browser.css
+++ b/browser/themes/winstripe/browser.css
@@ -2069,7 +2069,7 @@ richlistitem[type~="action"][actiontype="switchtab"] > .ac-url-box > .ac-action-
 
 .alltabs-item[tabIsVisible] {
   /* box-shadow instead of background-color to work around native styling */
-  box-shadow: inset -5px 0 ThreeDShadow;
+  box-shadow: inset 0 0 0 2em hsla(0,0%,50%,.15);
 }
 
 /* Tabstrip close button */
@@ -3074,70 +3074,3 @@ html|*#highlighter-nodeinfobar-pseudo-classes {
   margin-bottom: -3px;
   position: relative;
 }
-
-.gcli-panel-inner-arrowcontent {
-  padding: 0;
-}
-
-.gclitoolbar-input-node,
-.gclitoolbar-complete-node,
-.gclitoolbar-prompt {
-  font-family: Consolas, Lucida Console, monospace;
-}
-
-.gclitoolbar-input-node {
-  background-color: transparent;
-  -moz-appearance: none;
-  border: none;
-  padding: 0 0 0 22px;
-}
-
-.gclitoolbar-complete-node {
-  background-color: transparent;
-  color: transparent;
-  height: 100%;
-  line-height: 100%;
-  padding: 7px 0 0 27px;
-  margin: 0;
-}
-
-.gclitoolbar-prompt {
-  color: hsl(25,78%,50%);
-  -moz-appearance: textfield;
-  font-size: 150%;
-  font-weight: bold;
-  line-height: 100%;
-  padding-top: 1px;
-  padding-left: 4px;
-}
-
-.gcli-in-incomplete,
-.gcli-in-error,
-.gcli-in-ontab,
-.gcli-in-todo,
-.gcli-in-closebrace,
-.gcli-in-param,
-.gcli-in-valid {
-  margin: 0;
-  padding: 0;
-}
-
-.gcli-in-incomplete {
-  border-bottom: 2px dotted #999;
-}
-
-.gcli-in-error {
-  border-bottom: 2px dotted #F00;
-}
-
-.gcli-in-ontab {
-  color: hsl(200,40%,70%);
-}
-
-.gcli-in-todo {
-  color: hsl(48,28%,76%);
-}
-
-.gcli-in-closebrace {
-  color: hsl(0,0%,80%);
-}
diff --git a/browser/themes/winstripe/devtools/gcli.css b/browser/themes/winstripe/devtools/gcli.css
index 025430a6b441..33ddd10e1528 100644
--- a/browser/themes/winstripe/devtools/gcli.css
+++ b/browser/themes/winstripe/devtools/gcli.css
@@ -35,63 +35,310 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-#gclichrome-body {
-  margin: 0;
-  padding: 0;
-  font: message-box;
+/* From: $GCLI/mozilla/gcli/ui/gcliterm.css */
+
+/* Bug 678152 calls for UX review which will fix the color names */
+
+.gcliterm-input-node,
+.gcliterm-complete-node {
+  border: none;
+  -moz-appearance: none;
+  height: 100%;
+  vertical-align: middle;
+  background-color: transparent;
 }
 
-.gcli-row-out {
-  padding: 0 5px;
-  line-height: 1.2em;
-  border-top: none;
-  border-bottom: none;
+.gcliterm-input-node {
+  padding-top: 2px;
+  padding-bottom: 0;
+  -moz-padding-start: 16px;
+  -moz-padding-end: 0;
 }
 
-.gcli-row-out p,
-.gcli-row-out h1,
-.gcli-row-out h2,
-.gcli-row-out h3 {
-  margin: 5px 0;
+.gcliterm-complete-node {
+  color: #FFF;
+  padding-top: 4px;
+  padding-bottom: 2px;
+  -moz-padding-start: 21px;
+  -moz-padding-end: 4px;
 }
 
+.gcliterm-stack-node {
+  background: url("chrome://browser/skin/devtools/commandline.png") 4px center no-repeat;
+  width: 100%;
+}
+
+.gcliterm-argfetcher {
+  display: -moz-box;
+  -moz-box-flex: 1;
+}
+
+.gcliterm-hint-node {
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid #FFF;
+  border-left: 1px solid threedshadow;
+  border-right: 1px solid threedshadow;
+  border-top-right-radius: 5px;
+  border-top-left-radius: 5px;
+  margin-bottom: -1px;
+}
+
+.gcliterm-hint-parent {
+  width: 300px;
+  padding: 10px 10px 0;
+  border-top: 1px solid threedshadow;
+  border-bottom: 1px solid threedshadow;
+}
+
+.gcliterm-menu {
+  display: -moz-box;
+  -moz-box-flex: 1;
+  border-bottom-color: white;
+}
+
+.gcliterm-hint-scroll {
+  overflow-y: scroll;
+  border-bottom-color: threedshadow;
+}
+
+.gcliterm-hint-nospace {
+  display: none;
+}
+
+.gcliterm-msg-body {
+  margin-top: 0;
+  margin-bottom: 3px;
+  -moz-margin-start: 3px;
+  -moz-margin-end: 6px;
+  list-style-image: none;
+}
+
+/* Extract from display.css, we only want these 2 rules */
+
 .gcli-out-shortcut {
   border: 1px solid #999;
   border-radius: 3px;
-  padding: 1px 4px 0;
+  padding: 0 4px;
   margin: 0 4px;
-  font-size: 80%;
-  font-family: Consolas, Inconsolata, "Courier New", monospace;
+  font-size: 70%;
+  color: #666;
   cursor: pointer;
   vertical-align: bottom;
-  white-space: pre;
-  background-color: #fff;
 }
 
 .gcli-out-shortcut:before {
   color: #66F;
   content: '\bb';
+  padding: 0 2px;
 }
 
+/*
+ * The language of a console is not en_US or any other common language
+ * (i.e we don't attempt to translate 'console.log(x)')
+ * So we fix .gcliterm-input-node/.gcliterm-complete-node elements to be ltr.
+ * As a result we also want the hints to pop up on the left (above the prompt)
+ */
+.gcliterm-input-node,
+.gcliterm-complete-node,
+.gcliterm-display {
+  direction: ltr;
+}
+
+/*
+ * We want the stuff under .gcliterm-display to obey normal direction rules
+ * so we need to swap back when the document is in rtl mode.
+ * The selectors below are faster, but equivalent to:
+ * .gcliterm-display > *:-moz-locale-dir(rtl) {
+ *   direction: rtl;
+ * }
+ * In non-performance critical situations the above is preferred due to it's
+ * greater resilience to refactoring
+ */
+.gcliterm-hint-parent:-moz-locale-dir(rtl),
+.hud-output-node:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
+
+/* From: $GCLI/mozilla/gcli/ui/gcliterm-winstripe.css */
+
+.gcliterm-input-node,
+.gcliterm-complete-node {
+  font: 12px Consolas, "Lucida Console", monospace;
+}
+
+.gcli-out-shortcut {
+  font-family: Consolas, Inconsolata, "Courier New", monospace;
+}
+
+/* From: $GCLI/lib/gcli/ui/arg_fetch.css */
+
+.gcli-argfetch {
+  width: 100%;
+  -moz-box-sizing: border-box;
+}
+
+.gcli-af-cmddesc {
+  font-weight: bold;
+  text-align: center;
+  margin-bottom: 5px;
+  padding: 3px 10px 0;
+}
+
+.gcli-af-params {
+  padding: 0 10px;
+  width: 100%;
+  -moz-box-sizing: border-box;
+}
+
+.gcli-af-paramname {
+  text-align: right;
+  font-size: 90%;
+}
+
+.gcli-af-required {
+  font-size: 90%;
+  color: #f66;
+  -moz-padding-start: 5px;
+}
+
+.gcli-af-error {
+  font-size: 80%;
+  color: #900;
+}
+
+.gcli-af-submit {
+  text-align: right;
+}
+
+.gcli-field {
+  width: 100%;
+}
+
+.gcli-field-javascript {
+  margin-bottom: 0;
+}
+
+/* From: $GCLI/lib/gcli/ui/menu.css */
+
+.gcli-menu {
+  width: 100%;
+  overflow: hidden;
+}
+
+.gcli-menu-field {
+  border: 1px solid #aaa;
+  border-top: 0;
+  border-bottom-right-radius: 5px;
+  border-bottom-left-radius: 5px;
+  max-height: 300px;
+  margin: 0 3px;
+  padding: 0;
+}
+
+.gcli-menu-template {
+  border-collapse: collapse;
+  width: 100%;
+  margin: 10px 0;
+}
+
+.gcli-menu-option {
+  overflow: hidden;
+  white-space: nowrap;
+  cursor: pointer;
+  padding: 2px;
+}
+
+.gcli-menu-option:hover {
+  background-color: rgb(230, 230, 230);
+}
+
+.gcli-menu-name {
+  padding-top: 0;
+  padding-bottom: 0;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 2px;
+}
+
+.gcli-menu-desc {
+  font-size: 80%;
+  color: #999;
+}
+
+.gcli-menu-error {
+  overflow: hidden;
+  white-space: nowrap;
+  padding-top: 8px;
+  padding-bottom: 2px;
+  -moz-padding-start: 10px;
+  -moz-padding-end: 2px;
+  font-size: 80%;
+  color: red;
+}
+
+/* From: $GCLI/lib/gcli/ui/inputter.css */
+
+.gcli-in-complete {
+  position: absolute;
+  z-index: -1000;
+  border: 1px transparent solid;
+  padding: 1px 1px 1px 2px;
+  color: #DDD;
+}
+
+.gcli-in-incomplete {
+  border-bottom: 2px dotted #999;
+}
+
+.gcli-in-error {
+  border-bottom: 2px dotted #F00;
+}
+
+.gcli-in-ontab {
+  color: #999;
+}
+
+.gcli-in-closebrace {
+  color: #999;
+}
+
+.gcli-prompt {
+  color: #66F;
+  font-weight: bold;
+}
+
+.gcli-in-scratchlink {
+  float: right;
+  font-size: 85%;
+  color: #888;
+  padding-right: 10px;
+}
 
 /* From: $GCLI/lib/gcli/commands/help.css */
 
+.gcli-help-name {
+  text-align: end;
+}
+
 .gcli-help-arrow {
   font-size: 70%;
   color: #AAA;
 }
 
 .gcli-help-synopsis {
-  font-family: Consolas, Inconsolata, "Courier New", monospace;
+  font-family: monospace;
   font-weight: normal;
   padding: 0 3px;
   margin: 0 10px;
   border: 1px solid #999;
   border-radius: 3px;
+  color: #666;
+  cursor: pointer;
+  display: inline-block;
 }
 
 .gcli-help-synopsis:before {
   color: #66F;
+  content: '\bb';
 }
 
 .gcli-help-description {
@@ -107,34 +354,3 @@
 .gcli-help-header {
   margin: 10px 0 6px;
 }
-
-
-/* From: $GCLI/lib/gcli/ui/fields/menu.css */
-
-.gcli-menu-name {
-  -moz-padding-start: 8px;
-}
-
-.gcli-menu-desc {
-  -moz-padding-end: 8px;
-  color: #999;
-}
-
-.gcli-menu-option:hover {
-  background-color: #EEE;
-}
-
-.gcli-menu-highlight,
-.gcli-menu-highlight.gcli-menu-option:hover {
-  background-color: #DDD;
-}
-
-.gcli-menu-error {
-  padding: 8px 10px 2px;
-  font-size: 80%;
-  color: red;
-}
-
-.gcli-menu-typed {
-  color: hsl(25,78%,50%);
-}
diff --git a/toolkit/devtools/debugger/server/dbg-script-actors.js b/toolkit/devtools/debugger/server/dbg-script-actors.js
index d5aef886b410..a479825756c1 100644
--- a/toolkit/devtools/debugger/server/dbg-script-actors.js
+++ b/toolkit/devtools/debugger/server/dbg-script-actors.js
@@ -714,29 +714,29 @@ ThreadActor.prototype = {
   },
 
   /**
-   * Create and return an environment actor that corresponds to the provided
-   * Debugger.Environment.
-   * @param Debugger.Environment aEnvironment
-   *        The lexical environment we want to extract.
+   * Create and return an environment actor that corresponds to the
+   * Debugger.Environment for the provided object.
+   * @param Debugger.Object aObject
+   *        The object whose lexical environment we want to extract.
    * @param object aPool
    *        The pool where the newly-created actor will be placed.
-   * @return The EnvironmentActor for aEnvironment or undefined for host
-   *         functions or functions scoped to a non-debuggee global.
+   * @return The EnvironmentActor for aObject or undefined for host functions or
+   *         functions scoped to a non-debuggee global.
    */
-  createEnvironmentActor:
-  function TA_createEnvironmentActor(aEnvironment, aPool) {
-    if (!aEnvironment) {
+  createEnvironmentActor: function TA_createEnvironmentActor(aObject, aPool) {
+    let environment = aObject.environment;
+    if (!environment) {
       return undefined;
     }
 
-    if (aEnvironment.actor) {
-      return aEnvironment.actor;
+    if (environment.actor) {
+      return environment.actor;
     }
 
-    let actor = new EnvironmentActor(aEnvironment, this);
+    let actor = new EnvironmentActor(aObject, this);
     this._environmentActors.push(actor);
     aPool.addActor(actor);
-    aEnvironment.actor = actor;
+    environment.actor = actor;
 
     return actor;
   },
@@ -1054,7 +1054,7 @@ ObjectActor.prototype = {
     let descriptor = {};
     descriptor.configurable = aObject.configurable;
     descriptor.enumerable = aObject.enumerable;
-    if (aObject.value !== undefined) {
+    if (aObject.value) {
       descriptor.writable = aObject.writable;
       descriptor.value = this.threadActor.createValueGrip(aObject.value);
     } else {
@@ -1102,7 +1102,7 @@ ObjectActor.prototype = {
                         " 'Function' class." };
     }
 
-    let envActor = this.threadActor.createEnvironmentActor(this.obj.environment,
+    let envActor = this.threadActor.createEnvironmentActor(this.obj,
                                                            this.registeredPool);
     if (!envActor) {
       return { error: "notDebuggee",
@@ -1110,7 +1110,7 @@ ObjectActor.prototype = {
     }
 
     return { name: this.obj.name || null,
-             scope: envActor.form(this.obj) };
+             scope: envActor.form() };
   },
 
   /**
@@ -1239,9 +1239,9 @@ FrameActor.prototype = {
     }
 
     let envActor = this.threadActor
-                       .createEnvironmentActor(this.frame.environment,
+                       .createEnvironmentActor(this.frame,
                                                this.frameLifetimePool);
-    form.environment = envActor ? envActor.form(this.frame) : envActor;
+    form.environment = envActor ? envActor.form() : envActor;
     form.this = this.threadActor.createValueGrip(this.frame.this);
     form.arguments = this._args();
     if (this.frame.script) {
@@ -1350,14 +1350,14 @@ BreakpointActor.prototype.requestTypes = {
  * the bindings introduced by a lexical environment and assigning new values to
  * those identifier bindings.
  *
- * @param Debugger.Environment aEnvironment
- *        The lexical environment that will be used to create the actor.
+ * @param Debugger.Object aObject
+ *        The object whose lexical environment will be used to create the actor.
  * @param ThreadActor aThreadActor
  *        The parent thread actor that contains this environment.
  */
-function EnvironmentActor(aEnvironment, aThreadActor)
+function EnvironmentActor(aObject, aThreadActor)
 {
-  this.obj = aEnvironment;
+  this.obj = aObject;
   this.threadActor = aThreadActor;
 }
 
@@ -1365,47 +1365,41 @@ EnvironmentActor.prototype = {
   actorPrefix: "environment",
 
   /**
-   * Returns an environment form for use in a protocol message. Note that the
-   * requirement of passing the frame or function as a parameter is only
-   * temporary, since when bug 747514 lands, the environment will have a callee
-   * property that will contain it.
-   *
-   * @param object aObject
-   *        The stack frame or function object whose environment bindings are
-   *        being generated.
+   * Returns an environment form for use in a protocol message.
    */
-  form: function EA_form(aObject) {
+  form: function EA_form() {
     // Debugger.Frame might be dead by the time we get here, which will cause
     // accessing its properties to throw.
-    if (!aObject.live) {
+    if (!this.obj.live) {
       return undefined;
     }
 
     let parent;
-    if (this.obj.parent) {
-      let thread = this.threadActor;
-      parent = thread.createEnvironmentActor(this.obj.parent.environment,
-                                             this.registeredPool);
+    if (this.obj.environment.parent) {
+      parent = this.threadActor
+                   .createEnvironmentActor(this.obj.environment.parent,
+                                           this.registeredPool);
     }
     let form = { actor: this.actorID,
-                 parent: parent ? parent.form(this.obj.parent) : parent };
+                 parent: parent ? parent.form() : parent };
 
-    if (aObject.type == "object") {
-      if (this.obj.parent) {
+    if (this.obj.environment.type == "object") {
+      if (this.obj.environment.parent) {
         form.type = "with";
       } else {
         form.type = "object";
       }
-      form.object = this.threadActor.createValueGrip(aObject.object);
+      form.object = this.threadActor.createValueGrip(this.obj.environment.object);
     } else {
-      if (aObject.class == "Function") {
+      if (this.obj.class == "Function") {
         form.type = "function";
-        form.function = this.threadActor.createValueGrip(aObject);
-        form.functionName = aObject.name;
+        form.function = this.threadActor.createValueGrip(this.obj);
+        form.functionName = this.obj.name;
       } else {
         form.type = "block";
       }
-      form.bindings = this._bindings(aObject);
+
+      form.bindings = this._bindings();
     }
 
     return form;
@@ -1413,41 +1407,19 @@ EnvironmentActor.prototype = {
 
   /**
    * Return the identifier bindings object as required by the remote protocol
-   * specification. Note that the requirement of passing the frame or function
-   * as a parameter is only temporary, since when bug 747514 lands, the
-   * environment will have a callee property that will contain it.
-   *
-   * @param object aObject [optional]
-   *        The stack frame or function object whose environment bindings are
-   *        being generated. When left unspecified, the bindings do not contain
-   *        an 'arguments' property.
+   * specification.
    */
-  _bindings: function EA_bindings(aObject) {
+  _bindings: function EA_bindings() {
     let bindings = { arguments: [], variables: {} };
 
-    // TODO: this part should be removed in favor of the commented-out part
-    // below when getVariableDescriptor lands (bug 725815).
-    if (typeof this.obj.getVariable != "function") {
-    //if (typeof this.obj.getVariableDescriptor != "function") {
+    // TODO: this will be redundant after bug 692984 is fixed.
+    if (typeof this.obj.environment.getVariableDescriptor != "function") {
       return bindings;
     }
 
-    let parameterNames;
-    if (aObject && aObject.callee) {
-      parameterNames = aObject.callee.parameterNames;
-    }
-    for each (let name in parameterNames) {
+    for (let name in this.obj.parameterNames) {
       let arg = {};
-      // TODO: this part should be removed in favor of the commented-out part
-      // below when getVariableDescriptor lands (bug 725815).
-      let desc = {
-        value: this.obj.getVariable(name),
-        configurable: false,
-        writable: true,
-        enumerable: true
-      };
-
-      // let desc = this.obj.getVariableDescriptor(name);
+      let desc = this.obj.environment.getVariableDescriptor(name);
       let descForm = {
         enumerable: true,
         configurable: desc.configurable
@@ -1463,22 +1435,14 @@ EnvironmentActor.prototype = {
       bindings.arguments.push(arg);
     }
 
-    for each (let name in this.obj.names()) {
+    for (let name in this.obj.environment.names()) {
       if (bindings.arguments.some(function exists(element) {
                                     return !!element[name];
                                   })) {
         continue;
       }
 
-      // TODO: this part should be removed in favor of the commented-out part
-      // below when getVariableDescriptor lands.
-      let desc = {
-        value: this.obj.getVariable(name),
-        configurable: false,
-        writable: true,
-        enumerable: true
-      };
-      //let desc = this.obj.getVariableDescriptor(name);
+      let desc = this.obj.environment.getVariableDescriptor(name);
       let descForm = {
         enumerable: true,
         configurable: desc.configurable
@@ -1504,7 +1468,7 @@ EnvironmentActor.prototype = {
    *        The protocol request object.
    */
   onAssign: function EA_onAssign(aRequest) {
-    let desc = this.obj.getVariableDescriptor(aRequest.name);
+    let desc = this.obj.environment.getVariableDescriptor(aRequest.name);
 
     if (!desc.writable) {
       return { error: "immutableBinding",
@@ -1513,7 +1477,7 @@ EnvironmentActor.prototype = {
     }
 
     try {
-      this.obj.setVariable(aRequest.name, aRequest.value);
+      this.obj.environment.setVariable(aRequest.name, aRequest.value);
     } catch (e) {
       if (e instanceof Debugger.DebuggeeWouldRun) {
         return { error: "threadWouldRun",
diff --git a/toolkit/devtools/debugger/tests/unit/test_framebindings-01.js b/toolkit/devtools/debugger/tests/unit/test_framebindings-01.js
deleted file mode 100644
index 15ab5febdd63..000000000000
--- a/toolkit/devtools/debugger/tests/unit/test_framebindings-01.js
+++ /dev/null
@@ -1,63 +0,0 @@
-/* Any copyright is dedicated to the Public Domain.
-   http://creativecommons.org/publicdomain/zero/1.0/ */
-
-/**
- * Check a frame actor's bindings property.
- */
-
-var gDebuggee;
-var gClient;
-var gThreadClient;
-
-function run_test()
-{
-  initTestDebuggerServer();
-  gDebuggee = addTestGlobal("test-stack");
-  gClient = new DebuggerClient(DebuggerServer.connectPipe());
-  gClient.connect(function() {
-    attachTestGlobalClientAndResume(gClient, "test-stack", function(aResponse, aThreadClient) {
-      gThreadClient = aThreadClient;
-      test_pause_frame();
-    });
-  });
-  do_test_pending();
-}
-
-function test_pause_frame()
-{
-  gThreadClient.addOneTimeListener("paused", function(aEvent, aPacket) {
-    let bindings = aPacket.frame.environment.bindings;
-    let args = bindings.arguments;
-    let vars = bindings.variables;
-
-    do_check_eq(args.length, 6);
-    do_check_eq(args[0].aNumber.value, 42);
-    do_check_eq(args[1].aBool.value, true);
-    do_check_eq(args[2].aString.value, "nasu");
-    do_check_eq(args[3].aNull.value.type, "null");
-    do_check_eq(args[4].aUndefined.value.type, "undefined");
-    do_check_eq(args[5].aObject.value.type, "object");
-    do_check_eq(args[5].aObject.value.class, "Object");
-    do_check_true(!!args[5].aObject.value.actor);
-
-    do_check_eq(vars.a.value, 1);
-    do_check_eq(vars.b.value, true);
-    do_check_eq(vars.c.value.type, "object");
-    do_check_eq(vars.c.value.class, "Object");
-    do_check_true(!!vars.c.value.actor);
-
-    gThreadClient.resume(function() {
-      finishClient(gClient);
-    });
-  });
-
-  gDebuggee.eval("(" + function() {
-    function stopMe(aNumber, aBool, aString, aNull, aUndefined, aObject) {
-      var a = 1;
-      var b = true;
-      var c = { a: "a" };
-      debugger;
-    };
-    stopMe(42, true, "nasu", null, undefined, { foo: "bar" });
-  } + ")()");
-}
diff --git a/toolkit/devtools/debugger/tests/unit/xpcshell.ini b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
index d5eda7023465..43f6ce50b29c 100644
--- a/toolkit/devtools/debugger/tests/unit/xpcshell.ini
+++ b/toolkit/devtools/debugger/tests/unit/xpcshell.ini
@@ -53,4 +53,3 @@ tail =
 [test_stepping-02.js]
 [test_stepping-03.js]
 [test_stepping-04.js]
-[test_framebindings-01.js]